技术交底流程

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

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.oa;
 
+import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -82,6 +83,15 @@ public class CmcTechnicalController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CmcTechnical cmcTechnical)
     {
+        if (cmcTechnical.getDesignDescription() != null) {
+            cmcTechnical.setTechnicalUploadTime(new Date());
+        }
+        if (cmcTechnical.getTechnicalComment() != null) {
+            cmcTechnical.setTechApprovalTime(new Date());
+        }
+        if (cmcTechnical.getManageComment() != null) {
+            cmcTechnical.setManageApprovalTime(new Date());
+        }
         return toAjax(cmcTechnicalService.updateCmcTechnical(cmcTechnical));
     }
 

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

@@ -2,6 +2,7 @@ package com.ruoyi.oa.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -36,6 +37,12 @@ public class CmcTechnical extends BaseEntity
     @Excel(name = "技术安排人")
     private Long technicalPlanner;
 
+    private SysUser planUser;
+
+    private SysUser designUser;
+
+    private SysUser managerUser;
+
     /** 技术安排意见 */
     @Excel(name = "技术安排意见")
     private String planComment;
@@ -125,6 +132,24 @@ public class CmcTechnical extends BaseEntity
     {
         return technicalPlanner;
     }
+    public void setPlanUser(SysUser planUser)
+    {
+        this.planUser = planUser;
+    }
+
+    public SysUser getPlanUser()
+    {
+        return planUser;
+    }
+    public void setDesignUser(SysUser designUser)
+    {
+        this.designUser = designUser;
+    }
+
+    public SysUser getDesignUser()
+    {
+        return designUser;
+    }
     public void setPlanComment(String planComment)
     {
         this.planComment = planComment;

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

@@ -20,35 +20,51 @@
         <result property="technicalUploadTime"    column="technical_upload_time"    />
         <result property="techApprovalTime"    column="tech_approval_time"    />
         <result property="manageApprovalTime"    column="manage_approval_time"    />
+        <association property="planUser"    javaType="SysUser"         resultMap="PlanUserResult" />
+        <association property="designUser"    javaType="SysUser"         resultMap="DesignUserResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="PlanUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="plan_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="DesignUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="design_nick_name"    />
     </resultMap>
 
     <sql id="selectCmcTechnicalVo">
-        select technical_id, project_id, technical_director, technical_designer, technical_planner, plan_comment, quality_inspector, technical_time, technical_document, design_description, technical_comment, manage_comment, technical_upload_time, tech_approval_time, manage_approval_time from cmc_technical
+        select t.technical_id, t.project_id, t.technical_director, t.technical_designer, u.nick_name as design_nick_name, t.technical_planner, u1.nick_name as plan_nick_name,
+               t.plan_comment, t.quality_inspector, t.technical_time, t.technical_document, t.design_description, t.technical_comment, t.manage_comment, t.technical_upload_time,
+               t.tech_approval_time, t.manage_approval_time from cmc_technical as t
+         left join sys_user as u on u.user_id = t.technical_designer
+         left join sys_user as u1 on u1.user_id = t.technical_planner
     </sql>
 
     <select id="selectCmcTechnicalList" parameterType="CmcTechnical" resultMap="CmcTechnicalResult">
         <include refid="selectCmcTechnicalVo"/>
         <where>
-            <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
-            <if test="technicalDirector != null "> and technical_director = #{technicalDirector}</if>
-            <if test="technicalDesigner != null "> and technical_designer = #{technicalDesigner}</if>
-            <if test="technicalPlanner != null "> and technical_planner = #{technicalPlanner}</if>
-            <if test="planComment != null  and planComment != ''"> and plan_comment = #{planComment}</if>
-            <if test="qualityInspector != null  and qualityInspector != ''"> and quality_inspector = #{qualityInspector}</if>
-            <if test="technicalTime != null "> and technical_time = #{technicalTime}</if>
-            <if test="technicalDocument != null  and technicalDocument != ''"> and technical_document = #{technicalDocument}</if>
-            <if test="designDescription != null  and designDescription != ''"> and design_description = #{designDescription}</if>
-            <if test="technicalComment != null  and technicalComment != ''"> and technical_comment = #{technicalComment}</if>
-            <if test="manageComment != null  and manageComment != ''"> and manage_comment = #{manageComment}</if>
-            <if test="technicalUploadTime != null "> and technical_upload_time = #{technicalUploadTime}</if>
-            <if test="techApprovalTime != null "> and tech_approval_time = #{techApprovalTime}</if>
-            <if test="manageApprovalTime != null "> and manage_approval_time = #{manageApprovalTime}</if>
+            <if test="projectId != null  and projectId != ''"> and t.project_id = #{projectId}</if>
+            <if test="technicalDirector != null "> and t.technical_director = #{technicalDirector}</if>
+            <if test="technicalDesigner != null "> and t.technical_designer = #{technicalDesigner}</if>
+            <if test="technicalPlanner != null "> and t.technical_planner = #{technicalPlanner}</if>
+            <if test="planComment != null  and planComment != ''"> and t.plan_comment = #{planComment}</if>
+            <if test="qualityInspector != null  and qualityInspector != ''"> and t.quality_inspector = #{qualityInspector}</if>
+            <if test="technicalTime != null "> and t.technical_time = #{technicalTime}</if>
+            <if test="technicalDocument != null  and technicalDocument != ''"> and t.technical_document = #{technicalDocument}</if>
+            <if test="designDescription != null  and designDescription != ''"> and t.design_description = #{designDescription}</if>
+            <if test="technicalComment != null  and technicalComment != ''"> and t.technical_comment = #{technicalComment}</if>
+            <if test="manageComment != null  and manageComment != ''"> and t.manage_comment = #{manageComment}</if>
+            <if test="technicalUploadTime != null "> and t.technical_upload_time = #{technicalUploadTime}</if>
+            <if test="techApprovalTime != null "> and t.tech_approval_time = #{techApprovalTime}</if>
+            <if test="manageApprovalTime != null "> and t.manage_approval_time = #{manageApprovalTime}</if>
         </where>
     </select>
 
     <select id="selectCmcTechnicalByTechnicalId" parameterType="String" resultMap="CmcTechnicalResult">
         <include refid="selectCmcTechnicalVo"/>
-        where technical_id = #{technicalId}
+        where t.technical_id = #{technicalId}
     </select>
 
     <insert id="insertCmcTechnical" parameterType="CmcTechnical">

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

@@ -53,7 +53,7 @@
             </el-col>
           </el-row>
           <el-form-item label="技术安排意见" prop="planComment">
-            <el-input type="textarea" v-model="form.planComment" placeholder="请输入技术安排意见" />
+            <el-input type="textarea" v-model="form.planComment" placeholder="请输入技术安排意见" :disabled="taskName != '技术安排'" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
@@ -64,7 +64,7 @@
             <el-col :span="6">
               <el-form-item label="日期" prop="technicalTime" v-if="showFormItem('技术安排')">
                 <el-date-picker style="width:170px;" clearable v-model="form.technicalTime" type="date"
-                  value-format="yyyy-MM-dd" placeholder="请选择技术安排时间">
+                  value-format="yyyy-MM-dd" placeholder="请选择技术安排时间" :disabled="taskName != '技术安排'">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -117,7 +117,7 @@
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
               <el-form-item label="签名" prop="manager" v-if="showFormItem('总工审核')">
-                <span class="auditor"> {{ form.managerUser ? form.managerUser.nickName : managerUser }} </span>
+                <span class="auditor"> {{ managerUser }} </span>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -153,7 +153,7 @@ import { listUser } from '@/api/system/user';
 import flow from '@/views/flowable/task/todo/detail/flow';
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
 import { flowXmlAndNode } from "@/api/flowable/definition";
-import { getUsersDeptLeaderByDept } from '@/api/system/post'
+import { getUsersManageLeaderByDept } from '@/api/system/post'
 
 export default {
   components: {
@@ -257,7 +257,7 @@ export default {
         }
         else {
           this.formTotal = 1;
-          this.form = res.data;
+          let data = res.data;
           if (res.data.qualityInspector == null || res.data.qualityInspector == undefined || res.data.qualityInspector == "") {
             data.qualityInspector = []
           } else {
@@ -268,6 +268,8 @@ export default {
             }
             data.qualityInspector = arr
           }
+          this.form = data;
+          console.log(this.form);
         }
       })
     },
@@ -364,6 +366,8 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.formTotal != 0) {
+            this.form.qualityInspector = this.form.qualityInspector.join(',');
+            console.log(this.form);
             updateTechnical(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -379,7 +383,7 @@ export default {
                 });
               }
               else if (this.taskName == '技术审核') {
-                getUsersDeptLeaderByDept({ deptId: 110 }).then(res => {
+                getUsersManageLeaderByDept({ deptId: 110 }).then(res => {
                   let userId = res.data.userId;
                   this.$set(this.taskForm.variables, "approval", userId);
                   complete(this.taskForm).then(response => {
@@ -397,6 +401,7 @@ export default {
             })
           } else {
             this.form.qualityInspector = '';
+            this.form.technicalId = this.taskForm.formId;
             addTechnical(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;