Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

atms-dao/src/main/java/pwc/taxtech/atms/entity/Organization.java

@@ -268,6 +268,8 @@ public class Organization implements Serializable {
      */
     private String vehicleroutinglocation;
 
+    private String vehicleRoutingLocation;
+
     /**
      *
      * This field was generated by MyBatis Generator.
@@ -353,6 +355,14 @@ public class Organization implements Serializable {
 
     private BusinessUnit businessUnit;
 
+    public String getVehicleRoutingLocation() {
+        return vehicleRoutingLocation;
+    }
+
+    public void setVehicleRoutingLocation(String vehicleRoutingLocation) {
+        this.vehicleRoutingLocation = vehicleRoutingLocation;
+    }
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table Organization

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/AreaRegionExtendsMapper.xml

@@ -31,9 +31,9 @@
 
     <select id="selectAreaRegionByAreaId" parameterType="string" resultMap="ResultMapWithAreaAndRegion">
         SELECT
-        areaRegion.id,
-        areaRegion.area_id AS AREA_REGION_AREA_ID,
-        areaRegion.region_id AS AREA_REGION_REGION_ID,
+        area_region.id,
+        area_region.area_id AS AREA_REGION_AREA_ID,
+        area_region.region_id AS AREA_REGION_REGION_ID,
         area.id AS AREA_ID,
         area.parent_id AS AREA_PARENT_ID,
         area.name AS AREA_NAME,
@@ -50,13 +50,13 @@
         region.latitude AS REGION_LATITUDE,
         region.is_active AS REGION_IS_ACTIVE
         FROM
-        areaRegion,
+        area_region,
         area,
         region
         WHERE
-        areaRegion.area_id = area.ID
-        AND areaRegion.region_id = region.ID
-        AND areaRegion.area_id = #{areaId}
+        area_region.area_id = area.ID
+        AND area_region.region_id = region.ID
+        AND area_region.area_id = #{areaId}
         ORDER BY
         region_id
     </select>

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/IndustryExtendsMapper.xml

@@ -46,7 +46,7 @@
         WHERE
         A.name = "通用行业"
         AND B.group_type = 2
-        --AND rownum =1
+        LIMIT 1
     </select>
 
 </mapper>
\ No newline at end of file

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/RolePermissionExtendsMapper.xml

@@ -38,8 +38,8 @@
 
     <select id="selectByRoleAndServiceTypeWithAssociation" resultMap="ResultMapWithAssociation">
         SELECT
-        RP.id AS ID,
-        rp.roleid AS ROLE_ID,
+        rp.id AS ID,
+        rp.role_id AS ROLE_ID,
         rp.permission_id AS PERMISSION_ID,
         r.id AS ROLE_ID,
         r.name AS ROLE_NAME,
@@ -71,14 +71,14 @@
         p.id = rp.permission_id
         where
         rp.role_id= #{roleId,jdbcType=VARCHAR}
-        AND R.service_type_id= #{serviceTypeId,jdbcType=VARCHAR}
+        AND r.service_type_id= #{serviceTypeId,jdbcType=VARCHAR}
     </select>
 
     <select id="selectByRoleListAndServiceTypeWithAssociation" resultMap="ResultMapWithAssociation">
         SELECT
-        RP.id AS ID,
-        rp.role_id,
-        rp.permission_id,
+        rp.id AS ID,
+        rp.role_id as ROLE_ID,
+        rp.permission_id as PERMISSION_ID,
         r.id AS ROLE_ID,
         r.name AS ROLE_NAME,
         r.description AS ROLE_DESCRIPTION,
@@ -109,7 +109,7 @@
         p.id = rp.permission_id
         where
         r.service_type_id= #{serviceTypeId,jdbcType=VARCHAR}
-        AND RP.role_id in
+        AND rp.role_id in
         <foreach close=")" collection="roleList" index="index" item="roleID" open="(" separator=",">
             #{roleID}
         </foreach>

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/TemplateExtendsMapper.xml

@@ -71,7 +71,7 @@
         P.template_group_id=Q.id
         WHERE
         p.id= #{id,jdbcType=VARCHAR}
-        --AND ROWNUM=1
+        LIMIT 1
     </select>
 
     <select id="getCountOfTemplateAndGroupByTemplateName" parameterType="map" resultType="java.lang.Long">

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/DataSourceExtendsMapper.xml

@@ -310,7 +310,8 @@
         ON
         CELLDATA.ID = CELLDATASOURCE.CELL_DATA_ID
         WHERE
-        CELLDATASOURCE.DATA_SOURCE_ID = #{dataSourceID,jdbcType=BIGINT} AND ROWNUM = 1
+        CELLDATASOURCE.DATA_SOURCE_ID = #{dataSourceID,jdbcType=BIGINT}
+        LIMIT 1
     </select>
 
     <!--DELETE FROM period_tax_rule_setting WHERE period=#{period,jdbcType=INTEGER};-->

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/PeriodCellTemplateConfigExtendsMapper.xml

@@ -230,8 +230,9 @@
         AND CT.COLUMN_INDEX = #{columnIndex,jdbcType = INTEGER}
         AND CT.PERIOD = #{period,jdbcType = INTEGER}
         AND CTC.DATA_SOURCE_TYPE = 2
-        AND CTC.PERIOD= #{period,jdbcType = INTEGER} AND ROWNUM = 1
+        AND CTC.PERIOD= #{period,jdbcType = INTEGER}
         AND CT.PROJECT_ID = #{projectId,jdbcType=VARCHAR}
+        LIMIT 1
     </select>
 
 </mapper>
\ No newline at end of file

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/PeriodCellTemplateExtendsMapper.xml

@@ -112,7 +112,8 @@
         AND CT.PERIOD = R.PERIOD
         WHERE
         CT.CELL_TEMPLATE_ID = #{cellTemplateId,jdbcType=BIGINT}
-        AND R.ID = #{reportId,jdbcType=BIGINT} AND ROWNUM = 1
+        AND R.ID = #{reportId,jdbcType=BIGINT}
+        LIMIT 1
     </select>
 
 </mapper>
\ No newline at end of file

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/PeriodDataSourceExtendsMapper.xml

@@ -339,7 +339,8 @@
         ON
         CELLDATA.ID = CELLDATASOURCE.CELL_DATA_ID AND CELLDATA.PROJECT_ID = CELLDATASOURCE.PROJECT_ID
         WHERE
-        CELLDATASOURCE.DATA_SOURCE_ID = #{dataSourceID,jdbcType=BIGINT} AND ROWNUM = 1
+        CELLDATASOURCE.DATA_SOURCE_ID = #{dataSourceID,jdbcType=BIGINT}
+        LIMIT 1
     </select>