用户变更记录

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

@@ -1,12 +1,12 @@
 package com.ruoyi.web.controller.system;
 
 import java.lang.reflect.Field;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.oa.domain.CmcUserHistory;
@@ -131,35 +131,129 @@ public class SysUserController extends BaseController
     /**
      * 根据用户编号获取变更记录
      */
-    @GetMapping("/change/{userId}")
-    public AjaxResult getChangeInfo(@PathVariable(value = "userId", required = false) Long userId) throws NoSuchFieldException {
+    @GetMapping("/change")
+    public TableDataInfo getChangeInfo(SysUser user) {
+        startPage();
+        Long userId = user.getUserId();
         SysUser sysUser = userService.selectUserById(userId);
+        List<Long> userPostList = postService.selectPostListByUserId(userId);
+        List<Long> userRoleList = roleService.selectRoleListByUserId(userId);
+        sysUser.setRoleIds(userRoleList.toArray(new Long[userRoleList.size()]));
+        sysUser.setPostIds(userPostList.toArray(new Long[userPostList.size()]));
         JSONObject jsonObj = (JSONObject) JSON.toJSON(sysUser);
         CmcUserHistory userHistory = new CmcUserHistory();
         userHistory.setUserId(userId);
         List<CmcUserHistory> cmcUserHistoryList = cmcUserHistoryService.selectCmcUserHistoryList(userHistory);
         Field[] fields = userHistory.getClass().getDeclaredFields();
-        JSONObject jsonObject = new JSONObject();
+        JSONArray jsonArray = new JSONArray();
+        int changeNumber = 1;
         for (int i = 0; i < cmcUserHistoryList.size(); i++) {
             JSONObject beforeChangeHistoryJsonObj = (JSONObject) JSON.toJSON(cmcUserHistoryList.get(i));
             JSONObject afterChangeHistoryJsonObj = new JSONObject();
-            if (i == cmcUserHistoryList.size() - 1)
+            if (i == 0)
                 afterChangeHistoryJsonObj = (JSONObject) JSON.toJSON(jsonObj);
             else
-                afterChangeHistoryJsonObj = (JSONObject) JSON.toJSON(cmcUserHistoryList.get(i + 1));
+                afterChangeHistoryJsonObj = (JSONObject) JSON.toJSON(cmcUserHistoryList.get(i - 1));
             for (Field field : fields) {
+                JSONObject jsonObject = new JSONObject();
                 String fieldName = field.getName().split("\\.")[field.getName().split("\\.").length - 1];
-                if (!fieldName.equals("historyId") && !fieldName.equals("serialVersionUID") && !fieldName.equals("updateReason") && !fieldName.equals("updateTime")) {
-                    if (beforeChangeHistoryJsonObj.getString(fieldName) != null && afterChangeHistoryJsonObj.getString(fieldName) != null && !beforeChangeHistoryJsonObj.getString(fieldName).equals(afterChangeHistoryJsonObj.getString(fieldName)))
-                        jsonObject.put("变更" + (cmcUserHistoryList.indexOf(cmcUserHistoryList.get(i)) + 1), fieldName + ":" + beforeChangeHistoryJsonObj.getString(fieldName) + "变更为" + afterChangeHistoryJsonObj.getString(fieldName) + ";变更日期:" + DateFormatUtils.format(beforeChangeHistoryJsonObj.getDate("updateTime"), "yyyy-MM-dd"));
-                    else if (beforeChangeHistoryJsonObj.getString(fieldName) == null && afterChangeHistoryJsonObj.getString(fieldName) != null)
-                        jsonObject.put("变更" + (cmcUserHistoryList.indexOf(cmcUserHistoryList.get(i)) + 1), fieldName + ":" + beforeChangeHistoryJsonObj.getString(fieldName) + "变更为" + afterChangeHistoryJsonObj.getString(fieldName) + ";变更日期:" + DateFormatUtils.format(beforeChangeHistoryJsonObj.getDate("updateTime"), "yyyy-MM-dd"));
-                    else if (beforeChangeHistoryJsonObj.getString(fieldName) != null && afterChangeHistoryJsonObj.getString(fieldName) == null)
-                        jsonObject.put("变更" + (cmcUserHistoryList.indexOf(cmcUserHistoryList.get(i)) + 1), fieldName + ":" + beforeChangeHistoryJsonObj.getString(fieldName) + "变更为" + afterChangeHistoryJsonObj.getString(fieldName) + ";变更日期:" + DateFormatUtils.format(beforeChangeHistoryJsonObj.getDate("updateTime"), "yyyy-MM-dd"));
+                if (!fieldName.equals("historyId") && !fieldName.equals("serialVersionUID")  && !fieldName.equals("updateReason")  && !fieldName.equals("updateTime")) {
+                    if (!fieldName.equals("roleIds") && !fieldName.equals("postIds")) {
+                        if ((beforeChangeHistoryJsonObj.getString(fieldName) != null && afterChangeHistoryJsonObj.getString(fieldName) != null
+                                && !beforeChangeHistoryJsonObj.getString(fieldName).equals(afterChangeHistoryJsonObj.getString(fieldName)))
+                                || (beforeChangeHistoryJsonObj.getString(fieldName) == null && afterChangeHistoryJsonObj.getString(fieldName) != null)
+                                || (beforeChangeHistoryJsonObj.getString(fieldName) != null && afterChangeHistoryJsonObj.getString(fieldName) == null)) {
+                            if (fieldName.equals("deptId")) {
+                                jsonObject.put("before", deptService.selectDeptById(beforeChangeHistoryJsonObj.getLong(fieldName)).getDeptName());
+                                jsonObject.put("after", deptService.selectDeptById(afterChangeHistoryJsonObj.getLong(fieldName)).getDeptName());
+                            }
+                            else {
+                                jsonObject.put("before", beforeChangeHistoryJsonObj.getString(fieldName));
+                                jsonObject.put("after", afterChangeHistoryJsonObj.getString(fieldName));
+                            }
+                            jsonObject.put("id", changeNumber++);
+                            jsonObject.put("field", getFieldName(fieldName));
+                            jsonObject.put("date", DateFormatUtils.format(beforeChangeHistoryJsonObj.getDate("updateTime"), "yyyy-MM-dd"));
+                            jsonArray.add(jsonObject);
+                        }
+                    } else {
+                        if (i == 0) {
+                            if (!beforeChangeHistoryJsonObj.getString(fieldName).equals(StringUtils.join(afterChangeHistoryJsonObj.getJSONArray(fieldName), ","))) {
+                                if (fieldName.equals("roleIds")) {
+                                    getRoleOrPostName(beforeChangeHistoryJsonObj.getString(fieldName), jsonObject, "role", "before");
+                                    getRoleOrPostName(StringUtils.join(afterChangeHistoryJsonObj.getJSONArray(fieldName), ","), jsonObject, "role", "after");
+                                }
+                                else {
+                                    getRoleOrPostName(beforeChangeHistoryJsonObj.getString(fieldName), jsonObject, "post", "before");
+                                    getRoleOrPostName(StringUtils.join(afterChangeHistoryJsonObj.getJSONArray(fieldName), ","), jsonObject, "post", "after");
+                                }
+                                jsonObject.put("id", changeNumber++);
+                                jsonObject.put("field", getFieldName(fieldName));
+                                jsonObject.put("date", DateFormatUtils.format(beforeChangeHistoryJsonObj.getDate("updateTime"), "yyyy-MM-dd"));
+                                jsonArray.add(jsonObject);
+                            }
+                        }
+                        else {
+                            if (!beforeChangeHistoryJsonObj.getString(fieldName).equals(afterChangeHistoryJsonObj.getString(fieldName))) {
+                                if (fieldName.equals("roleIds")) {
+                                    getRoleOrPostName(beforeChangeHistoryJsonObj.getString(fieldName), jsonObject, "role", "before");
+                                    getRoleOrPostName(afterChangeHistoryJsonObj.getString(fieldName), jsonObject, "role", "after");
+                                }
+                                else {
+                                    getRoleOrPostName(beforeChangeHistoryJsonObj.getString(fieldName), jsonObject, "post", "before");
+                                    getRoleOrPostName(afterChangeHistoryJsonObj.getString(fieldName), jsonObject, "post", "after");
+                                }
+                                jsonObject.put("id", changeNumber++);
+                                jsonObject.put("field", getFieldName(fieldName));
+                                jsonObject.put("date", DateFormatUtils.format(beforeChangeHistoryJsonObj.getDate("updateTime"), "yyyy-MM-dd"));
+                                jsonArray.add(jsonObject);
+                            }
+                        }
+                    }
                 }
             }
         }
-        return success(jsonObject);
+        return getDataTable(jsonArray);
+    }
+
+    private void getRoleOrPostName(String fieldValue, JSONObject jsonObject, String roleOrPost, String beforeOrAfter) {
+        if (!fieldValue.equals("") && fieldValue.split(",").length > 0) {
+            StringBuilder names = new StringBuilder();
+            for (String id : fieldValue.split(",")) {
+                if (roleOrPost.equals("role"))
+                    names.append(roleService.selectRoleById(Long.parseLong(id)).getRoleName()).append(",");
+                else
+                    names.append(postService.selectPostById(Long.parseLong(id)).getPostName()).append(",");
+            }
+            if (beforeOrAfter.equals("before"))
+                jsonObject.put("before", names.substring(0, names.length() - 1));
+            else
+                jsonObject.put("after", names.substring(0, names.length() - 1));
+        }
+    }
+
+    /**
+     * 获取字段名备注
+     */
+    private String getFieldName(String fieldName) {
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("deptId", "部门");
+        jsonObject.put("pmLevel", "项目经理级别");
+        jsonObject.put("titles", "技术职称");
+        jsonObject.put("certificates", "执业证书");
+        jsonObject.put("engineerLevel", "工程师岗级");
+        jsonObject.put("postLevel", "岗级");
+        jsonObject.put("salaryLevel", "薪档");
+        jsonObject.put("operatorLevel", "技工等级");
+        jsonObject.put("politicalAffiliation", "政治面貌");
+        jsonObject.put("graduateSchool", "毕业院校");
+        jsonObject.put("major", "专业");
+        jsonObject.put("degree", "学历");
+        jsonObject.put("contractSign", "合同签订");
+        jsonObject.put("contractExpire", "合同期满");
+        jsonObject.put("roleIds", "角色");
+        jsonObject.put("postIds", "岗位");
+        return jsonObject.getString(fieldName);
     }
 
     /**
@@ -200,6 +294,7 @@ public class SysUserController extends BaseController
         CmcUserHistory cmcUserHistory = new CmcUserHistory();
         SysUser sysUser = userService.selectUserById(user.getUserId());
         cmcUserHistory.setUserId(user.getUserId());
+        cmcUserHistory.setDeptId(user.getDeptId());
         cmcUserHistory.setTitles(sysUser.getTitles());
         cmcUserHistory.setCertificates(sysUser.getCertificates());
         cmcUserHistory.setEngineerLevel(sysUser.getEngineerLevel());
@@ -207,18 +302,17 @@ public class SysUserController extends BaseController
         cmcUserHistory.setSalaryLevel(sysUser.getSalaryLevel());
         cmcUserHistory.setPmLevel(sysUser.getPmLevel());
         cmcUserHistory.setOperatorLevel(sysUser.getOperatorLevel());
-        cmcUserHistory.setIdCard(sysUser.getIdCard());
-        cmcUserHistory.setNativePlace(sysUser.getNativePlace());
         cmcUserHistory.setPoliticalAffiliation(sysUser.getPoliticalAffiliation());
-        cmcUserHistory.setEthnic(sysUser.getEthnic());
         cmcUserHistory.setGraduateSchool(sysUser.getGraduateSchool());
         cmcUserHistory.setMajor(sysUser.getMajor());
         cmcUserHistory.setDegree(sysUser.getDegree());
         cmcUserHistory.setContractSign(sysUser.getContractSign());
         cmcUserHistory.setContractExpire(sysUser.getContractExpire());
-        cmcUserHistory.setHomePlace(sysUser.getHomePlace());
         cmcUserHistory.setUpdateReason(user.getUpdateReason());
         cmcUserHistory.setUpdateTime(DateUtils.getNowDate());
+        cmcUserHistory.setRoleIds(StringUtils.join(roleService.selectRoleListByUserId(user.getUserId()),","));
+        cmcUserHistory.setPostIds(StringUtils.join(postService.selectPostListByUserId(user.getUserId()),","));
+        cmcUserHistory.setUpdateTime(DateUtils.getNowDate());
         cmcUserHistoryService.insertCmcUserHistory(cmcUserHistory);
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user.getUserId());

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

@@ -24,6 +24,10 @@ public class CmcUserHistory extends BaseEntity
     @Excel(name = "用户id")
     private Long userId;
 
+    /** 部门id */
+    @Excel(name = "部门id")
+    private Long deptId;
+
     /** 技术职称（0正高、1副高、2中级、3助工） */
     @Excel(name = "技术职称", readConverterExp = "0=正高、1=副高、2=中级、3=助工")
     private String titles;
@@ -56,22 +60,10 @@ public class CmcUserHistory extends BaseEntity
     @Excel(name = "更新原因", readConverterExp = "0=误录修改、1=正常调整")
     private String updateReason;
 
-    /** 身份证号码 */
-    @Excel(name = "身份证号码")
-    private String idCard;
-
-    /** 籍贯 */
-    @Excel(name = "籍贯")
-    private String nativePlace;
-
     /** 政治面貌 */
     @Excel(name = "政治面貌")
     private String politicalAffiliation;
 
-    /** 民族 */
-    @Excel(name = "民族")
-    private String ethnic;
-
     /** 毕业院校 */
     @Excel(name = "毕业院校")
     private String graduateSchool;
@@ -92,9 +84,11 @@ public class CmcUserHistory extends BaseEntity
     @Excel(name = "合同期满", width = 30, dateFormat = "yyyy-MM-dd")
     private Date contractExpire;
 
-    /** 家庭住址 */
-    @Excel(name = "家庭住址")
-    private String homePlace;
+    /** 角色组 */
+    private String roleIds;
+
+    /** 岗位组 */
+    private String postIds;
 
     public void setHistoryId(Integer historyId)
     {
@@ -114,6 +108,15 @@ public class CmcUserHistory extends BaseEntity
     {
         return userId;
     }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
     public void setTitles(String titles)
     {
         this.titles = titles;
@@ -183,24 +186,6 @@ public class CmcUserHistory extends BaseEntity
     {
         return updateReason;
     }
-    public void setIdCard(String idCard)
-    {
-        this.idCard = idCard;
-    }
-
-    public String getIdCard()
-    {
-        return idCard;
-    }
-    public void setNativePlace(String nativePlace)
-    {
-        this.nativePlace = nativePlace;
-    }
-
-    public String getNativePlace()
-    {
-        return nativePlace;
-    }
     public void setPoliticalAffiliation(String politicalAffiliation)
     {
         this.politicalAffiliation = politicalAffiliation;
@@ -210,15 +195,6 @@ public class CmcUserHistory extends BaseEntity
     {
         return politicalAffiliation;
     }
-    public void setEthnic(String ethnic)
-    {
-        this.ethnic = ethnic;
-    }
-
-    public String getEthnic()
-    {
-        return ethnic;
-    }
     public void setGraduateSchool(String graduateSchool)
     {
         this.graduateSchool = graduateSchool;
@@ -264,14 +240,24 @@ public class CmcUserHistory extends BaseEntity
     {
         return contractExpire;
     }
-    public void setHomePlace(String homePlace)
+    public String getRoleIds()
+    {
+        return roleIds;
+    }
+
+    public void setRoleIds(String roleIds)
+    {
+        this.roleIds = roleIds;
+    }
+
+    public String getPostIds()
     {
-        this.homePlace = homePlace;
+        return postIds;
     }
 
-    public String getHomePlace()
+    public void setPostIds(String postIds)
     {
-        return homePlace;
+        this.postIds = postIds;
     }
 
     @Override

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

@@ -7,8 +7,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CmcUserHistory" id="CmcUserHistoryResult">
         <result property="historyId"    column="history_id"    />
         <result property="userId"    column="user_id"    />
+        <result property="deptId"    column="dept_id"    />
         <result property="titles"    column="titles"    />
         <result property="certificates"    column="certificates"    />
+        <result property="roleIds"    column="roleIds"    />
+        <result property="postIds"    column="postIds"    />
         <result property="pmLevel"    column="pm_level"    />
         <result property="engineerLevel"    column="engineer_level"    />
         <result property="postLevel"    column="post_level"    />
@@ -16,21 +19,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="operatorLevel"    column="operator_level"    />
         <result property="updateTime"    column="update_time"    />
         <result property="updateReason"    column="update_reason"    />
-        <result property="idCard"    column="id_card"    />
-        <result property="nativePlace"    column="native_place"    />
         <result property="politicalAffiliation"    column="political_affiliation"    />
-        <result property="ethnic"    column="ethnic"    />
         <result property="graduateSchool"    column="graduate_school"    />
         <result property="major"    column="major"    />
         <result property="degree"    column="degree"    />
         <result property="contractSign"    column="contract_sign"    />
         <result property="contractExpire"    column="contract_expire"    />
-        <result property="homePlace"    column="home_place"    />
     </resultMap>
 
     <sql id="selectCmcUserHistoryVo">
-        select history_id, user_id, titles, certificates, pm_level, engineer_level, post_level, salary_level, operator_level, update_time, update_reason, id_card,
-               native_place, political_affiliation, ethnic, graduate_school, major, degree, contract_sign, contract_expire, home_place from cmc_user_history
+        select history_id, user_id, dept_id, titles, certificates, roleIds, postIds, pm_level, engineer_level, post_level, salary_level, operator_level, update_time, update_reason,
+            political_affiliation, graduate_school, major, degree, contract_sign, contract_expire from cmc_user_history
     </sql>
 
     <select id="selectCmcUserHistoryList" parameterType="CmcUserHistory" resultMap="CmcUserHistoryResult">
@@ -45,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="salaryLevel != null  and salaryLevel != ''"> and salary_level = #{salaryLevel}</if>
             <if test="updateReason != null  and updateReason != ''"> and update_reason = #{updateReason}</if>
         </where>
+        order by update_time desc
     </select>
     
     <select id="selectCmcUserHistoryByUserId" parameterType="Long" resultMap="CmcUserHistoryResult">
@@ -56,8 +56,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into cmc_user_history
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="userId != null">user_id,</if>
+            <if test="deptId != null">dept_id,</if>
             <if test="titles != null">titles,</if>
             <if test="certificates != null">certificates,</if>
+            <if test="roleIds != null">roleIds,</if>
+            <if test="postIds != null">postIds,</if>
             <if test="pmLevel != null">pm_level,</if>
             <if test="engineerLevel != null">engineer_level,</if>
             <if test="postLevel != null">post_level,</if>
@@ -65,21 +68,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="operatorLevel != null">operator_level,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="updateReason != null">update_reason,</if>
-            <if test="idCard != null">id_card,</if>
-            <if test="nativePlace != null">native_place,</if>
             <if test="politicalAffiliation != null">political_affiliation,</if>
-            <if test="ethnic != null">ethnic,</if>
             <if test="graduateSchool != null">graduate_school,</if>
             <if test="major != null">major,</if>
             <if test="degree != null">degree,</if>
             <if test="contractSign != null">contract_sign,</if>
             <if test="contractExpire != null">contract_expire,</if>
-            <if test="homePlace != null">home_place,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userId != null">#{userId},</if>
+            <if test="deptId != null">#{deptId},</if>
             <if test="titles != null">#{titles},</if>
             <if test="certificates != null">#{certificates},</if>
+            <if test="roleIds != null">#{roleIds},</if>
+            <if test="postIds != null">#{postIds},</if>
             <if test="pmLevel != null">#{pmLevel},</if>
             <if test="engineerLevel != null">#{engineerLevel},</if>
             <if test="postLevel != null">#{postLevel},</if>
@@ -87,16 +89,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="operatorLevel != null">#{operatorLevel},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="updateReason != null">#{updateReason},</if>
-            <if test="idCard != null">#{idCard},</if>
-            <if test="nativePlace != null">#{nativePlace},</if>
             <if test="politicalAffiliation != null">#{politicalAffiliation},</if>
-            <if test="ethnic != null">#{ethnic},</if>
             <if test="graduateSchool != null">#{graduateSchool},</if>
             <if test="major != null">#{major},</if>
             <if test="degree != null">#{degree},</if>
             <if test="contractSign != null">#{contractSign},</if>
             <if test="contractExpire != null">#{contractExpire},</if>
-            <if test="homePlace != null">#{homePlace},</if>
          </trim>
     </insert>
 
@@ -104,8 +102,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update cmc_user_history
         <trim prefix="SET" suffixOverrides=",">
             <if test="userId != null">user_id = #{userId},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="titles != null">titles = #{titles},</if>
             <if test="certificates != null">certificates = #{certificates},</if>
+            <if test="roleIds != null">roleIds = #{roleIds},</if>
+            <if test="postIds != null">postIds = #{postIds},</if>
             <if test="pmLevel != null">pm_level = #{pmLevel},</if>
             <if test="engineerLevel != null">engineer_level = #{engineerLevel},</if>
             <if test="postLevel != null">post_level = #{postLevel},</if>
@@ -113,16 +114,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="operatorLevel != null and operatorLevel != ''">#{operatorLevel},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateReason != null">update_reason = #{updateReason},</if>
-            <if test="idCard != null">#{idCard},</if>
-            <if test="nativePlace != null">#{nativePlace},</if>
             <if test="politicalAffiliation != null">#{politicalAffiliation},</if>
-            <if test="ethnic != null">#{ethnic},</if>
             <if test="graduateSchool != null">#{graduateSchool},</if>
             <if test="major != null">#{major},</if>
             <if test="degree != null">#{degree},</if>
             <if test="contractSign != null">#{contractSign},</if>
             <if test="contractExpire != null">#{contractExpire},</if>
-            <if test="homePlace != null">#{homePlace},</if>
         </trim>
         where history_id  = #{historyId}
     </update>

oa-back/sql/sql.sql

@@ -6880,25 +6880,24 @@ drop table if exists `cmc_user_history`;
 create table `cmc_user_history`  (
   history_id		int				not null	auto_increment 	comment '历史id',
   user_id			bigint			default null				comment '用户id',
+  dept_id			bigint			default null			   comment '部门id',
   pm_level			char(1)			default null			   comment '项目经理级别（0一、1二、2三）',
   titles			char(2)			default null				comment '技术职称（0正高、1副高、2中级、3助工）',
   certificates		varchar(9)		default null				comment '执业证书（0注测、1注规、2注岩、3注安、4注会）',
+  roleIds			varchar(9)		default null				comment '角色',
+  postIds			varchar(9)		default null				comment '岗位',
   engineer_level	char(1)			default null			   comment '工程师岗级（0一级、1二级、2三级、3四级、4五级、5六级）',
   post_level		char(1)			default null			   comment '岗级（0一岗、1二岗、2三岗、3四岗、4五岗、5六岗、6七岗、7八岗）',
   salary_level		char(1)			default null			   comment '薪档（0一级、1二级、2三级、3四级、4五级、5六级、6七级、7八级）',
   operator_level	char(1)			default null			   comment '技工等级（0一级、1二级、2三级）',
-  id_card 			char(18) 		default null				comment '身份证号码',
-  native_place 		varchar(50) 	default null				comment '籍贯',
   political_affiliation varchar(5)	default null				comment '政治面貌',
-  ethnic 			varchar(5) 		default null				comment '民族',
   graduate_school 	varchar(20) 	default null				comment '毕业院校',
   major 			varchar(20) 	default null				comment '专业',
   degree 			char(1) 		default null				comment '学历',
   contract_sign 	date			default null				comment '合同签订',
   contract_expire 	date			default null				comment '合同期满',
-  home_place 		varchar(255) 	default null				comment '家庭住址',
-  update_time		date			default null				comment '更新时间',
-  update_reason	char(1) 		default null				comment '更新原因（0误录修改、1正常调整）',
+  update_time		datetime		default null				comment '更新时间',
+  update_reason		char(1) 		default null				comment '更新原因（0误录修改、1正常调整）',
   primary key (`history_id`)
 ) engine = innodb comment = 'cmc用户历史表';
 

oa-ui/src/api/system/user.js

@@ -19,10 +19,11 @@ export function getUser(userId) {
 }
 
 // 查询用户变更信息
-export function getUserChangeInfo(userId) {
+export function getUserChangeInfo(query) {
   return request({
-    url: '/system/user/change/' + parseStrEmpty(userId),
-    method: 'get'
+    url: '/system/user/change',
+    method: 'get',
+    params: query
   })
 }
 

oa-ui/src/views/oa/staff/changeRecord.vue

@@ -1,15 +1,114 @@
+<!--
+ * @Author: wrh
+ * @Date: 2024-03-25 17:38:39
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-05-17 18:10:49
+-->
 <template>
   <div>
-
+    <el-table v-loading="loading" :data="changeRecordList">
+      <el-table-column label="序号" align="center" prop="id" />
+      <el-table-column label="类型" align="center" prop="field" />
+      <el-table-column label="变更前" align="center" prop="before" />
+      <el-table-column label="变更后" align="center" prop="after" />
+      <el-table-column label="变更日期" align="center" prop="date" />
+    </el-table>
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getChangeRecordList" />
   </div>
 </template>
 
 <script>
-  export default {
-    
+import { parseTime } from "@/utils/ruoyi";
+import { getUserChangeInfo } from "@/api/system/user";
+export default {
+  dicts: ['sys_user_titles', 'sys_user_certificates', 'sys_user_pmlevel', 'sys_user_engineerlevel', 'sys_user_operatorlevel', 'sys_user_postlevel', 'sys_user_salarylevel', 'sys_user_political', 'sys_user_degree'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 总条数
+      total: 0,
+      // 变更记录表格数据
+      changeRecordList: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userId: undefined
+      },
+    };
+  },
+  created() {
+    this.getChangeRecordList();
+  },
+  methods: {
+    /** 查询变更记录列表 */
+    getChangeRecordList() {
+      this.loading = true;
+      this.queryParams.userId = Number(this.$route.query.userId);
+      getUserChangeInfo(this.queryParams).then(response => {
+        for (let row of response.rows) {
+          if (row.field == '执业证书') {
+            row.before = this.formatDict(this.dict.type.sys_user_certificates, row.before);
+            row.after = this.formatDict(this.dict.type.sys_user_certificates, row.after);
+          }
+          else if (row.field == '项目经理级别') {
+            row.before = this.formatDict(this.dict.type.sys_user_pmlevel, row.before);
+            row.after = this.formatDict(this.dict.type.sys_user_pmlevel, row.after);
+          }
+          else if (row.field == '技术职称') {
+            row.before = this.formatDict(this.dict.type.sys_user_titles, row.before);
+            row.after = this.formatDict(this.dict.type.sys_user_titles, row.after);
+          }
+          else if (row.field == '工程师岗级') {
+            row.before = this.formatDict(this.dict.type.sys_user_engineerlevel, row.before);
+            row.after = this.formatDict(this.dict.type.sys_user_engineerlevel, row.after);
+          }
+          else if (row.field == '岗级') {
+            row.before = this.formatDict(this.dict.type.sys_user_postlevel, row.before);
+            row.after = this.formatDict(this.dict.type.sys_user_postlevel, row.after);
+          }
+          else if (row.field == '薪档') {
+            row.before = this.formatDict(this.dict.type.sys_user_salarylevel, row.before);
+            row.after = this.formatDict(this.dict.type.sys_user_salarylevel, row.after);
+          }
+          else if (row.field == '技工等级') {
+            row.before = this.formatDict(this.dict.type.sys_user_operatorlevel, row.before);
+            row.after = this.formatDict(this.dict.type.sys_user_operatorlevel, row.after);
+          }
+          else if (row.field == '政治面貌') {
+            row.before = this.formatDict(this.dict.type.sys_user_political, row.before);
+            row.after = this.formatDict(this.dict.type.sys_user_political, row.after);
+          }
+          else if (row.field == '学历') {
+            row.before = this.formatDict(this.dict.type.sys_user_degree, row.before);
+            row.after = this.formatDict(this.dict.type.sys_user_degree, row.after);
+          }
+          else if (row.field == '合同期满' || row.field == '合同签订') {
+            row.before = parseTime(row.before, '{y}-{m}-{d}');
+            row.after = parseTime(row.after, '{y}-{m}-{d}');
+          }
+          this.changeRecordList.push(row);
+        }
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+
+    formatDict(arr, val) {
+      if (val != null && val != undefined && val != "") {
+        let valArr = val.split(',');
+        let result = []
+        for (let i of valArr) {
+          result.push(arr[i].label)
+        }
+        return result.join(' / ')
+      }
+      else
+        return "无";
+    },
   }
+}
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>

oa-ui/src/views/oa/staff/index.vue

@@ -323,8 +323,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Staff",
-  dicts: ['sys_normal_disable', 'sys_user_sex', 'sys_user_titles', 'sys_user_certificates',
-    'sys_user_pmlevel', 'sys_user_engineerlevel', 'sys_user_operatorlevel', 'sys_user_postlevel', 'sys_user_salarylevel', 'sys_user_political', 'sys_user_degree'],
+  dicts: ['sys_normal_disable', 'sys_user_sex', 'sys_user_titles', 'sys_user_certificates', 'sys_user_pmlevel', 'sys_user_engineerlevel', 'sys_user_operatorlevel', 'sys_user_postlevel', 'sys_user_salarylevel', 'sys_user_political', 'sys_user_degree'],
   components: { Treeselect },
   data() {
     return {
@@ -628,8 +627,8 @@ export default {
             //   this.form.certificates = this.form.certificates.join(',')
             // else
             //   this.form.certificates = '';
-            this.form.certificates = this.formatArrayToString(this.form.certificates, ',');
-            this.form.politicalAffiliation = this.formatArrayToString(this.form.politicalAffiliation, ',')
+            this.form.certificates = this.formatArrayToString(this.form.certificates, ',') == '' ? undefined : this.formatArrayToString(this.form.certificates, ',');
+            this.form.politicalAffiliation = this.formatArrayToString(this.form.politicalAffiliation, ',') ? undefined : this.formatArrayToString(this.form.politicalAffiliation, ',');
             updateUser(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -747,8 +746,6 @@ export default {
       let newStr = "";
       if (str) {
         newStr = str.join(splitStr)
-      } else {
-        newStr = ""
       }
       return newStr
     }

oa-ui/src/views/oa/staff/projectInfo.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: wrh
  * @Date: 2024-03-25 17:38:39
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-15 19:05:45
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-05-17 14:56:12
 -->
 <template>
   <div>
@@ -70,7 +70,7 @@ export default {
     // this.getListByProjectLeader();
     if(this.$route.query){
       let userId = this.$route.query.userId
-      this.getUserInfo(userId)
+      // this.getUserInfo(userId)
     }
   },
   methods: {