Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

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

+package pwc.taxtech.atms.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.github.pagehelper.PageInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import pwc.taxtech.atms.dto.CitJournalAdjustDto;
+import pwc.taxtech.atms.dpo.CitTrialBalanceDto;
+import pwc.taxtech.atms.dto.vatdto.*;
+import pwc.taxtech.atms.dto.vatdto.dd.TrialBalanceDto;
+import pwc.taxtech.atms.dto.vatdto.dd.*;
+import pwc.taxtech.atms.service.impl.CitDataPreviewServiceImpl;
+import pwc.taxtech.atms.service.impl.DataPreviewSerivceImpl;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.UUID;
+
+import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
+import static javax.servlet.http.HttpServletResponse.SC_OK;
+
+/**
+ * @author zhikai.z.wei
+ */
+@RestController
+@RequestMapping("/api/v1/citDataPreview/")
+public class CitDataPreviewController extends BaseController {
+
+    @Autowired
+    private CitDataPreviewServiceImpl citDataPreviewService;
+
+    @PostMapping("getJournalMergeData")
+    public PageInfo<CitJournalAdjustDto> getJournalMergeData(@RequestBody CitJournalAdjustDto citJournalAdjustDto) {
+        logger.debug(String.format("CIT日记账合并预览 Condition:%s", JSON.toJSONString(citJournalAdjustDto)));
+        return citDataPreviewService.getJournalMergeData(citJournalAdjustDto);
+    }
+
+    @RequestMapping(value = "exportJournalMergeData", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public void exportJournalMergeData(@RequestBody CitJournalAdjustDto paras, HttpServletResponse response) {
+        response.setContentType("application/vnd.ms-excel;charset=utf-8");
+        response.addHeader("Access-Control-Expose-Headers", "Content-Type,Content-Disposition,x-file-name");
+        String fileName = paras.getPeriodStart() + "-" + paras.getPeriodEnd();
+        response.setCharacterEncoding("UTF-8");
+        OutputStream os = null;
+        try {
+            response.addHeader("Content-Disposition", "attachment;filename="
+                    + UUID.randomUUID() + ".xls");
+            response.addHeader("x-file-name", fileName);
+            os = response.getOutputStream();
+            int count = citDataPreviewService.exportJournalMergeData(paras, os);
+
+            if (count == 0) {
+                response.setStatus(SC_NO_CONTENT);
+            } else {
+                response.setStatus(SC_OK);
+            }
+        } catch (IOException e) {
+            logger.error(String.format("下载科目余额表-生成文件异常:%s",e.getMessage()));
+        }
+    }
+
+
+    @PostMapping("getTbGeneVerData")
+    public PageInfo<CitTrialBalanceDto> getTbGeneVerData(@RequestBody CitTrialBalanceDto citTrialBalanceDto) {
+        logger.debug(String.format("CIT日记账合并预览 Condition:%s", JSON.toJSONString(citTrialBalanceDto)));
+        return citDataPreviewService.getTbGeneVerData(citTrialBalanceDto);
+    }
+
+    @RequestMapping(value = "exportTbGeneVerData", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public void exportTbGeneVerData(@RequestBody CitTrialBalanceDto paras, HttpServletResponse response) {
+        response.setContentType("application/vnd.ms-excel;charset=utf-8");
+        response.addHeader("Access-Control-Expose-Headers", "Content-Type,Content-Disposition,x-file-name");
+        String fileName = paras.getPeriodStart() + "-" + paras.getPeriodEnd();
+        response.setCharacterEncoding("UTF-8");
+        OutputStream os = null;
+        try {
+            response.addHeader("Content-Disposition", "attachment;filename="
+                    + UUID.randomUUID() + ".xls");
+            response.addHeader("x-file-name", fileName);
+            os = response.getOutputStream();
+            int count = citDataPreviewService.exportTbGeneVerData(paras, os);
+
+            if (count == 0) {
+                response.setStatus(SC_NO_CONTENT);
+            } else {
+                response.setStatus(SC_OK);
+            }
+        } catch (IOException e) {
+            logger.error(String.format("下载试算平衡表生成版-生成文件异常:%s",e.getMessage()));
+        }
+    }
+
+    @PostMapping("getTbMappingVerData")
+    public PageInfo<CitTrialBalanceDto> getTbMappingVerData(@RequestBody CitTrialBalanceDto citTrialBalanceDto) {
+        logger.debug(String.format("CIT日记账合并预览 Condition:%s", JSON.toJSONString(citTrialBalanceDto)));
+        return citDataPreviewService.getTbMappingVerData(citTrialBalanceDto);
+    }
+
+
+    @RequestMapping(value = "exportTbMappingVerData", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public void exportTbMappingVerData(@RequestBody CitTrialBalanceDto paras, HttpServletResponse response) {
+        response.setContentType("application/vnd.ms-excel;charset=utf-8");
+        response.addHeader("Access-Control-Expose-Headers", "Content-Type,Content-Disposition,x-file-name");
+        String fileName = paras.getPeriodStart() + "-" + paras.getPeriodEnd();
+        response.setCharacterEncoding("UTF-8");
+        OutputStream os = null;
+        try {
+            response.addHeader("Content-Disposition", "attachment;filename="
+                    + UUID.randomUUID() + ".xls");
+            response.addHeader("x-file-name", fileName);
+            os = response.getOutputStream();
+            int count = citDataPreviewService.exportTbMappingVerData(paras, os);
+
+            if (count == 0) {
+                response.setStatus(SC_NO_CONTENT);
+            } else {
+                response.setStatus(SC_OK);
+            }
+        } catch (IOException e) {
+            logger.error(String.format("下载科目余额表-生成文件异常:%s",e.getMessage()));
+        }
+    }
+
+}
+
+

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

@@ -3,10 +3,7 @@ package pwc.taxtech.atms.controller;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import pwc.taxtech.atms.dto.ApiResultDto;
 import pwc.taxtech.atms.dto.ebsdto.*;
 import pwc.taxtech.atms.service.EbsApiService;
@@ -25,7 +22,8 @@ public class EbsApiController {
     private EbsApiService ebsApiService;
 
     @RequestMapping(value = "/updateJE", method = RequestMethod.POST)
-    public ApiResultDto updateJE(@RequestBody List<JournalEntryQueryDto> items) {
+    public @ResponseBody
+    ApiResultDto updateJE(@RequestBody List<JournalEntryQueryDto> items) {
         if (CollectionUtils.isEmpty(items)) {
             logger.debug("the updateJE return items is empty");
             return ApiResultDto.success(Collections.emptyList());
@@ -40,7 +38,7 @@ public class EbsApiController {
     }
 
     @RequestMapping(value = "/updateTB", method = RequestMethod.POST)
-    public ApiResultDto updateTB(@RequestBody List<TrialBalanceQueryDto> items) {
+    public @ResponseBody ApiResultDto updateTB(@RequestBody List<TrialBalanceQueryDto> items) {
         if (CollectionUtils.isEmpty(items)) {
             logger.debug("the updateTB return items is empty");
             return ApiResultDto.success(Collections.emptyList());
@@ -55,7 +53,7 @@ public class EbsApiController {
     }
 
     @RequestMapping(value = "/updateCF", method = RequestMethod.POST)
-    public ApiResultDto updateCF(@RequestBody List<CashFlowQueryDto> items) {
+    public @ResponseBody ApiResultDto updateCF(@RequestBody List<CashFlowQueryDto> items) {
         if (CollectionUtils.isEmpty(items)) {
             logger.debug("the updateCF return items is empty");
             return ApiResultDto.success(Collections.emptyList());
@@ -70,7 +68,7 @@ public class EbsApiController {
     }
 
     @RequestMapping(value = "/updateBS", method = RequestMethod.POST)
-    public ApiResultDto updateBS(@RequestBody List<BalanceSheetQueryDto> items) {
+    public @ResponseBody ApiResultDto updateBS(@RequestBody List<BalanceSheetQueryDto> items) {
         if (CollectionUtils.isEmpty(items)) {
             logger.debug("the updateBS return items is empty");
             return ApiResultDto.success(Collections.emptyList());
@@ -85,7 +83,7 @@ public class EbsApiController {
     }
 
     @RequestMapping(value = "/updatePL", method = RequestMethod.POST)
-    public ApiResultDto updatePL(@RequestBody List<ProfitLossStatementQueryDto> items) {
+    public @ResponseBody ApiResultDto updatePL(@RequestBody List<ProfitLossStatementQueryDto> items) {
         if (CollectionUtils.isEmpty(items)) {
             logger.debug("the updatePL return items is empty");
             return ApiResultDto.success(Collections.emptyList());
@@ -100,7 +98,7 @@ public class EbsApiController {
     }
 
     @RequestMapping(value = "/updateBSprc", method = RequestMethod.POST)
-    public ApiResultDto updateBSprc(@RequestBody List<BalanceSheetPrcQueryDto> items) {
+    public @ResponseBody ApiResultDto updateBSprc(@RequestBody List<BalanceSheetPrcQueryDto> items) {
         if (CollectionUtils.isEmpty(items)) {
             logger.debug("the updateBSprc return items is empty");
             return ApiResultDto.success(Collections.emptyList());
@@ -115,7 +113,7 @@ public class EbsApiController {
     }
 
     @RequestMapping(value = "/updatePLprc", method = RequestMethod.POST)
-    public ApiResultDto updatePLprc(@RequestBody List<ProfitLossStatementPrcQueryDto> items) {
+    public @ResponseBody ApiResultDto updatePLprc(@RequestBody List<ProfitLossStatementPrcQueryDto> items) {
         if (CollectionUtils.isEmpty(items)) {
             logger.debug("the updatePLprc return items is empty");
             return ApiResultDto.success(Collections.emptyList());
@@ -130,7 +128,7 @@ public class EbsApiController {
     }
 
     @RequestMapping(value = "/updateOAR", method = RequestMethod.POST)
-    public ApiResultDto updateOAR(@RequestBody List<OrganizationAccountingRateQueryDto> items) {
+    public @ResponseBody ApiResultDto updateOAR(@RequestBody List<OrganizationAccountingRateQueryDto> items) {
         if (CollectionUtils.isEmpty(items)) {
             logger.debug("the updateOAR return items is empty");
             return ApiResultDto.success(Collections.emptyList());
@@ -143,7 +141,6 @@ public class EbsApiController {
         }
         return ApiResultDto.fail();
     }
-
     @RequestMapping(value = "/updateOrg", method = RequestMethod.POST)
     public ApiResultDto updateOrg(@RequestBody @Valid List<OrganizationQueryDto> items) {
         if (CollectionUtils.isEmpty(items)) {

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

@@ -36,6 +36,27 @@ public class CitDataImportLogDto implements Serializable {
      * @mbg.generated
      */
     private String organizationId;
+    /**
+     * Database Column Remarks:
+     *   项目Id
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cit_data_import_log.project_id
+     *
+     * @mbg.generated
+     */
+    private String projectId;
+
+    /**
+     * Database Column Remarks:
+     *   期间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cit_data_import_log.period
+     *
+     * @mbg.generated
+     */
+    private Integer period;
 
     /**
      * Database Column Remarks:
@@ -214,6 +235,8 @@ public class CitDataImportLogDto implements Serializable {
      */
     private Date updateTime;
 
+    private String createTimeStr;
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table data_import_log
@@ -270,6 +293,22 @@ public class CitDataImportLogDto implements Serializable {
         this.organizationId = organizationId == null ? null : organizationId.trim();
     }
 
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public Integer getPeriod() {
+        return period;
+    }
+
+    public void setPeriod(Integer period) {
+        this.period = period;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column data_import_log.type
@@ -582,6 +621,14 @@ public class CitDataImportLogDto implements Serializable {
         this.createTime = createTime;
     }
 
+    public String getCreateTimeStr() {
+        return createTimeStr;
+    }
+
+    public void setCreateTimeStr(String createTimeStr) {
+        this.createTimeStr = createTimeStr;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column data_import_log.update_time

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

+package pwc.taxtech.atms.dto;
+
+import pwc.taxtech.atms.dpo.PagingDto;
+import pwc.taxtech.atms.entity.CitJournalEntryAdjust;
+
+/**
+ * @author zhikai.z.wei
+ */
+public class CitJournalAdjustDto extends CitJournalEntryAdjust {
+    private PagingDto pageInfo;
+
+    private Integer periodStart;
+
+    private Integer periodEnd;
+
+    public PagingDto getPageInfo() {
+        return pageInfo;
+    }
+
+    public void setPageInfo(PagingDto pageInfo) {
+        this.pageInfo = pageInfo;
+    }
+
+    public Integer getPeriodStart() {
+        return periodStart;
+    }
+
+    public void setPeriodStart(Integer periodStart) {
+        this.periodStart = periodStart;
+    }
+
+    public Integer getPeriodEnd() {
+        return periodEnd;
+    }
+
+    public void setPeriodEnd(Integer periodEnd) {
+        this.periodEnd = periodEnd;
+    }
+}

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

+package pwc.taxtech.atms.dto;
+
+import pwc.taxtech.atms.thirdparty.ExcelCell;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table journal_entry
+ *
+ * @mbg.generated do_not_delete_during_merge
+ */
+public class CitTrialBalanceExportDto {
+
+    private Long id;
+
+    private String organizationId;
+
+    private String projectId;
+
+    @ExcelCell(index=1)
+    private String accountCode;
+
+    @ExcelCell(index=2)
+    private String accountDescription;
+
+    @ExcelCell(index=3)
+    private Integer accountPeriod;
+
+    @ExcelCell(index=4)
+    private BigDecimal debitAmount;
+
+    @ExcelCell(index=5)
+    private BigDecimal creditAmount;
+
+    @ExcelCell(index=5)
+    private BigDecimal beginningBalance;
+
+    @ExcelCell(index=6)
+    private BigDecimal endingBalance;
+
+    @ExcelCell(index=7)
+    private String attribute;
+
+    @ExcelCell(index=8)
+    private String createdBy;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getOrganizationId() {
+        return organizationId;
+    }
+
+    public void setOrganizationId(String organizationId) {
+        this.organizationId = organizationId;
+    }
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getAccountCode() {
+        return accountCode;
+    }
+
+    public void setAccountCode(String accountCode) {
+        this.accountCode = accountCode;
+    }
+
+    public String getAccountDescription() {
+        return accountDescription;
+    }
+
+    public void setAccountDescription(String accountDescription) {
+        this.accountDescription = accountDescription;
+    }
+
+    public Integer getAccountPeriod() {
+        return accountPeriod;
+    }
+
+    public void setAccountPeriod(Integer accountPeriod) {
+        this.accountPeriod = accountPeriod;
+    }
+
+    public BigDecimal getDebitAmount() {
+        return debitAmount;
+    }
+
+    public void setDebitAmount(BigDecimal debitAmount) {
+        this.debitAmount = debitAmount;
+    }
+
+    public BigDecimal getCreditAmount() {
+        return creditAmount;
+    }
+
+    public void setCreditAmount(BigDecimal creditAmount) {
+        this.creditAmount = creditAmount;
+    }
+
+    public BigDecimal getBeginningBalance() {
+        return beginningBalance;
+    }
+
+    public void setBeginningBalance(BigDecimal beginningBalance) {
+        this.beginningBalance = beginningBalance;
+    }
+
+    public BigDecimal getEndingBalance() {
+        return endingBalance;
+    }
+
+    public void setEndingBalance(BigDecimal endingBalance) {
+        this.endingBalance = endingBalance;
+    }
+
+    public String getAttribute() {
+        return attribute;
+    }
+
+    public void setAttribute(String attribute) {
+        this.attribute = attribute;
+    }
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    @Override
+    public String toString() {
+        return "CitTrialBalanceExportDto{" +
+                "id=" + id +
+                ", organizationId='" + organizationId + '\'' +
+                ", projectId='" + projectId + '\'' +
+                ", accountCode='" + accountCode + '\'' +
+                ", accountDescription='" + accountDescription + '\'' +
+                ", accountPeriod=" + accountPeriod +
+                ", debitAmount=" + debitAmount +
+                ", creditAmount='" + creditAmount + '\'' +
+                ", beginningBalance='" + beginningBalance + '\'' +
+                ", endingBalance='" + endingBalance + '\'' +
+                ", attribute='" + attribute + '\'' +
+                ", createdBy='" + createdBy + '\'' +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                '}';
+    }
+}
\ No newline at end of file

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

+package pwc.taxtech.atms.dto;
+
+import pwc.taxtech.atms.thirdparty.ExcelCell;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table journal_entry
+ *
+ * @mbg.generated do_not_delete_during_merge
+ */
+public class JournalMergeExportDto {
+
+    private Long id;
+
+    private String organizationId;
+
+    private String projectId;
+
+    @ExcelCell(index=1)
+    private String approvalStatus;
+
+    @ExcelCell(index=2)
+    private String postedStatus;
+
+    @ExcelCell(index=3)
+    private Date accountingPeriod;
+
+    @ExcelCell(index=4)
+    private Date accountingDate;
+
+    @ExcelCell(index=5)
+    private String journalSource;
+
+    @ExcelCell(index=5)
+    private String category;
+
+    @ExcelCell(index=6)
+    private String name;
+
+    @ExcelCell(index=7)
+    private String voucherNum;
+
+    @ExcelCell(index=8)
+    private String description;
+
+    @ExcelCell(index=9)
+    private String OrgCode;
+
+    @ExcelCell(index=10)
+    private String SubjectCode;
+
+    @ExcelCell(index=11)
+    private String OrgName;
+
+    @ExcelCell(index=12)
+    private String SubjectName;
+
+    @ExcelCell(index=13)
+    private BigDecimal accountedDr;
+
+    @ExcelCell(index=14)
+    private BigDecimal accountedCr;
+
+    @ExcelCell(index=15)
+    private String createdBy;
+
+    @ExcelCell(index=16)
+    private Date createdDate;
+
+    @ExcelCell(index=17)
+    private String lateUpdatedBy;
+
+    @ExcelCell(index=18)
+    private Date lateUpdatedDate;
+
+    @ExcelCell(index=19)
+    private Integer period;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getOrganizationId() {
+        return organizationId;
+    }
+
+    public void setOrganizationId(String organizationId) {
+        this.organizationId = organizationId;
+    }
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getApprovalStatus() {
+        return approvalStatus;
+    }
+
+    public void setApprovalStatus(String approvalStatus) {
+        this.approvalStatus = approvalStatus;
+    }
+
+    public String getPostedStatus() {
+        return postedStatus;
+    }
+
+    public void setPostedStatus(String postedStatus) {
+        this.postedStatus = postedStatus;
+    }
+
+    public Date getAccountingPeriod() {
+        return accountingPeriod;
+    }
+
+    public void setAccountingPeriod(Date accountingPeriod) {
+        this.accountingPeriod = accountingPeriod;
+    }
+
+    public Date getAccountingDate() {
+        return accountingDate;
+    }
+
+    public void setAccountingDate(Date accountingDate) {
+        this.accountingDate = accountingDate;
+    }
+
+    public String getJournalSource() {
+        return journalSource;
+    }
+
+    public void setJournalSource(String journalSource) {
+        this.journalSource = journalSource;
+    }
+
+    public String getCategory() {
+        return category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getVoucherNum() {
+        return voucherNum;
+    }
+
+    public void setVoucherNum(String voucherNum) {
+        this.voucherNum = voucherNum;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getOrgCode() {
+        return OrgCode;
+    }
+
+    public void setOrgCode(String orgCode) {
+        OrgCode = orgCode;
+    }
+
+    public String getSubjectCode() {
+        return SubjectCode;
+    }
+
+    public void setSubjectCode(String subjectCode) {
+        SubjectCode = subjectCode;
+    }
+
+    public String getOrgName() {
+        return OrgName;
+    }
+
+    public void setOrgName(String orgName) {
+        OrgName = orgName;
+    }
+
+    public String getSubjectName() {
+        return SubjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        SubjectName = subjectName;
+    }
+
+    public BigDecimal getAccountedDr() {
+        return accountedDr;
+    }
+
+    public void setAccountedDr(BigDecimal accountedDr) {
+        this.accountedDr = accountedDr;
+    }
+
+    public BigDecimal getAccountedCr() {
+        return accountedCr;
+    }
+
+    public void setAccountedCr(BigDecimal accountedCr) {
+        this.accountedCr = accountedCr;
+    }
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public Date getCreatedDate() {
+        return createdDate;
+    }
+
+    public void setCreatedDate(Date createdDate) {
+        this.createdDate = createdDate;
+    }
+
+    public String getLateUpdatedBy() {
+        return lateUpdatedBy;
+    }
+
+    public void setLateUpdatedBy(String lateUpdatedBy) {
+        this.lateUpdatedBy = lateUpdatedBy;
+    }
+
+    public Date getLateUpdatedDate() {
+        return lateUpdatedDate;
+    }
+
+    public void setLateUpdatedDate(Date lateUpdatedDate) {
+        this.lateUpdatedDate = lateUpdatedDate;
+    }
+
+    public Integer getPeriod() {
+        return period;
+    }
+
+    public void setPeriod(Integer period) {
+        this.period = period;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    @Override
+    public String toString() {
+        return "JournalMergeExportDto{" +
+                "id=" + id +
+                ", organizationId='" + organizationId + '\'' +
+                ", projectId='" + projectId + '\'' +
+                ", approvalStatus='" + approvalStatus + '\'' +
+                ", postedStatus='" + postedStatus + '\'' +
+                ", accountingPeriod=" + accountingPeriod +
+                ", accountingDate=" + accountingDate +
+                ", journalSource='" + journalSource + '\'' +
+                ", category='" + category + '\'' +
+                ", name='" + name + '\'' +
+                ", voucherNum='" + voucherNum + '\'' +
+                ", description='" + description + '\'' +
+                ", OrgCode='" + OrgCode + '\'' +
+                ", SubjectCode='" + SubjectCode + '\'' +
+                ", OrgName='" + OrgName + '\'' +
+                ", SubjectName='" + SubjectName + '\'' +
+                ", accountedDr=" + accountedDr +
+                ", accountedCr=" + accountedCr +
+                ", createdBy='" + createdBy + '\'' +
+                ", createdDate=" + createdDate +
+                ", lateUpdatedBy='" + lateUpdatedBy + '\'' +
+                ", lateUpdatedDate=" + lateUpdatedDate +
+                ", period=" + period +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                '}';
+    }
+}
\ No newline at end of file

atms-api/src/main/java/pwc/taxtech/atms/dto/ebsdto/JournalEntryQueryDto.java

 package pwc.taxtech.atms.dto.ebsdto;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 
 public class JournalEntryQueryDto {
-    /**
-     * Database Column Remarks:
-     * 唯一编号 系统唯一编号
-     * <p>
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column journal_entry.id
-     *
-     * @mbg.generated
-     */
-    private Long id;
-
-    /**
-     * Database Column Remarks:
-     * 机构编号 对应机构编号
-     * <p>
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column journal_entry.organization_id
-     *
-     * @mbg.generated
-     */
-    private String organizationId;
-
-    /**
-     * Database Column Remarks:
-     * 项目ID
-     * <p>
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column journal_entry.project_id
-     *
-     * @mbg.generated
-     */
-    private String projectId;
-
     /**
      * Database Column Remarks:
      * 数据日期
@@ -47,7 +13,7 @@ public class JournalEntryQueryDto {
      *
      * @mbg.generated
      */
-    private Date date;
+    private String date;
 
     /**
      * Database Column Remarks:
@@ -102,7 +68,7 @@ public class JournalEntryQueryDto {
      *
      * @mbg.generated
      */
-    private String status;
+    private Boolean status;
 
     /**
      * Database Column Remarks:
@@ -168,7 +134,7 @@ public class JournalEntryQueryDto {
      *
      * @mbg.generated
      */
-    private Date accountingDate;
+    private String  accountingDate;
 
     /**
      * Database Column Remarks:
@@ -542,7 +508,7 @@ public class JournalEntryQueryDto {
      *
      * @mbg.generated
      */
-    private Date attribute2;
+    private String attribute2;
 
     /**
      * Database Column Remarks:
@@ -718,7 +684,7 @@ public class JournalEntryQueryDto {
      *
      * @mbg.generated
      */
-    private Date createdDate;
+    private String createdDate;
 
     /**
      * Database Column Remarks:
@@ -740,70 +706,13 @@ public class JournalEntryQueryDto {
      *
      * @mbg.generated
      */
-    private Date lateUpdatedDate;
-
-    /**
-     * Database Column Remarks:
-     * 创建时间
-     * <p>
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column journal_entry.create_time
-     *
-     * @mbg.generated
-     */
-    private Date createTime;
-
-    /**
-     * Database Column Remarks:
-     * 更新时间
-     * <p>
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column journal_entry.update_time
-     *
-     * @mbg.generated
-     */
-    private Date updateTime;
-
-    /**
-     * Database Column Remarks:
-     *    税务系统期间 yyyyMM
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column journal_entry.tms_period
-     *
-     * @mbg.generated
-     */
-    private Integer tmsPeriod;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getOrganizationId() {
-        return organizationId;
-    }
+    private String lateUpdatedDate;
 
-    public void setOrganizationId(String organizationId) {
-        this.organizationId = organizationId;
-    }
-
-    public String getProjectId() {
-        return projectId;
-    }
-
-    public void setProjectId(String projectId) {
-        this.projectId = projectId;
-    }
-
-    public Date getDate() {
+    public String getDate() {
         return date;
     }
 
-    public void setDate(Date date) {
+    public void setDate(String date) {
         this.date = date;
     }
 
@@ -839,11 +748,11 @@ public class JournalEntryQueryDto {
         this.currencyCode = currencyCode;
     }
 
-    public String getStatus() {
+    public Boolean getStatus() {
         return status;
     }
 
-    public void setStatus(String status) {
+    public void setStatus(Boolean status) {
         this.status = status;
     }
 
@@ -887,11 +796,11 @@ public class JournalEntryQueryDto {
         this.period = period;
     }
 
-    public Date getAccountingDate() {
+    public String getAccountingDate() {
         return accountingDate;
     }
 
-    public void setAccountingDate(Date accountingDate) {
+    public void setAccountingDate(String accountingDate) {
         this.accountingDate = accountingDate;
     }
 
@@ -1159,11 +1068,11 @@ public class JournalEntryQueryDto {
         this.attribute1 = attribute1;
     }
 
-    public Date getAttribute2() {
+    public String getAttribute2() {
         return attribute2;
     }
 
-    public void setAttribute2(Date attribute2) {
+    public void setAttribute2(String attribute2) {
         this.attribute2 = attribute2;
     }
 
@@ -1287,11 +1196,11 @@ public class JournalEntryQueryDto {
         this.createdBy = createdBy;
     }
 
-    public Date getCreatedDate() {
+    public String getCreatedDate() {
         return createdDate;
     }
 
-    public void setCreatedDate(Date createdDate) {
+    public void setCreatedDate(String createdDate) {
         this.createdDate = createdDate;
     }
 
@@ -1303,35 +1212,11 @@ public class JournalEntryQueryDto {
         this.lateUpdatedBy = lateUpdatedBy;
     }
 
-    public Date getLateUpdatedDate() {
+    public String getLateUpdatedDate() {
         return lateUpdatedDate;
     }
 
-    public void setLateUpdatedDate(Date lateUpdatedDate) {
+    public void setLateUpdatedDate(String lateUpdatedDate) {
         this.lateUpdatedDate = lateUpdatedDate;
     }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public Integer getTmsPeriod() {
-        return tmsPeriod;
-    }
-
-    public void setTmsPeriod(Integer tmsPeriod) {
-        this.tmsPeriod = tmsPeriod;
-    }
 }

atms-dao/src/main/java/pwc/taxtech/atms/dao/CitJournalEntryAdjustMapper.java

@@ -106,7 +106,28 @@ public interface CitJournalEntryAdjustMapper extends MyMapper {
      */
     int updateByPrimaryKey(CitJournalEntryAdjust record);
 
+    /**
+     * fetch data by citJournalAdjustList
+     *
+     * @param citJournalAdjustList
+     * @return int
+     */
     int insertBatch(List<CitJournalEntryAdjust> citJournalAdjustList);
 
+    /**
+     * fetch data by period orgList
+     *
+     * @param period
+     * @param orgList
+     * @return List<CitJournalEntryAdjust>
+     */
     List<CitJournalEntryAdjust> sumAmountByCondition(@Param("period") String period, @Param("orgList") List<String> orgList);
+
+    /**
+     * fetch data by projectId
+     *
+     * @param projectId
+     * @return List<CitJournalEntryAdjust>
+     */
+    List<CitJournalEntryAdjust> getJournalMerge(String projectId);
 }
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/dao/CitTrialBalanceMapper.java

@@ -5,6 +5,7 @@ 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.dpo.CitTrialBalanceDto;
 import pwc.taxtech.atms.entity.CitTrialBalance;
 import pwc.taxtech.atms.entity.CitTrialBalanceExample;
 
@@ -107,4 +108,12 @@ public interface CitTrialBalanceMapper extends MyMapper {
     int updateByPrimaryKey(CitTrialBalance record);
 
     int insertBatch(List<CitTrialBalance> citTrialBalanceList);
+
+    /**
+     * fetch data by citTrialBalanceDto
+     *
+     * @param citTrialBalanceDto
+     * @return List<CitTrialBalanceDto>
+     */
+    List<CitTrialBalanceDto> getTbMappingData(CitTrialBalanceDto citTrialBalanceDto);
 }
\ No newline at end of file