add ebs api taskId ----Ken

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

@@ -10,7 +10,6 @@ import pwc.taxtech.atms.service.EbsApiService;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import java.util.Collections;
 import java.util.List;
 
 @RestController
@@ -24,136 +23,226 @@ public class EbsApiController {
     @RequestMapping(value = "/updateJE", method = RequestMethod.POST)
     public @ResponseBody
     ApiResultDto updateJE(@RequestParam(value="id",defaultValue = "123123123") Long id,@RequestBody List<JournalEntryQueryDto> items) {
+        logger.info("开始日记账同步更新");
+        ApiResultDto apiResultDto = new ApiResultDto();
         if (CollectionUtils.isEmpty(items)) {
             logger.debug("the updateJE return items is empty");
-            return ApiResultDto.success(Collections.emptyList());
+            apiResultDto.setCode(0);
+            apiResultDto.setMessage("获取日记账数据为空");
+            return apiResultDto;
         }
-        try {
+        try{
             ebsApiService.queryRemoteServerThenUpdateJE(id,items);
-            return ApiResultDto.success();
-        } catch (Exception e) {
+            logger.debug("日记账同步更新 success");
+            apiResultDto.setCode(1);
+            apiResultDto.setMessage("日记账同步更新 success");
+            return apiResultDto;
+        }catch(Exception e){
             logger.error("updateJE error.", e);
+            e.printStackTrace();
+            apiResultDto.setCode(-1);
+            apiResultDto.setMessage("日记账同步更新失败");
+            return apiResultDto;
         }
-        return ApiResultDto.fail();
     }
 
     @RequestMapping(value = "/updateTB", method = RequestMethod.POST)
     public @ResponseBody ApiResultDto updateTB(@RequestParam("id") Long id,@RequestBody List<TrialBalanceQueryDto> items) {
+        logger.info("开始科目余额数据同步更新");
+        ApiResultDto apiResultDto = new ApiResultDto();
         if (CollectionUtils.isEmpty(items)) {
             logger.debug("the updateTB return items is empty");
-            return ApiResultDto.success(Collections.emptyList());
+            apiResultDto.setCode(0);
+            apiResultDto.setMessage("获取科目余额数据为空");
+            return apiResultDto;
         }
-        try {
+        try{
             ebsApiService.queryRemoteServerThenUpdateTB(id,items);
-            return ApiResultDto.success();
-        } catch (Exception e) {
+            logger.debug("科目余额数据同步更新 success");
+            apiResultDto.setCode(1);
+            apiResultDto.setMessage("科目余额数据同步更新 success");
+            return apiResultDto;
+        }catch(Exception e){
             logger.error("updateTB error.", e);
+            e.printStackTrace();
+            apiResultDto.setCode(-1);
+            apiResultDto.setMessage("科目余额数据同步更新失败");
+            return apiResultDto;
         }
-        return ApiResultDto.fail();
     }
 
     @RequestMapping(value = "/updateCF", method = RequestMethod.POST)
     public @ResponseBody ApiResultDto updateCF(@RequestParam("id") Long id,@RequestBody List<CashFlowQueryDto> items) {
+        logger.info("开始现金流量数据同步更新");
+        ApiResultDto apiResultDto = new ApiResultDto();
         if (CollectionUtils.isEmpty(items)) {
             logger.debug("the updateCF return items is empty");
-            return ApiResultDto.success(Collections.emptyList());
+            apiResultDto.setCode(0);
+            apiResultDto.setMessage("获取现金流量数据为空");
+            return apiResultDto;
         }
-        try {
+        try{
             ebsApiService.queryRemoteServerThenUpdateCF(id,items);
-            return ApiResultDto.success();
-        } catch (Exception e) {
+            logger.debug("现金流量数据同步更新 success");
+            apiResultDto.setCode(1);
+            apiResultDto.setMessage("现金流量数据同步更新 success");
+            return apiResultDto;
+        }catch(Exception e){
             logger.error("updateCF error.", e);
+            e.printStackTrace();
+            apiResultDto.setCode(-1);
+            apiResultDto.setMessage("现金流量数据同步更新失败");
+            return apiResultDto;
         }
-        return ApiResultDto.fail();
     }
 
     @RequestMapping(value = "/updateBS", method = RequestMethod.POST)
     public @ResponseBody ApiResultDto updateBS(@RequestParam("id") Long id,@RequestBody List<BalanceSheetQueryDto> items) {
+        logger.info("开始资产负债数据同步更新");
+        ApiResultDto apiResultDto = new ApiResultDto();
         if (CollectionUtils.isEmpty(items)) {
             logger.debug("the updateBS return items is empty");
-            return ApiResultDto.success(Collections.emptyList());
+            apiResultDto.setCode(0);
+            apiResultDto.setMessage("获取资产负债数据为空");
+            return apiResultDto;
         }
-        try {
+        try{
             ebsApiService.queryRemoteServerThenUpdateBS(id,items);
-            return ApiResultDto.success();
-        } catch (Exception e) {
+            logger.debug("资产负债数据同步更新 success");
+            apiResultDto.setCode(1);
+            apiResultDto.setMessage("资产负债数据同步更新 success");
+            return apiResultDto;
+        }catch(Exception e){
             logger.error("updateBS error.", e);
+            e.printStackTrace();
+            apiResultDto.setCode(-1);
+            apiResultDto.setMessage("资产负债数据同步更新失败");
+            return apiResultDto;
         }
-        return ApiResultDto.fail();
     }
 
     @RequestMapping(value = "/updatePL", method = RequestMethod.POST)
     public @ResponseBody ApiResultDto updatePL(@RequestParam("id") Long id,@RequestBody List<ProfitLossStatementQueryDto> items) {
+        logger.info("开始利润数据同步更新");
+        ApiResultDto apiResultDto = new ApiResultDto();
         if (CollectionUtils.isEmpty(items)) {
             logger.debug("the updatePL return items is empty");
-            return ApiResultDto.success(Collections.emptyList());
+            apiResultDto.setCode(0);
+            apiResultDto.setMessage("获取利润数据为空");
+            return apiResultDto;
         }
-        try {
+        try{
             ebsApiService.queryRemoteServerThenUpdatePL(id,items);
-            return ApiResultDto.success();
-        } catch (Exception e) {
+            logger.debug("利润数据同步更新 success");
+            apiResultDto.setCode(1);
+            apiResultDto.setMessage("利润数据同步更新 success");
+            return apiResultDto;
+        }catch(Exception e){
             logger.error("updatePL error.", e);
+            e.printStackTrace();
+            apiResultDto.setCode(-1);
+            apiResultDto.setMessage("利润数据同步更新失败");
+            return apiResultDto;
         }
-        return ApiResultDto.fail();
     }
 
     @RequestMapping(value = "/updateBSprc", method = RequestMethod.POST)
     public @ResponseBody ApiResultDto updateBSprc(@RequestParam("id") Long id,@RequestBody List<BalanceSheetPrcQueryDto> items) {
+        logger.info("开始资产负债PRC数据同步更新");
+        ApiResultDto apiResultDto = new ApiResultDto();
         if (CollectionUtils.isEmpty(items)) {
             logger.debug("the updateBSprc return items is empty");
-            return ApiResultDto.success(Collections.emptyList());
+            apiResultDto.setCode(0);
+            apiResultDto.setMessage("获取资产负债PRC数据为空");
+            return apiResultDto;
         }
-        try {
+        try{
             ebsApiService.queryRemoteServerThenUpdateBSprc(id,items);
-            return ApiResultDto.success();
-        } catch (Exception e) {
+            logger.debug("资产负债PRC数据同步更新 success");
+            apiResultDto.setCode(1);
+            apiResultDto.setMessage("资产负债PRC数据同步更新 success");
+            return apiResultDto;
+        }catch(Exception e){
             logger.error("updateBSprc error.", e);
+            e.printStackTrace();
+            apiResultDto.setCode(-1);
+            apiResultDto.setMessage("资产负债PRC数据同步更新失败");
+            return apiResultDto;
         }
-        return ApiResultDto.fail();
     }
 
     @RequestMapping(value = "/updatePLprc", method = RequestMethod.POST)
     public @ResponseBody ApiResultDto updatePLprc(@RequestParam("id") Long id,@RequestBody List<ProfitLossStatementPrcQueryDto> items) {
+        logger.info("开始利润PRC数据同步更新");
+        ApiResultDto apiResultDto = new ApiResultDto();
         if (CollectionUtils.isEmpty(items)) {
             logger.debug("the updatePLprc return items is empty");
-            return ApiResultDto.success(Collections.emptyList());
+            apiResultDto.setCode(0);
+            apiResultDto.setMessage("获取利润PRC数据为空");
+            return apiResultDto;
         }
-        try {
+        try{
             ebsApiService.queryRemoteServerThenUpdatePLprc(id,items);
-            return ApiResultDto.success();
-        } catch (Exception e) {
+            logger.debug("利润PRC数据同步更新 success");
+            apiResultDto.setCode(1);
+            apiResultDto.setMessage("利润PRC数据同步更新 success");
+            return apiResultDto;
+        }catch(Exception e){
             logger.error("updatePLprc error.", e);
+            e.printStackTrace();
+            apiResultDto.setCode(-1);
+            apiResultDto.setMessage("利润PRC数据同步更新失败");
+            return apiResultDto;
         }
-        return ApiResultDto.fail();
     }
 
     @RequestMapping(value = "/updateOAR", method = RequestMethod.POST)
     public @ResponseBody ApiResultDto updateOAR(@RequestParam("id") Long id,@RequestBody List<OrganizationAccountingRateQueryDto> items) {
+        logger.info("开始汇率数据同步更新");
+        ApiResultDto apiResultDto = new ApiResultDto();
         if (CollectionUtils.isEmpty(items)) {
             logger.debug("the updateOAR return items is empty");
-            return ApiResultDto.success(Collections.emptyList());
+            apiResultDto.setCode(0);
+            apiResultDto.setMessage("获取汇率数据为空");
+            return apiResultDto;
         }
-        try {
+        try{
             ebsApiService.queryRemoteServerThenUpdateOAR(id,items);
-            return ApiResultDto.success();
-        } catch (Exception e) {
+            logger.debug("汇率数据同步更新 success");
+            apiResultDto.setCode(1);
+            apiResultDto.setMessage("汇率数据同步更新 success");
+            return apiResultDto;
+        }catch(Exception e){
             logger.error("updateOAR error.", e);
+            e.printStackTrace();
+            apiResultDto.setCode(-1);
+            apiResultDto.setMessage("汇率数据同步更新失败");
+            return apiResultDto;
         }
-        return ApiResultDto.fail();
     }
     @RequestMapping(value = "/updateOrg", method = RequestMethod.POST)
     public ApiResultDto updateOrg(@RequestParam("id") Long id,@RequestBody @Valid List<OrganizationQueryDto> items) {
+        logger.info("开始机构信息数据同步更新");
+        ApiResultDto apiResultDto = new ApiResultDto();
         if (CollectionUtils.isEmpty(items)) {
             logger.debug("the updateOrg return items is empty");
-            return ApiResultDto.success(Collections.emptyList());
+            apiResultDto.setCode(0);
+            apiResultDto.setMessage("获取机构信息数据为空");
+            return apiResultDto;
         }
-        try {
+        try{
             ebsApiService.queryRemoteServerThenUpdateOrg(id,items);
-            return ApiResultDto.success();
-        } catch (Exception e) {
+            logger.debug("机构信息数据同步更新 success");
+            apiResultDto.setCode(1);
+            apiResultDto.setMessage("机构信息数据同步更新 success");
+            return apiResultDto;
+        }catch(Exception e){
             logger.error("updateOrg error.", e);
+            e.printStackTrace();
+            apiResultDto.setCode(-1);
+            apiResultDto.setMessage("机构信息数据同步更新失败");
+            return apiResultDto;
         }
-        return ApiResultDto.fail();
     }
 
 }

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

@@ -162,6 +162,25 @@ public class BalanceSheetPrcQueryDto {
      */
     private BigDecimal begBal;
 
+    /**
+     * Database Column Remarks:
+     *   同步用于标记不同分页的数据，避免重复删除
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cash_flow.task_id
+     *
+     * @mbg.generated
+     */
+    private String taskId;
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+
     public String getSource() {
         return source;
     }

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

@@ -161,6 +161,25 @@ public class BalanceSheetQueryDto {
      */
     private BigDecimal begBal;
 
+    /**
+     * Database Column Remarks:
+     *   同步用于标记不同分页的数据，避免重复删除
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cash_flow.task_id
+     *
+     * @mbg.generated
+     */
+    private String taskId;
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+
     public String getSource() {
         return source;
     }

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

@@ -173,6 +173,25 @@ public class CashFlowQueryDto {
      */
     private BigDecimal ytdAmt;
 
+    /**
+     * Database Column Remarks:
+     *   同步用于标记不同分页的数据，避免重复删除
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cash_flow.task_id
+     *
+     * @mbg.generated
+     */
+    private String taskId;
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+
     public Date getDate() {
         return date;
     }

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

@@ -716,6 +716,25 @@ public class JournalEntryQueryDto {
     @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm",timezone = "GMT+8")
     private Date lateUpdatedDate;
 
+    /**
+     * Database Column Remarks:
+     *   同步用于标记不同分页的数据，避免重复删除
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cash_flow.task_id
+     *
+     * @mbg.generated
+     */
+    private String taskId;
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+
     public Date getDate() {
         return date;
     }

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

@@ -73,6 +73,19 @@ public class OrganizationAccountingRateQueryDto {
      */
     private String invalidDate;
 
+    /**
+     *   同步用于标记不同分页的数据，避免重复删除
+     */
+    private String taskId;
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+
     public Date getDate() {
         return date;
     }

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

@@ -161,6 +161,25 @@ public class ProfitLossStatementPrcQueryDto {
      */
     private BigDecimal ytdAmt;
 
+    /**
+     * Database Column Remarks:
+     *   同步用于标记不同分页的数据，避免重复删除
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cash_flow.task_id
+     *
+     * @mbg.generated
+     */
+    private String taskId;
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+
     public String getSource() {
         return source;
     }

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

@@ -161,6 +161,25 @@ public class ProfitLossStatementQueryDto {
      */
     private BigDecimal ytdAmt;
 
+    /**
+     * Database Column Remarks:
+     *   同步用于标记不同分页的数据，避免重复删除
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cash_flow.task_id
+     *
+     * @mbg.generated
+     */
+    private String taskId;
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+
     public String getSource() {
         return source;
     }

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

@@ -546,6 +546,25 @@ public class TrialBalanceQueryDto {
      */
     private BigDecimal ytdCrBeq;
 
+    /**
+     * Database Column Remarks:
+     *   同步用于标记不同分页的数据，避免重复删除
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cash_flow.task_id
+     *
+     * @mbg.generated
+     */
+    private String taskId;
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+
     public Date getDate() {
         return date;
     }

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

@@ -233,18 +233,18 @@ public class EbsApiServiceImpl implements EbsApiService {
     private void processJE(JournalEntryQueryDto item) {
         JournalEntryExample journalEntryExample = new JournalEntryExample();
         //日记账头ID和日记账行号
-        journalEntryExample.createCriteria().andHeaderIdEqualTo(item.getHeaderId()).andLineNumEqualTo(item.getLineNum());
+        journalEntryExample.createCriteria().andHeaderIdEqualTo(item.getHeaderId()).andLineNumEqualTo(item.getLineNum()).andTaskIdEqualTo(item.getTaskId());
         List<JournalEntry> journalEntryList = journalEntryMapper.selectByExample(journalEntryExample);
         //唯一则更新否则插入
         JournalEntry journalEntry = new JournalEntry();
         if (journalEntryList.size() == 1) {
-            logger.debug("exit and update journalEntry headerId:{},lineNum:{}", item.getHeaderId(), item.getLineNum());
+            logger.debug("exit and update journalEntry headerId:{},lineNum:{},taskId:{}", item.getHeaderId(), item.getLineNum(),item.getTaskId());
             journalEntry = journalEntryList.get(0);
             populateFieldsJE(item, journalEntry);
             journalEntry.setId(journalEntryList.get(0).getId());
             journalEntryMapper.updateByPrimaryKeySelective(journalEntry);
         } else {
-            logger.debug("miss and insert journalEntry headerId:{},lineNum:{}", item.getHeaderId(), item.getLineNum());
+            logger.debug("miss and insert journalEntry headerId:{},lineNum:{},taskId:{}", item.getHeaderId(), item.getLineNum(),item.getTaskId());
             populateFieldsJE(item, journalEntry);
             journalEntry.setId(distributedIdService.nextId());
             journalEntry.setCreatedBy("");
@@ -257,15 +257,15 @@ public class EbsApiServiceImpl implements EbsApiService {
     private void processTB(Long id,TrialBalanceQueryDto item) {
         TrialBalanceExample example = new TrialBalanceExample();
         //机构编码和期间
-        example.createCriteria().andSegment1EqualTo(item.getSegment1()).andPeriodEqualTo(convertPeriodStr2Int(item.getPeriod()));
+        example.createCriteria().andSegment1EqualTo(item.getSegment1()).andPeriodEqualTo(convertPeriodStr2Int(item.getPeriod())).andTaskIdEqualTo(item.getTaskId());
         List<TrialBalance> itemList = trialBalanceMapper.selectByExample(example);
         //唯一则更新否则插入
         TrialBalance result = new TrialBalance();
         if (itemList.size() >0) {
-            logger.debug("exit and delete TrialBalance EntityCode:{},Period:{}", item.getSegment1(), convertPeriodStr2Int(item.getPeriod()));
+            logger.debug("exit and delete TrialBalance EntityCode:{},Period:{},taskId:{}", item.getSegment1(), convertPeriodStr2Int(item.getPeriod()),item.getTaskId());
             trialBalanceMapper.deleteByExample(example);
         }
-        logger.debug("insert TrialBalance EntityCode:{},Period:{}", item.getSegment1(), convertPeriodStr2Int(item.getPeriod()));
+        logger.debug("insert TrialBalance EntityCode:{},Period:{},taskId:{}", item.getSegment1(), convertPeriodStr2Int(item.getPeriod()),item.getTaskId());
         populateFieldsTB(item, result);
         result.setId(distributedIdService.nextId());
         result.setCreateBy(getCurrentOperatorName(id));
@@ -276,15 +276,15 @@ public class EbsApiServiceImpl implements EbsApiService {
     private void processCF(Long id,CashFlowQueryDto item) {
         CashFlowExample example = new CashFlowExample();
         //机构编码和期间
-        example.createCriteria().andEntityCodeEqualTo(item.getEntityCode()).andPeriodEqualTo(convertPeriodStr2Int(item.getPeriod()));
+        example.createCriteria().andEntityCodeEqualTo(item.getEntityCode()).andPeriodEqualTo(convertPeriodStr2Int(item.getPeriod())).andTaskIdEqualTo(item.getTaskId());
         List<CashFlow> itemList = cashFlowMapper.selectByExample(example);
         //唯一则更新否则插入
         CashFlow result = new CashFlow();
         if (itemList.size() >0) {
-            logger.debug("exit and delete CashFlow EntityCode:{},Period:{}", item.getEntityCode(), item.getPeriod());
+            logger.debug("exit and delete CashFlow EntityCode:{},Period:{},taskId:{}", item.getEntityCode(), item.getPeriod(),item.getTaskId());
             cashFlowMapper.deleteByExample(example);
         }
-        logger.debug("insert CashFlow EntityCode:{},Period:{}", item.getEntityCode(), item.getPeriod());
+        logger.debug("insert CashFlow EntityCode:{},Period:{},taskId:{}", item.getEntityCode(), item.getPeriod(),item.getTaskId());
         populateFieldsCF(item, result);
         result.setId(distributedIdService.nextId());
         result.setCreateTime(new Date());
@@ -296,15 +296,15 @@ public class EbsApiServiceImpl implements EbsApiService {
     private void processBS(Long id,BalanceSheetQueryDto item) {
         BalanceSheetExample example = new BalanceSheetExample();
         //机构编码和期间
-        example.createCriteria().andEntityCodeEqualTo(item.getEntityCode()).andPeriodEqualTo(convertPeriodStr2Int(item.getPeriod()));
+        example.createCriteria().andEntityCodeEqualTo(item.getEntityCode()).andPeriodEqualTo(convertPeriodStr2Int(item.getPeriod())).andTaskIdEqualTo(item.getTaskId());
         List<BalanceSheet> itemList = balanceSheetMapper.selectByExample(example);
         //唯一则更新否则插入
         BalanceSheet result = new BalanceSheet();
         if (itemList.size() >0) {
-            logger.debug("exit and delete BalanceSheet EntityCode:{},Period:{}", item.getEntityCode(), item.getPeriod());
+            logger.debug("exit and delete BalanceSheet EntityCode:{},Period:{},taskId:{}", item.getEntityCode(), item.getPeriod(),item.getTaskId());
             balanceSheetMapper.deleteByExample(example);
         }
-        logger.debug("insert BalanceSheet EntityCode:{},Period:{}", item.getEntityCode(), item.getPeriod());
+        logger.debug("insert BalanceSheet EntityCode:{},Period:{},taskId:{}", item.getEntityCode(), item.getPeriod(),item.getTaskId());
         populateFieldsBS(item, result);
         result.setId(distributedIdService.nextId());
         result.setCreateBy(getCurrentOperatorName(id));
@@ -324,15 +324,15 @@ public class EbsApiServiceImpl implements EbsApiService {
     private void processBSprc(Long id,BalanceSheetPrcQueryDto item) {
         BalanceSheetExample example = new BalanceSheetExample();
         //机构编码和期间
-        example.createCriteria().andEntityCodeEqualTo(item.getEntityCode()).andPeriodEqualTo(convertPeriodStr2Int(item.getPeriod()));
+        example.createCriteria().andEntityCodeEqualTo(item.getEntityCode()).andPeriodEqualTo(convertPeriodStr2Int(item.getPeriod())).andTaskIdEqualTo(item.getTaskId());
         List<BalanceSheet> itemList = balanceSheetMapper.selectByExample(example);
         //唯一则更新否则插入
         BalanceSheet result = new BalanceSheet();
         if (itemList.size() >0) {
-            logger.debug("exit and delete BalanceSheetPrc EntityCode:{},Period:{}", item.getEntityCode(), item.getPeriod());
+            logger.debug("exit and delete BalanceSheetPrc EntityCode:{},Period:{},taskId:{}", item.getEntityCode(), item.getPeriod(),item.getTaskId());
             balanceSheetMapper.deleteByExample(example);
         }
-        logger.debug("insert BalanceSheetPrc EntityCode:{},Period:{}", item.getEntityCode(), item.getPeriod());
+        logger.debug("insert BalanceSheetPrc EntityCode:{},Period:{},taskId:{}", item.getEntityCode(), item.getPeriod(),item.getTaskId());
         populateFieldsBSprc(item, result);
         result.setId(distributedIdService.nextId());
         result.setCreateBy(getCurrentOperatorName(id));
@@ -343,15 +343,15 @@ public class EbsApiServiceImpl implements EbsApiService {
     private void processPL(Long id,ProfitLossStatementQueryDto item) {
         ProfitLossStatementExample example = new ProfitLossStatementExample();
         //机构编码和期间
-        example.createCriteria().andEntityCodeEqualTo(item.getEntityCode()).andPeriodEqualTo(convertPeriodStr2Int(item.getPeriod()));
+        example.createCriteria().andEntityCodeEqualTo(item.getEntityCode()).andPeriodEqualTo(convertPeriodStr2Int(item.getPeriod())).andTaskIdEqualTo(item.getTaskId());
         List<ProfitLossStatement> itemList = profitLossStatementMapper.selectByExample(example);
         //唯一则更新否则插入
         ProfitLossStatement result = new ProfitLossStatement();
         if (itemList.size() >0) {
-            logger.debug("exit and delete ProfitLossStatement EntityCode:{},Period:{}", item.getEntityCode(), item.getPeriod());
+            logger.debug("exit and delete ProfitLossStatement EntityCode:{},Period:{},taskId:{}", item.getEntityCode(), item.getPeriod(),item.getTaskId());
             profitLossStatementMapper.deleteByExample(example);
         }
-        logger.debug("insert ProfitLossStatement EntityCode:{},Period:{}", item.getEntityCode(), item.getPeriod());
+        logger.debug("insert ProfitLossStatement EntityCode:{},Period:{},taskId:{}", item.getEntityCode(), item.getPeriod(),item.getTaskId());
         populateFieldsPLS(item, result);
         result.setId(distributedIdService.nextId());
         result.setCreateTime(new Date());
@@ -370,15 +370,15 @@ public class EbsApiServiceImpl implements EbsApiService {
     private void processPLprc(Long id,ProfitLossStatementPrcQueryDto item) {
         ProfitLossStatementExample example = new ProfitLossStatementExample();
         //机构编码和期间
-        example.createCriteria().andEntityCodeEqualTo(item.getEntityCode()).andPeriodEqualTo(convertPeriodStr2Int(item.getPeriod()));
+        example.createCriteria().andEntityCodeEqualTo(item.getEntityCode()).andPeriodEqualTo(convertPeriodStr2Int(item.getPeriod())).andTaskIdEqualTo(item.getTaskId());
         List<ProfitLossStatement> itemList = profitLossStatementMapper.selectByExample(example);
         //唯一则更新否则插入
         ProfitLossStatement result = new ProfitLossStatement();
         if (itemList.size() >0) {
-            logger.debug("exit and delete ProfitLossStatementPrc EntityCode:{},Period:{}", item.getEntityCode(), item.getPeriod());
+            logger.debug("exit and delete ProfitLossStatementPrc EntityCode:{},Period:{},taskId:{}", item.getEntityCode(), item.getPeriod(),item.getTaskId());
             profitLossStatementMapper.deleteByExample(example);
         }
-        logger.debug("insert ProfitLossStatementPrc EntityCode:{},Period:{}", item.getEntityCode(), item.getPeriod());
+        logger.debug("insert ProfitLossStatementPrc EntityCode:{},Period:{},taskId:{}", item.getEntityCode(), item.getPeriod(),item.getTaskId());
         populateFieldsPLSprc(item, result);
         result.setId(distributedIdService.nextId());
         result.setCreateTime(new Date());
@@ -389,19 +389,19 @@ public class EbsApiServiceImpl implements EbsApiService {
     private void processOAR(Long id,OrganizationAccountingRateQueryDto item) {
         OrganizationAccountingRateExample example = new OrganizationAccountingRateExample();
         //期间
-        example.createCriteria().andPeriodEqualTo(convertPeriod12(item.getPeriod()));
+        example.createCriteria().andPeriodEqualTo(convertPeriod12(item.getPeriod())).andTaskIdEqualTo(item.getTaskId());
         List<OrganizationAccountingRate> itemList = organizationAccountingRateMapper.selectByExample(example);
         //唯一则更新否则插入
         OrganizationAccountingRate result = new OrganizationAccountingRate();
         if (itemList.size() >0) {
-            logger.debug("exit and update OrganizationAccountingRate Period:{}", item.getPeriod());
+            logger.debug("exit and update OrganizationAccountingRate Period:{},taskId:{}", item.getPeriod(),item.getTaskId());
             result = itemList.get(0);
             populateFieldsOAR(item, result);
             result.setId(itemList.get(0).getId());
             result.setUpdateBy(getCurrentOperatorName(id));
             organizationAccountingRateMapper.updateByPrimaryKeySelective(result);
         }else {
-            logger.debug("insert OrganizationAccountingRate Period:{}", item.getPeriod());
+            logger.debug("insert OrganizationAccountingRate Period:{},taskId:{}", item.getPeriod(),item.getTaskId());
             populateFieldsOAR(item, result);
             result.setId(distributedIdService.nextId());
             result.setCreateTime(new Date());
@@ -488,6 +488,7 @@ public class EbsApiServiceImpl implements EbsApiService {
         result.setUpdateTime(new Date());
         result.setCreatedBy(item.getCreatedBy());
         result.setCreatedDate(item.getCreatedDate());
+        result.setTaskId(trimLimit(item.getTaskId(), 128));
         result.setTmsPeriod(convertPeriod);
     }
 
@@ -578,6 +579,7 @@ public class EbsApiServiceImpl implements EbsApiService {
                 .map(x -> x.setScale(4, RoundingMode.HALF_UP))
                 .orElse(BigDecimal.ZERO));
         result.setUpdateTime(new Date());
+        result.setTaskId(trimLimit(item.getTaskId(), 128));
         result.setTmsPeriod(convertPeriod);
     }
 
@@ -606,6 +608,7 @@ public class EbsApiServiceImpl implements EbsApiService {
                 .map(x -> x.setScale(4, RoundingMode.HALF_UP))
                 .orElse(BigDecimal.ZERO));
         result.setUpdateTime(new Date());
+        result.setTaskId(trimLimit(item.getTaskId(), 128));
         result.setTmsPeriod(convertPeriod);
     }
 
@@ -633,6 +636,7 @@ public class EbsApiServiceImpl implements EbsApiService {
                 .map(x -> x.setScale(4, RoundingMode.HALF_UP))
                 .orElse(BigDecimal.ZERO));
         result.setUpdateTime(new Date());
+        result.setTaskId(trimLimit(item.getTaskId(), 128));
         result.setTmsPeriod(convertPeriod);
     }
 
@@ -660,6 +664,7 @@ public class EbsApiServiceImpl implements EbsApiService {
                 .map(x -> x.setScale(4, RoundingMode.HALF_UP))
                 .orElse(BigDecimal.ZERO));
         result.setTmsPeriod(convertPeriod);
+        result.setTaskId(trimLimit(item.getTaskId(), 128));
         result.setUpdateTime(new Date());
     }
 
@@ -686,6 +691,7 @@ public class EbsApiServiceImpl implements EbsApiService {
         result.setYtdAmt(Optional.ofNullable(item.getYtdAmt())
                 .map(x -> x.setScale(4, RoundingMode.HALF_UP))
                 .orElse(BigDecimal.ZERO));
+        result.setTaskId(trimLimit(item.getTaskId(), 128));
         result.setTmsPeriod(convertPeriod);
         result.setUpdateTime(new Date());
     }
@@ -713,12 +719,14 @@ public class EbsApiServiceImpl implements EbsApiService {
         result.setYtdAmt(Optional.ofNullable(item.getYtdAmt())
                 .map(x -> x.setScale(4, RoundingMode.HALF_UP))
                 .orElse(BigDecimal.ZERO));
+        result.setTaskId(trimLimit(item.getTaskId(), 128));
         result.setUpdateTime(new Date());
         result.setTmsPeriod(convertPeriod);
     }
 
     private void populateFieldsOAR(OrganizationAccountingRateQueryDto item, OrganizationAccountingRate result) {
-        Integer convertPeriod=convertPeriod12(item.getPeriod());
+        //汇率表period存放格式原始yyyyMMdd
+        Integer convertPeriod=convertPeriodStr2Int(item.getPeriod());
         result.setDate(item.getDate());
         result.setSource(trimLimit(item.getSource(), 128));
         result.setPeriod(convertPeriod);
@@ -727,6 +735,7 @@ public class EbsApiServiceImpl implements EbsApiService {
         result.setCurrencyTo(trimLimit(item.getCurrencyTo(), 10));
         result.setEndDate(ebsDateFormat(item.getInvalidDate()));
         result.setRate(item.getRate().floatValue());
+        result.setTaskId(trimLimit(item.getTaskId(), 128));
         result.setUpdateTime(new Date());
     }
     @Override
@@ -881,10 +890,7 @@ public class EbsApiServiceImpl implements EbsApiService {
     }
 
     /**
-     * 期间格式转换yyyy13均改为yyyy12
-     * 返回的数据与用户在税务系统选择的期间需一致，
-     * 但用户选择12期时请求的数据应为YYYY-12和YYYY-13即12期和13期的数据，
-     * EBS返回的数据可以包含YYYY-12和YYYY-13
+     * 期间格式转换为原始的int类型
      * @param periodStr
      * @return
      */

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

 package pwc.taxtech.atms.dao;
 
-import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.session.RowBounds;
@@ -8,6 +7,8 @@ import pwc.taxtech.atms.MyMapper;
 import pwc.taxtech.atms.entity.OrganizationAccountingRate;
 import pwc.taxtech.atms.entity.OrganizationAccountingRateExample;
 
+import java.util.List;
+
 @Mapper
 public interface OrganizationAccountingRateMapper extends MyMapper {
     /**

atms-dao/src/main/java/pwc/taxtech/atms/entity/OrganizationAccountingRate.java

@@ -35,7 +35,7 @@ public class OrganizationAccountingRate extends BaseEntity implements Serializab
 
     /**
      * Database Column Remarks:
-     *   期间
+     *   期间,与滴滴联调传yyyy-MM-dd转为yyyyMMdd
      *
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column organization_accounting_rate.period
@@ -154,6 +154,17 @@ public class OrganizationAccountingRate extends BaseEntity implements Serializab
      */
     private Date updateTime;
 
+    /**
+     * Database Column Remarks:
+     *   同步用于标记不同分页的数据，避免重复删除
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column organization_accounting_rate.task_id
+     *
+     * @mbg.generated
+     */
+    private String taskId;
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table organization_accounting_rate
@@ -476,10 +487,27 @@ public class OrganizationAccountingRate extends BaseEntity implements Serializab
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table organization_accounting_rate
+     * This method returns the value of the database column organization_accounting_rate.task_id
+     *
+     * @return the value of organization_accounting_rate.task_id
      *
      * @mbg.generated
      */
+    public String getTaskId() {
+        return taskId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization_accounting_rate.task_id
+     *
+     * @param taskId the value for organization_accounting_rate.task_id
+     *
+     * @mbg.generated
+     */
+    public void setTaskId(String taskId) {
+        this.taskId = taskId == null ? null : taskId.trim();
+    }
 
     public OrganizationAccountingRate(){}
 
@@ -488,6 +516,12 @@ public class OrganizationAccountingRate extends BaseEntity implements Serializab
         this.organizationId = orgId;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table organization_accounting_rate
+     *
+     * @mbg.generated
+     */
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -507,6 +541,7 @@ public class OrganizationAccountingRate extends BaseEntity implements Serializab
         sb.append(", rate=").append(rate);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);
+        sb.append(", taskId=").append(taskId);
         sb.append("]");
         return sb.toString();
     }

atms-dao/src/main/java/pwc/taxtech/atms/entity/OrganizationAccountingRateExample.java

@@ -1024,6 +1024,76 @@ public class OrganizationAccountingRateExample {
             addCriterion("update_time not between", value1, value2, "updateTime");
             return (Criteria) this;
         }
+
+        public Criteria andTaskIdIsNull() {
+            addCriterion("task_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdIsNotNull() {
+            addCriterion("task_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdEqualTo(String value) {
+            addCriterion("task_id =", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotEqualTo(String value) {
+            addCriterion("task_id <>", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdGreaterThan(String value) {
+            addCriterion("task_id >", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdGreaterThanOrEqualTo(String value) {
+            addCriterion("task_id >=", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdLessThan(String value) {
+            addCriterion("task_id <", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdLessThanOrEqualTo(String value) {
+            addCriterion("task_id <=", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdLike(String value) {
+            addCriterion("task_id like", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotLike(String value) {
+            addCriterion("task_id not like", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdIn(List<String> values) {
+            addCriterion("task_id in", values, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotIn(List<String> values) {
+            addCriterion("task_id not in", values, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdBetween(String value1, String value2) {
+            addCriterion("task_id between", value1, value2, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotBetween(String value1, String value2) {
+            addCriterion("task_id not between", value1, value2, "taskId");
+            return (Criteria) this;
+        }
     }
 
     /**

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/BalanceSheetMapper.java

 package pwc.taxtech.atms.vat.dao;
 
-import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.session.RowBounds;
@@ -9,6 +8,8 @@ import pwc.taxtech.atms.vat.dpo.BalanceSheetCondition;
 import pwc.taxtech.atms.vat.entity.BalanceSheet;
 import pwc.taxtech.atms.vat.entity.BalanceSheetExample;
 
+import java.util.List;
+
 @Mapper
 public interface BalanceSheetMapper extends MyVatMapper {
     /**

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/JournalEntryMapper.java

 package pwc.taxtech.atms.vat.dao;
 
-import java.util.List;
-import java.util.Map;
-
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.session.RowBounds;
@@ -11,6 +8,9 @@ import pwc.taxtech.atms.vat.dpo.JournalEntryCondition;
 import pwc.taxtech.atms.vat.entity.JournalEntry;
 import pwc.taxtech.atms.vat.entity.JournalEntryExample;
 
+import java.util.List;
+import java.util.Map;
+
 @Mapper
 public interface JournalEntryMapper extends MyVatMapper {
     /**
@@ -109,7 +109,7 @@ public interface JournalEntryMapper extends MyVatMapper {
      */
     int updateByPrimaryKey(JournalEntry record);
 
-    List<JournalEntry> selectByCondition(@Param("jeCondition")JournalEntryCondition journalEntryCondition);
+    List<JournalEntry> selectByCondition(@Param("jeCondition") JournalEntryCondition journalEntryCondition);
 
     List<JournalEntry> selectNowAdjustData(Map<String,Object> map2);
 }
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/ProfitLossStatementMapper.java

 package pwc.taxtech.atms.vat.dao;
 
-import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.session.RowBounds;
@@ -9,6 +8,8 @@ import pwc.taxtech.atms.vat.dpo.ProfitLossStatementCondition;
 import pwc.taxtech.atms.vat.entity.ProfitLossStatement;
 import pwc.taxtech.atms.vat.entity.ProfitLossStatementExample;
 
+import java.util.List;
+
 @Mapper
 public interface ProfitLossStatementMapper extends MyVatMapper {
     /**
@@ -107,7 +108,7 @@ public interface ProfitLossStatementMapper extends MyVatMapper {
      */
     int updateByPrimaryKey(ProfitLossStatement record);
 
-    List<ProfitLossStatement> selectByCondition(@Param("plCondition")ProfitLossStatementCondition condition);
+    List<ProfitLossStatement> selectByCondition(@Param("plCondition") ProfitLossStatementCondition condition);
 
     int insertBatch(List<ProfitLossStatement> pls);
 }
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/TrialBalanceMapper.java

 package pwc.taxtech.atms.vat.dao;
 
-import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.session.RowBounds;
@@ -9,6 +8,8 @@ import pwc.taxtech.atms.vat.dpo.TrialBalanceCondition;
 import pwc.taxtech.atms.vat.entity.TrialBalance;
 import pwc.taxtech.atms.vat.entity.TrialBalanceExample;
 
+import java.util.List;
+
 @Mapper
 public interface TrialBalanceMapper extends MyVatMapper {
     /**

atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/BalanceSheet.java

@@ -244,6 +244,17 @@ public class BalanceSheet extends BaseEntity implements Serializable {
      */
     private Date updateTime;
 
+    /**
+     * Database Column Remarks:
+     *   同步用于标记不同分页的数据，避免重复删除
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column balance_sheet.task_id
+     *
+     * @mbg.generated
+     */
+    private String taskId;
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table balance_sheet
@@ -756,6 +767,30 @@ public class BalanceSheet extends BaseEntity implements Serializable {
         this.updateTime = updateTime;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column balance_sheet.task_id
+     *
+     * @return the value of balance_sheet.task_id
+     *
+     * @mbg.generated
+     */
+    public String getTaskId() {
+        return taskId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column balance_sheet.task_id
+     *
+     * @param taskId the value for balance_sheet.task_id
+     *
+     * @mbg.generated
+     */
+    public void setTaskId(String taskId) {
+        this.taskId = taskId == null ? null : taskId.trim();
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table balance_sheet
@@ -789,6 +824,7 @@ public class BalanceSheet extends BaseEntity implements Serializable {
         sb.append(", prcFlag=").append(prcFlag);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);
+        sb.append(", taskId=").append(taskId);
         sb.append("]");
         return sb.toString();
     }

atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/BalanceSheetExample.java

@@ -1575,6 +1575,76 @@ public class BalanceSheetExample {
             addCriterion("update_time not between", value1, value2, "updateTime");
             return (Criteria) this;
         }
+
+        public Criteria andTaskIdIsNull() {
+            addCriterion("task_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdIsNotNull() {
+            addCriterion("task_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdEqualTo(String value) {
+            addCriterion("task_id =", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotEqualTo(String value) {
+            addCriterion("task_id <>", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdGreaterThan(String value) {
+            addCriterion("task_id >", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdGreaterThanOrEqualTo(String value) {
+            addCriterion("task_id >=", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdLessThan(String value) {
+            addCriterion("task_id <", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdLessThanOrEqualTo(String value) {
+            addCriterion("task_id <=", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdLike(String value) {
+            addCriterion("task_id like", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotLike(String value) {
+            addCriterion("task_id not like", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdIn(List<String> values) {
+            addCriterion("task_id in", values, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotIn(List<String> values) {
+            addCriterion("task_id not in", values, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdBetween(String value1, String value2) {
+            addCriterion("task_id between", value1, value2, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotBetween(String value1, String value2) {
+            addCriterion("task_id not between", value1, value2, "taskId");
+            return (Criteria) this;
+        }
     }
 
     /**

atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/CashFlow.java

@@ -241,6 +241,17 @@ public class CashFlow extends BaseEntity implements Serializable {
      */
     private Date updateTime;
 
+    /**
+     * Database Column Remarks:
+     *   同步用于标记不同分页的数据，避免重复删除
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cash_flow.task_id
+     *
+     * @mbg.generated
+     */
+    private String taskId;
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table cash_flow
@@ -753,6 +764,30 @@ public class CashFlow extends BaseEntity implements Serializable {
         this.updateTime = updateTime;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cash_flow.task_id
+     *
+     * @return the value of cash_flow.task_id
+     *
+     * @mbg.generated
+     */
+    public String getTaskId() {
+        return taskId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cash_flow.task_id
+     *
+     * @param taskId the value for cash_flow.task_id
+     *
+     * @mbg.generated
+     */
+    public void setTaskId(String taskId) {
+        this.taskId = taskId == null ? null : taskId.trim();
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table cash_flow
@@ -786,6 +821,7 @@ public class CashFlow extends BaseEntity implements Serializable {
         sb.append(", ytdAmt=").append(ytdAmt);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);
+        sb.append(", taskId=").append(taskId);
         sb.append("]");
         return sb.toString();
     }

atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/CashFlowExample.java

@@ -1585,6 +1585,76 @@ public class CashFlowExample {
             addCriterion("update_time not between", value1, value2, "updateTime");
             return (Criteria) this;
         }
+
+        public Criteria andTaskIdIsNull() {
+            addCriterion("task_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdIsNotNull() {
+            addCriterion("task_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdEqualTo(String value) {
+            addCriterion("task_id =", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotEqualTo(String value) {
+            addCriterion("task_id <>", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdGreaterThan(String value) {
+            addCriterion("task_id >", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdGreaterThanOrEqualTo(String value) {
+            addCriterion("task_id >=", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdLessThan(String value) {
+            addCriterion("task_id <", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdLessThanOrEqualTo(String value) {
+            addCriterion("task_id <=", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdLike(String value) {
+            addCriterion("task_id like", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotLike(String value) {
+            addCriterion("task_id not like", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdIn(List<String> values) {
+            addCriterion("task_id in", values, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotIn(List<String> values) {
+            addCriterion("task_id not in", values, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdBetween(String value1, String value2) {
+            addCriterion("task_id between", value1, value2, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotBetween(String value1, String value2) {
+            addCriterion("task_id not between", value1, value2, "taskId");
+            return (Criteria) this;
+        }
     }
 
     /**

atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/JournalEntry.java

@@ -783,6 +783,17 @@ public class JournalEntry extends BaseEntity implements Serializable {
      */
     private Date updateTime;
 
+    /**
+     * Database Column Remarks:
+     *   同步用于标记不同分页的数据，避免重复删除
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column journal_entry.task_id
+     *
+     * @mbg.generated
+     */
+    private String taskId;
+
     private BigDecimal  periodJrMinDr;
 
     public BigDecimal getPeriodJrMinDr() {
@@ -792,7 +803,6 @@ public class JournalEntry extends BaseEntity implements Serializable {
     public void setPeriodJrMinDr(BigDecimal periodJrMinDr) {
         this.periodJrMinDr = periodJrMinDr;
     }
-
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table journal_entry
@@ -2481,6 +2491,30 @@ public class JournalEntry extends BaseEntity implements Serializable {
         this.updateTime = updateTime;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column journal_entry.task_id
+     *
+     * @return the value of journal_entry.task_id
+     *
+     * @mbg.generated
+     */
+    public String getTaskId() {
+        return taskId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column journal_entry.task_id
+     *
+     * @param taskId the value for journal_entry.task_id
+     *
+     * @mbg.generated
+     */
+    public void setTaskId(String taskId) {
+        this.taskId = taskId == null ? null : taskId.trim();
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table journal_entry
@@ -2563,6 +2597,7 @@ public class JournalEntry extends BaseEntity implements Serializable {
         sb.append(", lateUpdatedDate=").append(lateUpdatedDate);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);
+        sb.append(", taskId=").append(taskId);
         sb.append("]");
         return sb.toString();
     }

atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/JournalEntryExample.java

@@ -4955,6 +4955,76 @@ public class JournalEntryExample {
             addCriterion("update_time not between", value1, value2, "updateTime");
             return (Criteria) this;
         }
+
+        public Criteria andTaskIdIsNull() {
+            addCriterion("task_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdIsNotNull() {
+            addCriterion("task_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdEqualTo(String value) {
+            addCriterion("task_id =", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotEqualTo(String value) {
+            addCriterion("task_id <>", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdGreaterThan(String value) {
+            addCriterion("task_id >", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdGreaterThanOrEqualTo(String value) {
+            addCriterion("task_id >=", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdLessThan(String value) {
+            addCriterion("task_id <", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdLessThanOrEqualTo(String value) {
+            addCriterion("task_id <=", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdLike(String value) {
+            addCriterion("task_id like", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotLike(String value) {
+            addCriterion("task_id not like", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdIn(List<String> values) {
+            addCriterion("task_id in", values, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotIn(List<String> values) {
+            addCriterion("task_id not in", values, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdBetween(String value1, String value2) {
+            addCriterion("task_id between", value1, value2, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotBetween(String value1, String value2) {
+            addCriterion("task_id not between", value1, value2, "taskId");
+            return (Criteria) this;
+        }
     }
 
     /**

atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/ProfitLossStatement.java

@@ -244,6 +244,17 @@ public class ProfitLossStatement extends BaseEntity implements Serializable {
      */
     private Date updateTime;
 
+    /**
+     * Database Column Remarks:
+     *   同步用于标记不同分页的数据，避免重复删除
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column profit_loss_statement.task_id
+     *
+     * @mbg.generated
+     */
+    private String taskId;
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table profit_loss_statement
@@ -756,6 +767,30 @@ public class ProfitLossStatement extends BaseEntity implements Serializable {
         this.updateTime = updateTime;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column profit_loss_statement.task_id
+     *
+     * @return the value of profit_loss_statement.task_id
+     *
+     * @mbg.generated
+     */
+    public String getTaskId() {
+        return taskId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column profit_loss_statement.task_id
+     *
+     * @param taskId the value for profit_loss_statement.task_id
+     *
+     * @mbg.generated
+     */
+    public void setTaskId(String taskId) {
+        this.taskId = taskId == null ? null : taskId.trim();
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table profit_loss_statement
@@ -789,6 +824,7 @@ public class ProfitLossStatement extends BaseEntity implements Serializable {
         sb.append(", prcFlag=").append(prcFlag);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);
+        sb.append(", taskId=").append(taskId);
         sb.append("]");
         return sb.toString();
     }

atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/ProfitLossStatementExample.java

@@ -1575,6 +1575,76 @@ public class ProfitLossStatementExample {
             addCriterion("update_time not between", value1, value2, "updateTime");
             return (Criteria) this;
         }
+
+        public Criteria andTaskIdIsNull() {
+            addCriterion("task_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdIsNotNull() {
+            addCriterion("task_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdEqualTo(String value) {
+            addCriterion("task_id =", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotEqualTo(String value) {
+            addCriterion("task_id <>", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdGreaterThan(String value) {
+            addCriterion("task_id >", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdGreaterThanOrEqualTo(String value) {
+            addCriterion("task_id >=", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdLessThan(String value) {
+            addCriterion("task_id <", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdLessThanOrEqualTo(String value) {
+            addCriterion("task_id <=", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdLike(String value) {
+            addCriterion("task_id like", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotLike(String value) {
+            addCriterion("task_id not like", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdIn(List<String> values) {
+            addCriterion("task_id in", values, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotIn(List<String> values) {
+            addCriterion("task_id not in", values, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdBetween(String value1, String value2) {
+            addCriterion("task_id between", value1, value2, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotBetween(String value1, String value2) {
+            addCriterion("task_id not between", value1, value2, "taskId");
+            return (Criteria) this;
+        }
     }
 
     /**

atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/TrialBalance.java

@@ -618,6 +618,17 @@ public class TrialBalance extends BaseEntity implements Serializable {
      */
     private Date updateTime;
 
+    /**
+     * Database Column Remarks:
+     *   同步用于标记不同分页的数据，避免重复删除
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column trial_balance.task_id
+     *
+     * @mbg.generated
+     */
+    private String taskId;
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table trial_balance
@@ -1946,6 +1957,30 @@ public class TrialBalance extends BaseEntity implements Serializable {
         this.updateTime = updateTime;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column trial_balance.task_id
+     *
+     * @return the value of trial_balance.task_id
+     *
+     * @mbg.generated
+     */
+    public String getTaskId() {
+        return taskId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column trial_balance.task_id
+     *
+     * @param taskId the value for trial_balance.task_id
+     *
+     * @mbg.generated
+     */
+    public void setTaskId(String taskId) {
+        this.taskId = taskId == null ? null : taskId.trim();
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table trial_balance
@@ -2013,6 +2048,7 @@ public class TrialBalance extends BaseEntity implements Serializable {
         sb.append(", ytdCrBeq=").append(ytdCrBeq);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);
+        sb.append(", taskId=").append(taskId);
         sb.append("]");
         return sb.toString();
     }

atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/TrialBalanceExample.java

@@ -3825,6 +3825,76 @@ public class TrialBalanceExample {
             addCriterion("update_time not between", value1, value2, "updateTime");
             return (Criteria) this;
         }
+
+        public Criteria andTaskIdIsNull() {
+            addCriterion("task_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdIsNotNull() {
+            addCriterion("task_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdEqualTo(String value) {
+            addCriterion("task_id =", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotEqualTo(String value) {
+            addCriterion("task_id <>", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdGreaterThan(String value) {
+            addCriterion("task_id >", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdGreaterThanOrEqualTo(String value) {
+            addCriterion("task_id >=", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdLessThan(String value) {
+            addCriterion("task_id <", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdLessThanOrEqualTo(String value) {
+            addCriterion("task_id <=", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdLike(String value) {
+            addCriterion("task_id like", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotLike(String value) {
+            addCriterion("task_id not like", value, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdIn(List<String> values) {
+            addCriterion("task_id in", values, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotIn(List<String> values) {
+            addCriterion("task_id not in", values, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdBetween(String value1, String value2) {
+            addCriterion("task_id between", value1, value2, "taskId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaskIdNotBetween(String value1, String value2) {
+            addCriterion("task_id not between", value1, value2, "taskId");
+            return (Criteria) this;
+        }
     }
 
     /**

atms-dao/src/main/resources/pwc/taxtech/atms/dao/OrganizationAccountingRateMapper.xml

@@ -19,6 +19,7 @@
     <result column="rate" jdbcType="REAL" property="rate" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="task_id" jdbcType="VARCHAR" property="taskId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -92,7 +93,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     id, organization_id, period, date, source, convertion_type, currency_from, currency_to, 
-    start_date, end_date, rate, create_time, update_time
+    start_date, end_date, rate, create_time, update_time, task_id
   </sql>
   <select id="selectByExample" parameterType="pwc.taxtech.atms.entity.OrganizationAccountingRateExample" resultMap="BaseResultMap">
     <!--
@@ -149,12 +150,12 @@
       date, source, convertion_type, 
       currency_from, currency_to, start_date, 
       end_date, rate, create_time, 
-      update_time)
+      update_time, task_id)
     values (#{id,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, #{period,jdbcType=INTEGER}, 
       #{date,jdbcType=TIMESTAMP}, #{source,jdbcType=VARCHAR}, #{convertionType,jdbcType=VARCHAR}, 
       #{currencyFrom,jdbcType=VARCHAR}, #{currencyTo,jdbcType=VARCHAR}, #{startDate,jdbcType=TIMESTAMP}, 
       #{endDate,jdbcType=TIMESTAMP}, #{rate,jdbcType=REAL}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP})
+      #{updateTime,jdbcType=TIMESTAMP}, #{taskId,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="pwc.taxtech.atms.entity.OrganizationAccountingRate">
     <!--
@@ -202,6 +203,9 @@
       <if test="updateTime != null">
         update_time,
       </if>
+      <if test="taskId != null">
+        task_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -243,6 +247,9 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="taskId != null">
+        #{taskId,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="pwc.taxtech.atms.entity.OrganizationAccountingRateExample" resultType="java.lang.Long">
@@ -301,6 +308,9 @@
       <if test="record.updateTime != null">
         update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.taskId != null">
+        task_id = #{record.taskId,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -324,7 +334,8 @@
       end_date = #{record.endDate,jdbcType=TIMESTAMP},
       rate = #{record.rate,jdbcType=REAL},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      task_id = #{record.taskId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -372,6 +383,9 @@
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="taskId != null">
+        task_id = #{taskId,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -392,7 +406,8 @@
       end_date = #{endDate,jdbcType=TIMESTAMP},
       rate = #{rate,jdbcType=REAL},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP}
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      task_id = #{taskId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
   <select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.entity.OrganizationAccountingRateExample" resultMap="BaseResultMap">

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/BalanceSheetMapper.xml

@@ -27,6 +27,7 @@
     <result column="prc_flag" jdbcType="BIT" property="prcFlag" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="task_id" jdbcType="VARCHAR" property="taskId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -101,7 +102,7 @@
     -->
     id, organization_id, project_id, `date`, `source`, tms_period, period, `status`, 
     ledger_id, ledger_name, ledger_currency_code, entity_code, entity_name, category, 
-    frequency, item_name, end_bal, beg_bal, prc_flag, create_time, update_time
+    frequency, item_name, end_bal, beg_bal, prc_flag, create_time, update_time, task_id
   </sql>
   <select id="selectByExample" parameterType="pwc.taxtech.atms.vat.entity.BalanceSheetExample" resultMap="BaseResultMap">
     <!--
@@ -160,16 +161,16 @@
       ledger_name, ledger_currency_code, entity_code, 
       entity_name, category, frequency, 
       item_name, end_bal, beg_bal, 
-      prc_flag, create_time, update_time
-      )
+      prc_flag, create_time, update_time, 
+      task_id)
     values (#{id,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, 
       #{date,jdbcType=TIMESTAMP}, #{source,jdbcType=VARCHAR}, #{tmsPeriod,jdbcType=INTEGER}, 
       #{period,jdbcType=INTEGER}, #{status,jdbcType=VARCHAR}, #{ledgerId,jdbcType=VARCHAR}, 
       #{ledgerName,jdbcType=VARCHAR}, #{ledgerCurrencyCode,jdbcType=VARCHAR}, #{entityCode,jdbcType=VARCHAR}, 
       #{entityName,jdbcType=VARCHAR}, #{category,jdbcType=VARCHAR}, #{frequency,jdbcType=VARCHAR}, 
       #{itemName,jdbcType=VARCHAR}, #{endBal,jdbcType=DECIMAL}, #{begBal,jdbcType=DECIMAL}, 
-      #{prcFlag,jdbcType=BIT}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
-      )
+      #{prcFlag,jdbcType=BIT}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{taskId,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="pwc.taxtech.atms.vat.entity.BalanceSheet">
     <!--
@@ -241,6 +242,9 @@
       <if test="updateTime != null">
         update_time,
       </if>
+      <if test="taskId != null">
+        task_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -306,6 +310,9 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="taskId != null">
+        #{taskId,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="pwc.taxtech.atms.vat.entity.BalanceSheetExample" resultType="java.lang.Long">
@@ -388,6 +395,9 @@
       <if test="record.updateTime != null">
         update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.taskId != null">
+        task_id = #{record.taskId,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -419,7 +429,8 @@
       beg_bal = #{record.begBal,jdbcType=DECIMAL},
       prc_flag = #{record.prcFlag,jdbcType=BIT},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      task_id = #{record.taskId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -491,6 +502,9 @@
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="taskId != null">
+        task_id = #{taskId,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -519,7 +533,8 @@
       beg_bal = #{begBal,jdbcType=DECIMAL},
       prc_flag = #{prcFlag,jdbcType=BIT},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP}
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      task_id = #{taskId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
   <select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.vat.entity.BalanceSheetExample" resultMap="BaseResultMap">

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/CashFlowMapper.xml

@@ -27,6 +27,7 @@
     <result column="ytd_amt" jdbcType="DECIMAL" property="ytdAmt" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="task_id" jdbcType="VARCHAR" property="taskId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -101,7 +102,8 @@
     -->
     id, organization_id, project_id, `date`, `source`, tms_period, period, `status`, 
     ledger_id, ledger_name, ledger_currency_code, entity_code, entity_name, category, 
-    frequency, item_name, item_name2, period_amt, ytd_amt, create_time, update_time
+    frequency, item_name, item_name2, period_amt, ytd_amt, create_time, update_time, 
+    task_id
   </sql>
   <select id="selectByExample" parameterType="pwc.taxtech.atms.vat.entity.CashFlowExample" resultMap="BaseResultMap">
     <!--
@@ -160,16 +162,16 @@
       ledger_name, ledger_currency_code, entity_code, 
       entity_name, category, frequency, 
       item_name, item_name2, period_amt, 
-      ytd_amt, create_time, update_time
-      )
+      ytd_amt, create_time, update_time, 
+      task_id)
     values (#{id,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, 
       #{date,jdbcType=TIMESTAMP}, #{source,jdbcType=VARCHAR}, #{tmsPeriod,jdbcType=INTEGER}, 
       #{period,jdbcType=INTEGER}, #{status,jdbcType=VARCHAR}, #{ledgerId,jdbcType=VARCHAR}, 
       #{ledgerName,jdbcType=VARCHAR}, #{ledgerCurrencyCode,jdbcType=VARCHAR}, #{entityCode,jdbcType=VARCHAR}, 
       #{entityName,jdbcType=VARCHAR}, #{category,jdbcType=VARCHAR}, #{frequency,jdbcType=VARCHAR}, 
       #{itemName,jdbcType=VARCHAR}, #{itemName2,jdbcType=VARCHAR}, #{periodAmt,jdbcType=DECIMAL}, 
-      #{ytdAmt,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
-      )
+      #{ytdAmt,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{taskId,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="pwc.taxtech.atms.vat.entity.CashFlow">
     <!--
@@ -241,6 +243,9 @@
       <if test="updateTime != null">
         update_time,
       </if>
+      <if test="taskId != null">
+        task_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -306,6 +311,9 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="taskId != null">
+        #{taskId,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="pwc.taxtech.atms.vat.entity.CashFlowExample" resultType="java.lang.Long">
@@ -388,6 +396,9 @@
       <if test="record.updateTime != null">
         update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.taskId != null">
+        task_id = #{record.taskId,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -419,7 +430,8 @@
       period_amt = #{record.periodAmt,jdbcType=DECIMAL},
       ytd_amt = #{record.ytdAmt,jdbcType=DECIMAL},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      task_id = #{record.taskId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -491,6 +503,9 @@
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="taskId != null">
+        task_id = #{taskId,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -519,7 +534,8 @@
       period_amt = #{periodAmt,jdbcType=DECIMAL},
       ytd_amt = #{ytdAmt,jdbcType=DECIMAL},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP}
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      task_id = #{taskId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
   <select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.vat.entity.CashFlowExample" resultMap="BaseResultMap">

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/JournalEntryMapper.xml

@@ -76,6 +76,7 @@
     <result column="late_updated_date" jdbcType="TIMESTAMP" property="lateUpdatedDate" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="task_id" jdbcType="VARCHAR" property="taskId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -158,7 +159,7 @@
     attribute2, attribute3, attribute4, attribute5, attribute6, attribute7, attribute8, 
     attribute9, attribute10, attribute11, attribute12, attribute13, attribute14, attribute15, 
     attribute16, created_by, created_date, late_updated_by, late_updated_date, create_time, 
-    update_time
+    update_time, task_id
   </sql>
   <select id="selectByExample" parameterType="pwc.taxtech.atms.vat.entity.JournalEntryExample" resultMap="BaseResultMap">
     <!--
@@ -234,7 +235,7 @@
       attribute13, attribute14, attribute15, 
       attribute16, created_by, created_date, 
       late_updated_by, late_updated_date, create_time, 
-      update_time)
+      update_time, task_id)
     values (#{id,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, 
       #{date,jdbcType=TIMESTAMP}, #{source,jdbcType=VARCHAR}, #{ledgerId,jdbcType=VARCHAR}, 
       #{ledgerName,jdbcType=VARCHAR}, #{currencyCode,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, 
@@ -258,7 +259,7 @@
       #{attribute13,jdbcType=VARCHAR}, #{attribute14,jdbcType=VARCHAR}, #{attribute15,jdbcType=VARCHAR}, 
       #{attribute16,jdbcType=VARCHAR}, #{createdBy,jdbcType=VARCHAR}, #{createdDate,jdbcType=TIMESTAMP}, 
       #{lateUpdatedBy,jdbcType=VARCHAR}, #{lateUpdatedDate,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP})
+      #{updateTime,jdbcType=TIMESTAMP}, #{taskId,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="pwc.taxtech.atms.vat.entity.JournalEntry">
     <!--
@@ -477,6 +478,9 @@
       <if test="updateTime != null">
         update_time,
       </if>
+      <if test="taskId != null">
+        task_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -689,6 +693,9 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="taskId != null">
+        #{taskId,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="pwc.taxtech.atms.vat.entity.JournalEntryExample" resultType="java.lang.Long">
@@ -918,6 +925,9 @@
       <if test="record.updateTime != null">
         update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.taskId != null">
+        task_id = #{record.taskId,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -998,7 +1008,8 @@
       late_updated_by = #{record.lateUpdatedBy,jdbcType=VARCHAR},
       late_updated_date = #{record.lateUpdatedDate,jdbcType=TIMESTAMP},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      task_id = #{record.taskId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -1217,6 +1228,9 @@
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="taskId != null">
+        task_id = #{taskId,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -1294,7 +1308,8 @@
       late_updated_by = #{lateUpdatedBy,jdbcType=VARCHAR},
       late_updated_date = #{lateUpdatedDate,jdbcType=TIMESTAMP},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP}
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      task_id = #{taskId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
   <select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.vat.entity.JournalEntryExample" resultMap="BaseResultMap">

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/ProfitLossStatementMapper.xml

@@ -27,6 +27,7 @@
     <result column="prc_flag" jdbcType="BIT" property="prcFlag" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="task_id" jdbcType="VARCHAR" property="taskId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -101,7 +102,7 @@
     -->
     id, organization_id, project_id, `date`, `source`, tms_period, period, `status`, 
     ledger_id, ledger_name, ledger_currency_code, entity_code, entity_name, category, 
-    frequency, item_name, period_amt, ytd_amt, prc_flag, create_time, update_time
+    frequency, item_name, period_amt, ytd_amt, prc_flag, create_time, update_time, task_id
   </sql>
   <select id="selectByExample" parameterType="pwc.taxtech.atms.vat.entity.ProfitLossStatementExample" resultMap="BaseResultMap">
     <!--
@@ -160,16 +161,16 @@
       ledger_name, ledger_currency_code, entity_code, 
       entity_name, category, frequency, 
       item_name, period_amt, ytd_amt, 
-      prc_flag, create_time, update_time
-      )
+      prc_flag, create_time, update_time, 
+      task_id)
     values (#{id,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, 
       #{date,jdbcType=TIMESTAMP}, #{source,jdbcType=VARCHAR}, #{tmsPeriod,jdbcType=INTEGER}, 
       #{period,jdbcType=INTEGER}, #{status,jdbcType=VARCHAR}, #{ledgerId,jdbcType=VARCHAR}, 
       #{ledgerName,jdbcType=VARCHAR}, #{ledgerCurrencyCode,jdbcType=VARCHAR}, #{entityCode,jdbcType=VARCHAR}, 
       #{entityName,jdbcType=VARCHAR}, #{category,jdbcType=VARCHAR}, #{frequency,jdbcType=VARCHAR}, 
       #{itemName,jdbcType=VARCHAR}, #{periodAmt,jdbcType=DECIMAL}, #{ytdAmt,jdbcType=DECIMAL}, 
-      #{prcFlag,jdbcType=BIT}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
-      )
+      #{prcFlag,jdbcType=BIT}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{taskId,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="pwc.taxtech.atms.vat.entity.ProfitLossStatement">
     <!--
@@ -241,6 +242,9 @@
       <if test="updateTime != null">
         update_time,
       </if>
+      <if test="taskId != null">
+        task_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -306,6 +310,9 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="taskId != null">
+        #{taskId,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="pwc.taxtech.atms.vat.entity.ProfitLossStatementExample" resultType="java.lang.Long">
@@ -388,6 +395,9 @@
       <if test="record.updateTime != null">
         update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.taskId != null">
+        task_id = #{record.taskId,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -419,7 +429,8 @@
       ytd_amt = #{record.ytdAmt,jdbcType=DECIMAL},
       prc_flag = #{record.prcFlag,jdbcType=BIT},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      task_id = #{record.taskId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -491,6 +502,9 @@
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="taskId != null">
+        task_id = #{taskId,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -519,7 +533,8 @@
       ytd_amt = #{ytdAmt,jdbcType=DECIMAL},
       prc_flag = #{prcFlag,jdbcType=BIT},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP}
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      task_id = #{taskId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
   <select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.vat.entity.ProfitLossStatementExample" resultMap="BaseResultMap">

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/TrialBalanceMapper.xml

@@ -61,6 +61,7 @@
     <result column="ytd_cr_beq" jdbcType="DECIMAL" property="ytdCrBeq" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="task_id" jdbcType="VARCHAR" property="taskId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -140,7 +141,7 @@
     segment4_name, segment5_name, segment6_name, segment7_name, segment8_name, segment9_name, 
     segment10_name, beg_bal, period_dr, period_cr, end_bal, qtd_dr, qtd_cr, ytd_dr, ytd_cr, 
     beg_bal_beq, period_dr_beq, period_cr_beq, end_bal_beq, qtd_dr_beq, qtd_cr_beq, ytd_dr_beq, 
-    ytd_cr_beq, create_time, update_time
+    ytd_cr_beq, create_time, update_time, task_id
   </sql>
   <select id="selectByExample" parameterType="pwc.taxtech.atms.vat.entity.TrialBalanceExample" resultMap="BaseResultMap">
     <!--
@@ -211,7 +212,7 @@
       beg_bal_beq, period_dr_beq, period_cr_beq, 
       end_bal_beq, qtd_dr_beq, qtd_cr_beq, 
       ytd_dr_beq, ytd_cr_beq, create_time, 
-      update_time)
+      update_time, task_id)
     values (#{id,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, 
       #{date,jdbcType=TIMESTAMP}, #{source,jdbcType=VARCHAR}, #{tmsPeriod,jdbcType=INTEGER}, 
       #{period,jdbcType=INTEGER}, #{ledgerId,jdbcType=VARCHAR}, #{ledgerName,jdbcType=VARCHAR}, 
@@ -230,7 +231,7 @@
       #{begBalBeq,jdbcType=DECIMAL}, #{periodDrBeq,jdbcType=DECIMAL}, #{periodCrBeq,jdbcType=DECIMAL}, 
       #{endBalBeq,jdbcType=DECIMAL}, #{qtdDrBeq,jdbcType=DECIMAL}, #{qtdCrBeq,jdbcType=DECIMAL}, 
       #{ytdDrBeq,jdbcType=DECIMAL}, #{ytdCrBeq,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP})
+      #{updateTime,jdbcType=TIMESTAMP}, #{taskId,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="pwc.taxtech.atms.vat.entity.TrialBalance">
     <!--
@@ -404,6 +405,9 @@
       <if test="updateTime != null">
         update_time,
       </if>
+      <if test="taskId != null">
+        task_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -571,6 +575,9 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="taskId != null">
+        #{taskId,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="pwc.taxtech.atms.vat.entity.TrialBalanceExample" resultType="java.lang.Long">
@@ -755,6 +762,9 @@
       <if test="record.updateTime != null">
         update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.taskId != null">
+        task_id = #{record.taskId,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -820,7 +830,8 @@
       ytd_dr_beq = #{record.ytdDrBeq,jdbcType=DECIMAL},
       ytd_cr_beq = #{record.ytdCrBeq,jdbcType=DECIMAL},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      task_id = #{record.taskId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -994,6 +1005,9 @@
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="taskId != null">
+        task_id = #{taskId,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -1056,7 +1070,8 @@
       ytd_dr_beq = #{ytdDrBeq,jdbcType=DECIMAL},
       ytd_cr_beq = #{ytdCrBeq,jdbcType=DECIMAL},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP}
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      task_id = #{taskId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
   <select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.vat.entity.TrialBalanceExample" resultMap="BaseResultMap">