流程配置

huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouUploadfileinfoController.java

@@ -158,20 +158,21 @@ public class HuzhouUploadfileinfoController {
     public Result<?> uploadURTFile(@RequestParam(value = "file")
                                       MultipartFile[] files,
                                    @RequestParam(value = "planinfoid") String planinfoid,
-                                   @RequestParam(value = "urtEstimatedAmount") Double urtEstimatedAmount) throws IOException {
+                                   @RequestParam(value = "urtEstimatedAmount" ,required = false )Double urtEstimatedAmount) throws IOException {
-        uploadfileinfoService.submitURTFile(files, planinfoid,urtEstimatedAmount,"6");
+        uploadfileinfoService.submitURTFile(files, planinfoid,urtEstimatedAmount);
-
         return Result.OK("上传成功!!");
     }
+
     @PostMapping("/approveURTFile")
-    public Result<?> approveURTFile(@RequestParam(value = "file",required = false) MultipartFile[] files,
+    public Result<?> approveURTFile(@RequestParam(value = "file", required = false) MultipartFile[] files,
                                     @RequestParam String taskId,
                                     @RequestParam String flag,
+                                    // 这里应该是 planInfoId 而非 项目id
                                     @RequestParam String projectid,
                                     @RequestParam String comment,
-                                    @RequestParam(value = "adviceFile",required = false) MultipartFile[] adviceFiles,
+                                    @RequestParam(value = "adviceFile", required = false) MultipartFile[] adviceFiles,
-                                    @RequestParam(value = "urtEstimatedAmount") Double urtEstimatedAmount) throws IOException {
+                                    @RequestParam(value = "urtEstimatedAmount", required = false) Double urtEstimatedAmount) throws IOException {
-        uploadfileinfoService.approveURTFile(files, taskId, flag, projectid, comment, adviceFiles,urtEstimatedAmount);
+        uploadfileinfoService.approveURTFile(files, taskId, flag, projectid, comment, adviceFiles, urtEstimatedAmount);
         return Result.OK("审批成功!!");
 
     }

huzhou/src/main/java/com/easy/admin/modules/huzhou/listener/UserTaskCompleteListener.java

@@ -28,7 +28,7 @@ public class UserTaskCompleteListener implements TaskListener {
         }
         int size = approvedResult.size();
         delegateTask.getExecution().setVariable("size",size);
-        if(size==7){
+        if(size==2){
             if(!approvedResult.containsValue("0")){
                 delegateTask.getExecution().setVariable("rejected",false); // 更新审批结果变量
             }else{

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouUploadfileinfoService.java

@@ -29,7 +29,7 @@ public interface IHuzhouUploadfileinfoService extends IService<HuzhouUploadfilei
      */
     IPage<HuzhouUploadfileinfo> getuploacFilePageListOk(HuzhouUploadfileinfo uploadfileinfo, Integer pageNo, Integer pageSize);
 
-    void submitURTFile(MultipartFile[] files, String planinfoid, Double urtEstimatedAmount,String s) throws IOException;
+    void submitURTFile(MultipartFile[] files, String planinfoid, Double urtEstimatedAmount) throws IOException;
 
     void approveURTFile(MultipartFile[] files, String taskId, String flag, String projectid, String comment, MultipartFile[] adviceFiles,Double urtEstimatedAmount) throws IOException;
 }

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouUploadfileinfoServiceImpl.java

@@ -197,7 +197,7 @@ public class HuzhouUploadfileinfoServiceImpl extends ServiceImpl<HuzhouUploadfil
     }
 
     @Override
-    public void submitURTFile(MultipartFile[] files, String planinfoid, Double urtEstimatedAmount,String s) throws IOException {
+    public void submitURTFile(MultipartFile[] files, String planinfoid, Double urtEstimatedAmount) throws IOException {
         HuzhouPlaninfo huzhouPlaninfo = new HuzhouPlaninfo();
         huzhouPlaninfo.setId(planinfoid);
         huzhouPlaninfo.setIsfinish("1");
@@ -205,23 +205,29 @@ public class HuzhouUploadfileinfoServiceImpl extends ServiceImpl<HuzhouUploadfil
         planinfoMapper.updateById(huzhouPlaninfo);
 
         HuzhouPlaninfo planinfo = planinfoMapper.selectById(planinfoid);
+        String projectId = planinfo.getProjectId();
+        String taskName = planinfo.getTaskName();
 
         //更新项目的联合技术审查估算金额
-        String projectId = planinfo.getProjectId();
+        if (urtEstimatedAmount != null) {
             HuzhouProjectinfo huzhouProjectinfo = new HuzhouProjectinfo();
             huzhouProjectinfo.setId(projectId);
             huzhouProjectinfo.setUrtEstimatedAmount(urtEstimatedAmount);
             huzhouProjectinfoMapper.updateById(huzhouProjectinfo);
-        //
+        }
+
         HuzhouProjectinfo projectinfo=huzhouProjectinfoMapper.selectById(projectId);
         String adminDivision = projectinfo.getAdminDivision();
         WorkFlow workFlow=null;
         if(adminDivision.equals("市本级")){
+            if (taskName.equals("联合技术审查")){
                 workFlow = workflowService.createFlow("createURT", planinfoid);//创建流程createURT
+            }else if (taskName.equals("联合验收审批")){
+                workFlow = workflowService.createFlow("JAA", planinfoid);
+            }
 
         }else{
-//            workFlow = workflowService.createFlow("createURT2", planinfoid);//创建流程createURT2
+
-//            processinfoService.modifyStatusByProjectId(planinfoid,"2",processName);
             this.modifyUploadFileByURT(files,planinfoid,"1","1");
             HuzhouPlaninfo huzhouPlaninfo2 = new HuzhouPlaninfo();
             huzhouPlaninfo2.setId(planinfoid);
@@ -268,62 +274,69 @@ public class HuzhouUploadfileinfoServiceImpl extends ServiceImpl<HuzhouUploadfil
         String comment = "同意";
         taskService.addComment(taskId,processInstanceId,comment);//添加审批意见
         taskService.complete(taskId, variables);
-//        saveFileAndFileInfo(files, planinfoid, s);
         this.modifyUploadFileByURT(files,planinfoid,"1","1");
 
 
     }
 
     @Override
-    public void approveURTFile(MultipartFile[] files, String taskId, String flag, String projectid, String comment, MultipartFile[] adviceFiles,Double urtEstimatedAmount) throws IOException {
+    public void approveURTFile(MultipartFile[] files, String taskId, String flag, String planInfoId, String comment, MultipartFile[] adviceFiles,Double urtEstimatedAmount) throws IOException {
 
-        HuzhouPlaninfo planinfo = planinfoMapper.selectById(projectid);
+        HuzhouPlaninfo planinfo = planinfoMapper.selectById(planInfoId);
+        String taskName = planinfo.getTaskName();
         String projectId = planinfo.getProjectId();
         String adminDivision = huzhouProjectinfoMapper.selectById(projectId).getAdminDivision();
+
+        if (urtEstimatedAmount != null){
             HuzhouProjectinfo huzhouProjectinfo = new HuzhouProjectinfo();
             huzhouProjectinfo.setId(projectId);
             huzhouProjectinfo.setUrtEstimatedAmount(urtEstimatedAmount);
             huzhouProjectinfoMapper.updateById(huzhouProjectinfo);
+        }
+
 
         LambdaQueryWrapper<HuzhouProcessinfo> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(HuzhouProcessinfo::getProjectid,projectid);
+        queryWrapper.eq(HuzhouProcessinfo::getProjectid,planInfoId);
-        if(!adminDivision.equals("市本级")){
+        if(adminDivision.equals("市本级")){
-            queryWrapper.eq(HuzhouProcessinfo::getProcessName,"createURT2");//createURT2
+            if ("联合验收审批".equals(taskName)){
-        }else{
+                queryWrapper.eq(HuzhouProcessinfo::getProcessName,"JAA");
+            }else if ("联合技术审查".equals(taskName)){
                 queryWrapper.eq(HuzhouProcessinfo::getProcessName,"createURT");
+            }
 
         }
         queryWrapper.eq(HuzhouProcessinfo::getProcessstatus,"1");
         List<HuzhouProcessinfo> processinfos = processinfoService.list(queryWrapper);
         String processName = processinfos.get(0).getProcessName();
         if(files!=null&&"1".equals(flag)){
-            this.modifyUploadFileByURT(files,projectid,"2","1");
+            this.modifyUploadFileByURT(files,planInfoId,"2","1");
 
         }
 
         //意见文件
         if(adviceFiles!=null){
-            this.modifyUploadFileByURT(adviceFiles,projectid,"2","2");
+            this.modifyUploadFileByURT(adviceFiles,planInfoId,"2","2");
         }
+
         WorkFlow workFlow = workflowService.approveProjectInfo(taskId, flag, comment);
         ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(workFlow.getProcessInstanceId()).singleResult();
         if("3".equals(flag)){
-            processinfoService.modifyStatusByProjectId(projectid,"0",processName);
+            processinfoService.modifyStatusByProjectId(planInfoId,"0",processName);
             HuzhouPlaninfo huzhouPlaninfo = new HuzhouPlaninfo();
-            huzhouPlaninfo.setId(projectid);
+            huzhouPlaninfo.setId(planInfoId);
             huzhouPlaninfo.setIsfinish("0");
             huzhouPlaninfo.setActualEndTime(new Date());
             planinfoMapper.updateById(huzhouPlaninfo);
             LambdaUpdateWrapper<HuzhouPlaninfofile> queryWrapper1 = new LambdaUpdateWrapper<>();
-            queryWrapper1.eq(HuzhouPlaninfofile::getPlaninfoid,projectid);
+            queryWrapper1.eq(HuzhouPlaninfofile::getPlaninfoid,planInfoId);
             queryWrapper1.set(HuzhouPlaninfofile::getStage,"0");
             planinfofileMapper.update(null,queryWrapper1);
             return;
         }
         if(processInstance==null&&"1".equals(flag)){
-            processinfoService.modifyStatusByProjectId(projectid,"2",processName);
+            processinfoService.modifyStatusByProjectId(planInfoId,"2",processName);
             HuzhouPlaninfo huzhouPlaninfo = new HuzhouPlaninfo();
-            huzhouPlaninfo.setId(projectid);
+            huzhouPlaninfo.setId(planInfoId);
             huzhouPlaninfo.setIsfinish("2");
             huzhouPlaninfo.setActualEndTime(new Date());
             planinfoMapper.updateById(huzhouPlaninfo);