我的、待办、已办合同名称

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

@@ -637,24 +637,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                     }
                 }
             }
-            if (flowTask.getProcDefName().contains("合同评审")) {
-                flowTask.setContractId(flowTask.getProcInsId());
-                if (flowTask.getProcDefName().contains("承接"))
-                    flowTask.setContractName(cmcContractService.selectCmcContractByContractId(flowTask.getContractId()).getContractName());
-                if (flowTask.getProcDefName().contains("分包"))
-                    flowTask.setContractName(cmcSubContractService.selectCmcSubContractBySubContractId(flowTask.getContractId()).getSubContractName());
-            }
-            else {
-                flowTask.setProjectId(getFlowProjectId(flowTask));
-                if (flowTask.getProjectId() != null) {
-                    if (!flowTask.getProcDefName().equals("保证金审批")) {
-                        flowTask.setProjectNumber(cmcProjectService.selectCmcProjectByProjectId(flowTask.getProjectId()).getProjectNumber());
-                        flowTask.setProjectName(cmcProjectService.selectCmcProjectByProjectId(flowTask.getProjectId()).getProjectName());
-                    } else
-                        flowTask.setProjectName(cmcTenderService.selectCmcTenderByTenderId(flowTask.getProjectId()).getProjectName());
-                }
-            }
-            flowList.add(flowTask);
+            setFlowProjectInfo(flowList, flowTask);
         }
         page.setRecords(flowList);
         return AjaxResult.success(page);
@@ -898,24 +881,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             flowTask.setStartUserId(startUser.getUserId().toString());
             flowTask.setStartUserName(startUser.getNickName());
             flowTask.setStartDeptName(Objects.nonNull(startUser.getDept()) ? startUser.getDept().getDeptName() : "");
-            if (flowTask.getProcDefName().contains("合同评审")) {
-                flowTask.setContractId(flowTask.getProcInsId());
-                if (flowTask.getProcDefName().contains("承接"))
-                    flowTask.setContractName(cmcContractService.selectCmcContractByContractId(flowTask.getContractId()).getContractName());
-                if (flowTask.getProcDefName().contains("分包"))
-                    flowTask.setContractName(cmcSubContractService.selectCmcSubContractBySubContractId(flowTask.getContractId()).getSubContractName());
-            }
-            else {
-                flowTask.setProjectId(getFlowProjectId(flowTask));
-                if (flowTask.getProjectId() != null) {
-                    if (!flowTask.getProcDefName().equals("保证金审批")) {
-                        flowTask.setProjectNumber(cmcProjectService.selectCmcProjectByProjectId(flowTask.getProjectId()).getProjectNumber());
-                        flowTask.setProjectName(cmcProjectService.selectCmcProjectByProjectId(flowTask.getProjectId()).getProjectName());
-                    } else
-                        flowTask.setProjectName(cmcTenderService.selectCmcTenderByTenderId(flowTask.getProjectId()).getProjectName());
-                }
-            }
-            flowList.add(flowTask);
+            setFlowProjectInfo(flowList, flowTask);
         }
 
         page.setRecords(flowList);
@@ -975,28 +941,34 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             flowTask.setStartUserName(startUser.getNickName());
             flowTask.setStartDeptName(startUser.getDept().getDeptName());
             flowTask.setAssigneeId(Long.parseLong(histTask.getAssignee()));
-            if (flowTask.getProcDefName().contains("合同评审")) {
-                flowTask.setContractId(flowTask.getProcInsId());
+            setFlowProjectInfo(hisTaskList, flowTask);
+        }
+        page.setTotal(taskInstanceQuery.count());
+        page.setRecords(hisTaskList);
+        return AjaxResult.success(page);
+    }
+
+    private void setFlowProjectInfo(List<FlowTaskDto> hisTaskList, FlowTaskDto flowTask) {
+        if (flowTask.getProcDefName().contains("合同评审")) {
+            flowTask.setContractId(flowTask.getProcInsId());
+            if (flowTask.getContractId() != null) {
                 if (flowTask.getProcDefName().contains("承接"))
                     flowTask.setContractName(cmcContractService.selectCmcContractByContractId(flowTask.getContractId()).getContractName());
                 if (flowTask.getProcDefName().contains("分包"))
                     flowTask.setContractName(cmcSubContractService.selectCmcSubContractBySubContractId(flowTask.getContractId()).getSubContractName());
             }
-            else {
-                flowTask.setProjectId(getFlowProjectId(flowTask));
-                if (flowTask.getProjectId() != null) {
-                    if (!flowTask.getProcDefName().equals("保证金审批")) {
-                        flowTask.setProjectNumber(cmcProjectService.selectCmcProjectByProjectId(flowTask.getProjectId()).getProjectNumber());
-                        flowTask.setProjectName(cmcProjectService.selectCmcProjectByProjectId(flowTask.getProjectId()).getProjectName());
-                    } else
-                        flowTask.setProjectName(cmcTenderService.selectCmcTenderByTenderId(flowTask.getProjectId()).getProjectName());
-                }
+        }
+        else {
+            flowTask.setProjectId(getFlowProjectId(flowTask));
+            if (flowTask.getProjectId() != null) {
+                if (!flowTask.getProcDefName().equals("保证金审批")) {
+                    flowTask.setProjectNumber(cmcProjectService.selectCmcProjectByProjectId(flowTask.getProjectId()).getProjectNumber());
+                    flowTask.setProjectName(cmcProjectService.selectCmcProjectByProjectId(flowTask.getProjectId()).getProjectName());
+                } else
+                    flowTask.setProjectName(cmcTenderService.selectCmcTenderByTenderId(flowTask.getProjectId()).getProjectName());
             }
-            hisTaskList.add(flowTask);
         }
-        page.setTotal(taskInstanceQuery.count());
-        page.setRecords(hisTaskList);
-        return AjaxResult.success(page);
+        hisTaskList.add(flowTask);
     }
 
     private static <T> Predicate<T> distinctByKey(Function<? super T, ?> keyExtractor) {