[dev] fixed map sql to uppercase

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

@@ -72,16 +72,16 @@
     <select id="selectByRegionLevelType" parameterType="map" resultMap="resultMapAreaRegionDto">
         SELECT
         AREA_REGION_REAL.AREA_ID AS AREA_ID,
-        p.NAME AS REGION_NAME,
-        p.ID AS REGION_ID
+        P.NAME AS REGION_NAME,
+        P.ID AS REGION_ID
         FROM
         REGION AS P
         LEFT JOIN
         AREA_REGION AS AREA_REGION_REAL
         ON
-        p.ID = AREA_REGION_REAL.REGION_ID
+        P.ID = AREA_REGION_REAL.REGION_ID
         WHERE
-        p.LEVEL_TYPE = #{regionLevelType}
+        P.LEVEL_TYPE = #{regionLevelType}
     </select>
 
 </mapper>
\ No newline at end of file

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

@@ -42,8 +42,8 @@
 
         SELECT
         ID,
-        DimensionValueID,
-        OrganizationID
+        DIMENSION_VALUE_ID,
+        ORGANIZATION_ID
         FROM
         DIMENSION_VALUE_ORG
         )
@@ -52,7 +52,7 @@
         (
         SELECT
         ID AS DIMENSION_VALUE_ID,
-        Name AS DIMENSION_VALUE_NAME,
+        NAME AS DIMENSION_VALUE_NAME,
         IS_ACTIVE,
         #{organizationStructureID} AS DIMENSION_ID,
         CREATE_TIME,
@@ -62,7 +62,7 @@
         WHERE
         IS_ACTIVE=1
 
-        union
+        UNION
 
         SELECT
         ID AS DIMENSION_VALUE_ID,
@@ -83,10 +83,10 @@
         NAME AS DIMENSION_VALUE_NAME,
         IS_ACTIVE,
         #{areaID} AS DIMENSION_ID,
-        now (
+        NOW (
         )
         AS CREATE_TIME,
-        now (
+        NOW (
         )
         AS UPDATE_TIME
         FROM
@@ -109,13 +109,13 @@
         IS_ACTIVE=1
         )
         AS P
-        on
-        p.DIMENSION_VALUE_ID = q.DIMENSION_VALUE_ID
+        ON
+        P.DIMENSION_VALUE_ID = Q.DIMENSION_VALUE_ID
         JOIN
         DIMENSION AS R
-        on
-        r.IS_ACTIVE = 1
-        AND P.DIMENSION_ID = r.ID
+        ON
+        R.IS_ACTIVE = 1
+        AND P.DIMENSION_ID = R.ID
     </select>
 
 </mapper>
\ No newline at end of file

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

@@ -5,22 +5,22 @@
     <select id="getDto" resultType="pwc.taxtech.atms.dpo.EnterpriseAccountDto">
         SELECT
         EA.ID,
-        ea.CODE AS CODE,
-        ea.NAME AS NAME,
-        ea.PARENT_CODE AS PARENT_CODE,
-        ea.FULL_NAME AS FULL_NAME,
-        ea.IS_LEAF AS IS_LEAF,
-        ea.RULE_TYPE AS RULE_TYPE,
-        ea.ACCT_LEVEL AS ACCT_LEVEL,
-        ea.ACCT_PROP AS ACCT_PROP,
-        ea.DIRECTION AS DIRECTION,
-        ea.IS_ACTIVE AS IS_ACTIVE,
-        CASE WHEN am.STANDARD_ACCOUNT_CODE = '0000' THEN am.STANDARD_ACCOUNT_CODE ELSE sa.CODE END AS STD_CODE,
-        sa.NAME AS STD_NAME,
-        sa.PARENT_CODE AS STD_PARENT_CODE,
-        sa.DIRECTION AS STD_DIRECTION,
-        sa.ACCT_PROP AS STD_ACCT_PROP,
-        sa.FULL_NAME AS STD_FULL_NAME
+        EA.CODE AS CODE,
+        EA.NAME AS NAME,
+        EA.PARENT_CODE AS PARENT_CODE,
+        EA.FULL_NAME AS FULL_NAME,
+        EA.IS_LEAF AS IS_LEAF,
+        EA.RULE_TYPE AS RULE_TYPE,
+        EA.ACCT_LEVEL AS ACCT_LEVEL,
+        EA.ACCT_PROP AS ACCT_PROP,
+        EA.DIRECTION AS DIRECTION,
+        EA.IS_ACTIVE AS IS_ACTIVE,
+        CASE WHEN AM.STANDARD_ACCOUNT_CODE = '0000' THEN AM.STANDARD_ACCOUNT_CODE ELSE SA.CODE END AS STD_CODE,
+        SA.NAME AS STD_NAME,
+        SA.PARENT_CODE AS STD_PARENT_CODE,
+        SA.DIRECTION AS STD_DIRECTION,
+        SA.ACCT_PROP AS STD_ACCT_PROP,
+        SA.FULL_NAME AS STD_FULL_NAME
         FROM
         (
         SELECT
@@ -30,7 +30,7 @@
         WHERE
         ENTERPRISE_ACCOUNTSET_ID = #{epAccountSetID}
         )
-        ea
+        EA
         LEFT JOIN
         (
         SELECT
@@ -42,9 +42,9 @@
         AND INDUSTRY_ID = #{industryId}
         AND ENTERPRISE_ACCOUNT_SET_ID = #{epAccountSetID}
         )
-        am
+        AM
         ON
-        ea.CODE = am.ENTERPRISE_ACCOUNT_CODE
+        EA.CODE = AM.ENTERPRISE_ACCOUNT_CODE
         LEFT JOIN
         (
         SELECT
@@ -52,13 +52,13 @@
         FROM
         STANDARD_ACCOUNT
         WHERE
-        IndustryID = #{industryId}
+        INDUSTRY_ID = #{industryId}
         )
-        sa
+        SA
         ON
-        am.STANDARD_ACCOUNT_CODE = sa.CODE
+        AM.STANDARD_ACCOUNT_CODE = SA.CODE
         ORDER BY
-        ea.CODE
+        EA.CODE
     </select>
 
 </mapper>
\ No newline at end of file

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

@@ -5,20 +5,20 @@
     <select id="getAccountDtoByOrgId" resultMap="BaseResultMap">
         SELECT
         TA.ID,
-        ta.CODE,
-        ta.NAME,
-        ta.IS_ACTIVE,
-        ta.CREATOR_ID,
-        ta.CREATE_TIME,
-        ta.UPDATE_TIME
+        TA.CODE,
+        TA.NAME,
+        TA.IS_ACTIVE,
+        TA.CREATOR_ID,
+        TA.CREATE_TIME,
+        TA.UPDATE_TIME
         FROM
-        ENTERPRISE_ACCOUNT_SET ta
-        left outer JOIN
-        ENTERPRISE_ACCOUNT_SET_ORG tb
-        on
-        ta.ID = tb.ENTERPRISE_ACCOUNT_SET_ID
-        where
-        tb.ORGANIZATION_ID_= #{orgId}
+        ENTERPRISE_ACCOUNT_SET TA
+        LEFT OUTER JOIN
+        ENTERPRISE_ACCOUNT_SET_ORG TB
+        ON
+        TA.ID = TB.ENTERPRISE_ACCOUNT_SET_ID
+        WHERE
+        TB.ORGANIZATION_ID= #{orgId}
     </select>
 
 </mapper>
\ No newline at end of file

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

@@ -33,18 +33,18 @@
     <select id="getSingleOrgByOrgIDToEASODto" parameterType="map" resultMap="EnterpriseAccountSetOrgDto">
         SELECT
         M.ID AS ID,
-        m.ENTERPRISE_ACCOUNT_SET_ID AS ENTERPRISE_ACCOUNT_SET_ID,
-        m.ORGANIZATION_ID AS ORGANIZATION_ID,
-        m.EFFECTIVE_DATE AS EFFECTIVE_DATE,
-        m.EXPIRED_DATE AS EXPIRED_DATE,
-        n.NAME AS ENTERPRISE_ACCOUNT_SET_NAME
+        M.ENTERPRISE_ACCOUNT_SET_ID AS ENTERPRISE_ACCOUNT_SET_ID,
+        M.ORGANIZATION_ID AS ORGANIZATION_ID,
+        M.EFFECTIVE_DATE AS EFFECTIVE_DATE,
+        M.EXPIRED_DATE AS EXPIRED_DATE,
+        N.NAME AS ENTERPRISE_ACCOUNT_SET_NAME
         FROM
         ENTERPRISE_ACCOUNT_SET_ORG AS M
-        left JOIN
+        LEFT JOIN
         ENTERPRISE_ACCOUNT_SET AS N
-        on
-        m.ENTERPRISE_ACCOUNT_SET_ID = n.ID
+        ON
+        M.ENTERPRISE_ACCOUNT_SET_ID = N.ID
         WHERE
-        m.ORGANIZATION_ID = #{orgId}
+        M.ORGANIZATION_ID = #{ORGID}
     </select>
 </mapper>
\ No newline at end of file

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

@@ -38,14 +38,14 @@
         SELECT
         B.*
         FROM
-        INDUSTRY a
+        INDUSTRY A
         JOIN
-        template_group b
+        TEMPLATE_GROUP B
         ON
-        a.ID = b.industry_ids
+        A.ID = B.INDUSTRY_IDS
         WHERE
-        a.NAME = '通用行业'
-        AND B.group_type = 2 LIMIT 1
+        A.NAME = '通用行业'
+        AND B.GROUP_TYPE = 2 LIMIT 1
     </select>
 
 </mapper>
\ No newline at end of file

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

@@ -42,7 +42,7 @@
 
     <select id="selectIndBusiunitAreaOrgstrctReg" parameterType="map" resultMap="OrgBasicDto">
         SELECT
-        ORG.ID AS ID,
+        org.ID AS ID,
         org.PARENT_ID AS PARENT_ID,
         org.CODE AS CODE,
         org.NAME AS NAME,
@@ -59,25 +59,25 @@
         reg.MERGER_NAME AS REGION_NAME,
         org.IS_ACTIVE AS IS_ACTIVE
         FROM
-        ORGANIZATION  ORG
+        ORGANIZATION  org
         LEFT JOIN
-        INDUSTRY  IND
+        INDUSTRY  ind
         on
         org.INDUSTRY_ID = ind.ID
         LEFT JOIN
-        BUSINESS_UNIT  BU
+        BUSINESS_UNIT  bu
         on
         org.BUSINESS_UNIT_ID = bu.ID
         LEFT JOIN
-        AREA  AREA
+        AREA  area
         on
         org.AREA_ID = area.ID
         left JOIN
-        ORGANIZATION_STRUCTURE  OS
+        ORGANIZATION_STRUCTURE  os
         on
         org.STRUCTURE_ID = os.ID
         left JOIN
-        REGION  REG
+        REGION  reg
         on
         org.REGION_ID = reg.ID
         <if test="orgIsActive != null and orgIsActive == true">
@@ -115,7 +115,7 @@
 
     <select id="selectIndBusiunitAreaOrgstrct" parameterType="map" resultMap="OrganizationDto">
         SELECT
-        ORG.ID AS ID,
+        org.ID AS ID,
         org.NAME AS ORGANIZATION_NAME,
         org.PARENT_ID AS PARENT_ID,
         ind.NAME AS INDUSTRY_NAME,
@@ -132,21 +132,21 @@
         org.TAX_PAYER_NUMBER AS TAX_PAYER_NUMBER,
         org.IS_ACTIVE AS IS_ACTIVE
         FROM
-        ORGANIZATION  ORG
+        ORGANIZATION  org
         left JOIN
-        INDUSTRY  IND
+        INDUSTRY  ind
         on
         org.INDUSTRY_ID = ind.ID
         left JOIN
-        BUSINESS_UNIT  BU
+        BUSINESS_UNIT  bu
         on
         org.BUSINESS_UNIT_ID = bu.ID
         left JOIN
-        AREA  AREA
+        AREA  area
         on
         org.AREA_ID = area.ID
         left JOIN
-        ORGANIZATION_STRUCTURE  OS
+        ORGANIZATION_STRUCTURE  os
         on
         org.STRUCTURE_ID = os.ID
         <if test="orgIsActive != null and orgIsActive == true ">
@@ -174,11 +174,11 @@
         FROM
         DBO.ORGANIZATION p
         LEFT JOIN
-        DBO.BUSINESS_UNIT UNIT
+        DBO.BUSINESS_UNIT unit
         on
         p.BUSINESS_UNIT_ID = unit.ID --tempq
         left JOIN
-        DBO.INDUSTRY INDUSTRY
+        DBO.INDUSTRY industry
         on
         p.INDUSTRY_ID = industry.ID --industryReal
         left JOIN
@@ -235,34 +235,34 @@
     <!-- * 由于C#中OrganizationService.cs line 2356~2357以下代码被注释，故JAVA中未join * statDimension表做联合查询。 join sd in stat Dimension on d.ID equals sd.DimensionID * from sdTp in sdTemp.DefaultIfEmpty() -->
     <select id="getCustomDimensionOrgList" resultMap="OrganizationDtoForCDOrgList">
         SELECT DISTINCT
-        org.ID AS ID,
-        org.NAME AS NAME,
-        d.ATTRIBUTEID AS ATTRIBUTE_ID,
-        s.NAME AS ATTRIBUTE_NAME,
-        d.ID AS DIMENSION_ID,
-        d.NAME AS DIMENSION_NAME,
-        dv.ID AS DIMENSION_VALUE_ID,
-        dv.NAME AS DIMENSION_VALUE_NAME
+        ORG.ID AS ID,
+        ORG.NAME AS NAME,
+        D.ATTRIBUTEID AS ATTRIBUTE_ID,
+        S.NAME AS ATTRIBUTE_NAME,
+        D.ID AS DIMENSION_ID,
+        D.NAME AS DIMENSION_NAME,
+        DV.ID AS DIMENSION_VALUE_ID,
+        DV.NAME AS DIMENSION_VALUE_NAME
         FROM
         ORGANIZATION  ORG
         JOIN
         DIMENSION_VALUE_ORG  DVG
         ON
-        org.ID = dvg.ORGANIZATION_ID
+        ORG.ID = DVG.ORGANIZATION_ID
         JOIN
         DIMENSION_VALUE  DV
         ON
-        dvg.DIMENSION_VALUE_ID = dv.ID
+        DVG.DIMENSION_VALUE_ID = DV.ID
         JOIN
         DIMENSION  D
         ON
-        dv.DIMENSION_ID = d.ID
+        DV.DIMENSION_ID = D.ID
         JOIN
         STATISTIC_ATTRIBUTE  S
         ON
-        d.ATTRIBUTE_ID = s.ID
+        D.ATTRIBUTE_ID = S.ID
         WHERE
-        org.IS_ACTIVE = 1
+        ORG.IS_ACTIVE = 1
         AND S.IS_ACTIVE = 1
         AND D.IS_ACTIVE = 1
         AND DV.IS_ACTIVE = 1
@@ -280,7 +280,7 @@
 
     <select id="getDimensionValueOrgDtoList" resultMap="OrgDtoForGetDimValueOrgList">
         SELECT
-        DVQ.DIMENSION_VALUE_ID AS DIMENSION_VALUE_ID,
+        dvq.DIMENSION_VALUE_ID AS DIMENSION_VALUE_ID,
         dvgq.ORGANIZATION_ID AS ORGANIZATION_ID,
         dvgq.NAME AS ORGANIZATION_NAME,
         dvq.DIMENSION_ID AS DIMENSION_ID,
@@ -290,28 +290,28 @@
         FROM
         (
         SELECT
-        ORG.ID AS DIMENSION_VALUE_ID,
+        org.ID AS DIMENSION_VALUE_ID,
         org.NAME AS DIMENSION_VALUE_NAME,
         org.IS_ACTIVE AS IS_ACTIVE,
         'c61a5bd6-a996-4952-9869-d053966537e8' DIMENSION_ID,
         org.CREATE_TIME AS CREATE_TIME,
         org.UPDATE_TIME AS UPDATE_TIME
         FROM
-        ORGANIZATION  ORG
+        ORGANIZATION  org
         where
         org.IS_ACTIVE = 1
 
         union
 
         SELECT
-        BU.ID AS DIMENSION_VALUE_ID,
+        bu.ID AS DIMENSION_VALUE_ID,
         bu.NAME AS DIMENSION_VALUE_NAME,
         bu.IS_ACTIVE AS IS_ACTIVE,
         'c61a5bd6-a996-4952-9869-d053995237e5' DIMENSION_ID,
         bu.CREATE_TIME AS CREATE_TIME,
         bu.UPDATE_TIME AS UPDATE_TIME
         FROM
-        BUSINESS_UNIT  BU
+        BUSINESS_UNIT  bu
         where
         bu.IS_ACTIVE = 1
 
@@ -319,8 +319,8 @@
 
         SELECT
         AREA.ID AS DIMENSION_VALUE_ID,
-        area.NAME AS DIMENSION_VALUE_NAME,
-        area.IS_ACTIVE AS IS_ACTIVE,
+        AREA.NAME AS DIMENSION_VALUE_NAME,
+        AREA.IS_ACTIVE AS IS_ACTIVE,
         'c61a5bd6-a996-4952-9869-d053995237e6' DIMENSION_ID,
         now (
         )
@@ -336,14 +336,14 @@
         union
 
         SELECT
-        DV.ID AS DIMENSION_VALUE_ID,
+        dv.ID AS DIMENSION_VALUE_ID,
         dv.NAME AS DIMENSION_VALUE_NAME,
         dv.IS_ACTIVE AS IS_ACTIVE,
         dv.DIMENSION_ID AS DIMENSION_ID,
         dv.CREATE_TIME AS CREATE_TIME,
         dv.UPDATE_TIME AS UPDATE_TIME
         FROM
-        DIMENSION_VALUE AS DV
+        DIMENSION_VALUE AS dv
         )
         AS DVQ
         JOIN
@@ -356,56 +356,56 @@
         WHERE
         IS_ACTIVE = 1
         )
-        AS D
+        AS d
         on
         dvq.DIMENSION_ID = d.ID
         JOIN
         (
         SELECT
-        'C61A5BD6_-A996_-4952_-9869_-D053966537E8_' ID,
+        'c61a5bd6_-a996_-4952_-9869_-d053966537e8_' ID,
         org.STRUCTURE_ID AS DIMENSION_VALUE_ID,
         org.ID AS ORGANIZATION_ID,
         org.NAME AS NAME
         FROM
-        ORGANIZATION AS ORG
+        ORGANIZATION AS org
         WHERE
         org.IS_ACTIVE = 1
 
         UNION
 
         SELECT
-        'C61A5BD6_-A996_-4952_-9869_-D053995237E5_' ID,
+        'c61a5bd6_-a996_-4952_-9869_-d053995237e5_' ID,
         org.BUSINESS_UNIT_ID AS DIMENSION_VALUE_ID,
         org.ID AS ORGANIZATION_ID,
         org.NAME AS NAME
         FROM
-        ORGANIZATION  ORG
+        ORGANIZATION  org
         WHERE
         org.IS_ACTIVE = 1
 
         UNION
 
         SELECT
-        'C61A5BD6_-A996_-4952_-9869_-D053995237E6_' ID,
+        'c61a5bd6_-a996_-4952_-9869_-d053995237e6_' ID,
         org.AREA_ID AS DIMENSION_VALUE_ID,
         org.ID AS ORGANIZATION_ID,
         org.NAME AS NAME
         FROM
-        ORGANIZATION  ORG
+        ORGANIZATION  org
         WHERE
         org.IS_ACTIVE = 1
 
         UNION
 
         SELECT
-        DV.ID AS ID,
+        dv.ID AS ID,
         dv.DIMENSION_VALUE_ID AS DIMENSION_VALUE_ID,
         dv.ORGANIZATION_ID AS ORGANIZATION_ID,
         org.NAME AS NAME
         FROM
-        DIMENSION_VALUE_ORG  DV
+        DIMENSION_VALUE_ORG  dv
         JOIN
-        ORGANIZATION  ORG
+        ORGANIZATION  org
         on
         dv.ORGANIZATION_ID = org.ID
         WHERE
@@ -430,42 +430,42 @@
     <select id="getAllCustomDimensionOrgList" resultMap="OrgDtoForGetAllCusDimOrgList">
         SELECT
         Q.ID AS ID,
-        q.NAME AS NAME,
-        d.ATTRIBUTE_ID AS ATTRIBUTE_ID,
-        s.NAME AS ATTRIBUTE_NAME,
-        d.ID AS DIMENSION_ID,
-        d.NAME AS DIMENSION_NAME,
-        dv.ID AS DIMENSION_VALUE_ID,
-        dv.NAME AS DIMENSION_VALUE_NAME
+        Q.NAME AS NAME,
+        D.ATTRIBUTE_ID AS ATTRIBUTE_ID,
+        S.NAME AS ATTRIBUTE_NAME,
+        D.ID AS DIMENSION_ID,
+        D.NAME AS DIMENSION_NAME,
+        DV.ID AS DIMENSION_VALUE_ID,
+        DV.NAME AS DIMENSION_VALUE_NAME
         FROM
         (
         SELECT
         ID,
-        Name
+        NAME
         FROM
         ORGANIZATION  P
-        where
-        p.IS_ACTIVE = 1
+        WHERE
+        P.IS_ACTIVE = 1
         )
         AS Q
         JOIN
         DIMENSION_VALUE_ORG  DVG
-        on
-        q.ID = dvg.ORGANIZATION_ID
+        ON
+        Q.ID = DVG.ORGANIZATION_ID
         JOIN
         DIMENSION_VALUE  DV
-        on
-        dvg.DIMENSION_VALUE_ID = dv.ID
+        ON
+        DVG.DIMENSION_VALUE_ID = DV.ID
         JOIN
         DIMENSION  D
-        on
-        dv.DIMENSION_ID = d.ID
+        ON
+        DV.DIMENSION_ID = D.ID
         JOIN
         STATISTIC_ATTRIBUTE  S
-        on
-        d.ATTRIBUTE_ID = s.ID
-        where
-        s.IS_ACTIVE = 1
+        ON
+        D.ATTRIBUTE_ID = S.ID
+        WHERE
+        S.IS_ACTIVE = 1
     </select>
 
     <resultMap id="OrgDtoForGetSingleOrgByOrgID" type="pwc.taxtech.atms.dpo.OrganizationDto">
@@ -507,66 +507,66 @@
     <select id="getSingleOrgByOrgIdToOrgDto" parameterType="map" resultMap="OrgDtoForGetSingleOrgByOrgID">
         SELECT
         M.ID,
-        m.CLIENT_CODE,
-        m.NAME,
-        m.CODE,
-        m.PARENT_ID,
-        m.TAX_PAYER_NUMBER,
-        m.REGION_ID,
-        m.STRUCTURE_ID,
-        m.INDUSTRY_ID,
-        m.BUSINESS_UNIT_ID,
-        m.IS_ACTIVE,
-        m.P_LEVEL,
-        m.CREATE_TIME,
-        m.UPDATE_TIME,
-        m.AREA_ID,
-        m.ENGLISH_NAME,
-        m.ABBREVIATION,
-        m.INVOICE_TYPE,
-        m.LEGAL_PERSON_NAME,
-        m.MANUFACTURE_ADDRESS,
-        m.REGISTER_ADDRESS,
-        m.BANK_ACCOUNT_NAME,
-        m.BANK_ACCOUNT_NUMBER,
-        m.PHONE_NUMBER,
-        m.REGISTRATION_TYPE,
-        m.REMARK,
-        m.VEHICLE_ROUTING_LOCATION,
-        n.NAME AS INDUSTRY_NAME,
-        pregion.NAME + t.NAME AS REGION_NAME,
-        s.NAME AS STRUCTURE_NAME,
-        t.PARENT_ID AS PARENT_REGION_ID,
-        ar.NAME AS AREA_NAME,
-        bu.NAME AS BUSINESS_UNIT_NAME
+        M.CLIENT_CODE,
+        M.NAME,
+        M.CODE,
+        M.PARENT_ID,
+        M.TAX_PAYER_NUMBER,
+        M.REGION_ID,
+        M.STRUCTURE_ID,
+        M.INDUSTRY_ID,
+        M.BUSINESS_UNIT_ID,
+        M.IS_ACTIVE,
+        M.P_LEVEL,
+        M.CREATE_TIME,
+        M.UPDATE_TIME,
+        M.AREA_ID,
+        M.ENGLISH_NAME,
+        M.ABBREVIATION,
+        M.INVOICE_TYPE,
+        M.LEGAL_PERSON_NAME,
+        M.MANUFACTURE_ADDRESS,
+        M.REGISTER_ADDRESS,
+        M.BANK_ACCOUNT_NAME,
+        M.BANK_ACCOUNT_NUMBER,
+        M.PHONE_NUMBER,
+        M.REGISTRATION_TYPE,
+        M.REMARK,
+        M.VEHICLE_ROUTING_LOCATION,
+        N.NAME AS INDUSTRY_NAME,
+        PREGION.NAME + T.NAME AS REGION_NAME,
+        S.NAME AS STRUCTURE_NAME,
+        T.PARENT_ID AS PARENT_REGION_ID,
+        AR.NAME AS AREA_NAME,
+        BU.NAME AS BUSINESS_UNIT_NAME
         FROM
         ORGANIZATION  M
-        left JOIN
+        LEFT JOIN
         INDUSTRY  N
-        on
-        m.INDUSTRY_ID = n.ID
-        left JOIN
+        ON
+        M.INDUSTRY_ID = N.ID
+        LEFT JOIN
         REGION  T
-        on
-        m.REGION_ID = t.ID
-        left JOIN
+        ON
+        M.REGION_ID = T.ID
+        LEFT JOIN
         REGION  PREGION
-        on
-        t.PARENT_ID = pregion.ID
-        left JOIN
+        ON
+        T.PARENT_ID = PREGION.ID
+        LEFT JOIN
         AREA  AR
-        on
-        m.AREA_ID = ar.ID
-        left JOIN
+        ON
+        M.AREA_ID = AR.ID
+        LEFT JOIN
         ORGANIZATION_STRUCTURE  S
-        on
-        m.STRUCTURE_ID = s.ID
-        left JOIN
+        ON
+        M.STRUCTURE_ID = S.ID
+        LEFT JOIN
         BUSINESS_UNIT  BU
-        on
-        m.BUSINESS_UNIT_ID = bu.ID
-        where
-        m.ID = #{orgId}
+        ON
+        M.BUSINESS_UNIT_ID = BU.ID
+        WHERE
+        M.ID = #{orgId}
     </select>
 
     <select id="countForCodeUniqueValidate" parameterType="map" resultType="java.lang.Integer">
@@ -600,47 +600,47 @@
     <select id="selectJoinToOrgGeneralInfo" parameterType="map" resultMap="OrgGeneralInfoMiddleDto">
         SELECT
         M.ID AS ID,
-        m.NAME AS ORG_NAME,
-        m.TAX_PAYER_NUMBER AS TAX_PAYER_NUMBER,
-        accSet.NAME AS ACCOUNT_SET_NAME,
-        st.NAME AS SERVICE_NAME,
-        t.NAME AS BUSINESS_UNIT_NAME,
-        n.NAME AS INDUSTRY_NAME,
-        ar.NAME AS AREA_NAME,
-        m.AREA_ID AS AREA_ID,
-        m.BUSINESS_UNIT_ID AS BUSINESS_UNIT_ID
+        M.NAME AS ORG_NAME,
+        M.TAX_PAYER_NUMBER AS TAX_PAYER_NUMBER,
+        ACCSET.NAME AS ACCOUNT_SET_NAME,
+        ST.NAME AS SERVICE_NAME,
+        T.NAME AS BUSINESS_UNIT_NAME,
+        N.NAME AS INDUSTRY_NAME,
+        AR.NAME AS AREA_NAME,
+        M.AREA_ID AS AREA_ID,
+        M.BUSINESS_UNIT_ID AS BUSINESS_UNIT_ID
         FROM
         ORGANIZATION  M
         LEFT JOIN
         INDUSTRY  N
         ON
-        m.INDUSTRY_ID = n.ID
+        M.INDUSTRY_ID = N.ID
         LEFT JOIN
         ORGANIZATION_SERVICE_TEMP_LATE_GROUP  STG
         ON
-        m.ID = stg.ORGANIZATION_ID
+        M.ID = STG.ORGANIZATION_ID
         LEFT JOIN
         SERVICE_TYPE  ST
         ON
-        stg.ORGANIZATION_ID = st.ID
+        STG.ORGANIZATION_ID = ST.ID
         LEFT JOIN
         BUSINESS_UNIT  T
         ON
-        t.IS_ACTIVE = 1
-        AND M.BUSINESS_UNIT_ID = t.ID
+        T.IS_ACTIVE = 1
+        AND M.BUSINESS_UNIT_ID = T.ID
         LEFT JOIN
         AREA  AR
         ON
-        ar.IS_ACTIVE = 1
-        AND M.AREAID = ar.ID
+        AR.IS_ACTIVE = 1
+        AND M.AREAID = AR.ID
         LEFT JOIN
         ENTERPRISE_ACCOUNT_SET_ORG  SET_ORG
         ON
-        m.ID = setOrg.ORGANIZATION_ID
+        M.ID = SETORG.ORGANIZATION_ID
         LEFT JOIN
         ENTERPRISE_ACCOUNT_SET  ACC_SET
         ON
-        accSet.IS_ACTIVE = 1
-        AND SET_ORG.ENTERPRISE_ACCOUNTS_ET_ID = accSet.ID
+        ACCSET.IS_ACTIVE = 1
+        AND SET_ORG.ENTERPRISE_ACCOUNTS_ET_ID = ACCSET.ID
     </select>
 </mapper>
\ No newline at end of file

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

@@ -5,17 +5,17 @@
     <select id="getUserDimensionValueList" resultMap="BaseResultMap">
         SELECT
         Q.ID AS ID,
-        q.USER_ID AS USER_ID,
-        q.DIMENSION_ID AS DIMENSION_ID,
-        q.DIMENSION_VALUE_ID AS DIMENSION_VALUE_ID,
-        q.HAS_ORIGINAL_ROLE AS HAS_ORIGINAL_ROLE,
-        q.IS_ACCESSIBLE AS IS_ACCESSIBLE
+        Q.USER_ID AS USER_ID,
+        Q.DIMENSION_ID AS DIMENSION_ID,
+        Q.DIMENSION_VALUE_ID AS DIMENSION_VALUE_ID,
+        Q.HAS_ORIGINAL_ROLE AS HAS_ORIGINAL_ROLE,
+        Q.IS_ACCESSIBLE AS IS_ACCESSIBLE
         FROM
         USER_DIMENSION_VALUE AS Q
         JOIN
         "USER" AS U
-        on
-        q.USER_ID = u.ID
+        ON
+        Q.USER_ID = U.ID
         AND U.STATUS =1
     </select>
 

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

@@ -11,14 +11,14 @@
     <select id="getUserDimensionValueRoleList" resultMap="UserOrgRoleDto">
         SELECT
         UDV.USER_DIMENSION_VALUE_ID AS ID,
-        udv.ROLE_ID AS ROLE_ID,
-        r.NAME AS ROLE_NAME
+        UDV.ROLE_ID AS ROLE_ID,
+        R.NAME AS ROLE_NAME
         FROM
         USER_DIMENSION_VALUE_ROLE AS UDV
         JOIN
         ROLE AS R
-        on
-        udv.ROLE_ID = r.ID
+        ON
+        UDV.ROLE_ID = R.ID
     </select>
 
 </mapper>
\ No newline at end of file

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

@@ -5,18 +5,18 @@
     <select id="getUserOrganizationList" resultMap="BaseResultMap">
         SELECT
         Q.ID AS ID,
-        q.USER_ID AS USER_ID,
-        q.ORGANIZATION_ID AS ORGANIZATION_ID,
-        q.IS_ACCESSIBLE AS IS_ACCESSIBLE,
-        q.HAS_ORIGINAL_ROLE AS HAS_ORIGINAL_ROLE
+        Q.USER_ID AS USER_ID,
+        Q.ORGANIZATION_ID AS ORGANIZATION_ID,
+        Q.IS_ACCESSIBLE AS IS_ACCESSIBLE,
+        Q.HAS_ORIGINAL_ROLE AS HAS_ORIGINAL_ROLE
         FROM
         USER_ORGANIZATION AS Q
         JOIN
         "USER" AS U
-        on
-        q.USER_ID = u.ID
-        where
-        u.STATUS =1
+        ON
+        Q.USER_ID = U.ID
+        WHERE
+        U.STATUS =1
     </select>
 
 </mapper>
\ No newline at end of file

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

@@ -11,14 +11,14 @@
     <select id="getUserOrganizationRoleList" resultMap="UserOrgRoleDto">
         SELECT
         Q.USER_ORGANIZATION_ID AS ID,
-        q.ROLE_ID AS ROLE_ID,
-        r.NAME AS ROLE_NAME
+        Q.ROLE_ID AS ROLE_ID,
+        R.NAME AS ROLE_NAME
         FROM
         USER_ORGANIZATION_ROLE AS Q
         JOIN
         ROLE AS R
-        on
-        q.ROLE_ID = r.ID
+        ON
+        Q.ROLE_ID = R.ID
     </select>
 
 </mapper>
\ No newline at end of file

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

@@ -21,49 +21,49 @@
     <select id="selectUserRoleQueryByServiceTypeId" parameterType="java.lang.String" resultMap="UserRoleQuery">
         SELECT UR
         .ID AS ID,
-        u.ID AS USER_ID,
-        u.USER_NAME AS USER_NAME, ur
+        U.ID AS USER_ID,
+        U.USER_NAME AS USER_NAME, UR
         .ROLE_ID AS ROLE_ID,
-        r.NAME AS ROLE_NAME,
-        s.NAME AS SERVICE_TYPE_NAME,
-        s.ID AS SERVICE_TYPE_ID,
-        rc.ID AS ROLE_CATEGORY_ID,
-        rc.NAME AS ROLE_CATETORY_NAME,
-        org.ID AS ORG_ID,
-        org.NAME AS ORG_NAME,
-        u.EMAIL AS EMAIL,
-        u.STATUS AS STATUS
+        R.NAME AS ROLE_NAME,
+        S.NAME AS SERVICE_TYPE_NAME,
+        S.ID AS SERVICE_TYPE_ID,
+        RC.ID AS ROLE_CATEGORY_ID,
+        RC.NAME AS ROLE_CATETORY_NAME,
+        ORG.ID AS ORG_ID,
+        ORG.NAME AS ORG_NAME,
+        U.EMAIL AS EMAIL,
+        U.STATUS AS STATUS
         FROM
         USER AS U
-        left JOIN
+        LEFT JOIN
         USER_ROLE AS UR
-        on
-        u.ID = ur
+        ON
+        U.ID = UR
         .USER_ID
-        left JOIN
+        LEFT JOIN
         ROLE AS R
-        on ur
-        .ROLE_ID = r.ID
-        left JOIN
+        ON UR
+        .ROLE_ID = R.ID
+        LEFT JOIN
         SERVICE_TYPE AS S
-        on
-        s.ID = r.SERVICE_TYPE_ID
+        ON
+        S.ID = R.SERVICE_TYPE_ID
         AND S.IS_ACTIVE = 1
         AND S.ID = #{serviceTypeID}
-        left JOIN
+        LEFT JOIN
         ROLE_CATEGORY AS RC
-        on
-        rc.ID = r.ROLE_CATEGORY_ID
+        ON
+        RC.ID = R.ROLE_CATEGORY_ID
         AND RC.IS_ACTIVE = 1
-        left JOIN
+        LEFT JOIN
         ORGANIZATION AS ORG
-        on
-        u.ORGANIZATION_ID = org.ID
-        where
-        u.STATUS = 1
+        ON
+        U.ORGANIZATION_ID = ORG.ID
+        WHERE
+        U.STATUS = 1
         AND U.IS_SUPER_ADMIN = 0
-        order by
-        UserName
+        ORDER BY
+        USERNAME
     </select>
 
     <resultMap id="UserOrgRoleDto" type="pwc.taxtech.atms.dpo.UserOrgRoleDto">
@@ -76,14 +76,14 @@
     <select id="getOriginalRoleList" resultMap="UserOrgRoleDto">
         SELECT UR
         .USER_ID AS USER_ID,
-        r.ID AS ROLE_ID,
-        r.NAME AS ROLE_NAME
+        R.ID AS ROLE_ID,
+        R.NAME AS ROLE_NAME
         FROM
         USER_ROLE AS UR
         JOIN
         ROLE AS R
-        on ur
-        .ROLE_ID = r.ID
+        ON UR
+        .ROLE_ID = R.ID
     </select>
 
 </mapper>
\ No newline at end of file

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

@@ -53,56 +53,56 @@
     <select id="getAssetDetialResult" resultMap="assetDetailResultDto">
         SELECT
         ASSETS_LIST.ID AS ID,
-        assetsList.ID,
-        assetsList.ASSET_NUMBER,
-        assetsList.ASSET_GROUP_NAME,
-        assetsList.ASSET_DETAIL_GROUP_ID,
-        assetsList.ASSET_DESCRIPTION,
-        assetsList.BUY_DATE,
-        assetsList.DEPRECIATION_DATE,
-        assetsList.DEPRECIATION_PERIOD,
-        assetsList.ACQUISITION_VALUE,
-        assetsList.ADJUSTMENT_VALUE,
-        assetsList.DISPOSED_DATE,
-        assetsList.RESIDUAL_RATE,
-        assetsList.YEAR_DEPRECIATION_AMOUNT,
-        assetsList.YEAR_ADJUSTMENT_AMOUNT,
-        assetsList.YEAR_END_VALUE,
-        assetsList.`_S_T_A_T_U_S_`,
-        assetsList.ACCOUNT_ACQUISITION_VALUE,
-        assetsList.ACCOUNT_MONTH_DEPRECIATION_AMOUNT,
-        assetsList.ACCOUNT_YEAR_DEPRECIATION_AMOUNT,
-        assetsList.ACCOUNT_TOTALEPRECIATION_AMOUNT,
-        assetsList.TAX_DEPRECIATION_PERIOD,
-        assetsList.TAX_TO_LAST_YEAR_DEPRECIATION_PERIOD,
-        assetsList.TAX_TO_CURRENT_YEAR_DEPRECIATION_PERIOD,
-        assetsList.TAX_YEAR_DEPRECIATION_PERIOD,
-        assetsList.TAX_MONTH_DEPRECIATION_AMOUNT,
-        assetsList.TAX_TO_CURRENT_YEAR_DEPRECIATION_AMOUNT,
-        assetsList.TAX_CURRENT_YEAR_DEPRECIATION_AMOUNT,
-        assetsList.TOTAL_DIFFERENCE_AMOUNT,
-        assetsList.YEAR_DIFFERENCE_AMOUNT,
-        assetsList.IS_RETAIN,
-        assetsList.CREATE_TIME,
-        assetsList.UPDATE_TIME,
-        assetsList.ASSET_TYPE,
-        assetDetailGroup.ID,
-        assetDetailGroup.ASSET_GROUP_ID,
-        assetDetailGroup.DETAIL_GROUP_NAME,
-        assetDetailGroup.ASSET_GROUP_TYPE,
-        assetDetailGroup.GROUP_YEAR,
-        assetDetailGroup.CREATE_TIME,
-        assetDetailGroup.UPDATE_TIME,
-        assetDetailGroup.DETAIL_GROUP_TYPE,
-        assetDetailGroup.KEY_VALUES
+        ASSETSLIST.ID,
+        ASSETSLIST.ASSET_NUMBER,
+        ASSETSLIST.ASSET_GROUP_NAME,
+        ASSETSLIST.ASSET_DETAIL_GROUP_ID,
+        ASSETSLIST.ASSET_DESCRIPTION,
+        ASSETSLIST.BUY_DATE,
+        ASSETSLIST.DEPRECIATION_DATE,
+        ASSETSLIST.DEPRECIATION_PERIOD,
+        ASSETSLIST.ACQUISITION_VALUE,
+        ASSETSLIST.ADJUSTMENT_VALUE,
+        ASSETSLIST.DISPOSED_DATE,
+        ASSETSLIST.RESIDUAL_RATE,
+        ASSETSLIST.YEAR_DEPRECIATION_AMOUNT,
+        ASSETSLIST.YEAR_ADJUSTMENT_AMOUNT,
+        ASSETSLIST.YEAR_END_VALUE,
+        ASSETSLIST.`_S_T_A_T_U_S_`,
+        ASSETSLIST.ACCOUNT_ACQUISITION_VALUE,
+        ASSETSLIST.ACCOUNT_MONTH_DEPRECIATION_AMOUNT,
+        ASSETSLIST.ACCOUNT_YEAR_DEPRECIATION_AMOUNT,
+        ASSETSLIST.ACCOUNT_TOTALEPRECIATION_AMOUNT,
+        ASSETSLIST.TAX_DEPRECIATION_PERIOD,
+        ASSETSLIST.TAX_TO_LAST_YEAR_DEPRECIATION_PERIOD,
+        ASSETSLIST.TAX_TO_CURRENT_YEAR_DEPRECIATION_PERIOD,
+        ASSETSLIST.TAX_YEAR_DEPRECIATION_PERIOD,
+        ASSETSLIST.TAX_MONTH_DEPRECIATION_AMOUNT,
+        ASSETSLIST.TAX_TO_CURRENT_YEAR_DEPRECIATION_AMOUNT,
+        ASSETSLIST.TAX_CURRENT_YEAR_DEPRECIATION_AMOUNT,
+        ASSETSLIST.TOTAL_DIFFERENCE_AMOUNT,
+        ASSETSLIST.YEAR_DIFFERENCE_AMOUNT,
+        ASSETSLIST.IS_RETAIN,
+        ASSETSLIST.CREATE_TIME,
+        ASSETSLIST.UPDATE_TIME,
+        ASSETSLIST.ASSET_TYPE,
+        ASSETDETAILGROUP.ID,
+        ASSETDETAILGROUP.ASSET_GROUP_ID,
+        ASSETDETAILGROUP.DETAIL_GROUP_NAME,
+        ASSETDETAILGROUP.ASSET_GROUP_TYPE,
+        ASSETDETAILGROUP.GROUP_YEAR,
+        ASSETDETAILGROUP.CREATE_TIME,
+        ASSETDETAILGROUP.UPDATE_TIME,
+        ASSETDETAILGROUP.DETAIL_GROUP_TYPE,
+        ASSETDETAILGROUP.KEY_VALUES
         FROM
-        ${DB_NAME}.ASSETS_LIST assetsList
+        ${dbName}.ASSETS_LIST ASSETSLIST
         JOIN
-        tax_admin.ASSET_DETAIL_GROUP assetDetailGroup
+        TAX_ADMIN.ASSET_DETAIL_GROUP ASSETDETAILGROUP
         ON
-        assetsList.ASSET_DETAIL_GROUP_ID = assetDetailGroup.ID
+        ASSETSLIST.ASSET_DETAIL_GROUP_ID = ASSETDETAILGROUP.ID
         WHERE
-        assetsList.ASSET_DETAIL_GROUP_ID IS NOT NULL
+        ASSETSLIST.ASSET_DETAIL_GROUP_ID IS NOT NULL
         AND <![CDATA[ASSETS_LIST.ASSET_DETAIL_GROUP_ID<>'']]>
         AND ASSETS_LIST.ASSET_TYPE IS NOT NULL
         AND ASSETS_LIST.ASSET_TYPE = #{assetType,jdbcType=INTEGER}

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

@@ -62,7 +62,7 @@
         SELECT
         *
         FROM
-        $_{DB_NAME_}.BALANCE a
+          ${dbName}.BALANCE a
         WHERE
         a.ACCT_CODE_= ${accountCode,jdbcType=VARCHAR}
         AND A.PERIOD_ID_= ${period,jdbcType=INTEGER} LIMIT 1

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

@@ -6,19 +6,19 @@
         SELECT
         *
         FROM
-        $_{DB_NAME_}.BALANCE_STD_MANUAL a
+        ${dbName}.BALANCE_STD_MANUAL A
         WHERE
-        a.ACCT_CODE_= #{accountCode,jdbcType=VARCHAR}
-        AND A.PERIOD_ID_= #{period,jdbcType=INTEGER} LIMIT 1
+        A.ACCT_CODE_= #{accountCode,jdbcType=VARCHAR}
+        AND A.PERIOD_ID= #{period,jdbcType=INTEGER} LIMIT 1
     </select>
 
     <select id="selectOneWithAccountCode" resultMap="BaseResultMap">
         SELECT
         *
         FROM
-        BALANCE_STD_MANUAL a
+        BALANCE_STD_MANUAL A
         WHERE
-        a.ACCT_CODE_= #{accountCode,jdbcType=VARCHAR}
+        A.ACCT_CODE_= #{accountCode,jdbcType=VARCHAR}
         AND A.PERIOD_ID_= #{period,jdbcType=INTEGER} LIMIT 1
     </select>
 

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

@@ -21,37 +21,37 @@
 
     <select id="companyBalanceLeftJoinEnterpriseAccount" resultMap="TrialBalanceDto">
         SELECT DISTINCT
-        b.BALANCE_ID,
-        b.PERIOD_ID,
-        b.ACCT_CODE,
-        b.CUSTOMER_CODE,
-        b.BEG_DEBIT_BAL,
-        b.BEG_CREDIT_BAL,
-        b.BEG_BAL,
-        b.END_BAL,
-        b.END_DEBIT_BAL,
-        b.END_CREDIT_BAL,
-        b.DEBIT_BAL,
-        b.CREDIT_BAL,
-        b.MONTH_ID,
+        B.BALANCE_ID,
+        B.PERIOD_ID,
+        B.ACCT_CODE,
+        B.CUSTOMER_CODE,
+        B.BEG_DEBIT_BAL,
+        B.BEG_CREDIT_BAL,
+        B.BEG_BAL,
+        B.END_BAL,
+        B.END_DEBIT_BAL,
+        B.END_CREDIT_BAL,
+        B.DEBIT_BAL,
+        B.CREDIT_BAL,
+        B.MONTH_ID,
         IF (
         ISNULL (
-        a.PARENT_CODE
+        A.PARENT_CODE
         )
-        || a.PARENT_CODE = '',
+        || A.PARENT_CODE = '',
         '0',
-        a.PARENT_CODE
+        A.PARENT_CODE
         )
         AS PARENT_CODE,
-        a.`_NAME_` AS ACCOUNT_NAME,
-        a.ACCT_PROP,
-        a.DIRECTION
+        A.`NAME` AS ACCOUNT_NAME,
+        A.ACCT_PROP,
+        A.DIRECTION
         FROM
-        COMPANY_BALANCE b
+        COMPANY_BALANCE B
         LEFT JOIN
-        ENTERPRISE_ACCOUNT a
+        ENTERPRISE_ACCOUNT A
         ON
-        b.ACCT_CODE = a.ACCT_CODE
+        B.ACCT_CODE = A.ACCT_CODE
         WHERE
         1=1
         <if test="fromMonth!=null">
@@ -61,7 +61,7 @@
             AND B.PERIOD_ID &lt;= #{toMonth,jdbcType=VARCHAR}
         </if>
         ORDER BY
-        b.PERIOD_ID
+        B.PERIOD_ID
     </select>
 
 </mapper>
\ No newline at end of file

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

@@ -72,14 +72,14 @@
 
     <delete id="clearDataSourceDetailWithPeriod">
         DELETE
-        d FROM
-        data_source_detail d
+        D FROM
+        DATA_SOURCE_DETAIL D
         JOIN
-        data_source f
+        DATA_SOURCE F
         ON
-        d.data_source_id = f.ID
+        D.DATA_SOURCE_ID = F.ID
         WHERE
-        f.PERIOD = #{period,jdbcType=INTEGER} ;
+        F.PERIOD = #{period,jdbcType=INTEGER} ;
     </delete>
 
     <delete id="clearCellDataSourceDataWithPeriod">

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

@@ -182,52 +182,52 @@
 
     <select id="getInputVATInvoiceResultDto" resultMap="inputVATInvoiceResultDto" parameterType="java.lang.String">
         SELECT
-        INPUT_VAT_INVOICE.ID AS invoice_id,
-        inputVatInvoice.ID,
-        inputVatInvoice.PERIOD_ID,
-        inputVatInvoice.INVOICE_CODE,
-        inputVatInvoice.INVOICE_NUMBER,
-        inputVatInvoice.INVOICE_DATE,
-        inputVatInvoice.SELLER_TAX_NUMBER,
-        inputVatInvoice.AMOUNT,
-        inputVatInvoice.TAX_AMOUNT,
-        inputVatInvoice.INVOICE_TYPE,
-        inputVatInvoice.CERTIFICATION_RESULT,
-        inputVatInvoice.CERTIFICATION_DATE,
-        inputVatInvoice.CREATOR_ID,
-        inputVatInvoice.CREATE_TIME,
-        inputVatInvoice.`_S_T_A_T_U_S_`,
-        inputVatInvoice.PART_ACCNTED_PERIOD,
-        inputVatInvoice.ACCNTED_PERIOD,
-        inputVatInvoiceItem.ID,
-        inputVatInvoiceItem.INPUT_VAT_INVOICE_ID,
-        inputVatInvoiceItem.PERIOD_ID,
-        inputVatInvoiceItem.INVOICE_CODE,
-        inputVatInvoiceItem.INVOICE_NUMBER,
-        inputVatInvoiceItem.AMOUNT,
-        inputVatInvoiceItem.TAX_AMOUNT,
-        inputVatInvoiceItem.TAX_RATE,
-        inputVatInvoiceItem.PRODUCTION_NAME,
-        inputVatInvoiceItem.CREATOR_ID,
-        inputVatInvoiceItem.CREATE_TIME,
-        inputVatInvoiceItem.PRODUCTION_CODE,
-        goodsMapping.ID,
-        goodsMapping.CUST_GOODS_NAME,
-        goodsMapping.STD_GOODS_NAME,
-        goodsMapping.CREATOR_ID,
-        goodsMapping.CREATE_TIME,
-        goodsMapping.UPDATE_TIME
+        INPUT_VAT_INVOICE.ID AS INVOICE_ID,
+        INPUTVATINVOICE.ID,
+        INPUTVATINVOICE.PERIOD_ID,
+        INPUTVATINVOICE.INVOICE_CODE,
+        INPUTVATINVOICE.INVOICE_NUMBER,
+        INPUTVATINVOICE.INVOICE_DATE,
+        INPUTVATINVOICE.SELLER_TAX_NUMBER,
+        INPUTVATINVOICE.AMOUNT,
+        INPUTVATINVOICE.TAX_AMOUNT,
+        INPUTVATINVOICE.INVOICE_TYPE,
+        INPUTVATINVOICE.CERTIFICATION_RESULT,
+        INPUTVATINVOICE.CERTIFICATION_DATE,
+        INPUTVATINVOICE.CREATOR_ID,
+        INPUTVATINVOICE.CREATE_TIME,
+        INPUTVATINVOICE.`_S_T_A_T_U_S_`,
+        INPUTVATINVOICE.PART_ACCNTED_PERIOD,
+        INPUTVATINVOICE.ACCNTED_PERIOD,
+        INPUTVATINVOICEITEM.ID,
+        INPUTVATINVOICEITEM.INPUT_VAT_INVOICE_ID,
+        INPUTVATINVOICEITEM.PERIOD_ID,
+        INPUTVATINVOICEITEM.INVOICE_CODE,
+        INPUTVATINVOICEITEM.INVOICE_NUMBER,
+        INPUTVATINVOICEITEM.AMOUNT,
+        INPUTVATINVOICEITEM.TAX_AMOUNT,
+        INPUTVATINVOICEITEM.TAX_RATE,
+        INPUTVATINVOICEITEM.PRODUCTION_NAME,
+        INPUTVATINVOICEITEM.CREATOR_ID,
+        INPUTVATINVOICEITEM.CREATE_TIME,
+        INPUTVATINVOICEITEM.PRODUCTION_CODE,
+        GOODSMAPPING.ID,
+        GOODSMAPPING.CUST_GOODS_NAME,
+        GOODSMAPPING.STD_GOODS_NAME,
+        GOODSMAPPING.CREATOR_ID,
+        GOODSMAPPING.CREATE_TIME,
+        GOODSMAPPING.UPDATE_TIME
         FROM
-        $_{DB_NAME_}.INPUT_VAT_INVOICE inputVatInvoice
+          ${dbName}.INPUT_VAT_INVOICE INPUTVATINVOICE
         JOIN
-        $_{DB_NAME_}.INPUT_VAT_INVOICE_ITEM inputVatInvoiceItem
+          ${dbName}.INPUT_VAT_INVOICE_ITEM INPUTVATINVOICEITEM
         ON
-        inputVatInvoice.ID = inputVatInvoiceItem.INPUT_VAT_INVOICE_ID
-        AND INPUT_VAT_INVOICE.PERIOD_ID = inputVatInvoiceItem.PERIOD_ID
+        INPUTVATINVOICE.ID = INPUTVATINVOICEITEM.INPUT_VAT_INVOICE_ID
+        AND INPUT_VAT_INVOICE.PERIOD_ID = INPUTVATINVOICEITEM.PERIOD_ID
         LEFT JOIN
-        $_{DB_NAME_}.GOODS_MAPPING goodsMapping
+          ${dbName}.GOODS_MAPPING GOODSMAPPING
         ON
-        inputVatInvoiceItem.PRODUCTION_NAME = goodsMapping.CUST_GOODS_NAME
+        INPUTVATINVOICEITEM.PRODUCTION_NAME = GOODSMAPPING.CUST_GOODS_NAME
     </select>
 
     <resultMap id="cellInvoiceDto" type="pwc.taxtech.atms.dto.vatdto.CellInvoiceDto">
@@ -282,23 +282,23 @@
     <select id="selectInvoiceExtendDto" resultMap="inputVATInvoiceItemExtendDto">
         SELECT
         B.ID AS INVOICE_ID,
-        a.ID AS INVOICE_ITEM_ID,
-        a.PERIOD_ID AS PERIOD,
-        b.CERTIFICATION_DATE AS CERTIFICATION_DATE,
-        b.SELLER_TAX_NUMBER AS SELLER_TAX_NUMBER,
-        b.INVOICE_CODE AS INVOICE_CODE,
-        b.INVOICE_NUMBER AS INVOICE_NUMBER,
-        b.AMOUNT AS AMOUNT,
-        b.INVOICE_TYPE AS INVOICE_TYPE,
-        a.TAX_AMOUNT AS TAX_AMOUNT
+        A.ID AS INVOICE_ITEM_ID,
+        A.PERIOD_ID AS PERIOD,
+        B.CERTIFICATION_DATE AS CERTIFICATION_DATE,
+        B.SELLER_TAX_NUMBER AS SELLER_TAX_NUMBER,
+        B.INVOICE_CODE AS INVOICE_CODE,
+        B.INVOICE_NUMBER AS INVOICE_NUMBER,
+        B.AMOUNT AS AMOUNT,
+        B.INVOICE_TYPE AS INVOICE_TYPE,
+        A.TAX_AMOUNT AS TAX_AMOUNT
         FROM
-        INPUT_VAT_INVOICE_ITEM a
+        INPUT_VAT_INVOICE_ITEM A
         JOIN
-        INPUT_VAT_INVOICE b
+        INPUT_VAT_INVOICE B
         ON
-        a.INPUT_VAT_INVOICE_ID = b.ID
+        A.INPUT_VAT_INVOICE_ID = B.ID
         WHERE
-        a.ID = #{invoiceItemId,jdbcType=VARCHAR}
+        A.ID = #{invoiceItemId,jdbcType=VARCHAR}
     </select>
 
 </mapper>
\ No newline at end of file

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

@@ -33,71 +33,71 @@
     <select id="selectOutputVATInvoiceInfoLeftJoinItem" parameterType="pwc.taxtech.atms.dto.vatdto.QueryOutputDto" resultMap="OutputVATInvoiceInfoDto">
         SELECT
         O.INVOICE_ID,
-        o.INVOICE_TYPE,
-        o.CLASS_CODE,
-        o.INVOICE_NUMBER,
-        o.BUYER_NAME,
-        o.BUYER_TAX_NUMBER,
-        o.BANK_ACCOUNT,
-        o.PHONE_NUM,
-        o.INVOICE_DATE,
+        O.INVOICE_TYPE,
+        O.CLASS_CODE,
+        O.INVOICE_NUMBER,
+        O.BUYER_NAME,
+        O.BUYER_TAX_NUMBER,
+        O.BANK_ACCOUNT,
+        O.PHONE_NUM,
+        O.INVOICE_DATE,
         IFNULL (
-        oi.CODE_VERSION,
+        OI.CODE_VERSION,
         ''
         )
         AS CODE_VERSION,
         IFNULL (
-        oi.PRODUCT_NAME,
+        OI.PRODUCT_NAME,
         ''
         )
         AS PRODUCT_NAME,
         IFNULL (
-        oi.DOCUMENT_NUM,
+        OI.DOCUMENT_NUM,
         ''
         )
         AS DOCUMENT_NUM,
         IFNULL (
-        oi.PRODUCT_STANDARD,
+        OI.PRODUCT_STANDARD,
         ''
         )
         AS PRODUCT_STANDARD,
         IFNULL (
-        oi.UNIT,
+        OI.UNIT,
         ''
         )
         AS UNIT,
         IFNULL (
-        oi.QUANTITY,
+        OI.QUANTITY,
         ''
         )
         AS QUANTITY,
         IFNULL (
-        oi.UNIT_PRICE,
+        OI.UNIT_PRICE,
         ''
         )
         AS UNIT_PRICE,
         IFNULL (
-        oi.AMOUNT,
+        OI.AMOUNT,
         ''
         )
         AS AMOUNT,
         IFNULL (
-        oi.TAX_AMOUNT,
+        OI.TAX_AMOUNT,
         ''
         )
         AS TAX_AMOUNT,
         IFNULL (
-        oi.TAX_CLASS_CODE,
+        OI.TAX_CLASS_CODE,
         ''
         )
         AS TAX_CLASS_CODE,
-        o.PERIOD_ID
+        O.PERIOD_ID
         FROM
-        OUTPUT_VAT_INVOICE o
+        OUTPUT_VAT_INVOICE O
         LEFT JOIN
-        OUTPUT_VAT_INVOICE_ITEM oi
+        OUTPUT_VAT_INVOICE_ITEM OI
         ON
-        o.INVOICE_ID = oi.INVOICE_ID
+        O.INVOICE_ID = OI.INVOICE_ID
         WHERE
         1=1
         <if test="queryDto.periodStart">
@@ -158,50 +158,50 @@
     <select id="getVatInvoiceWithItems" resultMap="outputVATInvoiceDto" parameterType="java.lang.String">
         SELECT
         INVOICE.INVOICE_ID,
-        invoice.INVOICE_TYPE,
-        invoice.CLASS_CODE,
-        invoice.INVOICE_NUMBER,
-        invoice.BUYER_NAME,
-        invoice.BUYER_TAX_NUMBER,
-        invoice.BANK_ACCOUNT,
-        invoice.PHONE_NUM,
-        invoice.INVOICE_DATE,
-        invoice.SEQ_NO,
-        invoice.PERIOD_ID,
-        invoice.`_S_T_A_T_U_S_`,
-        invoice.CREATOR_ID,
-        invoice.CREATE_TIME,
-        invoice.PART_ACCNTED_PERIOD,
-        invoice.ACCNTED_PERIOD,
-        invoiceItem.ITEM_ID,
-        invoiceItem.INVOICE_ID,
-        invoiceItem.CODE_VERSION,
-        invoiceItem.PRODUCT_NAME,
-        invoiceItem.DOCUMENT_NUM,
-        invoiceItem.PRODUCT_STANDARD,
-        invoiceItem.UNIT,
-        invoiceItem.QUANTITY,
-        invoiceItem.UNIT_PRICE,
-        invoiceItem.AMOUNT,
-        invoiceItem.TAX_RATE,
-        invoiceItem.TAX_AMOUNT,
-        invoiceItem.SEQ_NO,
-        invoiceItem.TAX_CLASS_CODE,
-        invoiceItem.CREATOR_ID,
-        invoiceItem.CREATE_TIME,
-        invoiceItem.PERIOD_ID
+        INVOICE.INVOICE_TYPE,
+        INVOICE.CLASS_CODE,
+        INVOICE.INVOICE_NUMBER,
+        INVOICE.BUYER_NAME,
+        INVOICE.BUYER_TAX_NUMBER,
+        INVOICE.BANK_ACCOUNT,
+        INVOICE.PHONE_NUM,
+        INVOICE.INVOICE_DATE,
+        INVOICE.SEQ_NO,
+        INVOICE.PERIOD_ID,
+        INVOICE.`_S_T_A_T_U_S_`,
+        INVOICE.CREATOR_ID,
+        INVOICE.CREATE_TIME,
+        INVOICE.PART_ACCNTED_PERIOD,
+        INVOICE.ACCNTED_PERIOD,
+        INVOICEITEM.ITEM_ID,
+        INVOICEITEM.INVOICE_ID,
+        INVOICEITEM.CODE_VERSION,
+        INVOICEITEM.PRODUCT_NAME,
+        INVOICEITEM.DOCUMENT_NUM,
+        INVOICEITEM.PRODUCT_STANDARD,
+        INVOICEITEM.UNIT,
+        INVOICEITEM.QUANTITY,
+        INVOICEITEM.UNIT_PRICE,
+        INVOICEITEM.AMOUNT,
+        INVOICEITEM.TAX_RATE,
+        INVOICEITEM.TAX_AMOUNT,
+        INVOICEITEM.SEQ_NO,
+        INVOICEITEM.TAX_CLASS_CODE,
+        INVOICEITEM.CREATOR_ID,
+        INVOICEITEM.CREATE_TIME,
+        INVOICEITEM.PERIOD_ID
         FROM
-        $_{DB_NAME_}.OUTPUT_VAT_INVOICE invoice
+          ${dbName}.OUTPUT_VAT_INVOICE INVOICE
         JOIN
-        $_{DB_NAME_}.OUTPUT_VAT_INVOICE_ITEM invoiceItem
+          ${dbName}.OUTPUT_VAT_INVOICE_ITEM INVOICEITEM
         ON
-        invoice.INVOICE_ID = invoiceItem.INVOICE_ID
+        INVOICE.INVOICE_ID = INVOICEITEM.INVOICE_ID
         AND INVOICE.PERIOD_ID_=INVOICE_ITEM.PERIOD_ID
         ORDER BY
-        invoice.PERIOD_ID,
-        invoice.CLASS_CODE,
-        invoice.INVOICE_NUMBER,
-        invoiceItem.SEQ_NO
+        INVOICE.PERIOD_ID,
+        INVOICE.CLASS_CODE,
+        INVOICE.INVOICE_NUMBER,
+        INVOICEITEM.SEQ_NO
     </select>
 
     <resultMap id="outputInvoiceDataSourceDto" type="pwc.taxtech.atms.dto.vatdto.OutputInvoiceDataSourceDto">
@@ -220,22 +220,22 @@
     <select id="selectOutputInvoiceAndItem" resultMap="outputInvoiceDataSourceDto">
         SELECT
         OVII.INVOICE_ID AS ID,
-        ovii.AMOUNT AS AMOUNT,
+        OVII.AMOUNT AS AMOUNT,
         1 AS RESULT_TYPE,
-        ovii.TAX_AMOUNT AS TAX_AMOUNT,
-        ovii.TAX_RATE AS TAX_RATE,
-        oi.BUYER_NAME AS BUYER_NAME,
-        oi.CLASS_CODE AS INVOICE_CODE,
-        oi.INVOICE_NUMBER AS INVOICE_NUMBER,
-        oi.INVOICE_DATE AS INVOICE_DATE,
-        oi.INVOICE_TYPE AS INVOICE_TYPE,
-        oi.PERIOD_ID AS PERIOD
+        OVII.TAX_AMOUNT AS TAX_AMOUNT,
+        OVII.TAX_RATE AS TAX_RATE,
+        OI.BUYER_NAME AS BUYER_NAME,
+        OI.CLASS_CODE AS INVOICE_CODE,
+        OI.INVOICE_NUMBER AS INVOICE_NUMBER,
+        OI.INVOICE_DATE AS INVOICE_DATE,
+        OI.INVOICE_TYPE AS INVOICE_TYPE,
+        OI.PERIOD_ID AS PERIOD
         FROM
-        OUTPUT_VAT_INVOICE_ITEM ovii
+        OUTPUT_VAT_INVOICE_ITEM OVII
         JOIN
-        OUTPUT_VAT_INVOICE oi
+        OUTPUT_VAT_INVOICE OI
         ON
-        ovii.INVOICE_ID = oi.INVOICE_ID
+        OVII.INVOICE_ID = OI.INVOICE_ID
     </select>
 
 </mapper>
\ No newline at end of file

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

@@ -25,38 +25,38 @@
 
     <select id="selectProjectStandardAccountLeftJoinBalanceStdManual" resultMap="TrialBalanceDto">
         SELECT DISTINCT
-        b.PERIOD_ID,
-        b.ACCT_CODE,
+        B.PERIOD_ID,
+        B.ACCT_CODE,
         '' AS CUSTOMER_CODE,
-        b.BEG_DEBIT_BAL,
-        b.BEG_CREDIT_BAL,
-        b.BEG_BAL,
-        b.END_BAL,
-        b.END_DEBIT_BAL,
-        b.END_CREDIT_BAL,
-        b.DEBIT_BAL,
-        b.CREDIT_BAL,
-        b.PERIOD_ID AS MONTH_ID,
-        b.YEAR_DEBIT_BAL,
-        b.YEAR_CREDIT_BAL,
+        B.BEG_DEBIT_BAL,
+        B.BEG_CREDIT_BAL,
+        B.BEG_BAL,
+        B.END_BAL,
+        B.END_DEBIT_BAL,
+        B.END_CREDIT_BAL,
+        B.DEBIT_BAL,
+        B.CREDIT_BAL,
+        B.PERIOD_ID AS MONTH_ID,
+        B.YEAR_DEBIT_BAL,
+        B.YEAR_CREDIT_BAL,
         IF (
         ISNULL (
-        a.PARENT_CODE
+        A.PARENT_CODE
         )
-        || a.PARENT_CODE = '',
+        || A.PARENT_CODE = '',
         '0',
-        a.PARENT_CODE
+        A.PARENT_CODE
         )
         AS PARENT_CODE,
-        a.`_NAME_` AS ACCOUNT_NAME,
-        a.ACCT_PROP,
-        a.DIRECTION
+        A.`_NAME_` AS ACCOUNT_NAME,
+        A.ACCT_PROP,
+        A.DIRECTION
         FROM
-        STANDARD_ACCOUNT a
+        STANDARD_ACCOUNT A
         JOIN
-        BALANCE_STD_MANUAL b
+        BALANCE_STD_MANUAL B
         ON
-        a.`_CODE_` = b.ACCT_CODE
+        A.`CODE` = B.ACCT_CODE
         WHERE
         1=1
         <if test="fromMonth!=null">
@@ -66,16 +66,16 @@
             AND B.PERIOD_ID &lt;= #{toMonth,jdbcType=VARCHAR}
         </if>
         ORDER BY
-        b.PERIOD_ID
+        B.PERIOD_ID
     </select>
 
     <select id="selectOneByAccountCode" parameterType="java.lang.String" resultMap="BaseResultMap">
         SELECT
         *
         FROM
-        STANDARD_ACCOUNT a
+        STANDARD_ACCOUNT A
         WHERE
-        a.CODE_= #{accountCode,jdbcType=VARCHAR} LIMIT 1
+        A.CODE= #{accountCode,jdbcType=VARCHAR} LIMIT 1
     </select>
 
 </mapper>
\ No newline at end of file

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

@@ -21,22 +21,22 @@
     <select id="selectVoucherWithEnterpriseAccount" resultMap="cellVoucherDto">
         SELECT
         VCH.VOUCHER_ID AS ID,
-        vch.PERIOD AS PERIOD,
-        vch.CREATE_TIME AS CREATE_TIME,
-        vch.ACCT_CODE AS ACCOUNT_SUBJECT,
-        etc.STD_CODE AS STD_ACCOUNT,
-        vch.V_ID AS VOUCHER_CODE,
-        vch.SUMMARY AS VOUCHER_SUMMARY,
-        vch.DATE AS `DATE`,
-        vch.DEBIT AS DEBIT_AMOUNT,
-        vch.CREDIT AS CREDIT_AMOUNT,
-        etc.DIRECTION AS DIRECTION
+        VCH.PERIOD AS PERIOD,
+        VCH.CREATE_TIME AS CREATE_TIME,
+        VCH.ACCT_CODE AS ACCOUNT_SUBJECT,
+        ETC.STD_CODE AS STD_ACCOUNT,
+        VCH.V_ID AS VOUCHER_CODE,
+        VCH.SUMMARY AS VOUCHER_SUMMARY,
+        VCH.DATE AS `DATE`,
+        VCH.DEBIT AS DEBIT_AMOUNT,
+        VCH.CREDIT AS CREDIT_AMOUNT,
+        ETC.DIRECTION AS DIRECTION
         FROM
-        VOUCHER vch
+        VOUCHER VCH
         JOIN
-        ENTERPRISE_ACCOUNT etc
+        ENTERPRISE_ACCOUNT ETC
         ON
-        vch.ACCT_CODE = etc.ACCT_CODE
+        VCH.ACCT_CODE = ETC.ACCT_CODE
     </select>
 
 </mapper>
\ No newline at end of file