[dev]fixed mapp xml property ID to id

atms-dao/src/main/java/pwc/taxtech/atms/dpo/ProjectDisplayDto.java

@@ -16,6 +16,7 @@ public class ProjectDisplayDto {
     private Date expiredDate ;
     private Boolean haveCreateProject ;
     private String id ;
+
     private String industryId ;
     private String industryName ;
     private Boolean isActive ;

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

@@ -4,17 +4,17 @@
 
     <!-- User defined -->
     <resultMap id="ResultMapWithAreaAndRegion" type="pwc.taxtech.atms.entity.AreaRegion">
-        <id column="ID" jdbcType="VARCHAR" property="ID"/>
+        <id column="ID" jdbcType="VARCHAR" property="id"/>
         <result column="AREA_REGION_AREA_ID" jdbcType="VARCHAR" property="areaId"/>
         <result column="AREA_REGION_REGION_ID" jdbcType="VARCHAR" property="regionId"/>
         <association column="AREA_ID" javaType="pwc.taxtech.atms.entity.Area" property="area">
-            <id column="AREA_ID" property="ID"/>
+            <id column="AREA_ID" property="id"/>
             <result column="AREA_PARENT_ID" property="parentId"/>
             <result column="AREA_NAME" property="name"/>
             <result column="AREA_IS_ACTIVE" property="isActive"/>
         </association>
         <association column="REGION_ID" javaType="pwc.taxtech.atms.entity.Region" property="region">
-            <id column="REGION_ID" property="ID"/>
+            <id column="REGION_ID" property="id"/>
             <result column="REGION_PARENT_ID" property="parentId"/>
             <result column="REGION_NAME" property="name"/>
             <result column="REGION_SHORT_NAME" property="shortName"/>
@@ -63,7 +63,7 @@
     </select>
 
     <resultMap id="resultMapAreaRegionDto" type="pwc.taxtech.atms.dto.arearegion.AreaRegionDto">
-        <id column="ID" jdbcType="VARCHAR" property="ID"/>
+        <id column="ID" jdbcType="VARCHAR" property="id"/>
         <result column="AREA_ID" property="areaId"/>
         <result column="REGION_NAME" property="regionName"/>
         <result column="REGION_ID" property="regionId"/>

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

@@ -3,7 +3,7 @@
 <mapper namespace="pwc.taxtech.atms.dao.BusinessUnitMapper">
 
     <resultMap id="OrganizationDto" type="pwc.taxtech.atms.dpo.OrganizationDto">
-        <id column="ID" jdbcType="VARCHAR" property="ID"/>
+        <id column="ID" jdbcType="VARCHAR" property="id"/>
         <result column="ORGANIZATION_NAME" jdbcType="VARCHAR" property="name"/>
         <result column="INDUSTRY_NAME" jdbcType="VARCHAR" property="industryName"/>
         <result column="BUSINESS_UNIT_NAME" jdbcType="VARCHAR" property="businessUnitName"/>

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

@@ -3,7 +3,7 @@
 <mapper namespace="pwc.taxtech.atms.dao.DimensionMapper">
 
     <resultMap id="OrganizationDto" type="pwc.taxtech.atms.dpo.OrganizationDto">
-        <id column="ID" jdbcType="VARCHAR" property="ID"/>
+        <id column="ID" jdbcType="VARCHAR" property="id"/>
         <result column="DIMENSION_ID" jdbcType="VARCHAR" property="dimensionId"/>
         <result column="DIMENSION_NAME" jdbcType="VARCHAR" property="dimensionName"/>
         <result column="DIMENSION_VALUE_ID" jdbcType="VARCHAR" property="dimensionValueId"/>

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

@@ -14,7 +14,7 @@
     </select>
 
     <resultMap id="DimensionValueJoinDimensionDto" type="pwc.taxtech.atms.dto.dimension.DimensionValueJoinDimensionDto">
-        <id column="ID" jdbcType="VARCHAR" property="ID"/>
+        <id column="ID" jdbcType="VARCHAR" property="id"/>
         <result column="DIMENSION_NAME" jdbcType="VARCHAR" property="dimensionName"/>
         <result column="DIMENSION_VALUE" jdbcType="VARCHAR" property="dimensionValue"/>
         <result column="DIMENSION_VALUE_ID" jdbcType="VARCHAR" property="dimensionValueId"/>

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

@@ -3,7 +3,7 @@
 <mapper namespace="pwc.taxtech.atms.dao.DimensionValueOrgMapper">
 
     <resultMap id="UnionDimensionValueOrg" type="pwc.taxtech.atms.dto.dimension.UnionDimensionValueOrg">
-        <id column="ID" jdbcType="VARCHAR" property="ID"/>
+        <id column="ID" jdbcType="VARCHAR" property="id"/>
         <result column="DIMENSION_VALUE_ID" jdbcType="VARCHAR" property="dimensionValueId"/>
         <result column="ORGANIZATION_ID" jdbcType="VARCHAR" property="organizationId"/>
         <result column="DIMENSION_ID" jdbcType="VARCHAR" property="dimensionId"/>

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

@@ -22,7 +22,7 @@
         </if>
     </select>
     <resultMap id="EnterpriseAccountSetOrgDto" type="pwc.taxtech.atms.dpo.EnterpriseAccountSetOrgDto">
-        <id column="ID" jdbcType="VARCHAR" property="ID"/>
+        <id column="ID" jdbcType="VARCHAR" property="id"/>
         <result column="ENTERPRISE_ACCOUNT_SET_ID" jdbcType="VARCHAR" property="enterpriseAccountSetId"/>
         <result column="ORGANIZATION_ID" jdbcType="VARCHAR" property="organizationId"/>
         <result column="EFFECTIVE_DATE" jdbcType="VARCHAR" property="effectiveDate"/>

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

@@ -3,7 +3,7 @@
 <mapper namespace="pwc.taxtech.atms.dao.ModelConfigMapper">
 
     <resultMap id="getModelListByIndustryResult" type="pwc.taxtech.atms.dpo.ModelProfileDto">
-        <id column="ID" jdbcType="VARCHAR" property="ID"/>
+        <id column="ID" jdbcType="VARCHAR" property="id"/>
         <result column="NAME" jdbcType="VARCHAR" property="name"/>
         <result column="CATEGORY_ID" jdbcType="VARCHAR" property="categoryId"/>
         <result column="CATEGORY_STRING" jdbcType="VARCHAR" property="categoryString"/>

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

@@ -89,7 +89,7 @@
     </select>
 
     <resultMap id="OrganizationDto" type="pwc.taxtech.atms.dpo.OrganizationDto">
-        <id column="ID" jdbcType="VARCHAR" property="ID"/>
+        <id column="ID" jdbcType="VARCHAR" property="id"/>
 
         <!-- 注意! OrganizationName 对应 name-->
         <result column="ORGANIZATION_NAME" jdbcType="VARCHAR" property="name"/>
@@ -205,7 +205,7 @@
     </select>
 
     <resultMap id="OrganizationDtoForAreaRegIndBusList" type="pwc.taxtech.atms.dpo.OrganizationDto">
-        <id column="ID" jdbcType="VARCHAR" property="ID"/>
+        <id column="ID" jdbcType="VARCHAR" property="id"/>
         <result column="NAME" jdbcType="VARCHAR" property="name"/>
         <result column="BUSINESS_UNIT_ID" jdbcType="VARCHAR" property="businessUnitId"/>
         <result column="BUSINESS_UNIT_NAME" jdbcType="VARCHAR" property="businessUnitName"/>
@@ -222,7 +222,7 @@
     </resultMap>
 
     <resultMap id="OrganizationDtoForCDOrgList" type="pwc.taxtech.atms.dpo.OrganizationDto">
-        <id column="ID" jdbcType="VARCHAR" property="ID"/>
+        <id column="ID" jdbcType="VARCHAR" property="id"/>
         <result column="NAME" jdbcType="VARCHAR" property="name"/>
         <result column="ATTRIBUTE_ID" jdbcType="VARCHAR" property="attributeId"/>
         <result column="ATTRIBUTE_NAME" jdbcType="VARCHAR" property="attributeName"/>
@@ -269,7 +269,7 @@
     </select>
 
     <resultMap id="OrgDtoForGetDimValueOrgList" type="pwc.taxtech.atms.dpo.DimensionValueOrgDto">
-        <id column="ID" jdbcType="VARCHAR" property="ID"/>
+        <id column="ID" jdbcType="VARCHAR" property="id"/>
         <result column="DIMENSION_VALUE_ID" jdbcType="VARCHAR" property="dimensionValueId"/>
         <result column="ORGANIZATION_ID" jdbcType="VARCHAR" property="organizationId"/>
         <result column="ORGANIZATION_NAME" jdbcType="VARCHAR" property="organizationName"/>
@@ -417,7 +417,7 @@
     </select>
 
     <resultMap id="OrgDtoForGetAllCusDimOrgList" type="pwc.taxtech.atms.dpo.OrganizationDto">
-        <id column="ID" jdbcType="VARCHAR" property="ID"/>
+        <id column="ID" jdbcType="VARCHAR" property="id"/>
         <result column="NAME" jdbcType="VARCHAR" property="name"/>
         <result column="ATTRIBUTE_ID" jdbcType="VARCHAR" property="attributeId"/>
         <result column="ATTRIBUTE_NAME" jdbcType="VARCHAR" property="attributeName"/>
@@ -469,7 +469,7 @@
     </select>
 
     <resultMap id="OrgDtoForGetSingleOrgByOrgID" type="pwc.taxtech.atms.dpo.OrganizationDto">
-        <id column="ID" jdbcType="VARCHAR" property="ID"/>
+        <id column="ID" jdbcType="VARCHAR" property="id"/>
         <result column="CLIENT_CODE" jdbcType="VARCHAR" property="clientCode"/>
         <result column="NAME" jdbcType="VARCHAR" property="name"/>
         <result column="ENGLISH_NAME" jdbcType="VARCHAR" property="englishName"/>
@@ -585,7 +585,7 @@
     </select>
 
     <resultMap id="OrgGeneralInfoMiddleDto" type="pwc.taxtech.atms.dto.organization.OrgGeneralInfoMiddleDto">
-        <id column="ID" jdbcType="VARCHAR" property="ID"/>
+        <id column="ID" jdbcType="VARCHAR" property="id"/>
         <result column="ORG_NAME" jdbcType="VARCHAR" property="orgName"/>
         <result column="TAX_PAYER_NUMBER" jdbcType="VARCHAR" property="taxPayerNumber"/>
         <result column="ACCOUNT_SET_NAME" jdbcType="VARCHAR" property="accountSetName"/>

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

@@ -3,7 +3,7 @@
 <mapper namespace="pwc.taxtech.atms.dao.OrganizationServiceTemplateGroupMapper">
 
     <resultMap id="OrganizationServiceTemplateGroupDto" type="pwc.taxtech.atms.dpo.OrganizationServiceTemplateGroupDto">
-        <id column="ID" jdbcType="VARCHAR" property="ID"/>
+        <id column="ID" jdbcType="VARCHAR" property="id"/>
         <result column="SERVICE_TYPE_ID" jdbcType="VARCHAR" property="serviceTypeId"/>
         <result column="ORGANIZATION_ID" jdbcType="VARCHAR" property="organizationId"/>
         <result column="TEMPLATE_GROUP_ID" jdbcType="VARCHAR" property="templateGroupId"/>

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

@@ -13,7 +13,7 @@
 
     <resultMap extends="BaseResultMap" id="ResultMapWithAssociation" type="pwc.taxtech.atms.entity.RolePermission">
         <association column="ROLE_ID" javaType="pwc.taxtech.atms.entity.Role" property="role">
-            <id column="ROLE_ID" property="ID"/>
+            <id column="ROLE_ID" property="id"/>
             <result column="ROLE_NAME" property="name"/>
             <result column="ROLE_DESCRIPTION" property="description"/>
             <result column="ROLE_CATEGORY_ID" property="roleCategoryId"/>
@@ -22,7 +22,7 @@
             <result column="ROLE_UPDATE_TIME" property="updateTime"/>
         </association>
         <association column="PERMISSION_ID" javaType="pwc.taxtech.atms.entity.Permission" property="permission">
-            <id column="PERMISSION_ID" property="ID"/>
+            <id column="PERMISSION_ID" property="id"/>
             <result column="PERMISSION_NAME" property="name"/>
             <result column="PERMISSION_CODE" property="code"/>
             <result column="PERMISSION_PARENT_ID" property="parentId"/>

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

@@ -3,7 +3,7 @@
 <mapper namespace="pwc.taxtech.atms.dao.UserDimensionValueRoleMapper">
 
     <resultMap id="UserOrgRoleDto" type="pwc.taxtech.atms.dpo.UserOrgRoleDto">
-        <id column="ID" jdbcType="VARCHAR" property="ID"/>
+        <id column="ID" jdbcType="VARCHAR" property="id"/>
         <result column="ROLE_ID" jdbcType="VARCHAR" property="roleId"/>
         <result column="ROLE_NAME" jdbcType="VARCHAR" property="roleName"/>
     </resultMap>

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

@@ -3,7 +3,7 @@
 <mapper namespace="pwc.taxtech.atms.dao.UserOrganizationRoleMapper">
 
     <resultMap id="UserOrgRoleDto" type="pwc.taxtech.atms.dpo.UserOrgRoleDto">
-        <id column="ID" jdbcType="VARCHAR" property="ID"/>
+        <id column="ID" jdbcType="VARCHAR" property="id"/>
         <result column="ROLE_ID" jdbcType="VARCHAR" property="roleId"/>
         <result column="ROLE_NAME" jdbcType="VARCHAR" property="roleName"/>
     </resultMap>

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

@@ -3,7 +3,7 @@
 <mapper namespace="pwc.taxtech.atms.dao.UserRoleMapper">
 
     <resultMap id="UserRoleQuery" type="pwc.taxtech.atms.dto.user.UserRoleQuery">
-        <id column="ID" jdbcType="VARCHAR" property="ID"/>
+        <id column="ID" jdbcType="VARCHAR" property="id"/>
         <result column="USER_ID" jdbcType="VARCHAR" property="userId"/>
         <result column="USER_NAME" jdbcType="VARCHAR" property="userName"/>
         <result column="ROLE_ID" jdbcType="VARCHAR" property="roleId"/>
@@ -67,7 +67,7 @@
     </select>
 
     <resultMap id="UserOrgRoleDto" type="pwc.taxtech.atms.dpo.UserOrgRoleDto">
-        <id column="ID" jdbcType="VARCHAR" property="ID"/>
+        <id column="ID" jdbcType="VARCHAR" property="id"/>
         <result column="USER_ID" jdbcType="VARCHAR" property="userId"/>
         <result column="ROLE_ID" jdbcType="VARCHAR" property="roleId"/>
         <result column="ROLE_NAME" jdbcType="VARCHAR" property="roleName"/>

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

@@ -6,7 +6,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    <id column="ID" jdbcType="VARCHAR" property="ID" />
+    <id column="ID" jdbcType="VARCHAR" property="id" />
     <result column="AcctCode" jdbcType="VARCHAR" property="acctCode" />
     <result column="Name" jdbcType="VARCHAR" property="name" />
     <result column="ParentCode" jdbcType="VARCHAR" property="parentCode" />

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

@@ -6,7 +6,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    <id column="ID" jdbcType="VARCHAR" property="ID" />
+    <id column="ID" jdbcType="VARCHAR" property="id" />
     <result column="OperationName" jdbcType="VARCHAR" property="operationName" />
     <result column="ModuleID" jdbcType="INTEGER" property="moduleID" />
     <result column="OperationObject" jdbcType="VARCHAR" property="operationObject" />

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

@@ -6,7 +6,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    <id column="ID" jdbcType="VARCHAR" property="ID" />
+    <id column="ID" jdbcType="VARCHAR" property="id" />
     <result column="Code" jdbcType="VARCHAR" property="code" />
     <result column="Name" jdbcType="VARCHAR" property="name" />
     <result column="ParentCode" jdbcType="VARCHAR" property="parentCode" />

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

@@ -139,7 +139,7 @@
     <resultMap id="inputVATInvoiceResultDto" type="pwc.taxtech.atms.dto.vatdto.InputVATInvoiceResultDto">
         <id property="invoiceID" column="invoice_id"/>
         <association property="inputVATInvoice" javaType="pwc.taxtech.atms.vat.entity.InputVatInvoice">
-            <id column="ID" jdbcType="VARCHAR" property="ID"/>
+            <id column="ID" jdbcType="VARCHAR" property="id"/>
             <result column="PERIOD_ID" jdbcType="INTEGER" property="periodId"/>
             <result column="INVOICE_CODE" jdbcType="VARCHAR" property="invoiceCode"/>
             <result column="INVOICE_NUMBER" jdbcType="VARCHAR" property="invoiceNumber"/>
@@ -157,7 +157,7 @@
             <result column="ACCNTED_PERIOD" jdbcType="INTEGER" property="accntedPeriod"/>
         </association>
         <association property="inputVATInvoiceItem" javaType="pwc.taxtech.atms.vat.entity.InputVatInvoiceItem">
-            <id column="ID" jdbcType="VARCHAR" property="ID"/>
+            <id column="ID" jdbcType="VARCHAR" property="id"/>
             <result column="INPUT_VAT_INVOICE_ID" jdbcType="VARCHAR" property="inputVATInvoiceId"/>
             <result column="PERIOD_ID" jdbcType="INTEGER" property="periodId"/>
             <result column="INVOICE_CODE" jdbcType="VARCHAR" property="invoiceCode"/>
@@ -171,7 +171,7 @@
             <result column="PRODUCTION_CODE" jdbcType="VARCHAR" property="productionCode"/>
         </association>
         <association property="goodsMapping" javaType="pwc.taxtech.atms.vat.entity.GoodsMapping">
-            <id column="ID" jdbcType="VARCHAR" property="ID"/>
+            <id column="ID" jdbcType="VARCHAR" property="id"/>
             <result column="CUST_GOODS_NAME" jdbcType="VARCHAR" property="custGoodsName"/>
             <result column="STD_GOODS_NAME" jdbcType="VARCHAR" property="stdGoodsName"/>
             <result column="CREATOR_ID" jdbcType="VARCHAR" property="creatorId"/>