法规清单-变更接口完善。

法规清单-发起任务确认流程修改方式（后端自己处理批量启动流程）

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java

@@ -377,8 +377,8 @@ public class ProjectLawsInventoryEOController extends JeroController<ProjectLaws
 
 	 @AutoLog(value = "变更")
 	 @ApiOperation(value="变更", notes="变更")
-	 @GetMapping(value = "/change")
+	 @PostMapping(value = "/change")
-	 public Result<?> change(@RequestParam Map<String,Object> params) {
+	 public Result<?> change(@RequestBody JSONObject params) {
 	 	return this.projectLawsInventoryEOService.change(params);
 	 }
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java

@@ -122,7 +122,7 @@ public interface IProjectLawsInventoryEOService extends IService<ProjectLawsInve
 
 	void dataDispose(List<ProjectLawsInventoryEO> list, LoginUser currentUser, int isProjectRole, String cut);
 
-	Result<?> change(Map<String, Object> parmas);
+	Result<?> change(JSONObject parmas);
 
 	/**
 	 * 下载pdf报告

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java

@@ -4182,8 +4182,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	@Override
 	@Transactional
-	public Result<?> change(Map<String, Object> parmas) {
+	public Result<?> change(JSONObject parmas) {
-		String ids = parmas.get("ids").toString();
+		String ids = parmas.getString("ids");
 		if(StringUtils.isNotEmpty(ids)){
 			List<String> idList = Arrays.asList(ids.split(","));
 			String projectLawsInventoryIds = ids;
@@ -4199,6 +4199,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			updateWrapper.set(ProjectLawsInventoryEO::getHomologationEngineerSubmitStatus,null);
 			updateWrapper.set(ProjectLawsInventoryEO::getSendMsgFlag,null);
 			updateWrapper.set(ProjectLawsInventoryEO::getSendMsgCurrentFlag,null);
+			updateWrapper.set(ProjectLawsInventoryEO::getDesignDueDate,null);
+			updateWrapper.set(ProjectLawsInventoryEO::getPrehomoDueDate,null);
+			updateWrapper.set(ProjectLawsInventoryEO::getVerifyDueDate,null);
+			updateWrapper.set(ProjectLawsInventoryEO::getInventoryAffirmDueDate,null);
+			updateWrapper.set(ProjectLawsInventoryEO::getTaskAffirmDueDate,null);
 			super.update(projectLawsInventoryEO, updateWrapper);
 
 			QueryWrapper<ProjectTaskInventoryEO> taskInventoryQueryWrapper = new QueryWrapper<>();
@@ -4275,7 +4280,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			deleteConditionAssessmentWrapper.lambda().in(ConditionAssessmentEO::getProjectLawsInventoryId,idList);
 			this.conditionAssessmentEOService.remove(deleteConditionAssessmentWrapper);
 
-			Map<String,Object> params = new HashMap<>();
+			JSONObject params = new JSONObject();
 			params.put("projectLawsInventoryIds",projectLawsInventoryIds);
 			params.put("pIds",pIds);
 			//根据流程实例id 、 法规清单id  删除相关流程。

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java

@@ -54,8 +54,10 @@ public class workFlowController {
         jsonObject.put("loginUserId", currentUser.getId());
         jsonObject.put("loginUserName", currentUser.getUsername());
         if(StringUtils.equals(type,FlowTypeEnum.RWQRLC.getValue())){
-            jsonObject.put("id", FlowTypeEnum.RWQRLC.getProcessDefinitionKey()); //流程定义id
+            /*jsonObject.put("id", FlowTypeEnum.RWQRLC.getProcessDefinitionKey()); //流程定义id
-            return this.activiti_define_start(jsonObject);
+            return this.activiti_define_start(jsonObject);*/
+            jsonObject.put("processDefinitionKey", FlowTypeEnum.RWQRLC.getProcessDefinitionKey());
+            return this.startTaskToConfirmProcess(jsonObject);
         }else if(StringUtils.equals(type,FlowTypeEnum.SJFHXSHLC.getValue())){
             jsonObject.put("id", FlowTypeEnum.SJFHXSHLC.getProcessDefinitionKey());
             initConditionAssessmentEO(jsonObject);
@@ -203,4 +205,13 @@ public class workFlowController {
     public Result startLawsTechnologyEvaluationProcess(@RequestBody JSONObject jsonObject){
         return  workFlowFeignClient.startLawsTechnologyEvaluationProcess(jsonObject);
     }
+
+    /**
+     * 启动流程-任务确认流程
+     * @param jsonObject
+     * @return
+     */
+    public Result startTaskToConfirmProcess(@RequestBody JSONObject jsonObject){
+        return  workFlowFeignClient.startTaskToConfirmProcess(jsonObject);
+    }
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java

@@ -84,8 +84,8 @@ public interface WorkFlowFeignClient {
      * @param params
      * @return
      */
-    @RequestMapping(value = "/bat-wkflow/deleteProcessInstanceByProjectLawsInventoryIds",method = RequestMethod.GET)
+    @RequestMapping(value = "/bat-wkflow/deleteProcessInstanceByProjectLawsInventoryIds",method = RequestMethod.POST,headers = {"content-type=application/json"})
-    Result<String> deleteProcessInstanceByProjectLawsInventoryIds(@RequestParam Map<String,Object> params);
+    Result<String> deleteProcessInstanceByProjectLawsInventoryIds(String params);
 
     /**
      * 流程实例明细列表
@@ -146,6 +146,14 @@ public interface WorkFlowFeignClient {
     @RequestMapping(value = "/bat-wkflow/startLawsTechnologyEvaluationProcess",method = RequestMethod.POST,headers = {"content-type=application/json"})
     Result<String> startLawsTechnologyEvaluationProcess(String jsonObject);
 
+    /**
+     * 启动流程-任务确认流程
+     * @param jsonObject
+     * @return
+     */
+    @RequestMapping(value = "/bat-wkflow/startTaskToConfirmProcess",method = RequestMethod.POST,headers = {"content-type=application/json"})
+    Result<String> startTaskToConfirmProcess(String jsonObject);
+
     @RequestMapping(value = "/bat-wkflow/task/completeLawsTechnologyEvaluationTaskByPids",method = RequestMethod.GET)
     Result<String> completeLawsTechnologyEvaluationTaskByPids(@RequestParam("actiProcInstIds") String actiProcInstIds);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java

@@ -101,8 +101,8 @@ public class WorkFlowFeignClientImpl{
      * @param params
      * @return
      */
-    public Result<String> deleteProcessInstanceByProjectLawsInventoryIds(@RequestParam Map<String,Object> params){
+    public Result<String> deleteProcessInstanceByProjectLawsInventoryIds(@RequestBody JSONObject params){
-        return workFlowFeignClient.deleteProcessInstanceByProjectLawsInventoryIds(params);
+        return workFlowFeignClient.deleteProcessInstanceByProjectLawsInventoryIds(params.toString());
     }
 
     /**
@@ -167,4 +167,14 @@ public class WorkFlowFeignClientImpl{
         Result<String> stringWrapper = workFlowFeignClient.startLawsTechnologyEvaluationProcess(jsonObject.toString());
         return Result.OK(stringWrapper.getResult());
     }
+
+    /**
+     * 启动流程-任务确认流程
+     * @param jsonObject
+     * @return
+     */
+    public Result startTaskToConfirmProcess(@RequestBody net.sf.json.JSONObject jsonObject){
+        Result<String> stringWrapper = workFlowFeignClient.startTaskToConfirmProcess(jsonObject.toString());
+        return Result.OK(stringWrapper.getResult());
+    }
 }