1、修复权限校验失败后未返回的bug

2、缓存保留用户操作权限修改为一次登陆内或一天
3、迁移vat_mysql的dao层

atms-api/src/main/java/pwc/taxtech/atms/security/JwtAuthenticationService.java

+package pwc.taxtech.atms.security;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+@Service
+public class JwtAuthenticationService {
+
+    protected final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+
+    /**
+     * 27/12/2018 11:05
+     * 用户第一个需鉴权的操作时，从UPM获取用户操作权限存入EhCache，至下一次登陆前从EhCache获取权限进行操作鉴权。
+     * [userName]
+     * @author Gary J Li
+     * @return List<String>
+     */
+    @Cacheable(value = "apiAuthCache", key = "'userName'")
+    public List<String> getApiAuthList(String userName) {
+        List<String> apiAuthList = new ArrayList<>();
+        apiAuthList.add("template:get");
+        // todo upm return  response
+        logger.debug("get Cache from upm :"+"apiAuthCache-"+"key :"+userName + " value :"+String.join("，",apiAuthList));
+        return apiAuthList;
+    }
+
+    /**
+     * 27/12/2018 11:07
+     * 用户登陆时服务器EhCache中的用户权限信息。
+     * [userName]
+     * @author Gary J Li
+     *
+     */
+    @CacheEvict(value = "apiAuthCache", key = "'#userName'")
+    public void removeApiAuthList(String userName) {
+        logger.debug("remove Cache :"+"apiAuthCache"+"key :"+userName);
+    }
+
+}

atms-api/src/main/java/pwc/taxtech/atms/security/JwtUtil.java

@@ -29,6 +29,8 @@ public class JwtUtil implements InitializingBean {
 
     @Autowired
     private AtmsApiSettings atmsApiSettings;
+    @Autowired
+    private JwtAuthenticationService jwtAuthenticationService;
     @Value("${jwt.expireSecond}")
     private Integer jwtExpireSecond;
 
@@ -75,23 +77,13 @@ public class JwtUtil implements InitializingBean {
         List<SimpleGrantedAuthority> list = new ArrayList<>();
         list.add(new SimpleGrantedAuthority("ROLE_USER"));
         list.add(new SimpleGrantedAuthority("ROLE_JWT_USER"));
-        List<String> ecApiAuthList = getApiAuthList(userName);
+        List<String> ecApiAuthList = jwtAuthenticationService.getApiAuthList(userName);
         for(String ecApiAuth : ecApiAuthList){
             list.add(new SimpleGrantedAuthority(ecApiAuth));
         }
         return list;
     }
 
-    @Cacheable(value = "apiAuthCache", key = "userName")
-    public List<String> getApiAuthList(String userName) {
-        List<String> apiAuthList = new ArrayList<>();
-        apiAuthList.add("template:get");
-
-
-        // todo upm return  response
-        return apiAuthList;
-    }
-
     /***
      * @param username
      *            登录名,大小写不限，可以是全大写或全小写,如:admin, ADMIN

atms-api/src/main/java/pwc/taxtech/atms/service/impl/UserServiceImpl.java

@@ -52,6 +52,7 @@ import pwc.taxtech.atms.entity.*;
 import pwc.taxtech.atms.entity.UserRoleExample.Criteria;
 import pwc.taxtech.atms.exception.ApplicationException;
 import pwc.taxtech.atms.security.AtmsPasswordEncoder;
+import pwc.taxtech.atms.security.JwtAuthenticationService;
 import pwc.taxtech.atms.security.JwtUtil;
 import pwc.taxtech.atms.security.LdapAuthenticationProvider;
 
@@ -100,6 +101,8 @@ public class UserServiceImpl extends AbstractService {
     private OrganizationServiceImpl organizationService;
     @Autowired
     private UserRoleServiceImpl userRoleService;
+    @Autowired
+    private JwtAuthenticationService jwtAuthenticationService;
 
     @Value("${api.url}")
     private String apiUrl;
@@ -457,6 +460,8 @@ public class UserServiceImpl extends AbstractService {
             // 参照C#代码设置password
             userDto.setPassword(input.getPassword());
             userDto.setHasValidPeriod(false);
+            // todo 登陆成功后清除缓存中的用户权限
+            jwtAuthenticationService.removeApiAuthList(tempUser.getUserName());
         } else {
             logger.error("状态异常");
         }

atms-dao/etc/generator-mysql/generatorConfig.xml

@@ -329,80 +329,80 @@
             <columnOverride column="is_active" property="isActive" javaType="Boolean"/>
         </table>
 
-       <!-- <table tableName="output_ar_invoice" domainObjectName="OutputArInvoice">
-            <property name="useActualColumnNames" value="false"/>
-            <property name="ignoreQualifiersAtRuntime" value="true"/>
-        </table>
-
-        <table tableName="output_ar_receivables_trx" domainObjectName="OutputArReceivablesTrx">
-            <property name="useActualColumnNames" value="false"/>
-            <property name="ignoreQualifiersAtRuntime" value="true"/>
-        </table>
-
-        <table tableName="output_ar_trx_type" domainObjectName="OutputArTrxType">
-            <property name="useActualColumnNames" value="false"/>
-            <property name="ignoreQualifiersAtRuntime" value="true"/>
-        </table>
-
-        <table tableName="output_customer" domainObjectName="OutputCustomer">
-            <property name="useActualColumnNames" value="false"/>
-            <property name="ignoreQualifiersAtRuntime" value="true"/>
-        </table>
-
-        <table tableName="output_customer_account" domainObjectName="OutputCustomerAccount">
-            <property name="useActualColumnNames" value="false"/>
-            <property name="ignoreQualifiersAtRuntime" value="true"/>
-        </table>
-
-        <table tableName="output_customer_bank" domainObjectName="OutputCustomerBank">
-            <property name="useActualColumnNames" value="false"/>
-            <property name="ignoreQualifiersAtRuntime" value="true"/>
-        </table>
-
-        <table tableName="output_customer_contactor" domainObjectName="OutputCustomerContactor">
-            <property name="useActualColumnNames" value="false"/>
-            <property name="ignoreQualifiersAtRuntime" value="true"/>
-        </table>
-
-        <table tableName="output_customer_ex" domainObjectName="OutputCustomerEx">
-            <property name="useActualColumnNames" value="false"/>
-            <property name="ignoreQualifiersAtRuntime" value="true"/>
-        </table>
-
-        <table tableName="output_customer_party_site" domainObjectName="OutputCustomerPartySite">
-            <property name="useActualColumnNames" value="false"/>
-            <property name="ignoreQualifiersAtRuntime" value="true"/>
-        </table>
-
-        <table tableName="output_customer_site_use" domainObjectName="OutputCustomerSiteUse">
-            <property name="useActualColumnNames" value="false"/>
-            <property name="ignoreQualifiersAtRuntime" value="true"/>
-        </table>
-
-        <table tableName="output_flex_value" domainObjectName="OutputFlexValue">
-            <property name="useActualColumnNames" value="false"/>
-            <property name="ignoreQualifiersAtRuntime" value="true"/>
-        </table>
-
-        <table tableName="output_gl_daily_rate" domainObjectName="OutputGlDailyRate">
-            <property name="useActualColumnNames" value="false"/>
-            <property name="ignoreQualifiersAtRuntime" value="true"/>
-        </table>
-
-        <table tableName="output_invoice" domainObjectName="OutputInvoice">
-            <property name="useActualColumnNames" value="false"/>
-            <property name="ignoreQualifiersAtRuntime" value="true"/>
-        </table>
-
-        <table tableName="output_operation_unit" domainObjectName="OutputOperationUnit">
-            <property name="useActualColumnNames" value="false"/>
-            <property name="ignoreQualifiersAtRuntime" value="true"/>
-        </table>
-
-        <table tableName="output_ra_interface" domainObjectName="OutputRaInterface">
-            <property name="useActualColumnNames" value="false"/>
-            <property name="ignoreQualifiersAtRuntime" value="true"/>
-        </table>-->
+        <!-- <table tableName="output_ar_invoice" domainObjectName="OutputArInvoice">
+             <property name="useActualColumnNames" value="false"/>
+             <property name="ignoreQualifiersAtRuntime" value="true"/>
+         </table>
+
+         <table tableName="output_ar_receivables_trx" domainObjectName="OutputArReceivablesTrx">
+             <property name="useActualColumnNames" value="false"/>
+             <property name="ignoreQualifiersAtRuntime" value="true"/>
+         </table>
+
+         <table tableName="output_ar_trx_type" domainObjectName="OutputArTrxType">
+             <property name="useActualColumnNames" value="false"/>
+             <property name="ignoreQualifiersAtRuntime" value="true"/>
+         </table>
+
+         <table tableName="output_customer" domainObjectName="OutputCustomer">
+             <property name="useActualColumnNames" value="false"/>
+             <property name="ignoreQualifiersAtRuntime" value="true"/>
+         </table>
+
+         <table tableName="output_customer_account" domainObjectName="OutputCustomerAccount">
+             <property name="useActualColumnNames" value="false"/>
+             <property name="ignoreQualifiersAtRuntime" value="true"/>
+         </table>
+
+         <table tableName="output_customer_bank" domainObjectName="OutputCustomerBank">
+             <property name="useActualColumnNames" value="false"/>
+             <property name="ignoreQualifiersAtRuntime" value="true"/>
+         </table>
+
+         <table tableName="output_customer_contactor" domainObjectName="OutputCustomerContactor">
+             <property name="useActualColumnNames" value="false"/>
+             <property name="ignoreQualifiersAtRuntime" value="true"/>
+         </table>
+
+         <table tableName="output_customer_ex" domainObjectName="OutputCustomerEx">
+             <property name="useActualColumnNames" value="false"/>
+             <property name="ignoreQualifiersAtRuntime" value="true"/>
+         </table>
+
+         <table tableName="output_customer_party_site" domainObjectName="OutputCustomerPartySite">
+             <property name="useActualColumnNames" value="false"/>
+             <property name="ignoreQualifiersAtRuntime" value="true"/>
+         </table>
+
+         <table tableName="output_customer_site_use" domainObjectName="OutputCustomerSiteUse">
+             <property name="useActualColumnNames" value="false"/>
+             <property name="ignoreQualifiersAtRuntime" value="true"/>
+         </table>
+
+         <table tableName="output_flex_value" domainObjectName="OutputFlexValue">
+             <property name="useActualColumnNames" value="false"/>
+             <property name="ignoreQualifiersAtRuntime" value="true"/>
+         </table>
+
+         <table tableName="output_gl_daily_rate" domainObjectName="OutputGlDailyRate">
+             <property name="useActualColumnNames" value="false"/>
+             <property name="ignoreQualifiersAtRuntime" value="true"/>
+         </table>
+
+         <table tableName="output_invoice" domainObjectName="OutputInvoice">
+             <property name="useActualColumnNames" value="false"/>
+             <property name="ignoreQualifiersAtRuntime" value="true"/>
+         </table>
+
+         <table tableName="output_operation_unit" domainObjectName="OutputOperationUnit">
+             <property name="useActualColumnNames" value="false"/>
+             <property name="ignoreQualifiersAtRuntime" value="true"/>
+         </table>
+
+         <table tableName="output_ra_interface" domainObjectName="OutputRaInterface">
+             <property name="useActualColumnNames" value="false"/>
+             <property name="ignoreQualifiersAtRuntime" value="true"/>
+         </table>-->
 
         <table tableName="period_approve" domainObjectName="PeriodApprove">
             <property name="useActualColumnNames" value="false"/>
@@ -579,10 +579,10 @@
             <property name="ignoreQualifiersAtRuntime" value="true"/>
         </table>
 
-<!--        <table tableName="table_test" domainObjectName="TableTest">
-            <property name="useActualColumnNames" value="false"/>
-            <property name="ignoreQualifiersAtRuntime" value="true"/>
-        </table>-->
+        <!--        <table tableName="table_test" domainObjectName="TableTest">
+                    <property name="useActualColumnNames" value="false"/>
+                    <property name="ignoreQualifiersAtRuntime" value="true"/>
+                </table>-->
 
         <table tableName="tax_payer_report_rule" domainObjectName="TaxPayerReportRule">
             <property name="useActualColumnNames" value="false"/>

atms-dao/etc/generator-mysql/vatGenerator.properties

-/
 jdbc.driverClass=com.mysql.jdbc.Driver
-jdbc.connectionURL=jdbc:mysql://10.158.230.144:3306/a1800000?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+jdbc.connectionURL=jdbc:mysql://10.158.230.144:3306/tax_admin_didi?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
 jdbc.userId=root
 jdbc.password=tax@Admin2018

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/AccountRemapMapper.java

@@ -7,7 +7,7 @@ import org.apache.ibatis.session.RowBounds;
 import pwc.taxtech.atms.MyVatMapper;
 import pwc.taxtech.atms.vat.entity.AccountRemap;
 import pwc.taxtech.atms.vat.entity.AccountRemapExample;
-
+// todo 无此表
 @Mapper
 public interface AccountRemapMapper extends MyVatMapper {
     /**

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/AccountRemapSumMapper.java

@@ -7,7 +7,7 @@ import org.apache.ibatis.session.RowBounds;
 import pwc.taxtech.atms.MyVatMapper;
 import pwc.taxtech.atms.vat.entity.AccountRemapSum;
 import pwc.taxtech.atms.vat.entity.AccountRemapSumExample;
-
+// todo 无此表
 @Mapper
 public interface AccountRemapSumMapper extends MyVatMapper {
     /**

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/AssetGroupResultMapper.java

@@ -7,7 +7,7 @@ import org.apache.ibatis.session.RowBounds;
 import pwc.taxtech.atms.MyVatMapper;
 import pwc.taxtech.atms.vat.entity.AssetGroupResult;
 import pwc.taxtech.atms.vat.entity.AssetGroupResultExample;
-
+// todo 无此表
 @Mapper
 public interface AssetGroupResultMapper extends MyVatMapper {
     /**

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/OperationLogMapper.java

@@ -12,7 +12,7 @@ import pwc.taxtech.atms.vat.entity.OperationLogExample;
 public interface OperationLogMapper extends MyVatMapper {
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_PROJECT.OPERATION_LOG
+     * This method corresponds to the database table operation_log
      *
      * @mbg.generated
      */
@@ -20,7 +20,7 @@ public interface OperationLogMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_PROJECT.OPERATION_LOG
+     * This method corresponds to the database table operation_log
      *
      * @mbg.generated
      */
@@ -44,7 +44,7 @@ public interface OperationLogMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_PROJECT.OPERATION_LOG
+     * This method corresponds to the database table operation_log
      *
      * @mbg.generated
      */
@@ -52,7 +52,7 @@ public interface OperationLogMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_PROJECT.OPERATION_LOG
+     * This method corresponds to the database table operation_log
      *
      * @mbg.generated
      */
@@ -60,7 +60,7 @@ public interface OperationLogMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_PROJECT.OPERATION_LOG
+     * This method corresponds to the database table operation_log
      *
      * @mbg.generated
      */
@@ -84,7 +84,7 @@ public interface OperationLogMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_PROJECT.OPERATION_LOG
+     * This method corresponds to the database table operation_log
      *
      * @mbg.generated
      */

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/PeriodApproveMapper.java

@@ -134,21 +134,19 @@ public interface PeriodApproveMapper extends MyVatMapper {
 
     @Select("" +
             "SELECT  " +
-            "  status AS status   " +
+            "  p.status AS status   " +
             "FROM  " +
-            "  ( SELECT * FROM period_approve WHERE project_id = #{projectId} AND period = #{period} ORDER BY create_time DESC )   " +
-            "WHERE  " +
-            // todo 修改oracle的rownum "  ROWNUM = 1" +
+            "  ( SELECT * FROM period_approve WHERE project_id = #{projectId} AND period = #{period} ORDER BY create_time DESC ) p  " +
+            "LIMIT 1"+
             "")
     String getStatusByProjectIdAndPeriod(@Param("projectId") String projectId, @Param("period") Integer period);
 
     @Select("" +
             "SELECT  " +
-            "  instance_id AS instanceId ,status AS status " +
+            "  p.instance_id AS instanceId ,p.status AS status " +
             "FROM  " +
-            "  ( SELECT * FROM period_approve WHERE project_id = #{projectId} AND period = #{period} ORDER BY create_time DESC )   " +
-            "WHERE  " +
-            // todo 修改oracle的rownum "  ROWNUM = 1" +
+            "  ( SELECT * FROM period_approve WHERE project_id = #{projectId} AND period = #{period} ORDER BY create_time DESC )  p " +
+            "LIMIT 1"+
             "")
     PeriodApprove getInstanceIdByProjectIdAndPeriod(@Param("projectId") String projectId, @Param("period") Integer period);
 }
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/PeriodCellCommentMapper.java

@@ -12,7 +12,7 @@ import pwc.taxtech.atms.vat.entity.PeriodCellCommentExample;
 public interface PeriodCellCommentMapper extends MyVatMapper {
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_COMMENT
+     * This method corresponds to the database table period_cell_comment
      *
      * @mbg.generated
      */
@@ -20,7 +20,7 @@ public interface PeriodCellCommentMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_COMMENT
+     * This method corresponds to the database table period_cell_comment
      *
      * @mbg.generated
      */
@@ -28,7 +28,7 @@ public interface PeriodCellCommentMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_COMMENT
+     * This method corresponds to the database table period_cell_comment
      *
      * @mbg.generated
      */
@@ -36,7 +36,7 @@ public interface PeriodCellCommentMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_COMMENT
+     * This method corresponds to the database table period_cell_comment
      *
      * @mbg.generated
      */
@@ -44,7 +44,7 @@ public interface PeriodCellCommentMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_COMMENT
+     * This method corresponds to the database table period_cell_comment
      *
      * @mbg.generated
      */
@@ -52,7 +52,7 @@ public interface PeriodCellCommentMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_COMMENT
+     * This method corresponds to the database table period_cell_comment
      *
      * @mbg.generated
      */
@@ -60,7 +60,7 @@ public interface PeriodCellCommentMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_COMMENT
+     * This method corresponds to the database table period_cell_comment
      *
      * @mbg.generated
      */
@@ -68,7 +68,7 @@ public interface PeriodCellCommentMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_COMMENT
+     * This method corresponds to the database table period_cell_comment
      *
      * @mbg.generated
      */
@@ -76,7 +76,7 @@ public interface PeriodCellCommentMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_COMMENT
+     * This method corresponds to the database table period_cell_comment
      *
      * @mbg.generated
      */
@@ -84,7 +84,7 @@ public interface PeriodCellCommentMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_COMMENT
+     * This method corresponds to the database table period_cell_comment
      *
      * @mbg.generated
      */
@@ -92,7 +92,7 @@ public interface PeriodCellCommentMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_COMMENT
+     * This method corresponds to the database table period_cell_comment
      *
      * @mbg.generated
      */
@@ -100,7 +100,7 @@ public interface PeriodCellCommentMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_COMMENT
+     * This method corresponds to the database table period_cell_comment
      *
      * @mbg.generated
      */

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/PeriodCellDataMapper.java

 package pwc.taxtech.atms.vat.dao;
 
+import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.session.RowBounds;
@@ -7,13 +8,11 @@ import pwc.taxtech.atms.MyVatMapper;
 import pwc.taxtech.atms.vat.entity.PeriodCellData;
 import pwc.taxtech.atms.vat.entity.PeriodCellDataExample;
 
-import java.util.List;
-
 @Mapper
 public interface PeriodCellDataMapper extends MyVatMapper {
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_DATA
+     * This method corresponds to the database table period_cell_data
      *
      * @mbg.generated
      */
@@ -21,7 +20,7 @@ public interface PeriodCellDataMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_DATA
+     * This method corresponds to the database table period_cell_data
      *
      * @mbg.generated
      */
@@ -29,7 +28,7 @@ public interface PeriodCellDataMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_DATA
+     * This method corresponds to the database table period_cell_data
      *
      * @mbg.generated
      */
@@ -37,7 +36,7 @@ public interface PeriodCellDataMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_DATA
+     * This method corresponds to the database table period_cell_data
      *
      * @mbg.generated
      */
@@ -45,7 +44,7 @@ public interface PeriodCellDataMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_DATA
+     * This method corresponds to the database table period_cell_data
      *
      * @mbg.generated
      */
@@ -53,7 +52,7 @@ public interface PeriodCellDataMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_DATA
+     * This method corresponds to the database table period_cell_data
      *
      * @mbg.generated
      */
@@ -61,7 +60,7 @@ public interface PeriodCellDataMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_DATA
+     * This method corresponds to the database table period_cell_data
      *
      * @mbg.generated
      */
@@ -69,7 +68,7 @@ public interface PeriodCellDataMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_DATA
+     * This method corresponds to the database table period_cell_data
      *
      * @mbg.generated
      */
@@ -77,7 +76,7 @@ public interface PeriodCellDataMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_DATA
+     * This method corresponds to the database table period_cell_data
      *
      * @mbg.generated
      */
@@ -85,7 +84,7 @@ public interface PeriodCellDataMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_DATA
+     * This method corresponds to the database table period_cell_data
      *
      * @mbg.generated
      */
@@ -93,7 +92,7 @@ public interface PeriodCellDataMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_DATA
+     * This method corresponds to the database table period_cell_data
      *
      * @mbg.generated
      */
@@ -101,7 +100,7 @@ public interface PeriodCellDataMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_DATA
+     * This method corresponds to the database table period_cell_data
      *
      * @mbg.generated
      */

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/PeriodCellDataSourceMapper.java

@@ -12,7 +12,7 @@ import pwc.taxtech.atms.vat.entity.PeriodCellDataSourceExample;
 public interface PeriodCellDataSourceMapper extends MyVatMapper {
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_DATA_SOURCE
+     * This method corresponds to the database table period_cell_data_source
      *
      * @mbg.generated
      */
@@ -20,7 +20,7 @@ public interface PeriodCellDataSourceMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_DATA_SOURCE
+     * This method corresponds to the database table period_cell_data_source
      *
      * @mbg.generated
      */
@@ -28,7 +28,7 @@ public interface PeriodCellDataSourceMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_DATA_SOURCE
+     * This method corresponds to the database table period_cell_data_source
      *
      * @mbg.generated
      */
@@ -36,7 +36,7 @@ public interface PeriodCellDataSourceMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_DATA_SOURCE
+     * This method corresponds to the database table period_cell_data_source
      *
      * @mbg.generated
      */
@@ -44,7 +44,7 @@ public interface PeriodCellDataSourceMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_DATA_SOURCE
+     * This method corresponds to the database table period_cell_data_source
      *
      * @mbg.generated
      */
@@ -52,7 +52,7 @@ public interface PeriodCellDataSourceMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_DATA_SOURCE
+     * This method corresponds to the database table period_cell_data_source
      *
      * @mbg.generated
      */
@@ -60,7 +60,7 @@ public interface PeriodCellDataSourceMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_DATA_SOURCE
+     * This method corresponds to the database table period_cell_data_source
      *
      * @mbg.generated
      */
@@ -68,7 +68,7 @@ public interface PeriodCellDataSourceMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_DATA_SOURCE
+     * This method corresponds to the database table period_cell_data_source
      *
      * @mbg.generated
      */
@@ -76,7 +76,7 @@ public interface PeriodCellDataSourceMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_DATA_SOURCE
+     * This method corresponds to the database table period_cell_data_source
      *
      * @mbg.generated
      */
@@ -84,7 +84,7 @@ public interface PeriodCellDataSourceMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_DATA_SOURCE
+     * This method corresponds to the database table period_cell_data_source
      *
      * @mbg.generated
      */
@@ -92,7 +92,7 @@ public interface PeriodCellDataSourceMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_DATA_SOURCE
+     * This method corresponds to the database table period_cell_data_source
      *
      * @mbg.generated
      */
@@ -100,7 +100,7 @@ public interface PeriodCellDataSourceMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_CELL_DATA_SOURCE
+     * This method corresponds to the database table period_cell_data_source
      *
      * @mbg.generated
      */

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/PeriodDataSourceDetailMapper.java

@@ -12,7 +12,7 @@ import pwc.taxtech.atms.vat.entity.PeriodDataSourceDetailExample;
 public interface PeriodDataSourceDetailMapper extends MyVatMapper {
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL
+     * This method corresponds to the database table period_data_source_detail
      *
      * @mbg.generated
      */
@@ -20,7 +20,7 @@ public interface PeriodDataSourceDetailMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL
+     * This method corresponds to the database table period_data_source_detail
      *
      * @mbg.generated
      */
@@ -28,7 +28,7 @@ public interface PeriodDataSourceDetailMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL
+     * This method corresponds to the database table period_data_source_detail
      *
      * @mbg.generated
      */
@@ -36,7 +36,7 @@ public interface PeriodDataSourceDetailMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL
+     * This method corresponds to the database table period_data_source_detail
      *
      * @mbg.generated
      */
@@ -44,7 +44,7 @@ public interface PeriodDataSourceDetailMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL
+     * This method corresponds to the database table period_data_source_detail
      *
      * @mbg.generated
      */
@@ -52,7 +52,7 @@ public interface PeriodDataSourceDetailMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL
+     * This method corresponds to the database table period_data_source_detail
      *
      * @mbg.generated
      */
@@ -60,7 +60,7 @@ public interface PeriodDataSourceDetailMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL
+     * This method corresponds to the database table period_data_source_detail
      *
      * @mbg.generated
      */
@@ -68,7 +68,7 @@ public interface PeriodDataSourceDetailMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL
+     * This method corresponds to the database table period_data_source_detail
      *
      * @mbg.generated
      */
@@ -76,7 +76,7 @@ public interface PeriodDataSourceDetailMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL
+     * This method corresponds to the database table period_data_source_detail
      *
      * @mbg.generated
      */
@@ -84,7 +84,7 @@ public interface PeriodDataSourceDetailMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL
+     * This method corresponds to the database table period_data_source_detail
      *
      * @mbg.generated
      */
@@ -92,7 +92,7 @@ public interface PeriodDataSourceDetailMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL
+     * This method corresponds to the database table period_data_source_detail
      *
      * @mbg.generated
      */
@@ -100,7 +100,7 @@ public interface PeriodDataSourceDetailMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL
+     * This method corresponds to the database table period_data_source_detail
      *
      * @mbg.generated
      */

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/PeriodDataSourceMapper.java

@@ -14,7 +14,7 @@ import pwc.taxtech.atms.vat.entity.PeriodDataSourceExample;
 public interface PeriodDataSourceMapper extends MyVatMapper {
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_DATA_SOURCE
+     * This method corresponds to the database table period_data_source
      *
      * @mbg.generated
      */
@@ -22,7 +22,7 @@ public interface PeriodDataSourceMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_DATA_SOURCE
+     * This method corresponds to the database table period_data_source
      *
      * @mbg.generated
      */
@@ -30,7 +30,7 @@ public interface PeriodDataSourceMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_DATA_SOURCE
+     * This method corresponds to the database table period_data_source
      *
      * @mbg.generated
      */
@@ -38,7 +38,7 @@ public interface PeriodDataSourceMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_DATA_SOURCE
+     * This method corresponds to the database table period_data_source
      *
      * @mbg.generated
      */
@@ -46,7 +46,7 @@ public interface PeriodDataSourceMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_DATA_SOURCE
+     * This method corresponds to the database table period_data_source
      *
      * @mbg.generated
      */
@@ -54,7 +54,7 @@ public interface PeriodDataSourceMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_DATA_SOURCE
+     * This method corresponds to the database table period_data_source
      *
      * @mbg.generated
      */
@@ -62,7 +62,7 @@ public interface PeriodDataSourceMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_DATA_SOURCE
+     * This method corresponds to the database table period_data_source
      *
      * @mbg.generated
      */
@@ -70,7 +70,7 @@ public interface PeriodDataSourceMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_DATA_SOURCE
+     * This method corresponds to the database table period_data_source
      *
      * @mbg.generated
      */
@@ -78,7 +78,7 @@ public interface PeriodDataSourceMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_DATA_SOURCE
+     * This method corresponds to the database table period_data_source
      *
      * @mbg.generated
      */
@@ -86,7 +86,7 @@ public interface PeriodDataSourceMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_DATA_SOURCE
+     * This method corresponds to the database table period_data_source
      *
      * @mbg.generated
      */
@@ -94,7 +94,7 @@ public interface PeriodDataSourceMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_DATA_SOURCE
+     * This method corresponds to the database table period_data_source
      *
      * @mbg.generated
      */
@@ -102,7 +102,7 @@ public interface PeriodDataSourceMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_DATA_SOURCE
+     * This method corresponds to the database table period_data_source
      *
      * @mbg.generated
      */

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/PeriodEnterpriseAccountMapper.java

@@ -13,7 +13,7 @@ import pwc.taxtech.atms.vat.entity.VatEnterpriseAccount;
 public interface PeriodEnterpriseAccountMapper extends MyVatMapper {
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_ENTERPRISE_ACCOUNT
+     * This method corresponds to the database table period_enterprise_account
      *
      * @mbg.generated
      */
@@ -21,7 +21,7 @@ public interface PeriodEnterpriseAccountMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_ENTERPRISE_ACCOUNT
+     * This method corresponds to the database table period_enterprise_account
      *
      * @mbg.generated
      */
@@ -29,7 +29,7 @@ public interface PeriodEnterpriseAccountMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_ENTERPRISE_ACCOUNT
+     * This method corresponds to the database table period_enterprise_account
      *
      * @mbg.generated
      */
@@ -37,7 +37,7 @@ public interface PeriodEnterpriseAccountMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_ENTERPRISE_ACCOUNT
+     * This method corresponds to the database table period_enterprise_account
      *
      * @mbg.generated
      */
@@ -45,7 +45,7 @@ public interface PeriodEnterpriseAccountMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_ENTERPRISE_ACCOUNT
+     * This method corresponds to the database table period_enterprise_account
      *
      * @mbg.generated
      */
@@ -53,7 +53,7 @@ public interface PeriodEnterpriseAccountMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_ENTERPRISE_ACCOUNT
+     * This method corresponds to the database table period_enterprise_account
      *
      * @mbg.generated
      */
@@ -61,7 +61,7 @@ public interface PeriodEnterpriseAccountMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_ENTERPRISE_ACCOUNT
+     * This method corresponds to the database table period_enterprise_account
      *
      * @mbg.generated
      */
@@ -69,7 +69,7 @@ public interface PeriodEnterpriseAccountMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_ENTERPRISE_ACCOUNT
+     * This method corresponds to the database table period_enterprise_account
      *
      * @mbg.generated
      */
@@ -77,7 +77,7 @@ public interface PeriodEnterpriseAccountMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_ENTERPRISE_ACCOUNT
+     * This method corresponds to the database table period_enterprise_account
      *
      * @mbg.generated
      */
@@ -85,7 +85,7 @@ public interface PeriodEnterpriseAccountMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_ENTERPRISE_ACCOUNT
+     * This method corresponds to the database table period_enterprise_account
      *
      * @mbg.generated
      */
@@ -93,7 +93,7 @@ public interface PeriodEnterpriseAccountMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_ENTERPRISE_ACCOUNT
+     * This method corresponds to the database table period_enterprise_account
      *
      * @mbg.generated
      */
@@ -101,12 +101,12 @@ public interface PeriodEnterpriseAccountMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_ENTERPRISE_ACCOUNT
+     * This method corresponds to the database table period_enterprise_account
      *
      * @mbg.generated
      */
     int updateByPrimaryKey(PeriodEnterpriseAccount record);
 
-    List<VatEnterpriseAccount> getListWithAccountCode(@Param("accountCode") String accountCode,@Param("projectId") String projectId,@Param("period") int period);
+    List<VatEnterpriseAccount> getListWithAccountCode(@Param("accountCode") String accountCode, @Param("projectId") String projectId, @Param("period") int period);
 
 }
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/PeriodModifiedReportCellMapper.java

@@ -12,7 +12,7 @@ import pwc.taxtech.atms.vat.entity.PeriodModifiedReportCellExample;
 public interface PeriodModifiedReportCellMapper extends MyVatMapper {
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_MODIFIED_REPORT_CELL
+     * This method corresponds to the database table period_modified_report_cell
      *
      * @mbg.generated
      */
@@ -20,7 +20,7 @@ public interface PeriodModifiedReportCellMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_MODIFIED_REPORT_CELL
+     * This method corresponds to the database table period_modified_report_cell
      *
      * @mbg.generated
      */
@@ -28,7 +28,7 @@ public interface PeriodModifiedReportCellMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_MODIFIED_REPORT_CELL
+     * This method corresponds to the database table period_modified_report_cell
      *
      * @mbg.generated
      */
@@ -36,7 +36,7 @@ public interface PeriodModifiedReportCellMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_MODIFIED_REPORT_CELL
+     * This method corresponds to the database table period_modified_report_cell
      *
      * @mbg.generated
      */
@@ -44,7 +44,7 @@ public interface PeriodModifiedReportCellMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_MODIFIED_REPORT_CELL
+     * This method corresponds to the database table period_modified_report_cell
      *
      * @mbg.generated
      */
@@ -52,7 +52,7 @@ public interface PeriodModifiedReportCellMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_MODIFIED_REPORT_CELL
+     * This method corresponds to the database table period_modified_report_cell
      *
      * @mbg.generated
      */
@@ -60,7 +60,7 @@ public interface PeriodModifiedReportCellMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_MODIFIED_REPORT_CELL
+     * This method corresponds to the database table period_modified_report_cell
      *
      * @mbg.generated
      */
@@ -68,7 +68,7 @@ public interface PeriodModifiedReportCellMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_MODIFIED_REPORT_CELL
+     * This method corresponds to the database table period_modified_report_cell
      *
      * @mbg.generated
      */
@@ -76,7 +76,7 @@ public interface PeriodModifiedReportCellMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_MODIFIED_REPORT_CELL
+     * This method corresponds to the database table period_modified_report_cell
      *
      * @mbg.generated
      */
@@ -84,7 +84,7 @@ public interface PeriodModifiedReportCellMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_MODIFIED_REPORT_CELL
+     * This method corresponds to the database table period_modified_report_cell
      *
      * @mbg.generated
      */
@@ -92,7 +92,7 @@ public interface PeriodModifiedReportCellMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_MODIFIED_REPORT_CELL
+     * This method corresponds to the database table period_modified_report_cell
      *
      * @mbg.generated
      */
@@ -100,7 +100,7 @@ public interface PeriodModifiedReportCellMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_MODIFIED_REPORT_CELL
+     * This method corresponds to the database table period_modified_report_cell
      *
      * @mbg.generated
      */

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/PeriodStandardAccountMapper.java

 package pwc.taxtech.atms.vat.dao;
 
+import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.session.RowBounds;
@@ -8,15 +9,12 @@ import pwc.taxtech.atms.vat.dpo.TrialBalanceDto;
 import pwc.taxtech.atms.vat.entity.PeriodStandardAccount;
 import pwc.taxtech.atms.vat.entity.PeriodStandardAccountExample;
 import pwc.taxtech.atms.vat.entity.VatStandardAccount;
-import pwc.taxtech.atms.vat.entity.VatStandardAccount;
-
-import java.util.List;
 
 @Mapper
 public interface PeriodStandardAccountMapper extends MyVatMapper {
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_STANDARD_ACCOUNT
+     * This method corresponds to the database table period_standard_account
      *
      * @mbg.generated
      */
@@ -24,7 +22,7 @@ public interface PeriodStandardAccountMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_STANDARD_ACCOUNT
+     * This method corresponds to the database table period_standard_account
      *
      * @mbg.generated
      */
@@ -32,7 +30,7 @@ public interface PeriodStandardAccountMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_STANDARD_ACCOUNT
+     * This method corresponds to the database table period_standard_account
      *
      * @mbg.generated
      */
@@ -40,7 +38,7 @@ public interface PeriodStandardAccountMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_STANDARD_ACCOUNT
+     * This method corresponds to the database table period_standard_account
      *
      * @mbg.generated
      */
@@ -48,7 +46,7 @@ public interface PeriodStandardAccountMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_STANDARD_ACCOUNT
+     * This method corresponds to the database table period_standard_account
      *
      * @mbg.generated
      */
@@ -56,7 +54,7 @@ public interface PeriodStandardAccountMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_STANDARD_ACCOUNT
+     * This method corresponds to the database table period_standard_account
      *
      * @mbg.generated
      */
@@ -64,7 +62,7 @@ public interface PeriodStandardAccountMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_STANDARD_ACCOUNT
+     * This method corresponds to the database table period_standard_account
      *
      * @mbg.generated
      */
@@ -72,7 +70,7 @@ public interface PeriodStandardAccountMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_STANDARD_ACCOUNT
+     * This method corresponds to the database table period_standard_account
      *
      * @mbg.generated
      */
@@ -80,7 +78,7 @@ public interface PeriodStandardAccountMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_STANDARD_ACCOUNT
+     * This method corresponds to the database table period_standard_account
      *
      * @mbg.generated
      */
@@ -88,7 +86,7 @@ public interface PeriodStandardAccountMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_STANDARD_ACCOUNT
+     * This method corresponds to the database table period_standard_account
      *
      * @mbg.generated
      */
@@ -96,7 +94,7 @@ public interface PeriodStandardAccountMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_STANDARD_ACCOUNT
+     * This method corresponds to the database table period_standard_account
      *
      * @mbg.generated
      */
@@ -104,7 +102,7 @@ public interface PeriodStandardAccountMapper extends MyVatMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_STANDARD_ACCOUNT
+     * This method corresponds to the database table period_standard_account
      *
      * @mbg.generated
      */

atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/PeriodDataSourceDetail.java

@@ -5,7 +5,7 @@ import java.io.Serializable;
 /**
  *
  * This class was generated by MyBatis Generator.
- * This class corresponds to the database table TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL
+ * This class corresponds to the database table period_data_source_detail
  *
  * @mbg.generated do_not_delete_during_merge
  */
@@ -13,7 +13,7 @@ public class PeriodDataSourceDetail implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL.ID
+     * This field corresponds to the database column period_data_source_detail.id
      *
      * @mbg.generated
      */
@@ -22,7 +22,7 @@ public class PeriodDataSourceDetail implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL.DATA_SOURCE_ID
+     * This field corresponds to the database column period_data_source_detail.data_source_id
      *
      * @mbg.generated
      */
@@ -31,7 +31,7 @@ public class PeriodDataSourceDetail implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL.DATA_SOURCE_TYPE
+     * This field corresponds to the database column period_data_source_detail.data_source_type
      *
      * @mbg.generated
      */
@@ -40,7 +40,7 @@ public class PeriodDataSourceDetail implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL.ITEM_VALUE
+     * This field corresponds to the database column period_data_source_detail.item_value
      *
      * @mbg.generated
      */
@@ -49,7 +49,7 @@ public class PeriodDataSourceDetail implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL.PROJECT_ID
+     * This field corresponds to the database column period_data_source_detail.project_id
      *
      * @mbg.generated
      */
@@ -58,7 +58,7 @@ public class PeriodDataSourceDetail implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL.PERIOD
+     * This field corresponds to the database column period_data_source_detail.period
      *
      * @mbg.generated
      */
@@ -66,7 +66,7 @@ public class PeriodDataSourceDetail implements Serializable {
 
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL
+     * This field corresponds to the database table period_data_source_detail
      *
      * @mbg.generated
      */
@@ -74,9 +74,9 @@ public class PeriodDataSourceDetail implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL.ID
+     * This method returns the value of the database column period_data_source_detail.id
      *
-     * @return the value of TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL.ID
+     * @return the value of period_data_source_detail.id
      *
      * @mbg.generated
      */
@@ -86,9 +86,9 @@ public class PeriodDataSourceDetail implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL.ID
+     * This method sets the value of the database column period_data_source_detail.id
      *
-     * @param id the value for TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL.ID
+     * @param id the value for period_data_source_detail.id
      *
      * @mbg.generated
      */
@@ -98,9 +98,9 @@ public class PeriodDataSourceDetail implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL.DATA_SOURCE_ID
+     * This method returns the value of the database column period_data_source_detail.data_source_id
      *
-     * @return the value of TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL.DATA_SOURCE_ID
+     * @return the value of period_data_source_detail.data_source_id
      *
      * @mbg.generated
      */
@@ -110,9 +110,9 @@ public class PeriodDataSourceDetail implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL.DATA_SOURCE_ID
+     * This method sets the value of the database column period_data_source_detail.data_source_id
      *
-     * @param dataSourceId the value for TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL.DATA_SOURCE_ID
+     * @param dataSourceId the value for period_data_source_detail.data_source_id
      *
      * @mbg.generated
      */
@@ -122,9 +122,9 @@ public class PeriodDataSourceDetail implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL.DATA_SOURCE_TYPE
+     * This method returns the value of the database column period_data_source_detail.data_source_type
      *
-     * @return the value of TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL.DATA_SOURCE_TYPE
+     * @return the value of period_data_source_detail.data_source_type
      *
      * @mbg.generated
      */
@@ -134,9 +134,9 @@ public class PeriodDataSourceDetail implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL.DATA_SOURCE_TYPE
+     * This method sets the value of the database column period_data_source_detail.data_source_type
      *
-     * @param dataSourceType the value for TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL.DATA_SOURCE_TYPE
+     * @param dataSourceType the value for period_data_source_detail.data_source_type
      *
      * @mbg.generated
      */
@@ -146,9 +146,9 @@ public class PeriodDataSourceDetail implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL.ITEM_VALUE
+     * This method returns the value of the database column period_data_source_detail.item_value
      *
-     * @return the value of TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL.ITEM_VALUE
+     * @return the value of period_data_source_detail.item_value
      *
      * @mbg.generated
      */
@@ -158,9 +158,9 @@ public class PeriodDataSourceDetail implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL.ITEM_VALUE
+     * This method sets the value of the database column period_data_source_detail.item_value
      *
-     * @param itemValue the value for TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL.ITEM_VALUE
+     * @param itemValue the value for period_data_source_detail.item_value
      *
      * @mbg.generated
      */
@@ -170,9 +170,9 @@ public class PeriodDataSourceDetail implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL.PROJECT_ID
+     * This method returns the value of the database column period_data_source_detail.project_id
      *
-     * @return the value of TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL.PROJECT_ID
+     * @return the value of period_data_source_detail.project_id
      *
      * @mbg.generated
      */
@@ -182,9 +182,9 @@ public class PeriodDataSourceDetail implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL.PROJECT_ID
+     * This method sets the value of the database column period_data_source_detail.project_id
      *
-     * @param projectId the value for TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL.PROJECT_ID
+     * @param projectId the value for period_data_source_detail.project_id
      *
      * @mbg.generated
      */
@@ -194,9 +194,9 @@ public class PeriodDataSourceDetail implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL.PERIOD
+     * This method returns the value of the database column period_data_source_detail.period
      *
-     * @return the value of TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL.PERIOD
+     * @return the value of period_data_source_detail.period
      *
      * @mbg.generated
      */
@@ -206,9 +206,9 @@ public class PeriodDataSourceDetail implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL.PERIOD
+     * This method sets the value of the database column period_data_source_detail.period
      *
-     * @param period the value for TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL.PERIOD
+     * @param period the value for period_data_source_detail.period
      *
      * @mbg.generated
      */
@@ -218,7 +218,7 @@ public class PeriodDataSourceDetail implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TAX_ADMIN.PERIOD_DATA_SOURCE_DETAIL
+     * This method corresponds to the database table period_data_source_detail
      *
      * @mbg.generated
      */

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

@@ -135,9 +135,9 @@
         B.period AS PERIOD,
         B.template_id AS TEMPLATE_ID
         FROM
-        period_report b
+        period_report B
         WHERE
-        b.period = #{period,jdbcType=INTEGER}
+        B.period = #{period,jdbcType=INTEGER}
         AND B.project_id = #{projectId,jdbcType=VARCHAR}
         )
         D