待办合同名称

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectController.java

@@ -85,6 +85,16 @@ public class CmcProjectController extends BaseController
     public void export(HttpServletResponse response, CmcProject cmcProject)
     {
         List<CmcProject> list = cmcProjectService.selectCmcProjectList(cmcProject);
+        for (CmcProject project : list) {
+            project.setUndertakingDeptName(deptIdToName(project));
+            String qualityInspector = project.getQualityInspector();
+            StringBuilder qualityInspectorName = new StringBuilder();
+            if (qualityInspector != null && !qualityInspector.equals("") && qualityInspector.split(",").length > 0) {
+                for (String inspector : qualityInspector.split(","))
+                    qualityInspectorName.append(userService.selectUserById(Long.parseLong(inspector)).getNickName()).append(",");
+                project.setQualityInspectorName(qualityInspectorName.substring(0, qualityInspectorName.length() - 1));
+            }
+        }
         ExcelUtil<CmcProject> util = new ExcelUtil<CmcProject>(CmcProject.class);
         util.exportExcel(response, list, "cmc项目数据");
     }

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

@@ -955,7 +955,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
      */
     private void setFlowProjectInfo(List<FlowTaskDto> hisTaskList, FlowTaskDto flowTask) {
         if (flowTask.getProcDefName().contains("合同评审")) {
-            flowTask.setContractId(flowTask.getProcInsId());
+            String formId = flowVarInstMapper.selectVarByProcInsId(flowTask.getProcInsId()).getText();
+            flowTask.setContractId(formId);
             if (flowTask.getContractId() != null) {
                 if (flowTask.getProcDefName().contains("承接")) {
                     CmcContract cmcContract = cmcContractService.selectCmcContractByContractId(flowTask.getContractId());