Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanAuditServiceImpl.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.supervision.business.service.impl;
 
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.service.IWorkflowExcuteService;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.supervision.business.dao.repository.IPlanAuditDao;
@@ -26,10 +27,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 
 @Service("planAuditService")
 public class PlanAuditServiceImpl implements IPlanAuditService {
@@ -77,6 +75,8 @@ public class PlanAuditServiceImpl implements IPlanAuditService {
                 workflowExcuteService.CompleteTask(instanceId, conditionValue, reginParams);
                 ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
                 String userId = reginParams.getUserModel().getUserId();
+                plan.setNextGenDate(DateUtils.dateTimeToDate(new Date()));
+                planService.updateGenDate(plan);
                 // 更新计划状态,指定执行人
                 updatePlanStatus(condition,plan,instanceId, conditionValue);
                 // 更新流水表

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanServiceImpl.java

@@ -242,6 +242,11 @@ public class PlanServiceImpl implements IPlanService {
         }
     }
 
+
+    public void updateGenDate(Plan plan){
+    planMapper.updateById(plan);
+    }
+
     /**
      * 根据工作流获取下一审核人角色下的所有用户ID =》规则推送消息
      * @return