1.提交、查询审核表

2.流程图修改

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

@@ -1,17 +1,24 @@
 package com.ruoyi.web.controller.oa;
 
+import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SnowFlake;
+import com.ruoyi.oa.domain.CmcAssessContent;
+import com.ruoyi.oa.domain.CmcAssessContentWork;
+import com.ruoyi.oa.service.ICmcAssessContentService;
+import com.ruoyi.oa.service.ICmcAssessContentWorkService;
+import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.service.ISysUserService;
+import org.joda.time.DateTime;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -33,6 +40,14 @@ public class CmcAssessController extends BaseController
 {
     @Autowired
     private ICmcAssessService cmcAssessService;
+    @Autowired
+    private ICmcAssessContentService cmcAssessContentService;
+    @Autowired
+    private ICmcAssessContentWorkService cmcAssessContentWorkService;
+    @Autowired
+    private ISysUserService userService;
+    @Autowired
+    private ISysDeptService deptService;
 
     /**
      * 查询考核表列表
@@ -66,7 +81,45 @@ public class CmcAssessController extends BaseController
     @GetMapping(value = "/{assessId}")
     public AjaxResult getInfo(@PathVariable("assessId") String assessId)
     {
-        return success(cmcAssessService.selectCmcAssessByAssessId(assessId));
+        CmcAssess cmcAssess = cmcAssessService.selectCmcAssessByAssessId(assessId);
+        List<CmcAssessContent> cmcAssessContentList = cmcAssessContentService.selectCmcAssessContentByContentId(assessId);
+        List<CmcAssessContentWork> cmcAssessContentWorkList = cmcAssessContentWorkService.selectCmcAssessContentWorkByWorkId(assessId);
+        Long userId = cmcAssess.getUserId();
+        JSONObject formData = new JSONObject();
+        formData.put("nickName", userService.selectUserById(userId).getNickName());
+        formData.put("assessId", cmcAssess.getAssessId());
+        formData.put("assessTime", cmcAssess.getAssessTime());
+        formData.put("projectName", cmcAssess.getProjectId());
+        formData.put("deptName", deptService.selectDeptById(userService.selectUserById(userId).getDeptId()).getDeptName());
+        formData.put("postGroup", userService.selectUserPostGroup(userService.selectUserById(userId).getUserName()));
+        formData.put("pmlevel", userService.selectUserById(userId).getPmLevel());
+        formData.put("titles", userService.selectUserById(userId).getTitles());
+        formData.put("remark", userService.selectUserById(userId).getRemark());
+        formData.put("entryDate", userService.selectUserById(userId).getEntryDate());
+        formData.put("age", userService.selectUserById(userId).getAge());
+        formData.put("otherWork", cmcAssess.getOtherWork());
+        formData.put("selfAssess", cmcAssess.getSelfAssess());
+        formData.put("deptAssesser", cmcAssess.getDeptAssesser());
+        formData.put("deptAssessment", cmcAssess.getDeptAssessment());
+        formData.put("deptAdvice", cmcAssess.getDeptAdvice());
+        formData.put("deptTime", cmcAssess.getDeptTime());
+        formData.put("managerAssesser", cmcAssess.getManagerAssesser());
+        formData.put("managerAssessment", cmcAssess.getManagerAssessment());
+        formData.put("managerAdvice", cmcAssess.getManagerAdvice());
+        formData.put("managerTime", cmcAssess.getManagerTime());
+        for (CmcAssessContent cmcAssessContent: cmcAssessContentList) {
+            formData.put("role" + cmcAssessContent.getContentId().substring(19), cmcAssessContent.getRole());
+            formData.put("familiar" + cmcAssessContent.getContentId().substring(19), cmcAssessContent.getFamiliar());
+            formData.put("remark" + cmcAssessContent.getContentId().substring(19), cmcAssessContent.getRemark());
+            formData.put("skill" + cmcAssessContent.getContentId().substring(19), cmcAssessContent.getSkill());
+            formData.put("quality" + cmcAssessContent.getContentId().substring(19), cmcAssessContent.getQuality());
+            formData.put("assessment" + cmcAssessContent.getContentId().substring(19), cmcAssessContent.getAssessment());
+            formData.put("advice" + cmcAssessContent.getContentId().substring(19), cmcAssessContent.getAdvice());
+        }
+        for (CmcAssessContentWork cmcAssessContentWork: cmcAssessContentWorkList) {
+            formData.put("f" + cmcAssessContentWork.getWorkId().substring(19), cmcAssessContentWork.getWorkLoad());
+        }
+        return success(formData);
     }
 
     /**
@@ -80,6 +133,65 @@ public class CmcAssessController extends BaseController
         return toAjax(cmcAssessService.insertCmcAssess(cmcAssess));
     }
 
+    /**
+     * 提交考核表
+     */
+    @Log(title = "考核表", businessType = BusinessType.INSERT)
+    @PostMapping( "/submit")
+    public AjaxResult submit(@RequestParam("form")String formData)
+    {
+        JSONObject formDataJson = JSONObject.parse(formData);
+        SnowFlake snowFlake = new SnowFlake();
+        CmcAssess cmcAssess = new CmcAssess();
+        cmcAssess.setUserId(getLoginUser().getUserId());
+        cmcAssess.setFillTime(DateUtils.getNowDate());
+        cmcAssess.setAssessId(snowFlake.generateId());
+        cmcAssessService.insertCmcAssess(cmcAssess);
+        for (String key : formDataJson.keySet()) {
+            if (key.equals("projectId"))
+                cmcAssess.setProjectId(formDataJson.getLong(key));
+            if (key.equals("assessTime"))
+                cmcAssess.setAssessTime(formDataJson.getDate(key));
+            if (key.equals("otherWork"))
+                cmcAssess.setOtherWork(formDataJson.getString(key));
+            if (key.equals("selfAssess"))
+                cmcAssess.setSelfAssess(formDataJson.getString(key));
+            if (key.startsWith("role") && !Objects.equals(formDataJson.get(key), new JSONArray())) {
+                CmcAssessContent cmcAssessContent = new CmcAssessContent();
+                cmcAssessContent.setContentId(cmcAssess.getAssessId() + key.substring(4));
+                StringBuilder roles = new StringBuilder();
+                for (int i = 0; i < formDataJson.getJSONArray(key).size(); i++) {
+                    String rolei = "";
+                    if (i == formDataJson.getJSONArray(key).size() - 1)
+                        rolei = formDataJson.getJSONArray(key).getString(i);
+                    else
+                        rolei = formDataJson.getJSONArray(key).getString(i) + ",";
+                    roles.append(rolei);
+                }
+                cmcAssessContent.setRole(roles.toString());
+                cmcAssessContentService.insertCmcAssessContent(cmcAssessContent);
+            }
+            if (key.length() == 5 && key.startsWith("f") && !formDataJson.get(key).equals("")) {
+                CmcAssessContentWork cmcAssessContentWork = new CmcAssessContentWork();
+                cmcAssessContentWork.setWorkId(cmcAssess.getAssessId() + key.substring(1));
+                cmcAssessContentWork.setWorkLoad(formDataJson.getString(key));
+                cmcAssessContentWorkService.insertCmcAssessContentWork(cmcAssessContentWork);
+            }
+            if (key.startsWith("familiar")) {
+                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(cmcAssess.getAssessId() + key.substring(8)).get(0);
+                cmcAssessContent.setFamiliar(formDataJson.getString(key));
+                cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
+            }
+            if (key.startsWith("remark")) {
+                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(cmcAssess.getAssessId() + key.substring(6)).get(0);
+                cmcAssessContent.setRemark(formDataJson.getString(key));
+                cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
+            }
+
+        }
+        return AjaxResult.success("提交考核表成功");
+    }
+
     /**
      * 修改考核表
      */

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/oa/MyServiceTask.java

@@ -55,21 +55,21 @@ public class MyServiceTask implements JavaDelegate {
             if (key.equals("INITIATOR"))
                 cmcAssess.setUserId((Long) variables.get(key));
             if (removeDigital(key).equals(fieldList.get(0))) {
-                CmcAssessContent cmcAssessContent = cmcAssessContentMapper.selectCmcAssessContentByContentId(cmcAssess.getAssessId() + key.substring(4));
+                CmcAssessContent cmcAssessContent = cmcAssessContentMapper.selectCmcAssessContentByContentId(cmcAssess.getAssessId() + key.substring(4)).get(0);
                 if (cmcAssessContent != null) {
                     cmcAssessContent.setRole(variables.get(key).toString());
                     cmcAssessContentMapper.updateCmcAssessContent(cmcAssessContent);
                 }
             }
             if (removeDigital(key).equals(fieldList.get(1))) {
-                CmcAssessContent cmcAssessContent = cmcAssessContentMapper.selectCmcAssessContentByContentId(cmcAssess.getAssessId() + key.substring(8));
+                CmcAssessContent cmcAssessContent = cmcAssessContentMapper.selectCmcAssessContentByContentId(cmcAssess.getAssessId() + key.substring(8)).get(0);
                 if (cmcAssessContent != null) {
                     cmcAssessContent.setFamiliar(variables.get(key).toString());
                     cmcAssessContentMapper.updateCmcAssessContent(cmcAssessContent);
                 }
             }
             if (removeDigital(key).equals(fieldList.get(2))) {
-                CmcAssessContent cmcAssessContent = cmcAssessContentMapper.selectCmcAssessContentByContentId(cmcAssess.getAssessId() + key.substring(6));
+                CmcAssessContent cmcAssessContent = cmcAssessContentMapper.selectCmcAssessContentByContentId(cmcAssess.getAssessId() + key.substring(6)).get(0);
                 if (cmcAssessContent != null) {
                     cmcAssessContent.setRemark(variables.get(key).toString());
                     cmcAssessContentMapper.updateCmcAssessContent(cmcAssessContent);

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

@@ -29,11 +29,11 @@ public class CmcAssess extends BaseEntity
     private Long projectId;
 
     /** 考核时间（月份） */
-    @Excel(name = "考核时间", readConverterExp = "月=份")
+    @Excel(name = "考核时间", readConverterExp = "月份")
     private Date assessTime;
 
     /** 部门考核等级（不合格、合格、良好、优秀） */
-    @Excel(name = "部门考核等级", readConverterExp = "不=合格、合格、良好、优秀")
+    @Excel(name = "部门考核等级", readConverterExp = "不合格、合格、良好、优秀")
     private String deptAssessment;
 
     /** 部门考核意见 */
@@ -50,7 +50,7 @@ public class CmcAssess extends BaseEntity
     private String deptAssesser;
 
     /** 分管考核等级（不合格、合格、良好、优秀） */
-    @Excel(name = "分管考核等级", readConverterExp = "不=合格、合格、良好、优秀")
+    @Excel(name = "分管考核等级", readConverterExp = "不合格、合格、良好、优秀")
     private String managerAssessment;
 
     /** 分管考核意见 */
@@ -79,14 +79,6 @@ public class CmcAssess extends BaseEntity
     @Excel(name = "其他工作")
     private String otherWork;
 
-    /** 其他工作单位 */
-    @Excel(name = "其他工作单位")
-    private String otherWorkunit;
-
-    /** 其他工作量 */
-    @Excel(name = "其他工作量")
-    private String otherWorkload;
-
     public void setAssessId(String assessId)
     {
         this.assessId = assessId;
@@ -222,24 +214,6 @@ public class CmcAssess extends BaseEntity
     {
         return otherWork;
     }
-    public void setOtherWorkunit(String otherWorkunit)
-    {
-        this.otherWorkunit = otherWorkunit;
-    }
-
-    public String getOtherWorkunit()
-    {
-        return otherWorkunit;
-    }
-    public void setOtherWorkload(String otherWorkload)
-    {
-        this.otherWorkload = otherWorkload;
-    }
-
-    public String getOtherWorkload()
-    {
-        return otherWorkload;
-    }
 
     @Override
     public String toString() {
@@ -259,8 +233,6 @@ public class CmcAssess extends BaseEntity
                 .append("selfAssess", getSelfAssess())
                 .append("fillTime", getFillTime())
                 .append("otherWork", getOtherWork())
-                .append("otherWorkunit", getOtherWorkunit())
-                .append("otherWorkload", getOtherWorkload())
                 .toString();
     }
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcAssessContentMapper.java

@@ -17,7 +17,7 @@ public interface CmcAssessContentMapper
      * @param contentId 考核内容主键
      * @return 考核内容
      */
-    public CmcAssessContent selectCmcAssessContentByContentId(String contentId);
+    public List<CmcAssessContent> selectCmcAssessContentByContentId(String contentId);
 
     /**
      * 查询考核内容列表

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcAssessContentWorkMapper.java

@@ -17,7 +17,7 @@ public interface CmcAssessContentWorkMapper
      * @param workId 考核工作内容主键
      * @return 考核工作内容
      */
-    public CmcAssessContentWork selectCmcAssessContentWorkByWorkId(String workId);
+    public List<CmcAssessContentWork> selectCmcAssessContentWorkByWorkId(String workId);
 
     /**
      * 查询考核工作内容列表

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcAssessContentService.java

@@ -17,7 +17,7 @@ public interface ICmcAssessContentService
      * @param contentId 考核内容主键
      * @return 考核内容
      */
-    public CmcAssessContent selectCmcAssessContentByContentId(String contentId);
+    public List<CmcAssessContent> selectCmcAssessContentByContentId(String contentId);
 
     /**
      * 查询考核内容列表

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcAssessContentWorkService.java

@@ -17,7 +17,7 @@ public interface ICmcAssessContentWorkService
      * @param workId 考核工作内容主键
      * @return 考核工作内容
      */
-    public CmcAssessContentWork selectCmcAssessContentWorkByWorkId(String workId);
+    public List<CmcAssessContentWork> selectCmcAssessContentWorkByWorkId(String workId);
 
     /**
      * 查询考核工作内容列表

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcAssessContentServiceImpl.java

@@ -26,7 +26,7 @@ public class CmcAssessContentServiceImpl implements ICmcAssessContentService
      * @return 考核内容
      */
     @Override
-    public CmcAssessContent selectCmcAssessContentByContentId(String contentId)
+    public List<CmcAssessContent> selectCmcAssessContentByContentId(String contentId)
     {
         return cmcAssessContentMapper.selectCmcAssessContentByContentId(contentId);
     }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcAssessContentWorkServiceImpl.java

@@ -26,7 +26,7 @@ public class CmcAssessContentWorkServiceImpl implements ICmcAssessContentWorkSer
      * @return 考核工作内容
      */
     @Override
-    public CmcAssessContentWork selectCmcAssessContentWorkByWorkId(String workId)
+    public List<CmcAssessContentWork> selectCmcAssessContentWorkByWorkId(String workId)
     {
         return cmcAssessContentWorkMapper.selectCmcAssessContentWorkByWorkId(workId);
     }

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

@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectCmcAssessContentByContentId" parameterType="String" resultMap="CmcAssessContentResult">
         <include refid="selectCmcAssessContentVo"/>
-        where content_id = #{contentId}
+        where content_id like concat('%', #{content_id}, '%')
     </select>
         
     <insert id="insertCmcAssessContent" parameterType="CmcAssessContent">

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

@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectCmcAssessContentWorkByWorkId" parameterType="String" resultMap="CmcAssessContentWorkResult">
         <include refid="selectCmcAssessContentWorkVo"/>
-        where work_id = #{workId}
+        where work_id like concat('%', #{work_id}, '%')
     </select>
         
     <insert id="insertCmcAssessContentWork" parameterType="CmcAssessContentWork">

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

@@ -20,12 +20,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="selfAssess"    column="self_assess"    />
         <result property="fillTime"    column="fill_time"    />
         <result property="otherWork"    column="other_work"    />
-        <result property="otherWorkunit"    column="other_workunit"    />
-        <result property="otherWorkload"    column="other_workload"    />
     </resultMap>
 
     <sql id="selectCmcAssessVo">
-        select assess_id, user_id, project_id, assess_time, dept_assessment, dept_advice, dept_time, dept_assesser, manager_assessment, manager_advice, manager_time, manager_assesser, self_assess, fill_time, other_work, other_workunit, other_workload from cmc_assess
+        select assess_id, user_id, project_id, assess_time, dept_assessment, dept_advice, dept_time, dept_assesser, manager_assessment, manager_advice, manager_time, manager_assesser, self_assess, fill_time, other_work from cmc_assess
     </sql>
 
     <select id="selectCmcAssessList" parameterType="CmcAssess" resultMap="CmcAssessResult">
@@ -45,8 +43,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="selfAssess != null  and selfAssess != ''"> and self_assess = #{selfAssess}</if>
             <if test="fillTime != null "> and fill_time = #{fillTime}</if>
             <if test="otherWork != null  and otherWork != ''"> and other_work = #{otherWork}</if>
-            <if test="otherWorkunit != null  and otherWorkunit != ''"> and other_workunit = #{otherWorkunit}</if>
-            <if test="otherWorkload != null  and otherWorkload != ''"> and other_workload = #{otherWorkload}</if>
         </where>
     </select>
 
@@ -73,8 +69,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="selfAssess != null">self_assess,</if>
             <if test="fillTime != null">fill_time,</if>
             <if test="otherWork != null">other_work,</if>
-            <if test="otherWorkunit != null">other_workunit,</if>
-            <if test="otherWorkload != null">other_workload,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="assessId != null">#{assessId},</if>
@@ -92,8 +86,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="selfAssess != null">#{selfAssess},</if>
             <if test="fillTime != null">#{fillTime},</if>
             <if test="otherWork != null">#{otherWork},</if>
-            <if test="otherWorkunit != null">#{otherWorkunit},</if>
-            <if test="otherWorkload != null">#{otherWorkload},</if>
         </trim>
     </insert>
 
@@ -114,8 +106,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="selfAssess != null">self_assess = #{selfAssess},</if>
             <if test="fillTime != null">fill_time = #{fillTime},</if>
             <if test="otherWork != null">other_work = #{otherWork},</if>
-            <if test="otherWorkunit != null">other_workunit = #{otherWorkunit},</if>
-            <if test="otherWorkload != null">other_workload = #{otherWorkload},</if>
         </trim>
         where assess_id = #{assessId}
     </update>

oa-back/sql/ry_20231130.sql

@@ -68,7 +68,7 @@ create table sys_user (
   update_time       datetime                                   comment '更新时间',
   remark            varchar(500)    default null               comment '备注（作业类别）',
   pm_level			char(1)			default null			   comment '项目经理级别（0一、1二、2三）',
-  titles			char(1)			default null			   comment '技术职称（0正高、1副高、2中级、3助工、4注测、5注规、6注岩、7注安、8注会）',
+  titles			varchar(9)		default null			   comment '技术职称（0正高、1副高、2中级、3助工、4注测、5注规、6注岩、7注安、8注会）',
   engineer_level	char(1)			default null			   comment '岗级（0二、1三、2四、3五、4六）',
   entry_date		datetime								   comment '入职时间',
   age				int				default null			   comment '年龄',
@@ -1057,16 +1057,16 @@ insert into sys_dict_data values (54, 3, '精通', '3', 'cmc_skill', null, 'defa
 insert into sys_dict_data values (55, 0, '较少', '0', 'cmc_workload', null, 'default', 'N', '0', 'admin', '2024-01-08 16:09:14', '', null, null);
 insert into sys_dict_data values (56, 1, '正常', '1', 'cmc_workload', null, 'default', 'N', '0', 'admin', '2024-01-08 16:09:22', '', null, null);
 insert into sys_dict_data values (57, 2, '较多', '2', 'cmc_workload', null, 'default', 'N', '0', 'admin', '2024-01-08 16:09:30', '', null, null);
-insert into sys_dict_data values (58, 0, '主办', '0', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-08 16:11:04', '', null, null);
-insert into sys_dict_data values (59, 1, '参与', '1', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-08 16:11:15', '', null, null);
-insert into sys_dict_data values (60, 2, '协办', '2', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-08 16:11:39', '', null, null);
-insert into sys_dict_data values (61, 3, '常规项目', '3', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:15:45', '', null, null);
-insert into sys_dict_data values (62, 4, '监测项目', '4', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:16:47', '', null, null);
-insert into sys_dict_data values (63, 5, '调查项目', '5', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:19:17', '', null, null);
-insert into sys_dict_data values (64, 6, '测量项目', '6', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:20:20', '', null, null);
-insert into sys_dict_data values (65, 7, '其他项目', '7', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:20:32', '', null, null);
-insert into sys_dict_data values (66, 8, '选点', '8', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:23:11', '', null, null);
-insert into sys_dict_data values (67, 9, '埋石', '9', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:23:28', '', null, null);
+insert into sys_dict_data values (58, 0, '主办', '00', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-08 16:11:04', '', null, null);
+insert into sys_dict_data values (59, 1, '参与', '01', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-08 16:11:15', '', null, null);
+insert into sys_dict_data values (60, 2, '协办', '02', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-08 16:11:39', '', null, null);
+insert into sys_dict_data values (61, 3, '常规项目', '03', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:15:45', '', null, null);
+insert into sys_dict_data values (62, 4, '监测项目', '04', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:16:47', '', null, null);
+insert into sys_dict_data values (63, 5, '调查项目', '05', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:19:17', '', null, null);
+insert into sys_dict_data values (64, 6, '测量项目', '06', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:20:20', '', null, null);
+insert into sys_dict_data values (65, 7, '其他项目', '07', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:20:32', '', null, null);
+insert into sys_dict_data values (66, 8, '选点', '08', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:23:11', '', null, null);
+insert into sys_dict_data values (67, 9, '埋石', '09', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:23:28', '', null, null);
 insert into sys_dict_data values (68, 10, '观测', '10', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:23:44', '', null, null);
 insert into sys_dict_data values (69, 11, '计算', '11', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:24:21', '', null, null);
 insert into sys_dict_data values (70, 12, '检查', '12', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:24:33', '', null, null);
@@ -1292,8 +1292,6 @@ create table cmc_assess (
   self_assess			varchar(255)	default null	comment '自述',
   fill_time				datetime		default null	comment '考核填报时间',
   other_work			varchar(255)	default null	comment '其他工作',
-  other_workunit		varchar(255)	default null	comment '其他工作单位',
-  other_workload		varchar(255)	default null	comment '其他工作量',
   PRIMARY KEY (assess_id)
 ) engine=innodb	comment = 'cmc考核表';
 
@@ -1304,7 +1302,7 @@ create table cmc_assess (
 drop table if exists cmc_assess_content;
 create table cmc_assess_content (
   content_id			char(21)		not null		comment '考核内容id(总考核表id+2位)',
-  role					char(2)			default null	comment '承担角色',
+  role					varchar(17)			default null	comment '承担角色',
   familiar				char(1)			default null	comment '熟练程度（生疏、熟练、精通）',
   remark				varchar(255)	default null	comment '备注',
   workload				char(1)			default null	comment '工作量（较少、正常、较多）',

oa-ui/src/api/oa/assess/assess.js

@@ -0,0 +1,59 @@
+/*
+ * @Author: wrh
+ * @Date: 2024-01-24 17:16:42
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-01-24 17:31:59
+ */
+import request from '@/utils/request'
+
+// 查询cmc考核列表
+export function listAssess(query) {
+  return request({
+    url: '/oa/assess/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc考核详细
+export function getAssess(assessId) {
+  return request({
+    url: '/oa/assess/' + assessId,
+    method: 'get'
+  })
+}
+
+// 新增cmc考核
+export function addAssess(data) {
+  return request({
+    url: '/oa/assess',
+    method: 'post',
+    data: data
+  })
+}
+
+// 提交cmc考核
+export function submitAssess(data) {
+  return request({
+    url: '/oa/assess/submit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc考核
+export function updateAssess(data) {
+  return request({
+    url: '/oa/assess',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc考核
+export function delAssess(assessId) {
+  return request({
+    url: '/oa/assess/' + assessId,
+    method: 'delete'
+  })
+}

oa-ui/src/views/flowable/task/todo/detail/index.vue

@@ -342,7 +342,8 @@ export default {
       this.submitForm(null);
     },
     /** 用户审批任务 */
-    taskComplete() {
+    taskComplete() {      
+      this.$set(this.taskForm.variables, "pass", "通过");
       if (!this.taskForm.variables && this.checkSendUser) {
         this.$modal.msgError("请选择流程接收人员!");
         return;
@@ -395,14 +396,19 @@ export default {
     },
     /** 驳回任务 */
     taskReject() {
-      this.$refs["taskForm"].validate(valid => {
-        if (valid) {
-          rejectTask(this.taskForm).then(res => {
-            this.$modal.msgSuccess(res.msg);
-            this.goBack();
-          });
-        }
-      });
+      this.$set(this.taskForm.variables, "pass", "驳回");
+      complete(this.taskForm).then(response => {
+          this.$modal.msgSuccess(response.msg);
+          this.goBack();
+        });
+      // this.$refs["taskForm"].validate(valid => {
+      //   if (valid) {
+      //     rejectTask(this.taskForm).then(res => {
+      //       this.$modal.msgSuccess(res.msg);
+      //       this.goBack();
+      //     });
+      //   }
+      // });
     },
     /** 可退回任务列表 */
     handleReturn() {

oa-ui/src/views/system/user/index.vue

@@ -274,7 +274,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="技术职称" prop="titles">
-              <el-select v-model="form.titles" placeholder="请输入技术职称">
+              <el-select v-model="form.titles" multiple placeholder="请输入技术职称">
                 <el-option
                   v-for="dict in dict.type.sys_user_titles"
                   :key="dict.value"