浏览代码

流程项目信息

lamphua 9 个月前
父节点
当前提交
e107fe06c5

+ 16
- 6
oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java 查看文件

27
 import com.ruoyi.flowable.service.IFlowTaskService;
27
 import com.ruoyi.flowable.service.IFlowTaskService;
28
 import com.ruoyi.flowable.service.ISysDeployFormService;
28
 import com.ruoyi.flowable.service.ISysDeployFormService;
29
 import com.ruoyi.flowable.service.ISysFormService;
29
 import com.ruoyi.flowable.service.ISysFormService;
30
+import com.ruoyi.oa.domain.CmcContract;
30
 import com.ruoyi.oa.domain.CmcProject;
31
 import com.ruoyi.oa.domain.CmcProject;
32
+import com.ruoyi.oa.domain.CmcSubContract;
31
 import com.ruoyi.oa.service.*;
33
 import com.ruoyi.oa.service.*;
32
 import com.ruoyi.system.domain.FlowProcDefDto;
34
 import com.ruoyi.system.domain.FlowProcDefDto;
33
 import com.ruoyi.system.domain.FlowVarInst;
35
 import com.ruoyi.system.domain.FlowVarInst;
949
         return AjaxResult.success(page);
951
         return AjaxResult.success(page);
950
     }
952
     }
951
 
953
 
954
+    /**
955
+     * 流程项目合同信息
956
+     *
957
+     */
952
     private void setFlowProjectInfo(List<FlowTaskDto> hisTaskList, FlowTaskDto flowTask) {
958
     private void setFlowProjectInfo(List<FlowTaskDto> hisTaskList, FlowTaskDto flowTask) {
953
         if (flowTask.getProcDefName().contains("合同评审")) {
959
         if (flowTask.getProcDefName().contains("合同评审")) {
954
             flowTask.setContractId(flowTask.getProcInsId());
960
             flowTask.setContractId(flowTask.getProcInsId());
955
             if (flowTask.getContractId() != null) {
961
             if (flowTask.getContractId() != null) {
956
-                if (flowTask.getProcDefName().contains("承接"))
957
-                    flowTask.setContractName(cmcContractService.selectCmcContractByContractId(flowTask.getContractId()).getContractName());
958
-                if (flowTask.getProcDefName().contains("分包"))
959
-                    flowTask.setContractName(cmcSubContractService.selectCmcSubContractBySubContractId(flowTask.getContractId()).getSubContractName());
962
+                if (flowTask.getProcDefName().contains("承接")) {
963
+                    CmcContract cmcContract = cmcContractService.selectCmcContractByContractId(flowTask.getContractId());
964
+                    if (cmcContract != null)
965
+                        flowTask.setContractName(cmcContractService.selectCmcContractByContractId(flowTask.getContractId()).getContractName());
966
+                }
967
+                if (flowTask.getProcDefName().contains("分包")) {
968
+                    CmcSubContract cmcSubContract = cmcSubContractService.selectCmcSubContractBySubContractId(flowTask.getContractId());
969
+                    if (cmcSubContract != null)
970
+                        flowTask.setContractName(cmcSubContractService.selectCmcSubContractBySubContractId(flowTask.getContractId()).getSubContractName());
971
+                }
960
             }
972
             }
961
         }
973
         }
962
         else {
974
         else {
1589
     /**
1601
     /**
1590
      * 流程项目id
1602
      * 流程项目id
1591
      *
1603
      *
1592
-     * @param flowTaskDto
1593
-     * @return
1594
      */
1604
      */
1595
     private String getFlowProjectId(FlowTaskDto flowTaskDto) {
1605
     private String getFlowProjectId(FlowTaskDto flowTaskDto) {
1596
         String projectId = "";
1606
         String projectId = "";

正在加载...
取消
保存