1、dto id fix

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

 package pwc.taxtech.atms.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import pwc.taxtech.atms.common.util.PwCIdSerialize;
 
 public class DeleteTemplateParam {
+
     @JsonProperty("ID")
+    @JsonSerialize(using = PwCIdSerialize.class)
     private Long id;
     private boolean isDeletePermanent;
     private String path;

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

 package pwc.taxtech.atms.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import pwc.taxtech.atms.common.util.PwCIdSerialize;
 import pwc.taxtech.atms.constant.enums.RoleSource;
 
 public class NameDto {
+
     @JsonProperty("ID")
+    @JsonSerialize(using = PwCIdSerialize.class)
     private Long id;
 
     private String name;

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

 package pwc.taxtech.atms.dto;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import pwc.taxtech.atms.common.util.PwCIdSerialize;
+
 import java.util.Date;
 import java.util.List;
 
@@ -8,6 +11,7 @@ import java.util.List;
  */
 public class TemplateGroupDto {
 
+    @JsonSerialize(using = PwCIdSerialize.class)
     private Long id;
     private String name;
     private String serviceTypeId;

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

 package pwc.taxtech.atms.dto;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import pwc.taxtech.atms.common.util.PwCIdSerialize;
+
 public class TemplateUniqDto {
 
+    @JsonSerialize(using = PwCIdSerialize.class)
     private Long id;
 
     private String code;

atms-api/src/main/java/pwc/taxtech/atms/dto/analysis/AnalysisDomesticlParam.java

@@ -11,6 +11,8 @@ public class AnalysisDomesticlParam {
 
     private String period;
 
+    private String companyName;
+
     public Integer getType() {
         return type;
     }
@@ -27,4 +29,11 @@ public class AnalysisDomesticlParam {
         this.period = period;
     }
 
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
 }

atms-api/src/main/java/pwc/taxtech/atms/dto/billDetail/BillDetailResult.java

 package pwc.taxtech.atms.dto.billDetail;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import pwc.taxtech.atms.common.util.PwCIdSerialize;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 
@@ -7,6 +10,7 @@ public class BillDetailResult implements Serializable {
 
     private static final long serialVersionUID = 4342336578709406470L;
 
+    @JsonSerialize(using = PwCIdSerialize.class)
     private Long id;
 
     private String subject;

atms-api/src/main/java/pwc/taxtech/atms/dto/organization/OrganizationTaxpayerQualificationDto.java

 package pwc.taxtech.atms.dto.organization;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import pwc.taxtech.atms.common.util.PwCIdSerialize;
 import pwc.taxtech.atms.entity.BaseEntity;
 
 import java.io.Serializable;
@@ -22,6 +24,7 @@ public class OrganizationTaxpayerQualificationDto implements Serializable {
      *
      * @mbg.generated
      */
+    @JsonSerialize(using = PwCIdSerialize.class)
     private Long id;
 
     /**

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

 package pwc.taxtech.atms.dto.vatdto;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import pwc.taxtech.atms.common.util.PwCIdSerialize;
 import pwc.taxtech.atms.vat.entity.CellData;
 import pwc.taxtech.atms.vat.entity.CellDataSource;
 
 public class DataSourceCellDataDto {
+
+    @JsonSerialize(using = PwCIdSerialize.class)
     Long id;
     CellData cellData;
     CellDataSource cellDataSource;

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

 package pwc.taxtech.atms.dto.vatdto;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import pwc.taxtech.atms.common.util.PwCIdSerialize;
 import pwc.taxtech.atms.dto.TemplateDto;
 
 import java.util.List;
 
 public class TemplateByGroupDto {
+
+    @JsonSerialize(using = PwCIdSerialize.class)
     private Long id;
     private String name;
     private int OrderIndex;

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

 package pwc.taxtech.atms.dto.vatdto.dd;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import pwc.taxtech.atms.common.util.PwCIdSerialize;
 import pwc.taxtech.atms.thirdparty.ExcelCell;
 
 import java.math.BigDecimal;

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

 package pwc.taxtech.atms.dto.vatdto.dd;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import pwc.taxtech.atms.common.util.PwCIdSerialize;
 import pwc.taxtech.atms.thirdparty.ExcelCell;
 
 import java.math.BigDecimal;