流程标题

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/dto/FlowTaskDto.java

@@ -48,7 +48,7 @@ public class FlowTaskDto implements Serializable {
     private String assigneeName;
 
     @ApiModelProperty("任务执行人部门")
-    private String assigneeDeptName;;
+    private String assigneeDeptName;
 
     @ApiModelProperty("流程发起人Id")
     private String startUserId;
@@ -56,20 +56,8 @@ public class FlowTaskDto implements Serializable {
     @ApiModelProperty("流程发起人名称")
     private String startUserName;
 
-    @ApiModelProperty("流程关联项目Id")
-    private String projectId;
-
-    @ApiModelProperty("流程关联项目编号")
-    private String projectNumber;
-
-    @ApiModelProperty("流程关联项目名称")
-    private String projectName;
-
-    @ApiModelProperty("流程关联合同Id")
-    private String contractId;
-
-    @ApiModelProperty("流程关联合同名称")
-    private String contractName;
+    @ApiModelProperty("任务标题")
+    private String title;
 
     @ApiModelProperty("流程类型")
     private String category;

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

@@ -96,6 +96,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
     @Resource
     private ICmcContractService cmcContractService;
     @Resource
+    private ICmcBrandProjectService cmcBrandProjectService;
+    @Resource
     private ICmcProjectContractService cmcProjectContractService;
     @Resource
     private ICmcProjectSubContractService cmcProjectSubContractService;
@@ -638,7 +640,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                     }
                 }
             }
-            setFlowProjectInfo(flowList, flowTask);
+            getFlowTitle(flowTask);
+            flowList.add(flowTask);
         }
         page.setRecords(flowList);
         return AjaxResult.success(page);
@@ -882,7 +885,8 @@ 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() : "");
-            setFlowProjectInfo(flowList, flowTask);
+            getFlowTitle(flowTask);
+            flowList.add(flowTask);
         }
 
         page.setRecords(flowList);
@@ -942,50 +946,14 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             flowTask.setStartUserName(startUser.getNickName());
             flowTask.setStartDeptName(startUser.getDept().getDeptName());
             flowTask.setAssigneeId(Long.parseLong(histTask.getAssignee()));
-            setFlowProjectInfo(hisTaskList, flowTask);
+            getFlowTitle(flowTask);
+            hisTaskList.add(flowTask);
         }
         page.setTotal(taskInstanceQuery.count());
         page.setRecords(hisTaskList);
         return AjaxResult.success(page);
     }
 
-    /**
-     * 流程项目合同信息
-     *
-     */
-    private void setFlowProjectInfo(List<FlowTaskDto> hisTaskList, FlowTaskDto flowTask) {
-        if (flowTask.getProcDefName().contains("合同评审")) {
-            String formId = flowVarInstMapper.selectVarByProcInsId(flowTask.getProcInsId()).getText();
-            flowTask.setContractId(formId);
-            if (flowTask.getContractId() != null) {
-                if (flowTask.getProcDefName().contains("承接")) {
-                    CmcContract cmcContract = cmcContractService.selectCmcContractByContractId(flowTask.getContractId());
-                    if (cmcContract != null)
-                        flowTask.setContractName(cmcContractService.selectCmcContractByContractId(flowTask.getContractId()).getContractName());
-                }
-                if (flowTask.getProcDefName().contains("分包")) {
-                    CmcSubContract cmcSubContract = cmcSubContractService.selectCmcSubContractBySubContractId(flowTask.getContractId());
-                    if (cmcSubContract != null)
-                        flowTask.setContractName(cmcSubContractService.selectCmcSubContractBySubContractId(flowTask.getContractId()).getSubContractName());
-                }
-            }
-        }
-        else {
-            flowTask.setProjectId(getFlowProjectId(flowTask));
-            if (flowTask.getProjectId() != null) {
-                if (!flowTask.getProcDefName().equals("保证金审批")) {
-                    CmcProject cmcProject = cmcProjectService.selectCmcProjectByProjectId(flowTask.getProjectId());
-                    if (cmcProject != null) {
-                        flowTask.setProjectNumber(cmcProject.getProjectNumber());
-                        flowTask.setProjectName(cmcProject.getProjectName());
-                    }
-                } else
-                    flowTask.setProjectName(cmcTenderService.selectCmcTenderByTenderId(flowTask.getProjectId()).getProjectName());
-            }
-        }
-        hisTaskList.add(flowTask);
-    }
-
     private static <T> Predicate<T> distinctByKey(Function<? super T, ?> keyExtractor) {
         Set<Object> seen = ConcurrentHashMap.newKeySet();
         return t -> seen.add(keyExtractor.apply(t));
@@ -1601,7 +1569,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
      * 流程项目id
      *
      */
-    private String getFlowProjectId(FlowTaskDto flowTaskDto) {
+    private void getFlowTitle(FlowTaskDto flowTaskDto) {
         String projectId = "";
         String formId = flowVarInstMapper.selectVarByProcInsId(flowTaskDto.getProcInsId()).getText();
         if (flowTaskDto.getProcDefName().equals("品牌项目支付")) {
@@ -1610,10 +1578,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         }
         if (flowTaskDto.getProcDefName().equals("项目流转"))
             projectId = formId;
-        if (flowTaskDto.getProcDefName().equals("项目预算")) {
-            CmcBudget cmcBudget = cmcBudgetService.selectCmcBudgetByBudgetId(formId);
-            projectId = cmcBudget != null ? cmcBudget.getProjectId() : "";
-        }
+        if (flowTaskDto.getProcDefName().equals("项目预算"))
+            projectId = formId;
         if (flowTaskDto.getProcDefName().equals("技术方案"))
             projectId = formId;
         if (flowTaskDto.getProcDefName().equals("安全交底"))
@@ -1641,23 +1607,48 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         if (flowTaskDto.getProcDefName().equals("借款审批")) {
             CmcBorrow cmcBorrow = cmcBorrowService.selectCmcBorrowByBorrowId(formId);
             projectId = cmcBorrow != null ? cmcBorrow.getProjectId() : "";
+            if (projectId == null)
+                flowTaskDto.setTitle(cmcBorrow.getApplyReason());
         }
         if (flowTaskDto.getProcDefName().equals("用车审批")) {
             CmcCarApproval cmcCarApproval = cmcCarApprovalService.selectCmcCarApprovalByCarApplyId(formId);
             projectId = cmcCarApproval != null ? cmcCarApproval.getProjectId() : "";
+            if (projectId == null)
+                flowTaskDto.setTitle(cmcCarApproval.getApplyReason());
         }
         if (flowTaskDto.getProcDefName().equals("设备审批")) {
             CmcDeviceApproval cmcDeviceApproval = cmcDeviceApprovalService.selectCmcDeviceApprovalByDeviceApplyId(formId);
             projectId = cmcDeviceApproval != null ? cmcDeviceApproval.getProjectId() : "";
+            if (projectId == null)
+                flowTaskDto.setTitle(cmcDeviceApproval.getApplyReason());
         }
         if (flowTaskDto.getProcDefName().contains("考核")) {
             CmcAssess cmcAssess = cmcAssessService.selectCmcAssessByAssessId(formId);
             projectId = cmcAssess != null ? cmcAssess.getProjectId() : "";
         }
-        if (flowTaskDto.getProcDefName().equals("保证金评审")) {
+        if (flowTaskDto.getProcDefName().equals("保证金审批")) {
             CmcDeposit cmcDeposit = cmcDepositService.selectCmcDepositByDepositId(formId);
             projectId = cmcDeposit != null ? cmcDeposit.getTenderId().toString() : "";
         }
-        return projectId;
+        if (projectId != null && !projectId.equals("")){
+            if (flowTaskDto.getProcDefName().equals("保证金审批"))
+                flowTaskDto.setTitle(cmcTenderService.selectCmcTenderByTenderId(projectId).getProjectName());
+            else {
+                if (cmcProjectService.selectCmcProjectByProjectId(projectId) != null) //生产项目
+                    flowTaskDto.setTitle(cmcProjectService.selectCmcProjectByProjectId(projectId).getProjectNumber() + "-" + cmcProjectService.selectCmcProjectByProjectId(projectId).getProjectName());
+                else
+                    flowTaskDto.setTitle(cmcBrandProjectService.selectCmcBrandProjectByProjectId(projectId).getProjectNumber()); //品牌项目
+            }
+        }
+        if (flowTaskDto.getProcDefName().contains("承接")) {
+            CmcContract cmcContract = cmcContractService.selectCmcContractByContractId(formId);
+            if (cmcContract != null)
+                flowTaskDto.setTitle(cmcContractService.selectCmcContractByContractId(formId).getContractName());
+        }
+        if (flowTaskDto.getProcDefName().contains("分包")) {
+            CmcSubContract cmcSubContract = cmcSubContractService.selectCmcSubContractBySubContractId(formId);
+            if (cmcSubContract != null)
+                flowTaskDto.setTitle(cmcSubContractService.selectCmcSubContractBySubContractId(formId).getSubContractName());
+        }
     }
 }