fix:合同添加起始月

src/main/java/cn/ezhizao/project/business/order/controller/BizArchiveInputController.java

@@ -229,7 +229,9 @@ public class BizArchiveInputController extends BaseController {
     @Log(title = "档案审核", businessType = BusinessType.UPDATE)
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult verify(@RequestBody BizArchiveInput bizArchiveInput) {
-        return toAjax(bizArchiveInputService.verify(bizArchiveInput));
+        boolean flag = bizArchiveInputService.verify(bizArchiveInput);
+        bizArchiveInputService.saveDetailMonth(bizArchiveInput);
+        return toAjax(flag);
     }
 
     @PreAuthorize("@ss.hasPermi('business:archive:order:alter')")
@@ -280,7 +282,8 @@ public class BizArchiveInputController extends BaseController {
         bizArchiveInput.setDissolution(1);
         //传入当前时间为解除时间
         bizArchiveInput.setDissDate(new Date(System.currentTimeMillis()));
-        return toAjax(status && bizArchiveInputService.updateById(bizArchiveInput));
+        return toAjax(status && bizArchiveInputService.updateById(bizArchiveInput)
+                && bizArchiveInputService.saveDetailMonth(bizArchiveInput));
     }
 
 

src/main/java/cn/ezhizao/project/business/order/domain/BizArchiveInputDetail.java

@@ -168,4 +168,8 @@ public class BizArchiveInputDetail extends BaseEntity {
 
     @TableField(exist = false)
     private TimeVo timeVo;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date inputStartMonth;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date inputEndMonth;
 }

src/main/java/cn/ezhizao/project/business/order/service/IBizArchiveInputService.java

@@ -51,4 +51,5 @@ public interface IBizArchiveInputService extends IService<BizArchiveInput>
     List<BizArchiveInput> getListByInput(InputVo bizArchiveInput);
     boolean addLoopTasks(BizWorkOrder workOrder);
     boolean stopLoopTasks(BizWorkOrder workOrder);
+    boolean saveDetailMonth(BizArchiveInput bizArchiveInput);
 }

src/main/java/cn/ezhizao/project/business/order/service/impl/BizArchiveInputServiceImpl.java

@@ -423,6 +423,26 @@ public class BizArchiveInputServiceImpl extends ServiceImpl<BizArchiveInputMappe
         return true;
     }
 
+    @Override
+    public boolean saveDetailMonth(BizArchiveInput bizArchiveInput) {
+        if (bizArchiveInput.getVerifyStatus().equals(1)) {
+            // 判断是循环还是单次
+            if (bizArchiveInput.getServiceType().equals(1)) {
+                List<BizArchiveInputDetail> inputDetailList = archiveInputDetailService.query()
+                        .eq("contract_id",bizArchiveInput.getId()).list();
+                inputDetailList.forEach(inputDetail->{
+                    TimeVo vo = getTime(bizArchiveInput.getId(),inputDetail.getId(),inputDetail.getTaskTypeId(),inputDetail.getCompanyId());
+                    if(null != vo){
+                        inputDetail.setInputStartMonth(vo.getStartTime());
+                        inputDetail.setInputEndMonth(vo.getEndTime());
+                        archiveInputDetailService.updateById(inputDetail);
+                    }
+                });
+            }
+        }
+        return true;
+    }
+
     private boolean stopHousingFund(BizWorkOrder workOrder) {
         List<Map<String, Object>> maps = Arrays.stream(housingFundTaskTableNames).map(v -> {
             Map<String, Object> map = new HashMap<>();
@@ -1278,6 +1298,7 @@ public class BizArchiveInputServiceImpl extends ServiceImpl<BizArchiveInputMappe
         workOrderService.saveBatch(bizWorkOrders);
         workOrderDetailService.saveBatch(bizWorkOrderDetails);
         bizWorkOrders.forEach(this::addLoopTasks);
+        archiveInputs.forEach(this::saveDetailMonth);
         if (failureNum > 0) {
             failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
             throw new ServiceException(failureMsg.toString());

src/main/java/cn/ezhizao/project/business/workOrder/controller/BizWorkOrderController.java

@@ -384,6 +384,15 @@ public class BizWorkOrderController extends BaseController {
     @PutMapping
     public AjaxResult edit(@RequestBody BizWorkOrder bizWorkOrder) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(bizWorkOrder);
+        List<BizArchiveInputDetail> inputDetailList = bizArchiveInputDetailService.query()
+                .eq("id",bizWorkOrder.getContractDetailId())
+                .eq("task_type_id",bizWorkOrder.getTaskTypeId()).list();
+        if(!inputDetailList.isEmpty()){
+            BizArchiveInputDetail inputDetail = inputDetailList.get(0);
+            inputDetail.setInputEndMonth(bizWorkOrder.getEndMonth());
+            inputDetail.setInputStartMonth(bizWorkOrder.getStartMonth());
+            bizArchiveInputDetailService.updateById(inputDetail);
+        }
         return toAjax(bizWorkOrderService.updateById(bizWorkOrder));
     }