流程项目信息

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

@@ -27,9 +27,7 @@ import com.ruoyi.flowable.flow.FlowableUtils;
 import com.ruoyi.flowable.service.IFlowTaskService;
 import com.ruoyi.flowable.service.ISysDeployFormService;
 import com.ruoyi.flowable.service.ISysFormService;
-import com.ruoyi.oa.domain.CmcContract;
-import com.ruoyi.oa.domain.CmcProject;
-import com.ruoyi.oa.domain.CmcSubContract;
+import com.ruoyi.oa.domain.*;
 import com.ruoyi.oa.service.*;
 import com.ruoyi.system.domain.FlowProcDefDto;
 import com.ruoyi.system.domain.FlowVarInst;
@@ -1605,36 +1603,60 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
     private String getFlowProjectId(FlowTaskDto flowTaskDto) {
         String projectId = "";
         String formId = flowVarInstMapper.selectVarByProcInsId(flowTaskDto.getProcInsId()).getText();
-        if (flowTaskDto.getProcDefName().equals("品牌项目支付"))
-            projectId = cmcBrandService.selectCmcBrandByBrandId(formId).getProjectId();
+        if (flowTaskDto.getProcDefName().equals("品牌项目支付")) {
+            CmcBrand cmcBrand = cmcBrandService.selectCmcBrandByBrandId(formId);
+            projectId = cmcBrand != null ? cmcBrand.getProjectId() : "";
+        }
         if (flowTaskDto.getProcDefName().equals("项目流转"))
             projectId = formId;
-        if (flowTaskDto.getProcDefName().equals("项目预算"))
-            projectId = cmcBudgetService.selectCmcBudgetByBudgetId(formId).getProjectId();
+        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("技术交底"))
-            projectId = cmcTechnicalService.selectCmcTechnicalByTechnicalId(formId).getProjectId();
-        if (flowTaskDto.getProcDefName().equals("成果归档"))
-            projectId = cmcArchiveService.selectCmcArchiveByArchiveId(formId).getProjectId();
-        if (flowTaskDto.getProcDefName().contains("结算"))
-            projectId = cmcSettleService.selectCmcSettleBySettleId(formId).getProjectId();
-        if (flowTaskDto.getProcDefName().equals("项目变更"))
-            projectId = cmcProjectChangeService.selectCmcProjectChangeByChangeId(formId).getProjectId();
-        if (flowTaskDto.getProcDefName().equals("工作填报"))
-            projectId = cmcDeclareService.selectCmcDeclareByFormId(formId).getProjectId();
-        if (flowTaskDto.getProcDefName().equals("借款审批"))
-            projectId = cmcBorrowService.selectCmcBorrowByBorrowId(formId).getProjectId();
-        if (flowTaskDto.getProcDefName().equals("用车审批"))
-            projectId = cmcCarApprovalService.selectCmcCarApprovalByCarApplyId(formId).getProjectId();
-        if (flowTaskDto.getProcDefName().equals("设备审批"))
-            projectId = cmcDeviceApprovalService.selectCmcDeviceApprovalByDeviceApplyId(formId).getProjectId();
-        if (flowTaskDto.getProcDefName().contains("考核"))
-            projectId = cmcAssessService.selectCmcAssessByAssessId(formId).getProjectId();
-        if (flowTaskDto.getProcDefName().equals("保证金评审"))
-            projectId = cmcDepositService.selectCmcDepositByDepositId(formId).getTenderId().toString();
+        if (flowTaskDto.getProcDefName().equals("技术交底")) {
+            CmcTechnical cmcTechnical = cmcTechnicalService.selectCmcTechnicalByTechnicalId(formId);
+            projectId = cmcTechnical != null ? cmcTechnical.getProjectId() : "";
+        }
+        if (flowTaskDto.getProcDefName().equals("成果归档")) {
+            CmcArchive cmcArchive = cmcArchiveService.selectCmcArchiveByArchiveId(formId);
+            projectId = cmcArchive != null ? cmcArchive.getProjectId() : "";
+        }
+        if (flowTaskDto.getProcDefName().contains("结算")) {
+            CmcSettle cmcSettle = cmcSettleService.selectCmcSettleBySettleId(formId);
+            projectId = cmcSettle != null ? cmcSettle.getProjectId() : "";
+        }
+        if (flowTaskDto.getProcDefName().equals("项目变更")) {
+            CmcProjectChange cmcProjectChange = cmcProjectChangeService.selectCmcProjectChangeByChangeId(formId);
+            projectId = cmcProjectChange != null ? cmcProjectChange.getProjectId() : "";
+        }
+        if (flowTaskDto.getProcDefName().equals("工作填报")) {
+            CmcDeclare cmcDeclare = cmcDeclareService.selectCmcDeclareByFormId(formId);
+            projectId = cmcDeclare != null ? cmcDeclare.getProjectId() : "";
+        }
+        if (flowTaskDto.getProcDefName().equals("借款审批")) {
+            CmcBorrow cmcBorrow = cmcBorrowService.selectCmcBorrowByBorrowId(formId);
+            projectId = cmcBorrow != null ? cmcBorrow.getProjectId() : "";
+        }
+        if (flowTaskDto.getProcDefName().equals("用车审批")) {
+            CmcCarApproval cmcCarApproval = cmcCarApprovalService.selectCmcCarApprovalByCarApplyId(formId);
+            projectId = cmcCarApproval != null ? cmcCarApproval.getProjectId() : "";
+        }
+        if (flowTaskDto.getProcDefName().equals("设备审批")) {
+            CmcDeviceApproval cmcDeviceApproval = cmcDeviceApprovalService.selectCmcDeviceApprovalByDeviceApplyId(formId);
+            projectId = cmcDeviceApproval != null ? cmcDeviceApproval.getProjectId() : "";
+        }
+        if (flowTaskDto.getProcDefName().contains("考核")) {
+            CmcAssess cmcAssess = cmcAssessService.selectCmcAssessByAssessId(formId);
+            projectId = cmcAssess != null ? cmcAssess.getProjectId() : "";
+        }
+        if (flowTaskDto.getProcDefName().equals("保证金评审")) {
+            CmcDeposit cmcDeposit = cmcDepositService.selectCmcDepositByDepositId(formId);
+            projectId = cmcDeposit != null ? cmcDeposit.getTenderId().toString() : "";
+        }
         return projectId;
     }
 }