change the database to new style

atms-api/etc/generator/run.bat

 rem see http://www.mybatis.org/generator/running/runningFromCmdLine.html
 cd /d %~dp0
-call java -classpath .;./* org.mybatis.generator.api.ShellRunner -configfile generatorConfig.xml -overwrite -verbose -tables TemplateFormula
+call java -classpath .;./* org.mybatis.generator.api.ShellRunner -configfile generatorConfig.xml -overwrite -verbose
 echo @@@@@@@@@@@ DONE @@@@@@@@@@@
 pause

atms-api/etc/generator/vatGenerator.properties

 /
 jdbc.driverClass=com.mysql.jdbc.Driver
-jdbc.connectionURL=jdbc:mysql://10.157.107.89:3306/a1100000?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
+jdbc.connectionURL=jdbc:mysql://10.157.107.89:3306/a2100000?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
 jdbc.userId=root
 jdbc.password=tax@Admin2018

atms-api/etc/generator/vatGeneratorConfig.xml

@@ -336,5 +336,45 @@
             <property name="useActualColumnNames" value="true" />
             <property name="ignoreQualifiersAtRuntime" value="true"/>
         </table>
+
+        <table tableName="cell_comment" domainObjectName="CellComment">
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
+        </table>
+        <table tableName="cell_data" domainObjectName="CellData">
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
+        </table>
+        <table tableName="cell_data_source" domainObjectName="CellDataSource">
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
+        </table>
+        <table tableName="data_source" domainObjectName="DataSource">
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
+        </table>
+        <table tableName="data_source_detail" domainObjectName="DataSourceDetail">
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
+        </table>
+        <table tableName="period_cell_template" domainObjectName="PeriodCellTemplate">
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
+            <columnOverride column="is_read_only" javaType="java.lang.Boolean"/>
+        </table>
+        <table tableName="period_cell_template_config" domainObjectName="PeriodCellTemplateConfig">
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
+        </table>
+        <table tableName="period_formula_block" domainObjectName="PeriodFormulaBlock">
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
+        </table>
+        <table tableName="period_tax_payer_report_rule" domainObjectName="PeriodTaxPayerReportRule">
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
+        </table>
+        <table tableName="period_tax_rule_setting" domainObjectName="PeriodTaxRuleSetting">
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
+        </table>
+        <table tableName="period_tax_rule_setting_organization" domainObjectName="PeriodTaxRuleSettingOrganization">
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
+        </table>
+        <table tableName="period_template" domainObjectName="PeriodTemplate">
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
+            <columnOverride column="is_system_type" javaType="java.lang.Boolean"/>
+            <columnOverride column="is_active_association" javaType="java.lang.Boolean"/>
+        </table>
     </context>
 </generatorConfiguration>
\ No newline at end of file

atms-api/etc/generator/vat_run.bat

 rem see http://www.mybatis.org/generator/running/runningFromCmdLine.html
 cd /d %~dp0
-call java -classpath .;./* org.mybatis.generator.api.ShellRunner -configfile vatGeneratorConfig.xml -overwrite -verbose
+call java -classpath .;./* org.mybatis.generator.api.ShellRunner -configfile vatGeneratorConfig.xml -overwrite -verbose -tables cell_data_source
 echo @@@@@@@@@@@ DONE @@@@@@@@@@@
 pause

atms-api/src/main/java/pwc/taxtech/atms/controller/BaseController.java

@@ -5,5 +5,9 @@ import org.slf4j.LoggerFactory;
 
 public class BaseController {
     protected final Logger logger = LoggerFactory.getLogger(this.getClass());
-    
+
+    public Boolean isParamValid(Long primaryKey) {
+        return primaryKey != null && primaryKey != 0;
+    }
+
 }

atms-api/src/main/java/pwc/taxtech/atms/controller/CellTemplateController.java

@@ -15,17 +15,17 @@ import java.util.List;
 
 @RestController
 @RequestMapping(value = "api/v1/celltemplate")
-public class CellTemplateController {
+public class CellTemplateController extends BaseController {
     private static final Logger logger = LoggerFactory.getLogger(AccountController.class);
     @Autowired
     CellTemplateService cellTemplateService;
 
     @RequestMapping(value = "configList/{templateID}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public @ResponseBody
-    OperationResultDto<List<CellTemplateConfigDto>> getConfigList(@PathVariable String templateID) {
+    OperationResultDto<List<CellTemplateConfigDto>> getConfigList(@PathVariable Long templateID) {
         OperationResultDto<List<CellTemplateConfigDto>> result = new OperationResultDto<>();
 
-        if (StringUtils.isEmpty(templateID)) {
+        if (!isParamValid(templateID)) {
             result.setData(Collections.emptyList());
         }
 
@@ -40,8 +40,8 @@ public class CellTemplateController {
 
     @RequestMapping(value = "config/{cellTemplateID}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public @ResponseBody
-    OperationResultDto<CellTemplateConfigDto> getConfig(@PathVariable String cellTemplateID) {
-        if (StringUtils.isEmpty(cellTemplateID)) {
+    OperationResultDto<CellTemplateConfigDto> getConfig(@PathVariable Long cellTemplateID) {
+        if (!isParamValid(cellTemplateID)) {
             return new OperationResultDto<>();
         }
 

atms-api/src/main/java/pwc/taxtech/atms/controller/TemplateController.java

@@ -21,7 +21,7 @@ import java.util.List;
 
 @RestController
 @RequestMapping(value = "api/v1/template")
-public class TemplateController {
+public class TemplateController extends BaseController {
     private static final Logger logger = LoggerFactory.getLogger(TemplateController.class);
 
     @Autowired
@@ -32,8 +32,8 @@ public class TemplateController {
 
     @RequestMapping(value = "get", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public @ResponseBody
-    List<TemplateDto> get(@RequestParam String templateGroupID, @RequestParam String reportType) {
-        if (StringUtils.isEmpty(templateGroupID)) {
+    List<TemplateDto> get(@RequestParam Long templateGroupID, @RequestParam String reportType) {
+        if (!isParamValid(templateGroupID)) {
             return Collections.emptyList();
         }
 
@@ -47,15 +47,15 @@ public class TemplateController {
 
     @RequestMapping(value = "getTemplateJson", method = RequestMethod.POST, produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
     public @ResponseBody
-    void getTemplateBlob(@RequestParam String templateID, HttpServletResponse response) throws URISyntaxException {
+    void getTemplateBlob(@RequestParam Long templateID, HttpServletResponse response) throws URISyntaxException {
+        if (!isParamValid(templateID)) {
+            return;
+        }
         String filePath;
         File templateFile;
         InputStream inputStream = null;
         Template template = templateService.getTemplateByID(templateID);
         String templatePath = templateService.getTemplatePath(templateID);
-        if (StringUtils.isBlank(templateID)) {
-            return;
-        }
 
         if (StringUtils.isBlank(templatePath)) {
             return;
@@ -129,7 +129,12 @@ public class TemplateController {
 
     @RequestMapping(value = "rowColName/{id}", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public @ResponseBody
-    OperationResultDto setRowColName(@PathVariable String id, @RequestBody List<CellBriefDto> cellInfo) {
-        return templateService.setRowColName(id, cellInfo);
+    OperationResultDto setRowColName(@PathVariable Long id, @RequestBody List<CellBriefDto> cellInfo) {
+        if (isParamValid(id)) {
+            return templateService.setRowColName(id, cellInfo);
+        } else {
+            return null;
+        }
+
     }
 }

atms-api/src/main/java/pwc/taxtech/atms/controller/TemplateGroupController.java

@@ -114,7 +114,7 @@ public class TemplateGroupController {
     @ApiOperation(value = "导入报表")
     @RequestMapping(value = "importTemplateExcelFile", method = RequestMethod.POST)
     public OperationResultDto importTemplateExcelFile(@RequestParam MultipartFile file,
-                                                      @RequestParam String templateGroupID,
+                                                      @RequestParam Long templateGroupID,
                                                       @RequestParam String sheetList,
                                                       @RequestParam String tempFileName,
                                                       @RequestParam String reportType,

atms-api/src/main/java/pwc/taxtech/atms/dao/CellTemplateConfigMapper.java

@@ -12,7 +12,7 @@ import pwc.taxtech.atms.entitiy.CellTemplateConfigExample;
 public interface CellTemplateConfigMapper extends MyMapper {
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table CellTemplateConfig
+     * This method corresponds to the database table cell_template_config
      *
      * @mbg.generated
      */
@@ -20,7 +20,7 @@ public interface CellTemplateConfigMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table CellTemplateConfig
+     * This method corresponds to the database table cell_template_config
      *
      * @mbg.generated
      */
@@ -28,15 +28,15 @@ public interface CellTemplateConfigMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table CellTemplateConfig
+     * This method corresponds to the database table cell_template_config
      *
      * @mbg.generated
      */
-    int deleteByPrimaryKey(String ID);
+    int deleteByPrimaryKey(Long id);
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table CellTemplateConfig
+     * This method corresponds to the database table cell_template_config
      *
      * @mbg.generated
      */
@@ -44,7 +44,7 @@ public interface CellTemplateConfigMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table CellTemplateConfig
+     * This method corresponds to the database table cell_template_config
      *
      * @mbg.generated
      */
@@ -52,7 +52,7 @@ public interface CellTemplateConfigMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table CellTemplateConfig
+     * This method corresponds to the database table cell_template_config
      *
      * @mbg.generated
      */
@@ -60,7 +60,7 @@ public interface CellTemplateConfigMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table CellTemplateConfig
+     * This method corresponds to the database table cell_template_config
      *
      * @mbg.generated
      */
@@ -68,15 +68,15 @@ public interface CellTemplateConfigMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table CellTemplateConfig
+     * This method corresponds to the database table cell_template_config
      *
      * @mbg.generated
      */
-    CellTemplateConfig selectByPrimaryKey(String ID);
+    CellTemplateConfig selectByPrimaryKey(Long id);
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table CellTemplateConfig
+     * This method corresponds to the database table cell_template_config
      *
      * @mbg.generated
      */
@@ -84,7 +84,7 @@ public interface CellTemplateConfigMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table CellTemplateConfig
+     * This method corresponds to the database table cell_template_config
      *
      * @mbg.generated
      */
@@ -92,7 +92,7 @@ public interface CellTemplateConfigMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table CellTemplateConfig
+     * This method corresponds to the database table cell_template_config
      *
      * @mbg.generated
      */
@@ -100,15 +100,15 @@ public interface CellTemplateConfigMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table CellTemplateConfig
+     * This method corresponds to the database table cell_template_config
      *
      * @mbg.generated
      */
     int updateByPrimaryKey(CellTemplateConfig record);
 
-    List<CellTemplateConfig> getCellTemplateConfigByTemplateID(@Param("templateID") String templateID);
+    List<CellTemplateConfig> getCellTemplateConfigByTemplateID(@Param("templateID") Long templateID);
 
-    int deleteCellTemplateConfigByCellTemplate(@Param("templateDbID") String templateDbID);
+    int deleteCellTemplateConfigByCellTemplate(@Param("templateDbID") Long templateDbID);
 
     void batchInsert(List<CellTemplateConfig> list);
 }
\ No newline at end of file

atms-api/src/main/java/pwc/taxtech/atms/dao/CellTemplateMapper.java

@@ -12,7 +12,7 @@ import pwc.taxtech.atms.entitiy.CellTemplateExample;
 public interface CellTemplateMapper extends MyMapper {
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table CellTemplate
+     * This method corresponds to the database table cell_template
      *
      * @mbg.generated
      */
@@ -20,7 +20,7 @@ public interface CellTemplateMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table CellTemplate
+     * This method corresponds to the database table cell_template
      *
      * @mbg.generated
      */
@@ -28,15 +28,15 @@ public interface CellTemplateMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table CellTemplate
+     * This method corresponds to the database table cell_template
      *
      * @mbg.generated
      */
-    int deleteByPrimaryKey(String ID);
+    int deleteByPrimaryKey(Long id);
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table CellTemplate
+     * This method corresponds to the database table cell_template
      *
      * @mbg.generated
      */
@@ -44,7 +44,7 @@ public interface CellTemplateMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table CellTemplate
+     * This method corresponds to the database table cell_template
      *
      * @mbg.generated
      */
@@ -52,7 +52,7 @@ public interface CellTemplateMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table CellTemplate
+     * This method corresponds to the database table cell_template
      *
      * @mbg.generated
      */
@@ -60,7 +60,7 @@ public interface CellTemplateMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table CellTemplate
+     * This method corresponds to the database table cell_template
      *
      * @mbg.generated
      */
@@ -68,15 +68,15 @@ public interface CellTemplateMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table CellTemplate
+     * This method corresponds to the database table cell_template
      *
      * @mbg.generated
      */
-    CellTemplate selectByPrimaryKey(String ID);
+    CellTemplate selectByPrimaryKey(Long id);
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table CellTemplate
+     * This method corresponds to the database table cell_template
      *
      * @mbg.generated
      */
@@ -84,7 +84,7 @@ public interface CellTemplateMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table CellTemplate
+     * This method corresponds to the database table cell_template
      *
      * @mbg.generated
      */
@@ -92,7 +92,7 @@ public interface CellTemplateMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table CellTemplate
+     * This method corresponds to the database table cell_template
      *
      * @mbg.generated
      */
@@ -100,7 +100,7 @@ public interface CellTemplateMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table CellTemplate
+     * This method corresponds to the database table cell_template
      *
      * @mbg.generated
      */

atms-api/src/main/java/pwc/taxtech/atms/dao/KeyValueReferenceMapper.java

@@ -4,7 +4,6 @@ import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.session.RowBounds;
-import org.springframework.security.access.method.P;
 import pwc.taxtech.atms.MyMapper;
 import pwc.taxtech.atms.dto.AnalyticsModelDetail;
 import pwc.taxtech.atms.dto.FinancialStatementDetail;
@@ -110,7 +109,7 @@ public interface KeyValueReferenceMapper extends MyMapper {
      */
     int updateByPrimaryKey(KeyValueReference record);
 
-    int deleteKeyValueReferenceByCellTemplate(@Param("templateDbID") String templateDbID);
+    int deleteKeyValueReferenceByCellTemplate(@Param("templateDbID") Long templateDbID);
 
     List<FinancialStatementDetail> getFinancialStatementDetails(@Param("configurationID") String configurationID);
 

atms-api/src/main/java/pwc/taxtech/atms/dao/OrganizationServiceTemplateGroupMapper.java

@@ -13,7 +13,7 @@ import pwc.taxtech.atms.entitiy.OrganizationServiceTemplateGroupExample;
 public interface OrganizationServiceTemplateGroupMapper extends MyMapper {
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table OrganizationServiceTemplateGroup
+     * This method corresponds to the database table organization_service_template_group
      *
      * @mbg.generated
      */
@@ -21,7 +21,7 @@ public interface OrganizationServiceTemplateGroupMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table OrganizationServiceTemplateGroup
+     * This method corresponds to the database table organization_service_template_group
      *
      * @mbg.generated
      */
@@ -29,15 +29,15 @@ public interface OrganizationServiceTemplateGroupMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table OrganizationServiceTemplateGroup
+     * This method corresponds to the database table organization_service_template_group
      *
      * @mbg.generated
      */
-    int deleteByPrimaryKey(String ID);
+    int deleteByPrimaryKey(Long id);
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table OrganizationServiceTemplateGroup
+     * This method corresponds to the database table organization_service_template_group
      *
      * @mbg.generated
      */
@@ -45,7 +45,7 @@ public interface OrganizationServiceTemplateGroupMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table OrganizationServiceTemplateGroup
+     * This method corresponds to the database table organization_service_template_group
      *
      * @mbg.generated
      */
@@ -53,7 +53,7 @@ public interface OrganizationServiceTemplateGroupMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table OrganizationServiceTemplateGroup
+     * This method corresponds to the database table organization_service_template_group
      *
      * @mbg.generated
      */
@@ -61,7 +61,7 @@ public interface OrganizationServiceTemplateGroupMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table OrganizationServiceTemplateGroup
+     * This method corresponds to the database table organization_service_template_group
      *
      * @mbg.generated
      */
@@ -69,15 +69,15 @@ public interface OrganizationServiceTemplateGroupMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table OrganizationServiceTemplateGroup
+     * This method corresponds to the database table organization_service_template_group
      *
      * @mbg.generated
      */
-    OrganizationServiceTemplateGroup selectByPrimaryKey(String ID);
+    OrganizationServiceTemplateGroup selectByPrimaryKey(Long id);
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table OrganizationServiceTemplateGroup
+     * This method corresponds to the database table organization_service_template_group
      *
      * @mbg.generated
      */
@@ -85,7 +85,7 @@ public interface OrganizationServiceTemplateGroupMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table OrganizationServiceTemplateGroup
+     * This method corresponds to the database table organization_service_template_group
      *
      * @mbg.generated
      */
@@ -93,7 +93,7 @@ public interface OrganizationServiceTemplateGroupMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table OrganizationServiceTemplateGroup
+     * This method corresponds to the database table organization_service_template_group
      *
      * @mbg.generated
      */
@@ -101,7 +101,7 @@ public interface OrganizationServiceTemplateGroupMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table OrganizationServiceTemplateGroup
+     * This method corresponds to the database table organization_service_template_group
      *
      * @mbg.generated
      */
@@ -109,5 +109,5 @@ public interface OrganizationServiceTemplateGroupMapper extends MyMapper {
 
     List<OrganizationServiceTemplateGroupDto> getSingleOrgByOrgIDToOSTGDto(@Param("orgId") String orgId);
 
-    List<String> getOrgnizationServiceTemplateGroupOrgNames(@Param("templateGroupDtoID") String templateGroupDtoID);
+    List<String> getOrgnizationServiceTemplateGroupOrgNames(@Param("templateGroupDtoID") Long templateGroupDtoID);
 }
\ No newline at end of file

atms-api/src/main/java/pwc/taxtech/atms/dao/ProjectServiceTypeMapper.java

@@ -26,6 +26,14 @@ public interface ProjectServiceTypeMapper extends MyMapper {
      */
     int deleteByExample(ProjectServiceTypeExample example);
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ProjectServiceType
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(String ID);
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table ProjectServiceType
@@ -58,6 +66,14 @@ public interface ProjectServiceTypeMapper extends MyMapper {
      */
     List<ProjectServiceType> selectByExample(ProjectServiceTypeExample example);
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ProjectServiceType
+     *
+     * @mbg.generated
+     */
+    ProjectServiceType selectByPrimaryKey(String ID);
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table ProjectServiceType
@@ -73,4 +89,20 @@ public interface ProjectServiceTypeMapper extends MyMapper {
      * @mbg.generated
      */
     int updateByExample(@Param("record") ProjectServiceType record, @Param("example") ProjectServiceTypeExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ProjectServiceType
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(ProjectServiceType record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ProjectServiceType
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(ProjectServiceType record);
 }
\ No newline at end of file

atms-api/src/main/java/pwc/taxtech/atms/dao/TaxPayerReportRuleMapper.java

@@ -12,7 +12,7 @@ import pwc.taxtech.atms.entitiy.TaxPayerReportRuleExample;
 public interface TaxPayerReportRuleMapper extends MyMapper {
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TaxPayerReportRule
+     * This method corresponds to the database table tax_payer_report_rule
      *
      * @mbg.generated
      */
@@ -20,7 +20,7 @@ public interface TaxPayerReportRuleMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TaxPayerReportRule
+     * This method corresponds to the database table tax_payer_report_rule
      *
      * @mbg.generated
      */
@@ -28,15 +28,15 @@ public interface TaxPayerReportRuleMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TaxPayerReportRule
+     * This method corresponds to the database table tax_payer_report_rule
      *
      * @mbg.generated
      */
-    int deleteByPrimaryKey(String ID);
+    int deleteByPrimaryKey(Long id);
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TaxPayerReportRule
+     * This method corresponds to the database table tax_payer_report_rule
      *
      * @mbg.generated
      */
@@ -44,7 +44,7 @@ public interface TaxPayerReportRuleMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TaxPayerReportRule
+     * This method corresponds to the database table tax_payer_report_rule
      *
      * @mbg.generated
      */
@@ -52,7 +52,7 @@ public interface TaxPayerReportRuleMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TaxPayerReportRule
+     * This method corresponds to the database table tax_payer_report_rule
      *
      * @mbg.generated
      */
@@ -60,7 +60,7 @@ public interface TaxPayerReportRuleMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TaxPayerReportRule
+     * This method corresponds to the database table tax_payer_report_rule
      *
      * @mbg.generated
      */
@@ -68,15 +68,15 @@ public interface TaxPayerReportRuleMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TaxPayerReportRule
+     * This method corresponds to the database table tax_payer_report_rule
      *
      * @mbg.generated
      */
-    TaxPayerReportRule selectByPrimaryKey(String ID);
+    TaxPayerReportRule selectByPrimaryKey(Long id);
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TaxPayerReportRule
+     * This method corresponds to the database table tax_payer_report_rule
      *
      * @mbg.generated
      */
@@ -84,7 +84,7 @@ public interface TaxPayerReportRuleMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TaxPayerReportRule
+     * This method corresponds to the database table tax_payer_report_rule
      *
      * @mbg.generated
      */
@@ -92,7 +92,7 @@ public interface TaxPayerReportRuleMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TaxPayerReportRule
+     * This method corresponds to the database table tax_payer_report_rule
      *
      * @mbg.generated
      */
@@ -100,7 +100,7 @@ public interface TaxPayerReportRuleMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TaxPayerReportRule
+     * This method corresponds to the database table tax_payer_report_rule
      *
      * @mbg.generated
      */

atms-api/src/main/java/pwc/taxtech/atms/dao/TaxRuleSettingMapper.java

 package pwc.taxtech.atms.dao;
 
 import java.util.List;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Result;
-import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.Select;
+
+import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.session.RowBounds;
 import pwc.taxtech.atms.MyMapper;
 import pwc.taxtech.atms.dto.TaxRuleSettingDto;
@@ -14,147 +11,114 @@ import pwc.taxtech.atms.entitiy.TaxRuleSettingExample;
 
 @Mapper
 public interface TaxRuleSettingMapper extends MyMapper {
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to
-	 * the database table TaxRuleSetting
-	 *
-	 * @mbg.generated
-	 */
-	long countByExample(TaxRuleSettingExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to
-	 * the database table TaxRuleSetting
-	 *
-	 * @mbg.generated
-	 */
-	int deleteByExample(TaxRuleSettingExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to
-	 * the database table TaxRuleSetting
-	 *
-	 * @mbg.generated
-	 */
-	int deleteByPrimaryKey(String ID);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to
-	 * the database table TaxRuleSetting
-	 *
-	 * @mbg.generated
-	 */
-	int insert(TaxRuleSetting record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to
-	 * the database table TaxRuleSetting
-	 *
-	 * @mbg.generated
-	 */
-	int insertSelective(TaxRuleSetting record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to
-	 * the database table TaxRuleSetting
-	 *
-	 * @mbg.generated
-	 */
-	List<TaxRuleSetting> selectByExampleWithBLOBsWithRowbounds(TaxRuleSettingExample example, RowBounds rowBounds);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to
-	 * the database table TaxRuleSetting
-	 *
-	 * @mbg.generated
-	 */
-	List<TaxRuleSetting> selectByExampleWithBLOBs(TaxRuleSettingExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to
-	 * the database table TaxRuleSetting
-	 *
-	 * @mbg.generated
-	 */
-	List<TaxRuleSetting> selectByExampleWithRowbounds(TaxRuleSettingExample example, RowBounds rowBounds);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to
-	 * the database table TaxRuleSetting
-	 *
-	 * @mbg.generated
-	 */
-	List<TaxRuleSetting> selectByExample(TaxRuleSettingExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to
-	 * the database table TaxRuleSetting
-	 *
-	 * @mbg.generated
-	 */
-	TaxRuleSetting selectByPrimaryKey(String ID);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to
-	 * the database table TaxRuleSetting
-	 *
-	 * @mbg.generated
-	 */
-	int updateByExampleSelective(@Param("record") TaxRuleSetting record,
-			@Param("example") TaxRuleSettingExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to
-	 * the database table TaxRuleSetting
-	 *
-	 * @mbg.generated
-	 */
-	int updateByExampleWithBLOBs(@Param("record") TaxRuleSetting record,
-			@Param("example") TaxRuleSettingExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to
-	 * the database table TaxRuleSetting
-	 *
-	 * @mbg.generated
-	 */
-	int updateByExample(@Param("record") TaxRuleSetting record, @Param("example") TaxRuleSettingExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to
-	 * the database table TaxRuleSetting
-	 *
-	 * @mbg.generated
-	 */
-	int updateByPrimaryKeySelective(TaxRuleSetting record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to
-	 * the database table TaxRuleSetting
-	 *
-	 * @mbg.generated
-	 */
-	int updateByPrimaryKeyWithBLOBs(TaxRuleSetting record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to
-	 * the database table TaxRuleSetting
-	 *
-	 * @mbg.generated
-	 */
-	int updateByPrimaryKey(TaxRuleSetting record);
-
-	@Select("select trs.GroupName,trs.ID,trs.IsDefault,trs.Name,trs.TaxBase,trs.TaxRate*100 as TaxRate,trso.OrganizationID"
-			+ " from TaxRuleSetting trs " 
-			+ "left join TaxRuleSettingOrganization trso on trs.ID=trso.TaxSettingID")
-	@Results({ 
-		@Result(id = true, column = "ID", property = "ID"),
-		@Result(column = "GroupName",property="GroupName"),
-		@Result(column = "IsDefault",property="IsDefault"),
-		@Result(column = "Name",property="Name"),
-		@Result(column = "TaxBase",property="TaxBase"),
-		@Result(column = "TaxRate",property="TaxRate"),
-		@Result(column = "OrganizationID",property="OrganizationID"),
-	})
-	List<TaxRuleSettingDto> GetTaxRuleSetting();
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tax_rule_setting
+     *
+     * @mbg.generated
+     */
+    long countByExample(TaxRuleSettingExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tax_rule_setting
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(TaxRuleSettingExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tax_rule_setting
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tax_rule_setting
+     *
+     * @mbg.generated
+     */
+    int insert(TaxRuleSetting record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tax_rule_setting
+     *
+     * @mbg.generated
+     */
+    int insertSelective(TaxRuleSetting record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tax_rule_setting
+     *
+     * @mbg.generated
+     */
+    List<TaxRuleSetting> selectByExampleWithRowbounds(TaxRuleSettingExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tax_rule_setting
+     *
+     * @mbg.generated
+     */
+    List<TaxRuleSetting> selectByExample(TaxRuleSettingExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tax_rule_setting
+     *
+     * @mbg.generated
+     */
+    TaxRuleSetting selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tax_rule_setting
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") TaxRuleSetting record, @Param("example") TaxRuleSettingExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tax_rule_setting
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") TaxRuleSetting record, @Param("example") TaxRuleSettingExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tax_rule_setting
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(TaxRuleSetting record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tax_rule_setting
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(TaxRuleSetting record);
+
+
+    @Select("select trs.GroupName,trs.ID,trs.IsDefault,trs.Name,trs.TaxBase,trs.TaxRate*100 as TaxRate,trso.OrganizationID"
+            + " from TaxRuleSetting trs "
+            + "left join TaxRuleSettingOrganization trso on trs.ID=trso.TaxSettingID")
+    @Results({
+            @Result(id = true, column = "ID", property = "ID"),
+            @Result(column = "GroupName",property="GroupName"),
+            @Result(column = "IsDefault",property="IsDefault"),
+            @Result(column = "Name",property="Name"),
+            @Result(column = "TaxBase",property="TaxBase"),
+            @Result(column = "TaxRate",property="TaxRate"),
+            @Result(column = "OrganizationID",property="OrganizationID"),
+    })
+    List<TaxRuleSettingDto> GetTaxRuleSetting();
 }
\ No newline at end of file

atms-api/src/main/java/pwc/taxtech/atms/dao/TaxRuleSettingOrganizationMapper.java

@@ -12,7 +12,7 @@ import pwc.taxtech.atms.entitiy.TaxRuleSettingOrganizationExample;
 public interface TaxRuleSettingOrganizationMapper extends MyMapper {
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TaxRuleSettingOrganization
+     * This method corresponds to the database table tax_rule_setting_organization
      *
      * @mbg.generated
      */
@@ -20,7 +20,7 @@ public interface TaxRuleSettingOrganizationMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TaxRuleSettingOrganization
+     * This method corresponds to the database table tax_rule_setting_organization
      *
      * @mbg.generated
      */
@@ -28,15 +28,15 @@ public interface TaxRuleSettingOrganizationMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TaxRuleSettingOrganization
+     * This method corresponds to the database table tax_rule_setting_organization
      *
      * @mbg.generated
      */
-    int deleteByPrimaryKey(String ID);
+    int deleteByPrimaryKey(Long id);
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TaxRuleSettingOrganization
+     * This method corresponds to the database table tax_rule_setting_organization
      *
      * @mbg.generated
      */
@@ -44,7 +44,7 @@ public interface TaxRuleSettingOrganizationMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TaxRuleSettingOrganization
+     * This method corresponds to the database table tax_rule_setting_organization
      *
      * @mbg.generated
      */
@@ -52,7 +52,7 @@ public interface TaxRuleSettingOrganizationMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TaxRuleSettingOrganization
+     * This method corresponds to the database table tax_rule_setting_organization
      *
      * @mbg.generated
      */
@@ -60,7 +60,7 @@ public interface TaxRuleSettingOrganizationMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TaxRuleSettingOrganization
+     * This method corresponds to the database table tax_rule_setting_organization
      *
      * @mbg.generated
      */
@@ -68,15 +68,15 @@ public interface TaxRuleSettingOrganizationMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TaxRuleSettingOrganization
+     * This method corresponds to the database table tax_rule_setting_organization
      *
      * @mbg.generated
      */
-    TaxRuleSettingOrganization selectByPrimaryKey(String ID);
+    TaxRuleSettingOrganization selectByPrimaryKey(Long id);
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TaxRuleSettingOrganization
+     * This method corresponds to the database table tax_rule_setting_organization
      *
      * @mbg.generated
      */
@@ -84,7 +84,7 @@ public interface TaxRuleSettingOrganizationMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TaxRuleSettingOrganization
+     * This method corresponds to the database table tax_rule_setting_organization
      *
      * @mbg.generated
      */
@@ -92,7 +92,7 @@ public interface TaxRuleSettingOrganizationMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TaxRuleSettingOrganization
+     * This method corresponds to the database table tax_rule_setting_organization
      *
      * @mbg.generated
      */
@@ -100,7 +100,7 @@ public interface TaxRuleSettingOrganizationMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TaxRuleSettingOrganization
+     * This method corresponds to the database table tax_rule_setting_organization
      *
      * @mbg.generated
      */

atms-api/src/main/java/pwc/taxtech/atms/dao/TemplateFormulaMapper.java

-package pwc.taxtech.atms.dao;
-
-import java.util.List;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.session.RowBounds;
-import pwc.taxtech.atms.MyMapper;
-import pwc.taxtech.atms.entitiy.TemplateFormula;
-import pwc.taxtech.atms.entitiy.TemplateFormulaExample;
-
-@Mapper
-public interface TemplateFormulaMapper extends MyMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TemplateFormula
-     *
-     * @mbg.generated
-     */
-    long countByExample(TemplateFormulaExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TemplateFormula
-     *
-     * @mbg.generated
-     */
-    int deleteByExample(TemplateFormulaExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TemplateFormula
-     *
-     * @mbg.generated
-     */
-    int deleteByPrimaryKey(String ID);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TemplateFormula
-     *
-     * @mbg.generated
-     */
-    int insert(TemplateFormula record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TemplateFormula
-     *
-     * @mbg.generated
-     */
-    int insertSelective(TemplateFormula record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TemplateFormula
-     *
-     * @mbg.generated
-     */
-    List<TemplateFormula> selectByExampleWithRowbounds(TemplateFormulaExample example, RowBounds rowBounds);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TemplateFormula
-     *
-     * @mbg.generated
-     */
-    List<TemplateFormula> selectByExample(TemplateFormulaExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TemplateFormula
-     *
-     * @mbg.generated
-     */
-    TemplateFormula selectByPrimaryKey(String ID);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TemplateFormula
-     *
-     * @mbg.generated
-     */
-    int updateByExampleSelective(@Param("record") TemplateFormula record, @Param("example") TemplateFormulaExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TemplateFormula
-     *
-     * @mbg.generated
-     */
-    int updateByExample(@Param("record") TemplateFormula record, @Param("example") TemplateFormulaExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TemplateFormula
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKeySelective(TemplateFormula record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TemplateFormula
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKey(TemplateFormula record);
-}
\ No newline at end of file

atms-api/src/main/java/pwc/taxtech/atms/dao/TemplateGroupMapper.java

@@ -12,7 +12,7 @@ import pwc.taxtech.atms.entitiy.TemplateGroupExample;
 public interface TemplateGroupMapper extends MyMapper {
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TemplateGroup
+     * This method corresponds to the database table template_group
      *
      * @mbg.generated
      */
@@ -20,7 +20,7 @@ public interface TemplateGroupMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TemplateGroup
+     * This method corresponds to the database table template_group
      *
      * @mbg.generated
      */
@@ -28,15 +28,15 @@ public interface TemplateGroupMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TemplateGroup
+     * This method corresponds to the database table template_group
      *
      * @mbg.generated
      */
-    int deleteByPrimaryKey(String ID);
+    int deleteByPrimaryKey(Long id);
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TemplateGroup
+     * This method corresponds to the database table template_group
      *
      * @mbg.generated
      */
@@ -44,7 +44,7 @@ public interface TemplateGroupMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TemplateGroup
+     * This method corresponds to the database table template_group
      *
      * @mbg.generated
      */
@@ -52,7 +52,7 @@ public interface TemplateGroupMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TemplateGroup
+     * This method corresponds to the database table template_group
      *
      * @mbg.generated
      */
@@ -60,7 +60,7 @@ public interface TemplateGroupMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TemplateGroup
+     * This method corresponds to the database table template_group
      *
      * @mbg.generated
      */
@@ -68,15 +68,15 @@ public interface TemplateGroupMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TemplateGroup
+     * This method corresponds to the database table template_group
      *
      * @mbg.generated
      */
-    TemplateGroup selectByPrimaryKey(String ID);
+    TemplateGroup selectByPrimaryKey(Long id);
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TemplateGroup
+     * This method corresponds to the database table template_group
      *
      * @mbg.generated
      */
@@ -84,7 +84,7 @@ public interface TemplateGroupMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TemplateGroup
+     * This method corresponds to the database table template_group
      *
      * @mbg.generated
      */
@@ -92,7 +92,7 @@ public interface TemplateGroupMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TemplateGroup
+     * This method corresponds to the database table template_group
      *
      * @mbg.generated
      */
@@ -100,7 +100,7 @@ public interface TemplateGroupMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table TemplateGroup
+     * This method corresponds to the database table template_group
      *
      * @mbg.generated
      */

atms-api/src/main/java/pwc/taxtech/atms/dao/TemplateMapper.java

@@ -17,7 +17,7 @@ import pwc.taxtech.atms.entitiy.TemplateExample;
 public interface TemplateMapper extends MyMapper {
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table Template
+     * This method corresponds to the database table template
      *
      * @mbg.generated
      */
@@ -25,7 +25,7 @@ public interface TemplateMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table Template
+     * This method corresponds to the database table template
      *
      * @mbg.generated
      */
@@ -33,15 +33,15 @@ public interface TemplateMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table Template
+     * This method corresponds to the database table template
      *
      * @mbg.generated
      */
-    int deleteByPrimaryKey(String ID);
+    int deleteByPrimaryKey(Long id);
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table Template
+     * This method corresponds to the database table template
      *
      * @mbg.generated
      */
@@ -49,7 +49,7 @@ public interface TemplateMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table Template
+     * This method corresponds to the database table template
      *
      * @mbg.generated
      */
@@ -57,7 +57,7 @@ public interface TemplateMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table Template
+     * This method corresponds to the database table template
      *
      * @mbg.generated
      */
@@ -65,7 +65,7 @@ public interface TemplateMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table Template
+     * This method corresponds to the database table template
      *
      * @mbg.generated
      */
@@ -73,15 +73,15 @@ public interface TemplateMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table Template
+     * This method corresponds to the database table template
      *
      * @mbg.generated
      */
-    Template selectByPrimaryKey(String ID);
+    Template selectByPrimaryKey(Long id);
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table Template
+     * This method corresponds to the database table template
      *
      * @mbg.generated
      */
@@ -89,7 +89,7 @@ public interface TemplateMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table Template
+     * This method corresponds to the database table template
      *
      * @mbg.generated
      */
@@ -97,7 +97,7 @@ public interface TemplateMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table Template
+     * This method corresponds to the database table template
      *
      * @mbg.generated
      */
@@ -105,7 +105,7 @@ public interface TemplateMapper extends MyMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table Template
+     * This method corresponds to the database table template
      *
      * @mbg.generated
      */

atms-api/src/main/java/pwc/taxtech/atms/dao/dao/CellTemplateConfigDao.java

@@ -13,10 +13,10 @@ public class CellTemplateConfigDao {
     @Autowired
     private CellTemplateConfigMapper mapper;
 
-    public List<CellTemplateConfig> getByTemplateID(String id) {
+    public List<CellTemplateConfig> getByTemplateID(Long id) {
         CellTemplateConfigExample example = new CellTemplateConfigExample();
         CellTemplateConfigExample.Criteria criteria = example.createCriteria();
-        criteria.andReportTemplateIDEqualTo(id);
+        criteria.andReportTemplateIdEqualTo(id);
         return mapper.selectByExample(example);
     }
 

atms-api/src/main/java/pwc/taxtech/atms/dao/dao/CellTemplateDao.java

@@ -13,10 +13,10 @@ public class CellTemplateDao {
     @Autowired
     private CellTemplateMapper mapper;
 
-    public List<CellTemplate> getByTemplateID(String id) {
+    public List<CellTemplate> getByTemplateID(Long id) {
         CellTemplateExample example = new CellTemplateExample();
         CellTemplateExample.Criteria criteria = example.createCriteria();
-        criteria.andReportTemplateIDEqualTo(id);
+        criteria.andReportTemplateIdEqualTo(id);
         return mapper.selectByExample(example);
     }
 

atms-api/src/main/java/pwc/taxtech/atms/dao/dao/TemplateDao.java

@@ -27,10 +27,10 @@ public class TemplateDao {
         return mapper.selectByExample(example);
     }
 
-    public List<Template> getByGroupID(String groupID) {
+    public List<Template> getByGroupID(Long groupID) {
         TemplateExample example = new TemplateExample();
         TemplateExample.Criteria criteria = example.createCriteria();
-        criteria.andTemplateGroupIDEqualTo(groupID);
+        criteria.andTemplateGroupIdEqualTo(groupID);
         return mapper.selectByExample(example);
     }
 

atms-api/src/main/java/pwc/taxtech/atms/dto/CellTemplateConfigDto.java

@@ -4,15 +4,15 @@ import java.util.List;
 
 public class CellTemplateConfigDto {
 
-    private String cellTemplateID;
-    private String templateID;
+    private Long cellTemplateID;
+    private Long templateID;
     private int rowIndex;
     private String rowName;
     private int columnIndex;
     private String columnName;
     private Integer dataType;
-    private Integer isReadOnly;
-    private boolean hasFormula;
+    private Boolean isReadOnly;
+    private Boolean hasFormula;
     private String formula;
     private String parsedFormula;
     private String formulaDescription;
@@ -36,19 +36,19 @@ public class CellTemplateConfigDto {
     private String voucherKeyword;
 
 
-    public String getCellTemplateID() {
+    public Long getCellTemplateID() {
         return cellTemplateID;
     }
 
-    public void setCellTemplateID(String cellTemplateID) {
+    public void setCellTemplateID(Long cellTemplateID) {
         this.cellTemplateID = cellTemplateID;
     }
 
-    public String getTemplateID() {
+    public Long getTemplateID() {
         return templateID;
     }
 
-    public void setTemplateID(String templateID) {
+    public void setTemplateID(Long templateID) {
         this.templateID = templateID;
     }
 
@@ -92,11 +92,11 @@ public class CellTemplateConfigDto {
         this.dataType = dataType;
     }
 
-    public Integer getIsReadOnly() {
+    public Boolean getIsReadOnly() {
         return isReadOnly;
     }
 
-    public void setIsReadOnly(Integer isReadOnly) {
+    public void setIsReadOnly(Boolean isReadOnly) {
         this.isReadOnly = isReadOnly;
     }
 

atms-api/src/main/java/pwc/taxtech/atms/dto/DeleteTemplateParam.java

 package pwc.taxtech.atms.dto;
 
 public class DeleteTemplateParam {
-    private String ID;
+    private Long ID;
     private boolean isDeletePermanent;
     private String path;
 
-    public String getID() {
+    public Long getID() {
         return ID;
     }
 
-    public void setID(String ID) {
+    public void setID(Long ID) {
         this.ID = ID;
     }
 

atms-api/src/main/java/pwc/taxtech/atms/dto/OrganizationServiceTemplateGroupDto.java

@@ -6,7 +6,7 @@ public class OrganizationServiceTemplateGroupDto {
     private String organizationID;
     private String serviceTypeID;
     private String serviceTypeName;
-    private String templateGroupID;
+    private Long templateGroupID;
     private String templateGroupName;
     /**
      * @return the iD
@@ -59,13 +59,13 @@ public class OrganizationServiceTemplateGroupDto {
     /**
      * @return the templateGroupID
      */
-    public String getTemplateGroupID() {
+    public Long getTemplateGroupID() {
         return templateGroupID;
     }
     /**
      * @param templateGroupID the templateGroupID to set
      */
-    public void setTemplateGroupID(String templateGroupID) {
+    public void setTemplateGroupID(Long templateGroupID) {
         this.templateGroupID = templateGroupID;
     }
     /**

atms-api/src/main/java/pwc/taxtech/atms/dto/TaxPayerReportRuleDto.java

@@ -3,17 +3,17 @@ package pwc.taxtech.atms.dto;
 import java.util.List;
 
 public class TaxPayerReportRuleDto {
-    private String ID;
+    private Long ID;
     private int isDefault;
     private int taxPayerType;
-    private String templateGroupID;
+    private Long templateGroupID;
     private List<String> orgs;
 	
-    public String getID() {
+    public Long getID() {
 		return ID;
 	}
     
-	public void setID(String ID) {
+	public void setID(Long ID) {
 		this.ID = ID;
 	}
 	
@@ -33,10 +33,10 @@ public class TaxPayerReportRuleDto {
 		this.taxPayerType = taxPayerType;
 	}
 	
-	public String getTemplateGroupID() {
+	public Long getTemplateGroupID() {
 		return templateGroupID;
 	}
-	public void setTemplateGroupID(String templateGroupID) {
+	public void setTemplateGroupID(Long templateGroupID) {
 		this.templateGroupID = templateGroupID;
 	}
 

atms-api/src/main/java/pwc/taxtech/atms/dto/TemplateAndGroupDbDto.java

@@ -2,25 +2,25 @@ package pwc.taxtech.atms.dto;
 
 public class TemplateAndGroupDbDto {
 
-    private String templateID;
+    private Long templateID;
 
-    private String templateGroupID;
+    private Long templateGroupID;
 
     private String templateCode;
 
-    public String getTemplateID() {
+    public Long getTemplateID() {
         return templateID;
     }
 
-    public void setTemplateID(String templateID) {
+    public void setTemplateID(Long templateID) {
         this.templateID = templateID;
     }
 
-    public String getTemplateGroupID() {
+    public Long getTemplateGroupID() {
         return templateGroupID;
     }
 
-    public void setTemplateGroupID(String templateGroupID) {
+    public void setTemplateGroupID(Long templateGroupID) {
         this.templateGroupID = templateGroupID;
     }
 

atms-api/src/main/java/pwc/taxtech/atms/dto/TemplateGroupDto.java

@@ -6,12 +6,12 @@ import java.util.List;
 /** @see PwC.Tax.Tech.Atms.Application.Dto\TaxAdminDto\TemplateGroupDto.cs */
 public class TemplateGroupDto {
 
-    private String ID;
+    private Long ID;
     private String name;
     private String serviceTypeID;
     private Date updateTime;
     private Date createTime;
-    private String copyFrom;
+    private Long copyFrom;
     private String industryIDs;
     private Integer payTaxType;
     private Integer groupType;
@@ -19,11 +19,11 @@ public class TemplateGroupDto {
     private List<TemplateFormulaDto> changedFormulas;
     private List<String> sheetNameList;
 
-    public String getID() {
+    public Long getID() {
         return ID;
     }
 
-    public void setID(String iD) {
+    public void setID(Long iD) {
         ID = iD;
     }
 
@@ -59,11 +59,11 @@ public class TemplateGroupDto {
         this.createTime = createTime;
     }
 
-    public String getCopyFrom() {
+    public Long getCopyFrom() {
         return copyFrom;
     }
 
-    public void setCopyFrom(String copyFrom) {
+    public void setCopyFrom(Long copyFrom) {
         this.copyFrom = copyFrom;
     }
 

atms-api/src/main/java/pwc/taxtech/atms/entitiy/KeyValueReference.java

@@ -44,7 +44,7 @@ public class KeyValueReference implements Serializable {
      *
      * @mbg.generated
      */
-    private String cellTemplateID;
+    private Long cellTemplateID;
 
     /**
      *
@@ -161,7 +161,7 @@ public class KeyValueReference implements Serializable {
      *
      * @mbg.generated
      */
-    public String getCellTemplateID() {
+    public Long getCellTemplateID() {
         return cellTemplateID;
     }
 
@@ -173,8 +173,8 @@ public class KeyValueReference implements Serializable {
      *
      * @mbg.generated
      */
-    public void setCellTemplateID(String cellTemplateID) {
-        this.cellTemplateID = cellTemplateID == null ? null : cellTemplateID.trim();
+    public void setCellTemplateID(Long cellTemplateID) {
+        this.cellTemplateID = cellTemplateID;
     }
 
     /**

atms-api/src/main/java/pwc/taxtech/atms/entitiy/KeyValueReferenceExample.java

@@ -404,62 +404,52 @@ public class KeyValueReferenceExample {
             return (Criteria) this;
         }
 
-        public Criteria andCellTemplateIDEqualTo(String value) {
+        public Criteria andCellTemplateIDEqualTo(Long value) {
             addCriterion("CellTemplateID =", value, "cellTemplateID");
             return (Criteria) this;
         }
 
-        public Criteria andCellTemplateIDNotEqualTo(String value) {
+        public Criteria andCellTemplateIDNotEqualTo(Long value) {
             addCriterion("CellTemplateID <>", value, "cellTemplateID");
             return (Criteria) this;
         }
 
-        public Criteria andCellTemplateIDGreaterThan(String value) {
+        public Criteria andCellTemplateIDGreaterThan(Long value) {
             addCriterion("CellTemplateID >", value, "cellTemplateID");
             return (Criteria) this;
         }
 
-        public Criteria andCellTemplateIDGreaterThanOrEqualTo(String value) {
+        public Criteria andCellTemplateIDGreaterThanOrEqualTo(Long value) {
             addCriterion("CellTemplateID >=", value, "cellTemplateID");
             return (Criteria) this;
         }
 
-        public Criteria andCellTemplateIDLessThan(String value) {
+        public Criteria andCellTemplateIDLessThan(Long value) {
             addCriterion("CellTemplateID <", value, "cellTemplateID");
             return (Criteria) this;
         }
 
-        public Criteria andCellTemplateIDLessThanOrEqualTo(String value) {
+        public Criteria andCellTemplateIDLessThanOrEqualTo(Long value) {
             addCriterion("CellTemplateID <=", value, "cellTemplateID");
             return (Criteria) this;
         }
 
-        public Criteria andCellTemplateIDLike(String value) {
-            addCriterion("CellTemplateID like", value, "cellTemplateID");
-            return (Criteria) this;
-        }
-
-        public Criteria andCellTemplateIDNotLike(String value) {
-            addCriterion("CellTemplateID not like", value, "cellTemplateID");
-            return (Criteria) this;
-        }
-
-        public Criteria andCellTemplateIDIn(List<String> values) {
+        public Criteria andCellTemplateIDIn(List<Long> values) {
             addCriterion("CellTemplateID in", values, "cellTemplateID");
             return (Criteria) this;
         }
 
-        public Criteria andCellTemplateIDNotIn(List<String> values) {
+        public Criteria andCellTemplateIDNotIn(List<Long> values) {
             addCriterion("CellTemplateID not in", values, "cellTemplateID");
             return (Criteria) this;
         }
 
-        public Criteria andCellTemplateIDBetween(String value1, String value2) {
+        public Criteria andCellTemplateIDBetween(Long value1, Long value2) {
             addCriterion("CellTemplateID between", value1, value2, "cellTemplateID");
             return (Criteria) this;
         }
 
-        public Criteria andCellTemplateIDNotBetween(String value1, String value2) {
+        public Criteria andCellTemplateIDNotBetween(Long value1, Long value2) {
             addCriterion("CellTemplateID not between", value1, value2, "cellTemplateID");
             return (Criteria) this;
         }

atms-api/src/main/java/pwc/taxtech/atms/entitiy/ProjectServiceType.java

@@ -44,7 +44,7 @@ public class ProjectServiceType implements Serializable {
      *
      * @mbg.generated
      */
-    private String templateGroupID;
+    private Long templateGroupID;
 
     /**
      * This field was generated by MyBatis Generator.
@@ -134,7 +134,7 @@ public class ProjectServiceType implements Serializable {
      *
      * @mbg.generated
      */
-    public String getTemplateGroupID() {
+    public Long getTemplateGroupID() {
         return templateGroupID;
     }
 
@@ -146,8 +146,8 @@ public class ProjectServiceType implements Serializable {
      *
      * @mbg.generated
      */
-    public void setTemplateGroupID(String templateGroupID) {
-        this.templateGroupID = templateGroupID == null ? null : templateGroupID.trim();
+    public void setTemplateGroupID(Long templateGroupID) {
+        this.templateGroupID = templateGroupID;
     }
 
     /**

atms-api/src/main/java/pwc/taxtech/atms/entitiy/ProjectServiceTypeExample.java

@@ -414,62 +414,52 @@ public class ProjectServiceTypeExample {
             return (Criteria) this;
         }
 
-        public Criteria andTemplateGroupIDEqualTo(String value) {
+        public Criteria andTemplateGroupIDEqualTo(Long value) {
             addCriterion("TemplateGroupID =", value, "templateGroupID");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateGroupIDNotEqualTo(String value) {
+        public Criteria andTemplateGroupIDNotEqualTo(Long value) {
             addCriterion("TemplateGroupID <>", value, "templateGroupID");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateGroupIDGreaterThan(String value) {
+        public Criteria andTemplateGroupIDGreaterThan(Long value) {
             addCriterion("TemplateGroupID >", value, "templateGroupID");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateGroupIDGreaterThanOrEqualTo(String value) {
+        public Criteria andTemplateGroupIDGreaterThanOrEqualTo(Long value) {
             addCriterion("TemplateGroupID >=", value, "templateGroupID");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateGroupIDLessThan(String value) {
+        public Criteria andTemplateGroupIDLessThan(Long value) {
             addCriterion("TemplateGroupID <", value, "templateGroupID");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateGroupIDLessThanOrEqualTo(String value) {
+        public Criteria andTemplateGroupIDLessThanOrEqualTo(Long value) {
             addCriterion("TemplateGroupID <=", value, "templateGroupID");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateGroupIDLike(String value) {
-            addCriterion("TemplateGroupID like", value, "templateGroupID");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemplateGroupIDNotLike(String value) {
-            addCriterion("TemplateGroupID not like", value, "templateGroupID");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemplateGroupIDIn(List<String> values) {
+        public Criteria andTemplateGroupIDIn(List<Long> values) {
             addCriterion("TemplateGroupID in", values, "templateGroupID");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateGroupIDNotIn(List<String> values) {
+        public Criteria andTemplateGroupIDNotIn(List<Long> values) {
             addCriterion("TemplateGroupID not in", values, "templateGroupID");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateGroupIDBetween(String value1, String value2) {
+        public Criteria andTemplateGroupIDBetween(Long value1, Long value2) {
             addCriterion("TemplateGroupID between", value1, value2, "templateGroupID");
             return (Criteria) this;
         }
 
-        public Criteria andTemplateGroupIDNotBetween(String value1, String value2) {
+        public Criteria andTemplateGroupIDNotBetween(Long value1, Long value2) {
             addCriterion("TemplateGroupID not between", value1, value2, "templateGroupID");
             return (Criteria) this;
         }

atms-api/src/main/java/pwc/taxtech/atms/service/CellTemplateService.java

@@ -6,9 +6,9 @@ import pwc.taxtech.atms.dto.OperationResultDto;
 import java.util.List;
 
 public interface CellTemplateService {
-    OperationResultDto<List<CellTemplateConfigDto>> getCellConfigList(String templateID);
+    OperationResultDto<List<CellTemplateConfigDto>> getCellConfigList(Long templateID);
 
-    OperationResultDto<CellTemplateConfigDto> getCellConfig(String cellTemplateID);
+    OperationResultDto<CellTemplateConfigDto> getCellConfig(Long cellTemplateID);
 
     OperationResultDto saveOrEdit(CellTemplateConfigDto cellTemplateConfig);
 }

atms-api/src/main/java/pwc/taxtech/atms/service/TemplateGroupService.java

@@ -20,7 +20,7 @@ public interface TemplateGroupService {
 
     void importTemplateGroupExcelFile(MultipartFile file, TemplateGroupDto templateGroupDto) throws ServiceException;
 
-    void importTemplateExcelFile(MultipartFile file, String templateGroupID,
+    void importTemplateExcelFile(MultipartFile file, Long templateGroupID,
                                  String reportType, String sheetList) throws ServiceException;
 
     void addTemplateGroup(TemplateGroupDto templateGroupDto) throws ServiceException;

atms-api/src/main/java/pwc/taxtech/atms/service/TemplateService.java

@@ -11,11 +11,11 @@ public interface TemplateService {
      * @param 报表类型
      * @return 模板DTO 列表
      */
-    List<TemplateDto> get(String templateGroupID, Integer reportType);
+    List<TemplateDto> get(Long templateGroupID, Integer reportType);
 
-    String getTemplatePath(String templateID);
+    String getTemplatePath(Long templateID);
 
-    Template getTemplateByID(String templateID);
+    Template getTemplateByID(Long templateID);
 
     List<TemplateUniqDto> getTemplateUniqList(String serviceTypeID, Integer payTaxType, Integer reportType, String industryIDs);
 
@@ -23,5 +23,5 @@ public interface TemplateService {
 
     OperationResultDto<String> deleteTemplate(DeleteTemplateParam param);
 
-    OperationResultDto setRowColName(String id,List<CellBriefDto> cellInfo);
+    OperationResultDto setRowColName(Long id,List<CellBriefDto> cellInfo);
 }

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

@@ -119,8 +119,10 @@ public class AbstractService {
     protected CellTemplateConfigMapper cellTemplateConfigMapper;
     @Autowired
     protected TemplateMapper templateMapper;
-    @Autowired
-    protected  TemplateFormulaMapper templateFormulaMapper;
+//    @Autowired
+//    protected  TemplateFormulaMapper templateFormulaMapper;
     @Autowired
     protected  FormulaConfigMapper formulaConfigMapper;
+    @Autowired
+    DistributedIDService distributedIDService;
 }

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

@@ -19,12 +19,12 @@ public final class CellConfigTranslater {
             return null;
         }
 
-        return getConfigDto(template.getID(), template.getReportTemplateID(), template.getRowIndex(), template.getRowName(), template.getColumnIndex(),
+        return getConfigDto(template.getId(), template.getReportTemplateId(), template.getRowIndex(), template.getRowName(), template.getColumnIndex(),
                 template.getColumnName(), template.getDataType(), template.getIsReadOnly(), template.getComment(), configList);
     }
 
-    private static CellTemplateConfigDto getConfigDto(String configID, String templateID, int rowIndex, String rowName, int columnIndex,
-                                                      String columnName, Integer dataType, Integer isReadOnly, String description, List<CellTemplateConfig> configList) {
+    private static CellTemplateConfigDto getConfigDto(Long configID, Long templateID, int rowIndex, String rowName, int columnIndex,
+                                                      String columnName, Integer dataType, Boolean isReadOnly, String description, List<CellTemplateConfig> configList) {
         if (configList == null) {
             return null;
         }
@@ -49,7 +49,7 @@ public final class CellConfigTranslater {
                 cellTemplateConfigDto.setFormulaDescription(formulaItem.get().getFormulaDescription());
             }
             cellTemplateConfigDto.setFormulaDataSource(formulaItem.get().getFormulaDataSource());
-            cellTemplateConfigDto.setCellTemplateID(formulaItem.get().getCellTemplateID());
+            cellTemplateConfigDto.setCellTemplateID(formulaItem.get().getCellTemplateId());
         }
 
         Optional<CellTemplateConfig> voucherItem = configList.stream().filter(x -> x.getDataSourceType().equals(CellDataSourceType.Voucher.getCode())).findFirst();
@@ -92,7 +92,7 @@ public final class CellConfigTranslater {
         Optional<CellTemplateConfig> modelItem = configList.stream().filter(x -> x.getDataSourceType().equals(CellDataSourceType.RelatedModel.getCode())).findFirst();
         if (modelItem.isPresent()) {
             cellTemplateConfigDto.setHasModel(true);
-            cellTemplateConfigDto.setModelIDs(getList(modelItem.get().getModelIDs()));
+            cellTemplateConfigDto.setModelIDs(getList(modelItem.get().getModelIds()));
         }
 
         Optional<CellTemplateConfig> validationItem = configList.stream().filter(x -> x.getDataSourceType().equals(CellDataSourceType.Validation.getCode())).findFirst();
@@ -100,7 +100,7 @@ public final class CellConfigTranslater {
             cellTemplateConfigDto.setHasValidation(true);
             cellTemplateConfigDto.setValidation(validationItem.get().getValidation());
             cellTemplateConfigDto.setValidationDescription(validationItem.get().getValidationDescription());
-            cellTemplateConfigDto.setCellTemplateID(validationItem.get().getCellTemplateID());
+            cellTemplateConfigDto.setCellTemplateID(validationItem.get().getCellTemplateId());
         }
         return cellTemplateConfigDto;
     }