优化需求

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

@@ -203,6 +203,9 @@ public class WorkflowController {
                     if("撤回".equals(select.getLabel())){
                         reshashMap.put("isrecall","1");
                     }
+                    if("作废".equals(select.getLabel())){
+                        reshashMap.put("isrecall","3");
+                    }
                 }
             }else if(size>1){
                 List<Task> taskList = taskService.createTaskQuery()
@@ -221,6 +224,9 @@ public class WorkflowController {
                     if("撤回".equals(select.getLabel())){
                         reshashMap.put("isrecall","1");
                     }
+                    if("作废".equals(select.getLabel())){
+                        reshashMap.put("isrecall","3");
+                    }
                 }
             }
 //            if(task!=null){

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

@@ -22,13 +22,18 @@ public class UserTaskCompleteListener implements TaskListener {
             approvedResult.put(userId,"1"); // 审批通过
         }else if("0".equals(approved)){
             approvedResult.put(userId,"0"); // 审批不通过
-            delegateTask.getExecution().setVariable("rejected",true); // 更新审批结果变量
+//            delegateTask.getExecution().setVariable("rejected",true); // 更新审批结果变量
         }else{
             return;
         }
         int size = approvedResult.size();
-        if(size==7&&!approvedResult.containsValue("0")){
+        delegateTask.getExecution().setVariable("size",size);
-            delegateTask.getExecution().setVariable("rejected",false); // 更新审批结果变量
+        if(size==7){
+            if(!approvedResult.containsValue("0")){
+                delegateTask.getExecution().setVariable("rejected",false); // 更新审批结果变量
+            }else{
+                delegateTask.getExecution().setVariable("rejected",true); // 更新审批结果变量
+            }
         }
         delegateTask.getExecution().setVariable( "ApprovedResult", approvedResult); // 更新审批状态变量
 //        identityService.createUserQuery()

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

@@ -70,7 +70,7 @@ public class HuzhouMergesplitinfoServiceImpl extends ServiceImpl<HuzhouMergespli
         huzhouProjectinfo.setPayamount2023Money(0.0);
         huzhouProjectinfo.setPayamount2024Money(0.0);
         huzhouProjectinfo.setPayamount2025Money(0.0);
-        huzhouProjectinfo.setStage("-1");//0
+        huzhouProjectinfo.setStage("-2");//0
         projectinfoService.save(huzhouProjectinfo);
         userprojectService.saveFromProject(huzhouProjectinfo, "0");
         for (String oldprojectid :mergesplitinfoVo.getProjectids()
@@ -80,7 +80,7 @@ public class HuzhouMergesplitinfoServiceImpl extends ServiceImpl<HuzhouMergespli
             BeanUtils.copyProperties(projectinfo, huzhouMergesplitinfo);
             huzhouMergesplitinfo.setMergeOrSplit("merge");
             huzhouMergesplitinfo.setProjectId(huzhouProjectinfo.getId());
-            projectinfo.setStage("0.1");
+            projectinfo.setStage("-1");
 //            projectinfoService.updateById(projectinfo);
             mergesplitinfoMapper.insert(huzhouMergesplitinfo);
         }
@@ -160,7 +160,7 @@ public class HuzhouMergesplitinfoServiceImpl extends ServiceImpl<HuzhouMergespli
             huzhouProjectinfo.setPayamount2023Money(0.0);
             huzhouProjectinfo.setPayamount2024Money(0.0);
             huzhouProjectinfo.setPayamount2025Money(0.0);
-            huzhouProjectinfo.setStage("-1");//0
+            huzhouProjectinfo.setStage("-2");//0
             projectinfoService.save(huzhouProjectinfo);
             userprojectService.saveFromProject(huzhouProjectinfo, "0");
             for (String oldprojectid :mergesplitinfoVo.getProjectids()
@@ -170,7 +170,7 @@ public class HuzhouMergesplitinfoServiceImpl extends ServiceImpl<HuzhouMergespli
                 BeanUtils.copyProperties(projectinfo, huzhouMergesplitinfo);
                 huzhouMergesplitinfo.setMergeOrSplit("split");
                 huzhouMergesplitinfo.setProjectId(huzhouProjectinfo.getId());
-                projectinfo.setStage("0.1");
+                projectinfo.setStage("-1");
 //                projectinfoService.updateById(projectinfo);
                 mergesplitinfoMapper.insert(huzhouMergesplitinfo);
             }
@@ -240,7 +240,7 @@ public class HuzhouMergesplitinfoServiceImpl extends ServiceImpl<HuzhouMergespli
             List<HuzhouMergesplitinfo> mergesplitinfos = mergesplitinfoMapper.selectList(lambdaQueryWrapper);
             for (HuzhouMergesplitinfo mergesplitinfo : mergesplitinfos) {
                 HuzhouProjectinfo oldpj = projectinfoService.getById(mergesplitinfo.getId());
-                oldpj.setStage("0.1");
+                oldpj.setStage("-1");
                 projectinfoService.updateById(oldpj);
             }
             processinfoService.modifyStatusByProjectId(projectid,"2",processName);
@@ -280,9 +280,9 @@ public class HuzhouMergesplitinfoServiceImpl extends ServiceImpl<HuzhouMergespli
         }
         ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(workFlow.getProcessInstanceId()).singleResult();
         if(processInstance==null&&"1".equals(flag)){
-            //将旧项目状态变成已停止0.1，可见
+            //将旧项目状态变成已停止-1，可见
             HuzhouProjectinfo oldpj = projectinfoService.getById(oldprojectid);
-            oldpj.setStage("0.1");
+            oldpj.setStage("-1");
             projectinfoService.updateById(oldpj);
             //查询项目拆分后，新项目的id，改变其状态
             //新项目id在HuzhouMergesplitinfo projectid字段中

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

@@ -609,6 +609,7 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl<HuzhouPlaninfoMapper,
 
     @Override
     public IPage<HuzhouProjectinfoOV> projectPlanPageList(HuzhouProjectinfo projectinfo, Integer pageNo, Integer pageSize, String newStage) {
+//        runtimeService.deleteProcessInstance("383306","停止流程");
         IPage<HuzhouProjectinfoOV> infoPageList = projectinfoService.getProjectInfoAndChildPageList(projectinfo, pageNo, pageSize,newStage);
         return infoPageList;
     }

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

@@ -73,7 +73,7 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
 //    private String[] names ={"可研技术审查报告（初稿）确认","可研技术审查报告（复审稿）确认","可研技术审查报告（终稿）确认","造价评估报告确认","可行性研究报告审批（发改）","合同签订","首付支付","初验阶段","终验阶段","初步设计审批"};
     private String[] names ={"合同签订","首付支付","初验阶段","终验阶段","初步设计审批"};
 
-//    private String[] tNames ={"可研报告初稿编制","可研报告终稿编制","造价评估"};
+//    private String[] tNames ={"可研报告初稿编制","可研报告送审稿编制","造价评估"};
     @Override
     public Page<HuzhouPlaninfofile> getplanFilePageList(HuzhouPlaninfofile planinfofile,Integer pageNo, Integer pageSize) {
         Page<HuzhouPlaninfofile> page = new Page<>(pageNo,pageSize);
@@ -306,7 +306,7 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
             huzhouPlaninfo1.setActualEndTime(new Date());
             planinfoService.updateById(huzhouPlaninfo1);
 
-        } else if ("可研报告终稿编制".equals(taskName)) {
+        } else if ("可研报告送审稿编制".equals(taskName)) {
            //finalFeasibilityReportDraft
            WorkFlow workFlow = workflowService.createFlow("finalFeasibilityReportDraft",planinfoid);
            Task task = workFlow.getTask();
@@ -451,7 +451,7 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
         if(processInstance==null&&"1".equals(flag)){
             HuzhouPlaninfo byId = planinfoService.getById(planinfoid);
             String taskName = StrUtil.trim(byId.getTaskName());
-            if("可研报告终稿编制".equals(taskName)){
+            if("可研报告送审稿编制".equals(taskName)){
                 //查询是否已有完成的流程。有两个以上
                 queryWrapper.clear();
                 queryWrapper.eq(HuzhouProcessinfo::getProjectid,planinfoid);
@@ -564,7 +564,7 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
             huzhouPlaninfo.setActualEndTime(new Date());
             planinfoService.updateById(huzhouPlaninfo);
 
-        } else if ("可研报告终稿编制".equals(taskName)) {
+        } else if ("可研报告送审稿编制".equals(taskName)) {
             //finalFeasibilityReportDraft
             WorkFlow workFlow = workflowService.createFlow("finalFeasibilityReportDraft",planinfoid);
             Task task = workFlow.getTask();

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

@@ -79,6 +79,9 @@ public class HuzhouProcessinfoServiceImpl extends ServiceImpl<HuzhouProcessinfoM
         queryWrapper.eq(HuzhouProcessinfo::getProcessinstanceid,processInstanceId);
         List<HuzhouProcessinfo> list = list(queryWrapper);
         LambdaQueryWrapper<HuzhouProjectinfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        if(list.size()==0){
+            return null;
+        }
         lambdaQueryWrapper.eq(HuzhouProjectinfo::getId,list.get(0).getProjectid());
         WorkflowBaseInfo projectInfo = workflowMapper.getProjectInfo(list.get(0).getProjectid());
         HuzhouProjectinfo huzhouProjectinfo = projectinfoMapper.selectOne(lambdaQueryWrapper);

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

@@ -295,6 +295,19 @@ public class HuzhouUploadfileinfoServiceImpl extends ServiceImpl<HuzhouUploadfil
         }
         WorkFlow workFlow = workflowService.approveProjectInfo(taskId, flag, comment);
         ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(workFlow.getProcessInstanceId()).singleResult();
+        if("3".equals(flag)){
+            processinfoService.modifyStatusByProjectId(projectid,"0",processName);
+            HuzhouPlaninfo huzhouPlaninfo = new HuzhouPlaninfo();
+            huzhouPlaninfo.setId(projectid);
+            huzhouPlaninfo.setIsfinish("0");
+            huzhouPlaninfo.setActualEndTime(new Date());
+            planinfoMapper.updateById(huzhouPlaninfo);
+            LambdaUpdateWrapper<HuzhouPlaninfofile> queryWrapper1 = new LambdaUpdateWrapper<>();
+            queryWrapper1.eq(HuzhouPlaninfofile::getPlaninfoid,projectid);
+            queryWrapper1.set(HuzhouPlaninfofile::getStage,"0");
+            planinfofileMapper.update(null,queryWrapper1);
+            return;
+        }
         if(processInstance==null&&"1".equals(flag)){
             processinfoService.modifyStatusByProjectId(projectid,"2",processName);
             HuzhouPlaninfo huzhouPlaninfo = new HuzhouPlaninfo();
@@ -340,6 +353,9 @@ public class HuzhouUploadfileinfoServiceImpl extends ServiceImpl<HuzhouUploadfil
                         }
                     }
                     if (StringUtils.isNotEmpty(tongyi)) {
+                        if(task.getName().equals("任务牵头处室")){
+                            break;
+                        }
                         String id = task.getId();
                         taskService.claim(id, tongyi);
                         taskService.setVariableLocal(id, "approvalStatue", "1");//添加审批状态 通过
@@ -382,6 +398,7 @@ public class HuzhouUploadfileinfoServiceImpl extends ServiceImpl<HuzhouUploadfil
                     //修改以前记录为作废
                     LambdaUpdateWrapper<HuzhouPlaninfofile> updateWrapper = new LambdaUpdateWrapper<>();
                     updateWrapper.eq(HuzhouPlaninfofile::getPlaninfoid,planinfoid);
+                    updateWrapper.eq(HuzhouPlaninfofile::getDocumentName,originalFilename);
                     updateWrapper.eq(HuzhouPlaninfofile::getCreateUser,currentUser.getId());
                     updateWrapper.set(HuzhouPlaninfofile::getStatus,"0");
                     planinfofileMapper.update(null,updateWrapper);

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

@@ -227,8 +227,8 @@ public class WorkflowServiceImpl implements IWorkflowService {
                         if(filteredList.size()==0&&taskInstance.getProcessDefinitionId().contains("createURT")){
                             if(taskInstance.getName().equals("发起人")){
                                 Select select = new Select();
-                                select.setLabel("撤回");
+                                select.setLabel("作废");
-                                select.setValue("2");
+                                select.setValue("3");
                                 actionButtons.add(select);
                                 workflowActionParamOV.setButtons(actionButtons);
                                 workflowActionParamOV.setShowApprovalForm(true);
@@ -253,6 +253,24 @@ public class WorkflowServiceImpl implements IWorkflowService {
             UserTask userTask = (UserTask) flowElement;
             String name = userTask.getName();
             if("发起人".equals(name)&&!task.getProcessDefinitionId().contains("costEvalReportConfirm")){
+                //如果是联合技术审查
+
+                if(task.getProcessDefinitionId().contains("createURT")){
+                    Select select1 = new Select();
+                    select1.setLabel("同意");
+                    select1.setValue("1");
+                    actionButtons.add(select1);
+                    Select select2 = new Select();
+                    select2.setLabel("作废");
+                    select2.setValue("3");
+                    actionButtons.add(select2);
+                }else{
+                    Select select1 = new Select();
+                    select1.setLabel("同意");
+                    select1.setValue("1");
+                    actionButtons.add(select1);
+                    workflowActionParamOV.setIsEdit(true);
+                }
                 Select select1 = new Select();
                 select1.setLabel("同意");
                 select1.setValue("1");