成果归档质检节点修改

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

@@ -8,8 +8,11 @@ import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SnowFlake;
 import com.ruoyi.oa.domain.CmcProjectWork;
+import com.ruoyi.oa.domain.CmcTechnical;
 import com.ruoyi.oa.service.ICmcProjectWorkService;
+import com.ruoyi.oa.service.ICmcTechnicalService;
 import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
@@ -34,12 +37,18 @@ public class CmcProjectController extends BaseController
     @Autowired
     private ICmcProjectService cmcProjectService;
 
+    @Autowired
+    private ICmcTechnicalService cmcTechnicalService;
+
     @Autowired
     private ICmcProjectWorkService cmcProjectWorkService;
 
     @Autowired
     private ISysDeptService deptService;
 
+    @Autowired
+    private ISysUserService userService;
+
     /**
      * 查询cmc项目列表
      */
@@ -77,6 +86,13 @@ public class CmcProjectController extends BaseController
                 underTakingDeptName.append(deptService.selectDeptById(Long.parseLong(dept)).getDeptName()).append("、");
             cmcProject.setUndertakingDeptName(underTakingDeptName.substring(0, underTakingDeptName.length() - 1));
         }
+        String qualityInspector = cmcProject.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("、");
+            cmcProject.setQualityInspectorName(qualityInspectorName.substring(0, qualityInspectorName.length() - 1));
+        }
         return success(cmcProject);
     }
 

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcProject.java

@@ -37,7 +37,9 @@ public class CmcProject extends BaseEntity
 
     private SysUser technicalDirectorUser;
 
-    private SysUser qualityInspectorUser;
+    private String qualityInspector;
+
+    private String qualityInspectorName;
 
     /** 项目状态（0进行中、1已结束） */
     @Excel(name = "项目状态", readConverterExp = "0=进行中,1=已结束")
@@ -387,14 +389,23 @@ public class CmcProject extends BaseEntity
     {
         return technicalDirectorUser;
     }
-    public void setQualityInspectorUser(SysUser qualityInspectorUser)
+    public void setQualityInspector(String qualityInspector)
+    {
+        this.qualityInspector = qualityInspector;
+    }
+
+    public String getQualityInspector()
+    {
+        return qualityInspector;
+    }
+    public void setQualityInspectorName(String qualityInspectorName)
     {
-        this.qualityInspectorUser = qualityInspectorUser;
+        this.qualityInspectorName = qualityInspectorName;
     }
 
-    public SysUser getQualityInspectorUser()
+    public String getQualityInspectorName()
     {
-        return qualityInspectorUser;
+        return qualityInspectorName;
     }
     public void setProjectKml(String projectKml)
     {

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectMapper.xml

@@ -19,6 +19,7 @@
         <result property="projectRegistrant"    column="project_registrant"    />
         <result property="undertakingDept"    column="undertaking_dept"    />
         <result property="projectPlanner"    column="project_planner"    />
+        <result property="qualityInspector"    column="quality_inspector"    />
         <result property="siteLeader"    column="site_leader"    />
         <result property="organizeDocument"    column="organize_document"    />
         <result property="organizeTime"    column="organize_time"    />
@@ -39,7 +40,6 @@
         <association property="projectLeaderUser"    javaType="SysUser"         resultMap="ProjectLeaderResult" />
         <association property="projectRegistrantUser"    javaType="SysUser"         resultMap="ProjectRegistrantResult" />
         <association property="technicalDirectorUser"    javaType="SysUser"         resultMap="TechnicalDirectorResult" />
-        <association property="qualityInspectorUser"    javaType="SysUser"         resultMap="QualityInspectorResult" />
     </resultMap>
 
     <resultMap type="SysUser" id="ProjectLeaderResult">
@@ -57,21 +57,14 @@
         <result property="nickName"    column="director_nick_name"    />
     </resultMap>
 
-    <resultMap type="SysUser" id="QualityInspectorResult">
-        <result property="userId"    column="inspector_user_id"    />
-        <result property="nickName"    column="inspector_nick_name"    />
-    </resultMap>
-
     <sql id="selectCmcProjectVo">
         select p.project_id, p.project_number, p.project_name, p.project_leader, u.nick_name as leader_nick_name, p.is_finished, p.project_source, p.party_a, p.contact_person, p.telephone,
                p.project_type, p.project_level, p.project_registrant, u1.nick_name as registrant_nick_name, p.undertaking_dept, p.project_planner, p.site_leader, p.organize_document, p.organize_time,
-               p.register_time, p.plan_time, p.entry_time, p.exit_time, p.remark, c.technical_director, u2.nick_name as director_nick_name, c.quality_inspector, u3.nick_name as inspector_nick_name,
-               u3.user_id as inspector_user_id, p.project_kml, p.project_cp, p.kml_lng, p.kml_lat, p.cars, p.drivers, p.devices, p.participates, p.task_document from cmc_project as p
+               p.register_time, p.plan_time, p.entry_time, p.exit_time, p.remark, c.technical_director, u2.nick_name as director_nick_name, c.quality_inspector, p.project_kml, p.project_cp, p.kml_lng, p.kml_lat, p.cars, p.drivers, p.devices, p.participates, p.task_document from cmc_project as p
         left join sys_user as u on u.user_id = p.project_leader
         left join sys_user as u1 on u1.user_id = p.project_registrant
         left join cmc_technical as c on c.project_id = p.project_id
         left join sys_user as u2 on u2.user_id = c.technical_director
-        left join sys_user as u3 on u3.user_id = c.quality_inspector
     </sql>
 
     <select id="selectCmcProjectList" parameterType="CmcProject" resultMap="CmcProjectResult">

oa-ui/src/views/flowable/form/archiveForm.vue

@@ -14,29 +14,29 @@
             </el-select> -->
             <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="2" direction="vertical">
               <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
-                }}</el-descriptions-item>
+              }}</el-descriptions-item>
               <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
-                }}</el-descriptions-item>
+              }}</el-descriptions-item>
               <el-descriptions-item label="甲方单位" label-class-name="my-label">{{ chooseProject.partyA
-                }}</el-descriptions-item>
+              }}</el-descriptions-item>
               <el-descriptions-item label="合同编码" label-class-name="my-label">{{ contractCode
-                }}</el-descriptions-item>
+              }}</el-descriptions-item>
               <el-descriptions-item label="承担部门" label-class-name="my-label">{{
-      chooseProject.undertakingDeptName
-    }}</el-descriptions-item>
+                chooseProject.undertakingDeptName
+              }}</el-descriptions-item>
               <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser
-      ? chooseProject.projectLeaderUser.nickName : ''
-                }}</el-descriptions-item>
+                ? chooseProject.projectLeaderUser.nickName : ''
+              }}</el-descriptions-item>
               <el-descriptions-item label="技术负责人" label-class-name="my-label">{{
-      chooseProject.technicalDirectorUser ? chooseProject.technicalDirectorUser.nickName :
-        '' }}</el-descriptions-item>
+                chooseProject.technicalDirectorUser ? chooseProject.technicalDirectorUser.nickName :
+                '' }}</el-descriptions-item>
               <el-descriptions-item label="质检审核员" label-class-name="my-label">{{
-      chooseProject.qualityInspectorUser ? chooseProject.qualityInspectorUser.nickName : ''
-    }}</el-descriptions-item>
+                chooseProject.qualityInspectorName
+              }}</el-descriptions-item>
               <el-descriptions-item label="坐标经度" label-class-name="my-label">{{ chooseProject.kmlLng
-                }}</el-descriptions-item>
+              }}</el-descriptions-item>
               <el-descriptions-item label="坐标纬度" label-class-name="my-label">{{ chooseProject.kmlLat
-                }}</el-descriptions-item>
+              }}</el-descriptions-item>
             </el-descriptions>
           </el-form-item>
           <el-form-item label="归档状态">
@@ -48,8 +48,8 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item label="备注说明" prop="submitSituation">
-            <el-input type="textarea" v-model="form.submitSituation" placeholder="请输入备注说明"
-              :disabled="taskName != '成果上传'" :autosize="{ minRows: 4 }" />
+            <el-input type="textarea" v-model="form.submitSituation" placeholder="请输入备注说明" :disabled="taskName != '成果上传'"
+              :autosize="{ minRows: 4 }" />
           </el-form-item>
           <el-divider></el-divider>
           <el-form-item label="部门检查员检查" prop="produceComment">
@@ -190,9 +190,9 @@ export default {
       type: Object,
       required: true
     },
-    isFlow:{
-      type:Object,
-      default:true
+    isFlow: {
+      type: Object,
+      default: true
     }
   },
   name: "Archive",
@@ -299,7 +299,7 @@ export default {
     }
     this.getProjectList();
     this.getList();
-    if(this.isFlow){
+    if (this.isFlow) {
       flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
         this.flowData = res.data;
       })
@@ -536,7 +536,8 @@ export default {
                 this.completeTitle = "流程审批";
               }
               if (this.taskName == '部门检查') {
-                this.$set(this.taskForm.variables, "approval", this.chooseProject.qualityInspectorUser.userId);
+                let approvalList = this.chooseProject.qualityInspector.split(',')
+                this.$set(this.taskForm.variables, "approvalList", approvalList);
                 complete(this.taskForm).then(response => {
                   this.$modal.msgSuccess(response.msg);
                   this.$emit('goBack')