查询考核表用户信息

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

@@ -1,11 +1,13 @@
 package com.ruoyi.web.controller.oa;
 
+import java.util.ArrayList;
 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.core.domain.entity.SysDictData;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.oa.domain.CmcAssessContent;
 import com.ruoyi.oa.domain.CmcAssessContentWork;
@@ -13,6 +15,7 @@ import com.ruoyi.oa.service.ICmcAssessContentService;
 import com.ruoyi.oa.service.ICmcAssessContentWorkService;
 import com.ruoyi.oa.service.ICmcProjectService;
 import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -47,6 +50,8 @@ public class CmcAssessController extends BaseController
     private ISysDeptService deptService;
     @Autowired
     private ICmcProjectService cmcProjectService;
+    @Autowired
+    private ISysDictDataService dictDataService;
 
     /**
      * 查询考核表列表
@@ -91,8 +96,12 @@ public class CmcAssessController extends BaseController
         }
         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("pmLevel", dictDataService.selectDictLabel("sys_user_pmlevel", userService.selectUserById(userId).getPmLevel()));
+        String[] titles = userService.selectUserById(userId).getTitles().split(",");
+        List<String> titleList = new ArrayList<>();
+        for (String title : titles)
+            titleList.add(dictDataService.selectDictLabel("sys_user_titles", title));
+        formData.put("titles", String.join(",", titleList));
         formData.put("remark", userService.selectUserById(userId).getRemark());
         formData.put("entryDate", userService.selectUserById(userId).getEntryDate());
         formData.put("age", userService.selectUserById(userId).getAge());
@@ -220,6 +229,21 @@ public class CmcAssessController extends BaseController
         cmcAssess.setManagerAssessment(formDataJson.getString("managerAssessment"));
         cmcAssess.setManagerAdvice(formDataJson.getString("managerAdvice"));
         cmcAssess.setManagerTime(formDataJson.getDate("managerTime"));
+        //判断是否删除某项考核工作
+        List<CmcAssessContentWork> cmcAssessContentWorks = cmcAssessContentWorkService.selectCmcAssessContentWorkByWorkId(formDataJson.getString("assessId"));
+        List<String> oldCmcAssessContentWorkIds = new ArrayList<>();
+        List<String> newCmcAssessContentWorkIds = new ArrayList<>();
+        for (CmcAssessContentWork cmcAssessContentWork : cmcAssessContentWorks) {
+            oldCmcAssessContentWorkIds.add(cmcAssessContentWork.getWorkId());
+        }
+        for (String key : formDataJson.keySet()) {
+            if (key.length() == 5 && key.startsWith("f") && !formDataJson.get(key).equals(""))
+                newCmcAssessContentWorkIds.add(key.substring(1));
+        }
+        for (String id : oldCmcAssessContentWorkIds) {
+            if (!newCmcAssessContentWorkIds.contains(id.substring(19)))
+                cmcAssessContentWorkService.deleteCmcAssessContentWorkByWorkId(id);
+        }
         for (String key : formDataJson.keySet()) {
             if (key.startsWith("role") && !Objects.equals(formDataJson.get(key), new JSONArray())) {
                 CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("assessId") + key.substring(4)).get(0);
@@ -236,9 +260,17 @@ public class CmcAssessController extends BaseController
                 cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
             }
             if (key.length() == 5 && key.startsWith("f") && !formDataJson.get(key).equals("")) {
-                CmcAssessContentWork cmcAssessContentWork = cmcAssessContentWorkService.selectCmcAssessContentWorkByWorkId(formDataJson.getString("assessId") + key.substring(1)).get(0);
-                cmcAssessContentWork.setWorkLoad(formDataJson.getString(key));
-                cmcAssessContentWorkService.updateCmcAssessContentWork(cmcAssessContentWork);
+                List<CmcAssessContentWork> cmcAssessContentWorkList = cmcAssessContentWorkService.selectCmcAssessContentWorkByWorkId(formDataJson.getString("assessId") + key.substring(1));
+                if (cmcAssessContentWorkList.size() > 0) { //某项考核工作更改工作量
+                    cmcAssessContentWorkList.get(0).setWorkLoad(formDataJson.getString(key));
+                    cmcAssessContentWorkService.updateCmcAssessContentWork(cmcAssessContentWorkList.get(0));
+                }
+                else { //新增一项考核工作
+                    CmcAssessContentWork cmcAssessContentWork = new CmcAssessContentWork();
+                    cmcAssessContentWork.setWorkId(formDataJson.getString("assessId") + key.substring(1));
+                    cmcAssessContentWork.setWorkLoad(formDataJson.getString(key));
+                    cmcAssessContentWorkService.insertCmcAssessContentWork(cmcAssessContentWork);
+                }
             }
             if (key.startsWith("familiar")) {
                 CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("assessId") + key.substring(8)).get(0);

oa-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -88,7 +88,7 @@ public class SysUser extends BaseEntity
 
     /** 年龄 */
     @Excel(name = "年龄")
-    private int age;
+    private Integer age;
 
     /** 部门对象 */
     @Excels({
@@ -307,15 +307,12 @@ public class SysUser extends BaseEntity
         this.entryDate = entryDate;
     }
 
-    public int getAge()
+    public Integer getAge()
     {
         return age;
     }
 
-    public void setAge(int roleId)
-    {
-        this.age = age;
-    }
+    public void setAge(Integer age) { this.age = age; }
 
     public SysDept getDept()
     {

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

@@ -206,10 +206,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="loginDate != null">login_date = #{loginDate},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			<if test="remark != null">remark = #{remark},</if>
- 			<if test="pmLevel != null">pmLevel = #{pmLevel},</if>
+ 			<if test="pmLevel != null">pm_level = #{pmLevel},</if>
  			<if test="titles != null">titles = #{titles},</if>
- 			<if test="engineerLevel != null">engineerLevel = #{engineerLevel},</if>
- 			<if test="entryDate != null">entryDate = #{entryDate},</if>
+ 			<if test="engineerLevel != null">engineer_level = #{engineerLevel},</if>
+ 			<if test="entryDate != null">entry_date = #{entryDate},</if>
  			<if test="age != null">age = #{age},</if>
  			update_time = sysdate()
  		</set>

oa-back/sql/ry_20231130.sql

@@ -71,7 +71,7 @@ create table sys_user (
   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 '年龄',
+  age				int											comment '年龄',
   primary key (user_id)
 ) engine=innodb auto_increment=1 comment = '用户信息表';
 
@@ -793,10 +793,10 @@ insert into sys_user_post values (30, 24);
 insert into sys_user_post values (31, 25);
 insert into sys_user_post values (32, 12);
 insert into sys_user_post values (33, 11);
-insert into sys_user_post values (34, 21);
-insert into sys_user_post values (35, 21);
-insert into sys_user_post values (36, 23);
-insert into sys_user_post values (37, 21);
+insert into sys_user_post values (34, 26);
+insert into sys_user_post values (35, 26);
+insert into sys_user_post values (36, 26);
+insert into sys_user_post values (37, 26);
 insert into sys_user_post values (38, 12);
 insert into sys_user_post values (39, 13);
 insert into sys_user_post values (40, 26);