[fixed issue] report config renew with new table

atms-api/pom.xml

@@ -383,6 +383,14 @@
 				</includes>
 				<filtering>true</filtering><!-- replace variable attribute or not -->
 			</resource>
+			<resource>
+				<directory>src/main/resources/Document</directory>
+				<includes>
+					<include>**/*.xls</include>
+					<include>**/*.xlsx</include>
+				</includes>
+				<targetPath>${basedir}/target/classes/document</targetPath>
+			</resource>
 			<resource>
 				<directory>test/resources</directory>
 				<includes>
@@ -470,15 +478,26 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
 				<version>2.7</version>
-				<configuration>
-					<encoding>UTF-8</encoding>
-				</configuration>
+				<dependencies>
+					<dependency>
+						<groupId>org.apache.maven.shared</groupId>
+						<artifactId>maven-filtering</artifactId>
+						<version>1.3</version>
+					</dependency>
+				</dependencies>
 			</plugin>
 			<!-- java编译插件 -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.2</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.apache.maven.shared</groupId>
+						<artifactId>maven-filtering</artifactId>
+						<version>3.1.1</version>
+					</dependency>
+				</dependencies>
 				<configuration>
 					<source>1.8</source>
 					<target>1.8</target>

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

@@ -20,7 +20,7 @@ public class CellTemplateController extends BaseController {
     @Autowired
     CellTemplateService cellTemplateService;
 
-    @RequestMapping(value = "configList/{templateID}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @RequestMapping(value = "configList/{templateID}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
     public @ResponseBody
     OperationResultDto<List<CellTemplateConfigDto>> getConfigList(@PathVariable Long templateID) {
         OperationResultDto<List<CellTemplateConfigDto>> result = new OperationResultDto<>();

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

@@ -112,5 +112,5 @@ public interface CellTemplateConfigMapper extends MyMapper {
 
     void batchInsert(List<CellTemplateConfig> list);
 
-    void batchInser2(List<CellTemplateConfig> list);
+    void batchInsert2(List<CellTemplateConfig> list);
 }
\ No newline at end of file

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

@@ -16,20 +16,20 @@ public class CellTemplateConfigDto {
     private String formula;
     private String parsedFormula;
     private String formulaDescription;
-    private boolean hasVoucher;
+    private Boolean hasVoucher;
     private List<String> accountCodes;
-    private boolean hasInvoice;
+    private Boolean hasInvoice;
     private Integer invoiceType;
     private List<String> taxRate;
-    private boolean hasKeyIn;
+    private Boolean hasKeyIn;
     private String creator;
     private String updater;
     private Integer invoiceAmountType;
-    private boolean hasModel;
+    private Boolean hasModel;
     private List<String> modelIDs;
     private List<Integer> invoiceCategory;
     private String formulaDataSource;
-    private boolean hasValidation;
+    private Boolean hasValidation;
     private String validation;
     private String parsedValidation;
     private String validationDescription;
@@ -100,11 +100,11 @@ public class CellTemplateConfigDto {
         this.isReadOnly = isReadOnly;
     }
 
-    public boolean getHasFormula() {
+    public Boolean getHasFormula() {
         return hasFormula;
     }
 
-    public void setHasFormula(boolean hasFormula) {
+    public void setHasFormula(Boolean hasFormula) {
         this.hasFormula = hasFormula;
     }
 
@@ -132,11 +132,11 @@ public class CellTemplateConfigDto {
         this.formulaDescription = formulaDescription;
     }
 
-    public boolean getHasVoucher() {
+    public Boolean getHasVoucher() {
         return hasVoucher;
     }
 
-    public void setHasVoucher(boolean hasVoucher) {
+    public void setHasVoucher(Boolean hasVoucher) {
         this.hasVoucher = hasVoucher;
     }
 
@@ -148,11 +148,11 @@ public class CellTemplateConfigDto {
         this.accountCodes = accountCodes;
     }
 
-    public boolean getHasInvoice() {
+    public Boolean getHasInvoice() {
         return hasInvoice;
     }
 
-    public void setHasInvoice(boolean hasInvoice) {
+    public void setHasInvoice(Boolean hasInvoice) {
         this.hasInvoice = hasInvoice;
     }
 
@@ -172,11 +172,11 @@ public class CellTemplateConfigDto {
         this.taxRate = taxRate;
     }
 
-    public boolean getHasKeyIn() {
+    public Boolean getHasKeyIn() {
         return hasKeyIn;
     }
 
-    public void setHasKeyIn(boolean hasKeyIn) {
+    public void setHasKeyIn(Boolean hasKeyIn) {
         this.hasKeyIn = hasKeyIn;
     }
 
@@ -204,11 +204,11 @@ public class CellTemplateConfigDto {
         this.invoiceAmountType = invoiceAmountType;
     }
 
-    public boolean getHasModel() {
+    public Boolean getHasModel() {
         return hasModel;
     }
 
-    public void setHasModel(boolean hasModel) {
+    public void setHasModel(Boolean hasModel) {
         this.hasModel = hasModel;
     }
 
@@ -236,11 +236,11 @@ public class CellTemplateConfigDto {
         this.formulaDataSource = formulaDataSource;
     }
 
-    public boolean getHasValidation() {
+    public Boolean getHasValidation() {
         return hasValidation;
     }
 
-    public void setHasValidation(boolean hasValidation) {
+    public void setHasValidation(Boolean hasValidation) {
         this.hasValidation = hasValidation;
     }
 

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

@@ -2,17 +2,17 @@ package pwc.taxtech.atms.dto;
 
 import pwc.taxtech.atms.constant.enums.RoleSource;
 public class NameDto {
-    private String ID;
+    private Long ID;
 
     private String name;
 
     private RoleSource RoleSource;
 
-    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/TemplateAndGroupDbDto.java

@@ -2,26 +2,26 @@ package pwc.taxtech.atms.dto;
 
 public class TemplateAndGroupDbDto {
 
-    private Long templateID;
+    private Long templateId;
 
-    private Long templateGroupID;
+    private Long templateGroupId;
 
     private String templateCode;
 
-    public Long getTemplateID() {
-        return templateID;
+    public Long getTemplateId() {
+        return templateId;
     }
 
-    public void setTemplateID(Long templateID) {
-        this.templateID = templateID;
+    public void setTemplateId(Long templateId) {
+        this.templateId = templateId;
     }
 
-    public Long getTemplateGroupID() {
-        return templateGroupID;
+    public Long getTemplateGroupId() {
+        return templateGroupId;
     }
 
-    public void setTemplateGroupID(Long templateGroupID) {
-        this.templateGroupID = templateGroupID;
+    public void setTemplateGroupId(Long templateGroupId) {
+        this.templateGroupId = templateGroupId;
     }
 
     public String getTemplateCode() {

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

@@ -4,14 +4,14 @@ import java.util.Date;
 import java.util.List;
 
 public final class TemplateDto {
-    private String ID;
+    private Long id;
     private String name;
     private String path;
     private Integer reportType;
-    private String templateGroupID;
+    private String templateGroupId;
     private Date createTime;
     private Date updateTime;
-    private String parentID;
+    private String parentId;
     private String templateName;
 
     private int orderIndex;
@@ -32,12 +32,12 @@ public final class TemplateDto {
      */
     private String validateMsg;
 
-    public String getID() {
-        return ID;
+    public Long getId() {
+        return id;
     }
 
-    public void setID(String ID) {
-        this.ID = ID;
+    public void setId(Long id) {
+        this.id = id;
     }
 
     public String getName() {
@@ -64,12 +64,12 @@ public final class TemplateDto {
         this.reportType = reportType;
     }
 
-    public String getTemplateGroupID() {
-        return templateGroupID;
+    public String getTemplateGroupId() {
+        return templateGroupId;
     }
 
-    public void setTemplateGroupID(String templateGroupID) {
-        this.templateGroupID = templateGroupID;
+    public void setTemplateGroupId(String templateGroupId) {
+        this.templateGroupId = templateGroupId;
     }
 
     public Date getCreateTime() {
@@ -88,12 +88,12 @@ public final class TemplateDto {
         this.updateTime = updateTime;
     }
 
-    public String getParentID() {
-        return parentID;
+    public String getParentId() {
+        return parentId;
     }
 
-    public void setParentID(String parentID) {
-        this.parentID = parentID;
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
     }
 
     public String getTemplateName() {

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

@@ -6,25 +6,25 @@ import java.util.List;
 /** @see PwC.Tax.Tech.Atms.Application.Dto\TaxAdminDto\TemplateGroupDto.cs */
 public class TemplateGroupDto {
 
-    private Long ID;
+    private Long id;
     private String name;
-    private String serviceTypeID;
+    private String serviceTypeId;
     private Date updateTime;
     private Date createTime;
     private Long copyFrom;
-    private String industryIDs;
+    private String industryIds;
     private Integer payTaxType;
     private Integer groupType;
     private Boolean isSystemType;
     private List<TemplateFormulaDto> changedFormulas;
     private List<String> sheetNameList;
 
-    public Long getID() {
-        return ID;
+    public Long getId() {
+        return id;
     }
 
-    public void setID(Long iD) {
-        ID = iD;
+    public void setId(Long iD) {
+        id = iD;
     }
 
     public String getName() {
@@ -35,12 +35,12 @@ public class TemplateGroupDto {
         this.name = name;
     }
 
-    public String getServiceTypeID() {
-        return serviceTypeID;
+    public String getServiceTypeId() {
+        return serviceTypeId;
     }
 
-    public void setServiceTypeID(String serviceTypeID) {
-        this.serviceTypeID = serviceTypeID;
+    public void setServiceTypeId(String serviceTypeId) {
+        this.serviceTypeId = serviceTypeId;
     }
 
     public Date getUpdateTime() {
@@ -67,12 +67,12 @@ public class TemplateGroupDto {
         this.copyFrom = copyFrom;
     }
 
-    public String getIndustryIDs() {
-        return industryIDs;
+    public String getIndustryIds() {
+        return industryIds;
     }
 
-    public void setIndustryIDs(String industryIDs) {
-        this.industryIDs = industryIDs;
+    public void setIndustryIds(String industryIds) {
+        this.industryIds = industryIds;
     }
 
     public Integer getPayTaxType() {

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

@@ -2,7 +2,7 @@ package pwc.taxtech.atms.dto;
 
 public class TemplateUniqDto {
 
-    private String ID;
+    private Long id;
 
     private String code;
 
@@ -12,12 +12,12 @@ public class TemplateUniqDto {
 
     private Integer reportType;
 
-    private String templateGroupID;
+    private Long templateGroupId;
 
 
     private String templateGroupName;
 
-    private String parentID;
+    private Long parentId;
 
     private String parentName;
 
@@ -26,18 +26,18 @@ public class TemplateUniqDto {
      */
     private Integer payTaxType;
 
-    private String industryIDs;
+    private String industryIds;
 
-    private String serviceTypeID;
+    private String serviceTypeId;
 
     private boolean isActiveAssociation;
 
-    public String getID() {
-        return ID;
+    public Long getId() {
+        return id;
     }
 
-    public void setID(String ID) {
-        this.ID = ID;
+    public void setId(Long id) {
+        this.id = id;
     }
 
     public String getCode() {
@@ -72,12 +72,12 @@ public class TemplateUniqDto {
         this.reportType = reportType;
     }
 
-    public String getTemplateGroupID() {
-        return templateGroupID;
+    public Long getTemplateGroupId() {
+        return templateGroupId;
     }
 
-    public void setTemplateGroupID(String templateGroupID) {
-        this.templateGroupID = templateGroupID;
+    public void setTemplateGroupId(Long templateGroupId) {
+        this.templateGroupId = templateGroupId;
     }
 
     public String getTemplateGroupName() {
@@ -88,12 +88,12 @@ public class TemplateUniqDto {
         this.templateGroupName = templateGroupName;
     }
 
-    public String getParentID() {
-        return parentID;
+    public Long getParentId() {
+        return parentId;
     }
 
-    public void setParentID(String parentID) {
-        this.parentID = parentID;
+    public void setParentId(Long parentId) {
+        this.parentId = parentId;
     }
 
     public String getParentName() {
@@ -112,20 +112,20 @@ public class TemplateUniqDto {
         this.payTaxType = payTaxType;
     }
 
-    public String getIndustryIDs() {
-        return industryIDs;
+    public String getIndustryIds() {
+        return industryIds;
     }
 
-    public void setIndustryIDs(String industryIDs) {
-        this.industryIDs = industryIDs;
+    public void setIndustryIds(String industryIds) {
+        this.industryIds = industryIds;
     }
 
-    public String getServiceTypeID() {
-        return serviceTypeID;
+    public String getServiceTypeId() {
+        return serviceTypeId;
     }
 
-    public void setServiceTypeID(String serviceTypeID) {
-        this.serviceTypeID = serviceTypeID;
+    public void setServiceTypeId(String serviceTypeId) {
+        this.serviceTypeId = serviceTypeId;
     }
 
     public boolean getIsActiveAssociation() {

atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/ReportDto.java

@@ -3,8 +3,8 @@ package pwc.taxtech.atms.dto.vatdto;
 import java.util.Date;
 
 public class ReportDto {
-    private String ID ;
-    private String templateID ;
+    private Long id;
+    private Long templateId;
     private String templateCode ;
     private String templateName ;
     private int period ;
@@ -13,20 +13,20 @@ public class ReportDto {
     private String updater ;
     private Date updateTime ;
 
-    public String getID() {
-        return ID;
+    public Long getId() {
+        return id;
     }
 
-    public void setID(String ID) {
-        this.ID = ID;
+    public void setId(Long id) {
+        this.id = id;
     }
 
-    public String getTemplateID() {
-        return templateID;
+    public Long getTemplateId() {
+        return templateId;
     }
 
-    public void setTemplateID(String templateID) {
-        this.templateID = templateID;
+    public void setTemplateId(Long templateId) {
+        this.templateId = templateId;
     }
 
     public String getTemplateCode() {

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

@@ -18,8 +18,6 @@ import pwc.taxtech.atms.common.OperateLogType;
 import pwc.taxtech.atms.common.OperationModule;
 import pwc.taxtech.atms.common.datasource.ShardingContextHolder;
 import pwc.taxtech.atms.constant.Constant;
-import pwc.taxtech.atms.dao.AccountMappingMapper;
-import pwc.taxtech.atms.dao.EnterpriseAccountMapper;
 import pwc.taxtech.atms.dao.OrganizationServiceTemplateGroupMapper;
 import pwc.taxtech.atms.dao.ProjectClientMapper;
 import pwc.taxtech.atms.dao.ProjectMapper;
@@ -38,15 +36,11 @@ import pwc.taxtech.atms.entitiy.*;
 import pwc.taxtech.atms.entitiy.ProjectClientExample.Criteria;
 import pwc.taxtech.atms.service.OperationLogService;
 import pwc.taxtech.atms.service.ProjectService;
-import pwc.taxtech.atms.vat.dao.VatEnterpriseAccountMapper;
 import pwc.taxtech.atms.vat.dao.VatStandardAccountMapper;
-import pwc.taxtech.atms.vat.entity.VatEnterpriseAccount;
 import pwc.taxtech.atms.vat.entity.VatStandardAccount;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
@@ -132,7 +126,7 @@ public class ProjectServiceImpl implements ProjectService {
             // serviceType 和 templateGroup是上下层级关系，遍历ServiceTypeDto,
             // 并将每个ServiceType下级关联的templateGroup填充进去
             serviceTypeDto.setTemplateGroupList(templateGroupDtoList.stream()
-                    .filter(templateGroupDto -> (serviceTypeDto.getID().equals(templateGroupDto.getServiceTypeID())))
+                    .filter(templateGroupDto -> (serviceTypeDto.getID().equals(templateGroupDto.getServiceTypeId())))
                     .collect(Collectors.toList()));
         }
         return serviceTypeDtoList;

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

@@ -94,9 +94,9 @@ public class TemplateGroupServiceImpl extends AbstractService implements Templat
 
     @Override
     public OperationResultDto<Object> updateTemplateGroupName(TemplateGroupDto templateGroupDto) {
-        TemplateGroup entity = templateGroupMapper.selectByPrimaryKey(templateGroupDto.getID());
+        TemplateGroup entity = templateGroupMapper.selectByPrimaryKey(templateGroupDto.getId());
         TemplateGroupExample example = new TemplateGroupExample();
-        example.createCriteria().andNameEqualTo(templateGroupDto.getName()).andIdNotEqualTo(templateGroupDto.getID()).andServiceTypeIdEqualTo(entity.getServiceTypeId()).andIndustryIdsEqualTo(entity.getIndustryIds()).andPayTaxTypeEqualTo(entity.getPayTaxType());
+        example.createCriteria().andNameEqualTo(templateGroupDto.getName()).andIdNotEqualTo(templateGroupDto.getId()).andServiceTypeIdEqualTo(entity.getServiceTypeId()).andIndustryIdsEqualTo(entity.getIndustryIds()).andPayTaxTypeEqualTo(entity.getPayTaxType());
         List<TemplateGroup> templateGroups = templateGroupMapper.selectByExample(example);
         if (!templateGroups.isEmpty()) {
             OperationResultDto<Object> result = new OperationResultDto<>();
@@ -114,7 +114,7 @@ public class TemplateGroupServiceImpl extends AbstractService implements Templat
     @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
     public OperationResultDto<Object> deleteTemplateGroup(TemplateGroupDto templateGroupDto) {
         OperationResultDto<Object> result = new OperationResultDto<>();
-        TemplateGroup templateGroupDb = templateGroupMapper.selectByPrimaryKey(templateGroupDto.getID());
+        TemplateGroup templateGroupDb = templateGroupMapper.selectByPrimaryKey(templateGroupDto.getId());
 
         if (templateGroupDb.getIsSystemType()) {
             result.setResult(false);
@@ -122,7 +122,7 @@ public class TemplateGroupServiceImpl extends AbstractService implements Templat
             return result;
         }
 
-        List<String> userOranizationNameList = organizationServiceTemplateGroupMapper.getOrgnizationServiceTemplateGroupOrgNames(templateGroupDto.getID());
+        List<String> userOranizationNameList = organizationServiceTemplateGroupMapper.getOrgnizationServiceTemplateGroupOrgNames(templateGroupDto.getId());
         if (userOranizationNameList != null && !userOranizationNameList.isEmpty()) {
             result.setResult(false);
             result.setResultMsg(TemplateGroupMessage.ORGANIZATION_USED_TEMPLATE_GROUP);

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

@@ -31,7 +31,7 @@ public class TemplateServiceImpl extends AbstractService implements TemplateServ
             criteria.andReportTypeEqualTo(reportType.intValue());
         }
 
-        example.setOrderByClause("OrderIndex asc");
+        example.setOrderByClause("order_index asc");
 
         List<Template> templates = templateMapper.selectByExample(example);
         List<TemplateDto> templateDtos = new ArrayList<>();
@@ -74,7 +74,9 @@ public class TemplateServiceImpl extends AbstractService implements TemplateServ
         map.put("industryIDs", industryIDs);
 
         List<TemplateUniqDto> templatedbList = templateMapper.getTemplateUniqDtosByTemplateAndTemplateGroup(map);
-        Map<String, Map<String, List<TemplateUniqDto>>> groupList = templatedbList.stream().filter(sa -> sa.getIsActiveAssociation()).collect(groupingBy(TemplateUniqDto::getTemplateGroupID, Collectors.groupingBy(TemplateUniqDto::getTemplateGroupName)));
+        Map<Long, Map<String, List<TemplateUniqDto>>> groupList = templatedbList.stream()
+                .filter(sa -> sa.getIsActiveAssociation())
+                .collect(groupingBy(TemplateUniqDto::getTemplateGroupId, Collectors.groupingBy(TemplateUniqDto::getTemplateGroupName)));
         List<NameDto> groupListResult = new ArrayList<>();
         groupList.forEach((key, value) -> {
             NameDto temp = new NameDto();
@@ -89,15 +91,17 @@ public class TemplateServiceImpl extends AbstractService implements TemplateServ
 
         for (NameDto group : groupListResult) {
             TemplateUniqDto parent = new TemplateUniqDto();
-            parent.setID(group.getID());
+            parent.setId(group.getID());
             parent.setCode("");
             parent.setName(group.getName());
             result.add(parent);
 
-            List<TemplateUniqDto> subList = templatedbList.stream().filter(sa -> sa.getTemplateGroupID() == group.getID() && sa.getIsActiveAssociation()).collect(Collectors.toList());
+            List<TemplateUniqDto> subList = templatedbList.stream()
+                    .filter(sa -> sa.getTemplateGroupId() == group.getID() && sa.getIsActiveAssociation())
+                    .collect(Collectors.toList());
 
             subList.forEach(sa -> {
-                sa.setParentID(sa.getTemplateGroupID());
+                sa.setParentId(sa.getTemplateGroupId());
                 sa.setParentName(sa.getTemplateGroupName());
             });
             result.addAll(subList);
@@ -107,14 +111,14 @@ public class TemplateServiceImpl extends AbstractService implements TemplateServ
 
         if (!noGroupTemplateList.isEmpty()) {
             TemplateUniqDto parent = new TemplateUniqDto();
-            parent.setID(UUID.fromString("").toString());
+            parent.setId(0L);
             parent.setCode("");
             parent.setName(Constant.Other);
 
             result.add(parent);
 
             noGroupTemplateList.forEach(sa -> {
-                sa.setParentID(parent.getID());
+                sa.setParentId(parent.getId());
                 sa.setParentName(parent.getName());
             });
 
@@ -135,7 +139,7 @@ public class TemplateServiceImpl extends AbstractService implements TemplateServ
             return result;
         }
         Map<String, Object> map = new HashMap<>(3);
-        map.put("templateGroupID", templateDb.getTemplateGroupID());
+        map.put("templateGroupID", templateDb.getTemplateGroupId());
         map.put("templateID", param.getID());
         map.put("templateName", param.getName());
 
@@ -148,7 +152,7 @@ public class TemplateServiceImpl extends AbstractService implements TemplateServ
             return result;
         }
 
-        Template updateTemplate = templateMapper.selectByPrimaryKey(templateDb.getTemplateID());
+        Template updateTemplate = templateMapper.selectByPrimaryKey(templateDb.getTemplateId());
         updateTemplate.setName(param.getName());
         updateTemplate.setUpdateTime(new Date());
         templateMapper.updateByPrimaryKey(updateTemplate);

atms-api/src/main/resources/Document/UserTemplate/说明.txt

-此文件夹用来保存用户上传的报表,请不要删除
\ No newline at end of file

atms-api/src/main/resources/pwc/taxtech/atms/dao/CellTemplateConfigMapper.xml

@@ -525,41 +525,56 @@
     </if>
   </select>
 
-  <select id="getCellTemplateConfigByTemplateID" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select b.* from CellTemplate a join CellTemplateConfig b on a.ID  = b.CellTemplateID where a.ReportTemplateID=#{templateID,jdbcType=VARCHAR}
+  <select id="getCellTemplateConfigByTemplateID" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select b.* from cell_template a join cell_template_config b on a.id  = b.cell_template_id where a.report_template_id=#{templateID,jdbcType=VARCHAR}
   </select>
 
   <delete id="deleteCellTemplateConfigByCellTemplate" parameterType="java.lang.Long">
     delete a.*
 FROM
-	CellTemplateConfig a
+	cell_template_config a
 WHERE
-	ID IN (select ID from(
+	id IN (select id from(
 		SELECT
-			b.ID
+			b.id
 		FROM
-			CellTemplateConfig b
-		INNER JOIN CellTemplate c ON b.CellTemplateID = c.ID
+			cell_template_config b
+		INNER JOIN cell_template c ON b.cell_template_id = c.id
 		WHERE
-			c.ReportTemplateID = #{templateDbID,jdbcType=VARCHAR}
+			c.report_template_id = #{templateDbID,jdbcType=VARCHAR}
 	) x)
   </delete>
 
   <insert id="batchInsert" parameterType="pwc.taxtech.atms.entitiy.CellTemplateConfig">
-    insert into CellTemplateConfig (ID, CellTemplateID, ReportTemplateID,
-    DataSourceType, Formula, FormulaDescription,
-    AccountCodes, InvoiceType, TaxRate,
-    InvoiceAmountType, ModelIDs, Creator,
-    CreateTime, Updater, UpdateTime,
-    InvoiceCategory, FormulaDataSource, Validation,
-    ValidationDescription, VoucherKeyword)
-    values
+      INSERT INTO tax_admin.cell_template_config
+      (id,
+      cell_template_id,
+      report_template_id,
+      data_source_type,
+      formula,
+      formula_description,
+      account_codes,
+      invoice_type,
+      tax_rate,
+      invoice_amount_type,
+      model_ids,
+      create_by,
+      create_time,
+      update_by,
+      update_time,
+      invoice_category,
+      formula_data_source,
+      validation,
+      validation_description,
+      voucher_keyword
+      )
+      VALUES
       <foreach collection ="list" item="item" separator =",">
-      (#{item.ID,jdbcType=VARCHAR}, #{item.cellTemplateID,jdbcType=VARCHAR}, #{item.reportTemplateID,jdbcType=VARCHAR},
+          (#{item.id,jdbcType=INTEGER}, #{item.cellTemplateId,jdbcType=INTEGER}, #{item.reportTemplateId,jdbcType=INTEGER},
           #{item.dataSourceType,jdbcType=INTEGER}, #{item.formula,jdbcType=VARCHAR}, #{item.formulaDescription,jdbcType=VARCHAR},
           #{item.accountCodes,jdbcType=VARCHAR}, #{item.invoiceType,jdbcType=INTEGER}, #{item.taxRate,jdbcType=VARCHAR},
-      #{item.invoiceAmountType,jdbcType=INTEGER}, #{item.modelIDs,jdbcType=VARCHAR}, #{item.creator,jdbcType=VARCHAR},
-      #{item.createTime,jdbcType=TIMESTAMP}, #{item.updater,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
+          #{item.invoiceAmountType,jdbcType=INTEGER}, #{item.modelIds,jdbcType=VARCHAR}, #{item.createBy,jdbcType=VARCHAR},
+          #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateBy,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
           #{item.invoiceCategory,jdbcType=VARCHAR}, #{item.formulaDataSource,jdbcType=VARCHAR}, #{item.validation,jdbcType=VARCHAR},
           #{item.validationDescription,jdbcType=VARCHAR}, #{item.voucherKeyword,jdbcType=VARCHAR})
       </foreach>

atms-api/src/main/resources/pwc/taxtech/atms/dao/TemplateMapper.xml

@@ -429,58 +429,58 @@
     </if>
   </select>
   <resultMap id="TemplateUniqDto" type="pwc.taxtech.atms.dto.TemplateUniqDto">
-    <id column="ID" jdbcType="VARCHAR" property="ID"/>
-    <result column="Code" jdbcType="VARCHAR" property="Code"/>
-    <result column="Name" jdbcType="VARCHAR" property="Name"/>
-    <result column="OrderIndex" jdbcType="INTEGER" property="OrderIndex"/>
-    <result column="ReportType" jdbcType="INTEGER" property="ReportType"/>
-    <result column="TemplateGroupID" jdbcType="VARCHAR" property="TemplateGroupID"/>
-    <result column="TemplateGroupName" jdbcType="VARCHAR" property="TemplateGroupName"/>
-    <result column="ParentID" jdbcType="VARCHAR" property="ParentID"/>
-    <result column="ParentName" jdbcType="VARCHAR" property="ParentName"/>
-    <result column="PayTaxType" jdbcType="INTEGER" property="PayTaxType"/>
-    <result column="IndustryIDs" jdbcType="VARCHAR" property="IndustryIDs"/>
-    <result column="ServiceTypeID" jdbcType="VARCHAR" property="ServiceTypeID"/>
-    <result column="IsActiveAssociation" jdbcType="INTEGER" property="IsActiveAssociation"/>
+    <id column="id" jdbcType="INTEGER" property="id"/>
+    <result column="code" jdbcType="VARCHAR" property="code"/>
+    <result column="name" jdbcType="VARCHAR" property="name"/>
+    <result column="order_index" jdbcType="INTEGER" property="orderIndex"/>
+    <result column="report_type" jdbcType="INTEGER" property="reportType"/>
+    <result column="template_group_id" jdbcType="VARCHAR" property="templateGroupId"/>
+    <result column="template_group_name" jdbcType="VARCHAR" property="templateGroupName"/>
+    <result column="parent_id" jdbcType="VARCHAR" property="parentId"/>
+    <result column="parent_name" jdbcType="VARCHAR" property="parentName"/>
+    <result column="pay_tax_type" jdbcType="INTEGER" property="payTaxType"/>
+    <result column="industry_ids" jdbcType="VARCHAR" property="industryIds"/>
+    <result column="service_type_id" jdbcType="VARCHAR" property="serviceTypeId"/>
+    <result column="is_active_association" jdbcType="INTEGER" property="isActiveAssociation"/>
   </resultMap>
 
   <select id="getTemplateUniqDtosByTemplateAndTemplateGroup" parameterType="map" resultMap="TemplateUniqDto">
-    SELECT p.ID,p.Code,p.Name,p.ReportType,q.ID as TemplateGroupID,q.Name as TemplateGroupName,p.IsActiveAssociation
-    FROM Template p join TemplateGroup q on p.templategroupID=q.ID
+    SELECT p.id,p.code,p.name,p.report_type,q.id as template_group_id,q.name as template_group_name,p.is_active_association
+    FROM template p join template_group q on p.template_group_id=q.id
     <where>
       1=1
-      <if test="serviceTypeID!=null">
-        AND q.ServiceTypeID=#{serviceTypeID,jdbcType=VARCHAR}
+      <if test="serviceTypeId!=null">
+        AND q.service_type_id=#{serviceTypeId,jdbcType=VARCHAR}
       </if>
       <if test="payTaxType!=null">
-        AND q.PayTaxType = #{payTaxType,jdbcType=INTEGER}
+        AND q.pay_tax_type = #{payTaxType,jdbcType=INTEGER}
       </if>
       <if test="reportType!=null">
-        AND p.ReportType =#{reportType,jdbcType=INTEGER}
+        AND p.report_type =#{reportType,jdbcType=INTEGER}
       </if>
-      <if test="industryIDs!=null">
-        AND q.IndustryIDs =#{industryID,jdbcType=VARCHAR}
+      <if test="industryIds!=null">
+        AND q.industry_ids =#{industryID,jdbcType=VARCHAR}
       </if>
     </where>
-    ORDER BY p.TemplateGroupID, p.OrderIndex
+    ORDER BY p.template_group_id, p.order_index
   </select>
   <resultMap id="TemplateAndGroupDbDto" type="pwc.taxtech.atms.dto.TemplateAndGroupDbDto">
-    <id column="ID" jdbcType="VARCHAR" property="templateID"/>
-    <result column="templateGroupID" jdbcType="VARCHAR" property="templateGroupID"/>
-    <result column="templateCode" jdbcType="VARCHAR" property="templateCode"/>
+    <id column="id" jdbcType="VARCHAR" property="templateId"/>
+    <result column="template_group_id" jdbcType="VARCHAR" property="templateGroupId"/>
+    <result column="template_code" jdbcType="VARCHAR" property="templateCode"/>
   </resultMap>
   <select id="getTemplateAndGroupByID" parameterType="java.lang.String" resultMap="TemplateAndGroupDbDto">
-    SELECT p.ID as ID,q.ID as templateGroupID,p.Code as templateCode FROM Template p JOIN TemplateGroup q on p.TemplateGroupID=q.ID WHERE p.ID=#{ID,jdbcType=VARCHAR} LIMIT 1
+    SELECT p.id as id,q.id as template_group_id,p.code as template_code FROM template p JOIN template_group q on p.template_group_id=q.id WHERE p.id=#{id,jdbcType=VARCHAR} LIMIT 1
   </select>
   <select id="getCountOfTemplateAndGroupByTemplateName" parameterType="map" resultType="java.lang.Long">
-    SELECT COUNT(1) FROM Template p join TemplateGroup q on p.TemplateGroupID=q.ID
+    SELECT COUNT(1) FROM template p join template_group q on p.template_group_id=q.id
     <where>
       1=1
-      <if test="templateGroupID!=null">
-        AND q.ID = #{templateGroupID,jdbcType=VARCHAR}
+      <if test="templateGroupId!=null">
+        AND q.id = #{templateGroupId,jdbcType=VARCHAR}
       </if>
-      <if test="templateID!=null">
-        AND p.ID&lt;&gt;#{templateID,jdbcType=VARCHAR}
+      <if test="templateId!=null">
+        AND p.id&lt;&gt;#{templateId,jdbcType=VARCHAR}
       </if>
       <if test="templateName!=null">
         AND p.Name= #{templateName,jdbcType=VARCHAR}
@@ -488,32 +488,32 @@
     </where>
   </select>
   <resultMap id="reportDto" type="pwc.taxtech.atms.dto.vatdto.ReportDto">
-    <id column="ID" jdbcType="VARCHAR" property="ID"/>
+    <id column="id" jdbcType="VARCHAR" property="id"/>
     <result column="period" jdbcType="INTEGER" property="period"/>
-    <result column="templateID" jdbcType="VARCHAR" property="templateID"/>
-    <result column="templateName" jdbcType="VARCHAR" property="templateName"/>
-    <result column="templateCode" jdbcType="VARCHAR" property="templateCode"/>
+    <result column="template_id" jdbcType="INTEGER" property="templateId"/>
+    <result column="template_name" jdbcType="VARCHAR" property="templateName"/>
+    <result column="template_code" jdbcType="VARCHAR" property="templateCode"/>
   </resultMap>
 
   <select id="getTemplateLeftJoinReport" parameterType="map" resultMap="reportDto">
     SELECT
-    d.ID     AS ID,
-    d.Period AS period,
-    c.ID     AS templateID,
-    c.Name   AS templateName,
-    c.Code   AS templateCode
+    d.id     AS id,
+    d.period AS period,
+    c.id     AS template_id,
+    c.name   AS template_name,
+    c.code   AS template_code
     FROM (SELECT
-    a.ID,
-    a.Name,
-    a.Code
-    FROM tax_admin.Template a
-    WHERE a.TemplateGroupID = #{templateGroupID,jdbcType=VARCHAR}
-    AND a.IsActiveAssociation = 1
-    ORDER BY a.OrderIndex) c
-    LEFT JOIN (SELECT b.ID,b.Period,b.TemplateID
-    FROM ${dbName}.Report b
-    WHERE b.Period = #{period,jdbcType=INTEGER}
-    AND b.ProjectID = #{ProjectID,jdbcType=VARCHAR}) d
-    ON c.ID = d.TemplateID
+    a.id,
+    a.name,
+    a.code
+    FROM tax_admin.template a
+    WHERE a.template_group_id = #{templateGroupId,jdbcType=VARCHAR}
+    AND a.is_active_association = 1
+    ORDER BY a.order_index) c
+    LEFT JOIN (SELECT b.id,b.period,b.template_id
+    FROM ${dbName}.report b
+    WHERE b.period = #{period,jdbcType=INTEGER}
+    AND b.project_id = #{ProjectID,jdbcType=VARCHAR}) d
+    ON c.id = d.template_id
   </select>
 </mapper>
\ No newline at end of file

atms-api/src/test/java/pwc/taxtech/atms/DataMigration.java

@@ -24,6 +24,8 @@ public class DataMigration extends CommonIT {
 
     private List<CellTemplate> cellTemplates;
 
+    private List<Template> templates;
+
     private List<Map<String, Object>> cellTemplate20180622List;
 
     @Test
@@ -102,7 +104,7 @@ public class DataMigration extends CommonIT {
     //todo:cell_template  --220081
     @Test
     public void doMigrationCellTemplate() {
-        String sql = "Select * from CellTemplate_20180622";
+        String sql = "SELECT * FROM CellTemplate_20180622 WHERE ReportTemplateID IN (SELECT ID FROM Template_20180622 WHERE TemplateGroupID IN('1E741076-2CBF-448A-A31C-B92C9ECB29D3','04B3B25D-131F-4214-9EDE-3B3858BE196A') AND path LIKE '%VatTemplate/DefaultVersion/%')";
         List<Map<String, Object>> queryForList = jdbcTemplate.queryForList(sql);
         System.out.println(sql);
         sql = "DELETE FROM cell_template";
@@ -113,8 +115,10 @@ public class DataMigration extends CommonIT {
         List<CellTemplate> cellTemplateList = new ArrayList<>();
         sql = "SELECT ID,`Name`,Code,CreateTime from Template_20180622";
         template20180622List = jdbcTemplate.queryForList(sql);
-        sql = "SELECT id,`name`,code,create_time from template";
-        templateList = jdbcTemplate.queryForList(sql);
+//        sql = "SELECT id,`name`,code,create_time from template";
+//        templateList = jdbcTemplate.queryForList(sql);
+
+        templates = templateMapper.selectByExample(new TemplateExample());
 
         int i = 0, j = 0;
         for (Map<String, Object> item : queryForList) {
@@ -132,7 +136,7 @@ public class DataMigration extends CommonIT {
             cellTemplate.setUpdateTime(DateUtils.strToDateLong(MapUtils.getString(item, "UpdateTime")));
             cellTemplate.setCopyFromId(0L);
             cellTemplate.setDataType(MapUtils.getInteger(item, "DataType") != null ? MapUtils.getInteger(item, "DataType") : 0);
-            cellTemplate.setIsReadOnly(MapUtils.getBoolean(item, "IsReadOnly") != null ? MapUtils.getBoolean(item, "IsReadOnly") : true);
+            cellTemplate.setIsReadOnly(MapUtils.getInteger(item, "IsReadOnly") != null ? MapUtils.getBoolean(item, "IsReadOnly") : false);
             cellTemplate.setUpdateBy(StringUtils.EMPTY);
             cellTemplate.setCreateBy(StringUtils.EMPTY);
 //          cellTemplateMapper.insert(cellTemplate);
@@ -173,15 +177,19 @@ public class DataMigration extends CommonIT {
             String code = MapUtils.getString(item, "Code");
             String createTime = MapUtils.getString(item, "CreateTime");
             //template20180622List.remove(item);
-            item = templateList.stream()
-                    .filter(a -> MapUtils.getString(a, "name").equals(name)
-                            && MapUtils.getString(a, "code").equals(code)
-                            && MapUtils.getString(a, "create_time").equals(createTime))
+//            item = templateList.stream()
+//                    .filter(a -> MapUtils.getString(a, "name").equals(name)
+//                            && MapUtils.getString(a, "code").equals(code)
+//                            && MapUtils.getString(a, "create_time").equals(createTime))
+//                    .findFirst().get();
+
+            Template template =  templates.stream()
+                    .filter(a->a.getName().equals(name)&&a.getCode().equals(code)&&a.getCreateTime().equals(DateUtils.strToDateLong(createTime)))
                     .findFirst().get();
             //sql = "SELECT id from template a WHERE create_time='" + createTime + "' AND `name`='" + name + "' AND code='" + code + "'";
             //System.out.println(sql);
             //result = jdbcTemplate.queryForMap(sql);
-            Long newId = MapUtils.getLong(item, "id");
+            Long newId =template.getId();
             //templateList.remove(item);
             return newId;
         } catch (Exception e) {
@@ -271,18 +279,32 @@ public class DataMigration extends CommonIT {
     //todo:cell_template_config --76577
     @Test
     public void doMigrationCellTemplateConfig() {
-        String sql = "Select * from CellTemplateConfig_20180622";
+        String sql = "SELECT *\n" +
+                "FROM CellTemplateConfig_20180622\n" +
+                "WHERE ReportTemplateID IN(SELECT\n" +
+                "                            ID\n" +
+                "                          FROM Template_20180622\n" +
+                "                          WHERE TemplateGroupID IN('1E741076-2CBF-448A-A31C-B92C9ECB29D3','04B3B25D-131F-4214-9EDE-3B3858BE196A')\n" +
+                "                              AND path LIKE '%VatTemplate/DefaultVersion/%')\n" +
+                "    AND celltemplateid IN(SELECT\n" +
+                "                            id\n" +
+                "                          FROM CellTemplate_20180622\n" +
+                "                          WHERE ReportTemplateID IN(SELECT\n" +
+                "                                                      ID\n" +
+                "                                                    FROM Template_20180622\n" +
+                "                                                    WHERE TemplateGroupID IN('1E741076-2CBF-448A-A31C-B92C9ECB29D3','04B3B25D-131F-4214-9EDE-3B3858BE196A')\n" +
+                "                                                        AND path LIKE '%VatTemplate/DefaultVersion/%'))";
         System.out.println(sql);
         List<Map<String, Object>> queryForList = jdbcTemplate.queryForList(sql);
         sql = "DELETE FROM cell_template_config";
         System.out.println(sql);
         jdbcTemplate.execute(sql);
 
-        sql = "SELECT ID,`Name`,Code,CreateTime from Template_20180622";
+        sql = "SELECT ID,`Name`,Code,CreateTime from Template_20180622 ";
         template20180622List = jdbcTemplate.queryForList(sql);
-        List<Template> templateList = templateMapper.selectByExample(new TemplateExample());
-        List<CellTemplate> cellTemplateList = cellTemplateMapper.selectByExample(new CellTemplateExample());
-        sql = "SELECT ID,ReportTemplateID,RowIndex,ColumnIndex from CellTemplate_20180622";
+        templates = templateMapper.selectByExample(new TemplateExample());
+        cellTemplates = cellTemplateMapper.selectByExample(new CellTemplateExample());
+        sql = "SELECT ID,ReportTemplateID,RowIndex,ColumnIndex from CellTemplate_20180622 WHERE ReportTemplateID IN (SELECT ID FROM Template_20180622 WHERE TemplateGroupID IN('1E741076-2CBF-448A-A31C-B92C9ECB29D3','04B3B25D-131F-4214-9EDE-3B3858BE196A') AND path LIKE '%VatTemplate/DefaultVersion/%')";
         cellTemplate20180622List = jdbcTemplate.queryForList(sql);
 
         List<CellTemplateConfig> cellTemplateConfigList = new ArrayList<>();
@@ -296,32 +318,32 @@ public class DataMigration extends CommonIT {
             cellTemplateConfig.setCellTemplateId(getIdFromExistTable3(MapUtils.getString(item, "CellTemplateID"), MapUtils.getString(item, "ReportTemplateID")));
             cellTemplateConfig.setReportTemplateId(getIdFromExistTable2(MapUtils.getString(item, "ReportTemplateID")));
             cellTemplateConfig.setDataSourceType(MapUtils.getInteger(item, "DataSourceType"));
-            cellTemplateConfig.setFormula(MapUtils.getString(item, "Formula"));
-            cellTemplateConfig.setFormulaDescription(MapUtils.getString(item, "FormulaDescription"));
-            cellTemplateConfig.setAccountCodes(MapUtils.getString(item, "AccountCodes"));
-            cellTemplateConfig.setInvoiceType(MapUtils.getInteger(item, "InvoiceType"));
-            cellTemplateConfig.setTaxRate(MapUtils.getString(item, "TaxRate"));
-            cellTemplateConfig.setInvoiceAmountType(MapUtils.getInteger(item, "InvoiceAmountType"));
-            cellTemplateConfig.setModelIds(MapUtils.getString(item, "ModelIDs"));
-            cellTemplateConfig.setCreateBy(MapUtils.getString(item, "Creator"));
+            cellTemplateConfig.setFormula(MapUtils.getString(item, "Formula")!=null?MapUtils.getString(item, "Formula"):"");
+            cellTemplateConfig.setFormulaDescription(MapUtils.getString(item, "FormulaDescription")!=null?MapUtils.getString(item, "FormulaDescription"):"");
+            cellTemplateConfig.setAccountCodes(MapUtils.getString(item, "AccountCodes")!=null?MapUtils.getString(item, "AccountCodes"):"");
+            cellTemplateConfig.setInvoiceType(MapUtils.getInteger(item, "InvoiceType")!=null?MapUtils.getInteger(item, "InvoiceType"):0);
+            cellTemplateConfig.setTaxRate(MapUtils.getString(item, "TaxRate")!=null?MapUtils.getString(item, "TaxRate"):"");
+            cellTemplateConfig.setInvoiceAmountType(MapUtils.getInteger(item, "InvoiceAmountType")!=null?MapUtils.getInteger(item, "InvoiceAmountType"):0);
+            cellTemplateConfig.setModelIds(MapUtils.getString(item, "ModelIDs")!=null?MapUtils.getString(item, "ModelIDs"):"");
+            cellTemplateConfig.setCreateBy(MapUtils.getString(item, "Creator")!=null?MapUtils.getString(item, "Creator"):"");
             cellTemplateConfig.setCreateTime(DateUtils.strToDateLong(MapUtils.getString(item, "CreateTime")));
-            cellTemplateConfig.setUpdateBy(MapUtils.getString(item, "Updater"));
+            cellTemplateConfig.setUpdateBy(MapUtils.getString(item, "Updater")!=null?MapUtils.getString(item, "Updater"):"");
             cellTemplateConfig.setUpdateTime(DateUtils.strToDateLong(MapUtils.getString(item, "UpdateTime")));
-            cellTemplateConfig.setInvoiceCategory(MapUtils.getString(item, "InvoiceCategory"));
-            cellTemplateConfig.setFormulaDataSource(MapUtils.getString(item, "FormulaDataSource"));
-            cellTemplateConfig.setValidation(MapUtils.getString(item, "Validation"));
-            cellTemplateConfig.setValidationDescription(MapUtils.getString(item, "ValidationDescription"));
-            cellTemplateConfig.setVoucherKeyword(MapUtils.getString(item, "VoucherKeyword"));
+            cellTemplateConfig.setInvoiceCategory(MapUtils.getString(item, "InvoiceCategory")!=null?MapUtils.getString(item, "InvoiceCategory"):"");
+            cellTemplateConfig.setFormulaDataSource(MapUtils.getString(item, "FormulaDataSource")!=null?MapUtils.getString(item, "FormulaDataSource"):"");
+            cellTemplateConfig.setValidation(MapUtils.getString(item, "Validation")!=null?MapUtils.getString(item, "Validation"):"");
+            cellTemplateConfig.setValidationDescription(MapUtils.getString(item, "ValidationDescription")!=null?MapUtils.getString(item, "ValidationDescription"):"");
+            cellTemplateConfig.setVoucherKeyword(MapUtils.getString(item, "VoucherKeyword")!=null?MapUtils.getString(item, "VoucherKeyword"):"");
             System.out.println("i=" + i);
             System.out.println("j=" + j);
             cellTemplateConfigList.add(cellTemplateConfig);
-            if (i == 1000 && j < queryForList.size()) {
-                //cellTemplateConfigMapper.batchInsert2(cellTemplateConfigList);
+            if (i == 10 && j < queryForList.size()) {
+                cellTemplateConfigMapper.batchInsert2(cellTemplateConfigList);
                 cellTemplateConfigList.clear();
                 i = 0;
             } else {
                 if (j == queryForList.size()) {
-                    //cellTemplateConfigMapper.batchInsert2(cellTemplateConfigList);
+                    cellTemplateConfigMapper.batchInsert2(cellTemplateConfigList);
                     cellTemplateConfigList.clear();
                 }
             }