resolve CONFLICT ----Ken

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/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;
-    }
 }