用户变更信息查询；岗位工资图表

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

@@ -1,13 +1,18 @@
 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.JSONObject;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.oa.domain.CmcUserHistory;
 import com.ruoyi.oa.service.ICmcUserHistoryService;
 import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -123,6 +128,40 @@ public class SysUserController extends BaseController
         return ajax;
     }
 
+    /**
+     * 根据用户编号获取变更记录
+     */
+    @GetMapping("/change/{userId}")
+    public AjaxResult getChangeInfo(@PathVariable(value = "userId", required = false) Long userId) throws NoSuchFieldException {
+        SysUser sysUser = userService.selectUserById(userId);
+        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();
+        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)
+                afterChangeHistoryJsonObj = (JSONObject) JSON.toJSON(jsonObj);
+            else
+                afterChangeHistoryJsonObj = (JSONObject) JSON.toJSON(cmcUserHistoryList.get(i + 1));
+            for (Field field : fields) {
+                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"));
+                }
+            }
+        }
+        return success(jsonObject);
+    }
+
     /**
      * 新增用户
      */

oa-back/sql/sql.sql

@@ -178,7 +178,7 @@ insert into sys_user values (75, 111, '18190687602', '杨为康', '0', null, '18
 insert into sys_user values (76, 111, '18048613219', '刘轩庭', '0', null, '18048613219', '0', null, '$2a$10$.pSSK43SDZGc3tt1sjZREe/d0hCAbHpmUKvyFzJ1vtctvSZpdf.ka', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, '2', '3', null, null, null, null, null, '2021-09-08', null, null, null, '513822199204048934', '四川省仁寿县', '13', '汉族', '西南科技大学', '交通工程', '2', '2022-09-08', '2025-09-07', '四川省成都市武侯区晋阳街道红运花园');
 insert into sys_user values (77, 111, '18482156612', '廖友福', '0', null, '18482156612', '0', null, '$2a$10$47nqvaqoPpAbcR9wH.ar9.nBCbKshOpTP0HwgBxsFWt3wqSaW/U0y', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '3', null, '4', null, null, null, '2018-10-03', null, null, null, '513029199610124278', '四川省达州市', '12', '汉族', '西华大学', '土木工程', '2', '2022-10-03', null, '四川省达州市大竹县竹阳镇学府路惠民小区');
 insert into sys_user values (78, 111, '13880417112', '潘林海', '0', null, '13880417112', '0', null, '$2a$10$z1iuKFb6q9SSiXoELcrfjuYWLnAbPorD42T.5nCEmLUXwL0/Ahe8m', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '2', null, '4', null, null, null, '1997-12-01', null, null, null, '510105197807111772', '吉林省扶余市', '9', '汉族', '武汉大学', '工程测量技术', '3', '2016-01-01', null, '四川省成都市青羊区浣花北路一号13栋3单元502');
-insert into sys_user values (79, 111, '13518119939', '邓锡全', '0', null, '13518119939', '0', null, '$2a$10$auJq1XFdaj.2.WXKS98mxOWcprpL3LGl5h3Fd1sBwAoUfh1c6zlrK', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2004-06-01', null, null, null, '511121197304061516', '四川省仁寿县', '13', '汉族', null, null, '5', '2017-04-01', null, '眉山市东坡区裴城路双赋园A区');
+insert into sys_user values (79, 111, '13518119939', '邓锡全', '0', null, '13518119939', '0', null, '$2a$10$auJq1XFdaj.2.WXKS98mxOWcprpL3LGl5h3Fd1sBwAoUfh1c6zlrK', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2004-06-01', null, null, null, '511121197304061516', '四川省仁寿县', '13', '汉族', null, null, '4', '2017-04-01', null, '眉山市东坡区裴城路双赋园A区');
 insert into sys_user values (80, 111, '15208122776', '张杰', '0', null, '15208122776', '0', null, '$2a$10$HcC7iiq4GR1Ca0JRrJntOemcBW3vO.tt9/EUbmvQJ9M.QIs1j6IJC', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '2', null, '3', null, null, null, '2021-10-28', null, null, null, '500239198710080211', '重庆市黔江区', '13', '土家族', '长春工程学院', '测绘工程', '2', '2022-10-28', '2025-10-27', '成都市蜀西环街59号青房尚瑞天韵1-1-2105');
 insert into sys_user values (81, 111, '17345094889', '廖双', '0', null, '17345094889', '0', null, '$2a$10$AA3hI9GxRBB3XD9N/NthD.nqYf487wG3BvJQgYsSTublKos1Gy1Km', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2022-10-08', null, null, null, '500230200102060279', '重庆市丰都县', '12', '汉族', '四川水利职业技术学院', '工程测量技术', '3', '2023-10-08', '2026-10-07', '成都市金牛区茶店子西街金璐天下36号');
 insert into sys_user values (82, 111, '15520996706', '廖吉兴', '0', null, '15520996706', '0', null, '$2a$10$/KNuVYgY/iKADZZg.iykyuJK/rrgi/CpbZy.ZFv3NKm4MrpqBnCFu', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2023-06-01', null, null, null, '511123198706040475', '四川省犍为县', '13', '汉族', null, null, null, '2023-06-01', '2024-05-31', '四川省乐山市犍为县玉津镇机场村5组8号');
@@ -187,16 +187,16 @@ insert into sys_user values (84, 112, '13540773353', '杨振', '0', null, '13540
 insert into sys_user values (85, 112, '18380220140', '甘雨婷', '0', null, '18380220140', '1', null, '$2a$10$HXgw5OtU9uUCiKbSAPG0xe5PwGiZWlCIlJtltgXdtCYIZxIcKw01S', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '2', null, null, '4', null, null, '2017-07-05', null, null, null, '511011199412182527', '四川省内江市', '13', '汉族', '成都理工大学', '地理信息科学', '2', '2021-07-05', null, '成都市成华区龙潭寺街道北湖印象二期一栋二单元504');
 insert into sys_user values (86, 112, '13540422960', '邹霞', '0', null, '13540422960', '1', null, '$2a$10$JGmiiO3vjhEF5e2BXubE1uE/DRzpcmK3SMBZo/EDExsd8L9TWqEHm', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '2', null, '3', null, null, null, '2011-07-05', null, null, null, '510322198806060442', '四川省自贡市', '13', '汉族', '西南交通大学', '工程造价管理', '2', '2015-07-05', null, '成都市青羊区培风路276号颐和京都小区');
 insert into sys_user values (87, 112, '13488985627', '罗声燕', '0', null, '13488985627', '1', null, '$2a$10$.lFR.S8c/i3550O88zhk4OIyeYF2vmulknGqBvE/hi8b9id1RLNry', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '2', null, '3', null, null, null, '2011-07-05', null, null, null, '500383198810144949', '重庆市永川区', '13', '汉族', '西南交通大学', '工程造价管理', '2', '2015-07-05', null, '成都市青羊区清水滨河路131号金沙十年');
-insert into sys_user values (88, 112, '18227609102', '王琴', '0', null, '18227609102', '1', null, '$2a$10$hW41I3wMpnM.GiPO85jv3eyr6uJglfpj2SV/fU9etfXuBjHgIIveO', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, '5', null, null, null, '2019-12-19', null, null, null, '511321199803101842', '四川省南充市', '13', '汉族', '郑州测绘学校', '地图制图与地理信息系统', '6', '2023-12-19', null, '成都市郫都区校园路东段绵世溪地湾');
+insert into sys_user values (88, 112, '18227609102', '王琴', '0', null, '18227609102', '1', null, '$2a$10$hW41I3wMpnM.GiPO85jv3eyr6uJglfpj2SV/fU9etfXuBjHgIIveO', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, '5', null, null, null, '2019-12-19', null, null, null, '511321199803101842', '四川省南充市', '13', '汉族', '郑州测绘学校', '地图制图与地理信息系统', '5', '2023-12-19', null, '成都市郫都区校园路东段绵世溪地湾');
 insert into sys_user values (89, 112, '15281034798', '李静', '0', null, '15281034798', '1', null, '$2a$10$BIV.X9sgXwCLmnx0MjvbN.xnJ0d9mSv7Fe1HsB.d5UvqhYBux4aRK', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '2', null, '4', null, null, null, '2019-12-19', null, null, null, '510681199007141829', '四川省广汉市', '13', '汉族', '大连理工大学城市学院', '测绘工程', '2', '2023-12-19', null, '成都市成华区府华二路68号蓝光COCO时代');
-insert into sys_user values (90, 112, '18380143305', '刘垚', '0', null, '18380143305', '1', null, '$2a$10$9pXNh3pit.p.3lCv.1vIAeqm594O0y2ycUVTK5aXqbf1.DD9ckHr6', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, '5', null, null, null, '2019-12-19', null, null, null, '50022819970829454X', '重庆市梁平区', '12', '汉族', '成都铁路工程学院', '铁道施工与养护', '6', '2023-12-19', null, '成都市郫都区犀浦镇天河路合能橙中心');
+insert into sys_user values (90, 112, '18380143305', '刘垚', '0', null, '18380143305', '1', null, '$2a$10$9pXNh3pit.p.3lCv.1vIAeqm594O0y2ycUVTK5aXqbf1.DD9ckHr6', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, '5', null, null, null, '2019-12-19', null, null, null, '50022819970829454X', '重庆市梁平区', '12', '汉族', '成都铁路工程学院', '铁道施工与养护', '5', '2023-12-19', null, '成都市郫都区犀浦镇天河路合能橙中心');
 insert into sys_user values (91, 112, '15208298451', '李杨', '0', null, '15208298451', '0', null, '$2a$10$K25fAdfUGilTZz9BHlKBnezcMkD/Pv.uJKM1H0/jn.cOOas5jDVea', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '3', null, '4', null, null, null, '2017-06-27', null, null, null, '513701199607243913', '四川省巴中市', '13', '汉族', '中国地质大学', '土木工程', '2', '2021-06-27', null, '成都市金牛区西安街道荣光巷一居');
 insert into sys_user values (92, 112, '18990913384', '朱姝', '0', null, '18990913384', '1', null, '$2a$10$GXcpkSxBeuM1tj66W6M50.YPQKMOccRTD64wikP5LuRW0PMhJ2Z5q', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '3', null, '4', null, null, null, '2021-08-16', null, null, null, '511502199907285561', '四川省宜宾市', '12', '汉族', '四川农业大学', '地理信息科学', '2', '2022-08-16', '2025-08-15', '成都市青羊区青羊大道16号水木光华6栋');
 insert into sys_user values (93, 112, '15108355309', '张韦', '0', null, '15108355309', '0', null, '$2a$10$2aepTeKqlbUhb1x6i0K88OxLlZohvIf5JZ2xhgZO8It5MagkvLHHC', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '3', null, '4', null, null, null, '2019-04-02', null, null, null, '510181199611041915', '成都市都江堰市', '12', '汉族', '中国地质大学', '土木工程', '2', '2023-04-02', null, '四川省成都市都江堰市幸福镇奎光东街96号');
-insert into sys_user values (94, 112, '18108260500', '黄建春', '0', null, '18108260500', '0', null, '$2a$10$sfPuHSWY3AytrF7.o/cMAeXwb.GU1/wk4VJw4FLKgEnLNKlMdIRee', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '11', null, null, null, null, '1', '1998-12-01', null, null, null, '510106198102023212', '四川省成都市', '13', '汉族', null, null, '6', '2016-01-01', null, '四川省成都市武侯区沙堰西二街20号25栋2单元5号');
+insert into sys_user values (94, 112, '18108260500', '黄建春', '0', null, '18108260500', '0', null, '$2a$10$sfPuHSWY3AytrF7.o/cMAeXwb.GU1/wk4VJw4FLKgEnLNKlMdIRee', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '11', null, null, null, null, '1', '1998-12-01', null, null, null, '510106198102023212', '四川省成都市', '13', '汉族', null, null, '5', '2016-01-01', null, '四川省成都市武侯区沙堰西二街20号25栋2单元5号');
 insert into sys_user values (95, 112, '13881755761', '廖绍毅', '0', null, '13881755761', '0', null, '$2a$10$g9/NOZbNS6eIcqnEg6Z2geNyQIMNJtTJrahTvIYeDis68GaQ.McJG', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, '1', '1', null, null, null, null, null, '2021-07-16', null, null, null, '510121198410190614', '四川省成都市', '13', '汉族', '西南交通大学', '土木工程', '2', '2022-07-16', '2025-07-15', '四川省成都市金堂县赵镇康宁街398号星月湾2栋2单元');
 insert into sys_user values (96, 112, '15700353317', '杨晶', '0', null, '15700353317', '0', null, '$2a$10$Efj2FINLArOIOgEKa3vqp.k0gpwmJKlWWlXwTrQmSIO2qsVlIWZAa', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '2', null, '3', null, null, null, '2017-07-18', null, null, null, '510822199312115978', '四川省广元市', '10', '汉族', '内江师范学院', '测绘工程', '2', '2021-07-18', null, '四川省成都市彭州市桂花镇清桥村一组21号');
-insert into sys_user values (97, 112, '13618069959', '蒋剑虹', '0', null, '13618069959', '0', null, '$2a$10$5osgmB9ZInuTYvyMUedKqe2aDJM91i/KjOxGWWCZb9WO/45U7Zok.', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '10', null, null, null, null, '0', '1990-12-01', null, null, null, '51900319710108643X', '四川省都江堰市', '13', '汉族', null, null, '5', '2016-01-01', null, '四川省成都市都江堰市彩虹大道北段268号五幢三单元401');
+insert into sys_user values (97, 112, '13618069959', '蒋剑虹', '0', null, '13618069959', '0', null, '$2a$10$5osgmB9ZInuTYvyMUedKqe2aDJM91i/KjOxGWWCZb9WO/45U7Zok.', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '10', null, null, null, null, '0', '1990-12-01', null, null, null, '51900319710108643X', '四川省都江堰市', '13', '汉族', null, null, '4', '2016-01-01', null, '四川省成都市都江堰市彩虹大道北段268号五幢三单元401');
 insert into sys_user values (98, 112, '13882487125', '赵明焱', '0', null, '13882487125', '0', null, '$2a$10$zs4QH/xd0JDuYgrftHUhRedB5SWCE.d7pdTxhUmdo/OYVxx2fSFWq', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2022-10-08', null, null, null, '513226199810310712', '四川省金川县', '12', '藏族', '防灾科技学院', '测绘工程', '2', '2023-10-08', '2026-10-07', '成都市成华区八里庄地质花园');
 insert into sys_user values (99, 112, '18228226661', '董旭鹏', '0', null, '18228226661', '0', null, '$2a$10$yaBpFaISskiafcOa/k28VeSQSMiYhCxbtmMoXN/fruESTkMs4RwA6', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2022-10-08', null, null, null, '513901200010170615', '四川省资阳市', '12', '汉族', '四川水利职业技术学院', '测绘地理信息技术', '3', '2023-10-08', '2026-10-07', '四川省资阳市雁江区帝景名苑17栋12-1');
 insert into sys_user values (100, 112, '15775308748', '邓汶滨', '0', null, '15775308748', '0', null, '$2a$10$5L36DYl/Q.wmGKsolG/x0u4vnK78sVY59Qjx6fQA3z9n4dl62ykM.', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2023-09-18', null, null, null, '513821200105047038', '四川省眉山市', '12', '汉族', '西华师范大学', '测绘工程', '2', '2023-09-18', '2024-09-17', '四川省眉山市东坡区双赋园a区');
@@ -206,7 +206,7 @@ insert into sys_user values (103, 113, '13688404696', '柏金川', '0', null, '1
 insert into sys_user values (104, 113, '13594658239', '黄安堂', '0', null, '13594658239', '0', null, '$2a$10$uSefDVQx.kottALOIZptjO0RnZhvITS4QTnXjSBJddqYfOftdZ8Pa', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '3', null, '4', null, null, null, '2019-09-24', null, null, null, '500226199508056237', '重庆市荣昌', '10', '汉族', '内江师范学院', '测绘工程', '2', '2023-09-24', null, '四川省成都市成华区经华北路1号院');
 insert into sys_user values (105, 113, '13408566079', '李学勇', '0', null, '13408566079', '0', null, '$2a$10$8ru4dmjHBh21h8C3FTpdMeqsG4RHVyvqmqUFRFCDCUok2uH2ZLjiy', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '10', null, null, null, null, '0', '1994-03-10', null, null, null, '110222197112176817', '北京市顺义区', '13', '汉族', null, null, '3', '2016-01-01', null, '四川省都江堰市彩虹大道北段348号中冶堰景');
 insert into sys_user values (106, 113, '15881283512', '陈俊恺', '0', null, '15881283512', '0', null, '$2a$10$eqX3G0LjlptoBsMefxIjXuzSEaq5opPJjzqoitrp4Dhun3u1o1F1i', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '3', null, '4', null, null, null, '2018-02-01', null, null, null, '510422199508160015', '四川省攀枝花市', '13', '汉族', '重庆大学', '土木工程', '2', '2019-01-31', null, '四川省攀枝花市仁和区银华社区金科集美阳光');
-insert into sys_user values (107, 113, '15883351306', '彭永红', '0', null, '15883351306', '0', null, '$2a$10$Tlq6UDINB73aeR8MCW6emOO7MHLRUGkTZ0ud/oNvTrJllwwDpxhGe', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, '1', '2019-09-19', null, null, null, '511124197501080811', '四川省乐山市', '13', '汉族', null, null, '5', '2023-09-19', null, '四川省乐山市市中区通江街道岷河北街38号都市江景');
+insert into sys_user values (107, 113, '15883351306', '彭永红', '0', null, '15883351306', '0', null, '$2a$10$Tlq6UDINB73aeR8MCW6emOO7MHLRUGkTZ0ud/oNvTrJllwwDpxhGe', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, '1', '2019-09-19', null, null, null, '511124197501080811', '四川省乐山市', '13', '汉族', null, null, '4', '2023-09-19', null, '四川省乐山市市中区通江街道岷河北街38号都市江景');
 insert into sys_user values (108, 113, '18281010079', '邓静', '0', null, '18281010079', '0', null, '$2a$10$pstdOImPwTHv54sONZEyBObA1RySMTJx2rx5btFUq6WF3qkkeP2Y6', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '3', null, '4', null, null, null, '2020-12-17', null, null, null, '510623199309281938', '四川省中江县', '13', '汉族', '四川建筑职业技术学院', '建筑工程技术', '3', '2021-12-17', '2024-12-16', '四川省中江县黄鹿镇红金村5组33号');
 insert into sys_user values (109, 113, '18328739381', '刘庆波', '0', null, '18328739381', '0', null, '$2a$10$p72rrc68EO/XkCYDVVTNDurHcg4z64VgyedcadnOiX7RWV2GU7pv.', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '2', null, '3', null, null, null, '2021-06-11', null, null, null, '51072719921006431X', '四川省绵阳市', '13', '羌族', '成都理工大学', '勘查技术与工程', '2', '2022-06-11', '2025-06-10', '四川省绵阳市江油市诗城路中段236号江城苑二区');
 insert into sys_user values (110, 113, '18205207306', '高强', '0', null, '18205207306', '0', null, '$2a$10$p9WM4wlg34eq7yb9GAe.a.yvZhqsUBVQ.DIFIrBWZ5ufrUsu5oIKm', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '3', null, '4', null, null, null, '2021-08-23', null, null, null, '513822199609142451', '四川省仁寿县', '12', '汉族', '中国矿业大学', '测绘工程', '2', '2022-08-23', '2025-08-22', '四川省成都市新都区斑竹园街道锦城小区25栋10号');
@@ -214,7 +214,7 @@ insert into sys_user values (111, 113, '18380411075', '韩兴国', '0', null, '1
 insert into sys_user values (112, 113, '13693480782', '何安', '0', null, '13693480782', '0', null, '$2a$10$vPcVlPiTH2nOO48/JTeXt.FpFoc9V407XxcCUmbt23Fe3pL5AvqYK', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2023-06-25', null, null, null, '452701199902162617', '广西河池市', '12', '壮族', '成都理工大学', '测绘工程', '2', '2023-06-25', '2024-06-24', '成都市龙泉驿区大面街道天鹅西湖南路1号世茂城2期25栋3008');
 insert into sys_user values (113, 113, '15802829286', '向艳雄', '0', null, '15802829286', '0', null, '$2a$10$FQo1zf1ss2OZw4eIlzzxwOyPV0FkkLDN0ZBxqRSIijNpUCCSxBjQy', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, '1', '2', null, null, null, null, null, '2007-03-21', null, null, null, '420984198104101051', '湖北省汉川市', '13', '汉族', '四川大学', '工程管理', '2', '2017-03-30', null, '温江区天府学海路88号中铁丽景书香');
 insert into sys_user values (114, 113, '18113169528', '蒲帆', '0', null, '18113169528', '0', null, '$2a$10$Z.3Y46kvgMCHpVSsXl3WJO4OOLJhr5IlzXTQqWx1a8yR1HaJQJQQW', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, '2', '2', null, null, null, null, null, '2017-07-06', null, null, null, '511325199303064016', '四川省南充市', '13', '汉族', '成都信息工程大学', '测绘工程', '2', '2021-07-06', null, '成都市金牛区新泉路33号兴元绿洲五栋一单元802');
-insert into sys_user values (115, 113, '13628057328', '薛帅', '0', null, '13628057328', '0', null, '$2a$10$ND.pJthbdY1tY8LHYtJkpeADmaTDJNvwPClaERSAyKIcLd4xT5uyq', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '10', null, null, null, null, '0', '1993-12-07', null, null, null, '513022197004281835', '成都市温江区', '13', '汉族', null, null, '5', '2016-01-01', null, '四川省成都市温江区海科路水韵尚城519号10-1-302');
+insert into sys_user values (115, 113, '13628057328', '薛帅', '0', null, '13628057328', '0', null, '$2a$10$ND.pJthbdY1tY8LHYtJkpeADmaTDJNvwPClaERSAyKIcLd4xT5uyq', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '10', null, null, null, null, '0', '1993-12-07', null, null, null, '513022197004281835', '成都市温江区', '13', '汉族', null, null, '4', '2016-01-01', null, '四川省成都市温江区海科路水韵尚城519号10-1-302');
 insert into sys_user values (116, 113, '17709008823', '魏琪豪', '0', null, '17709008823', '0', null, '$2a$10$jL1qzKInoqHwJDalTwfKEOU/bTIO2WyQSrhu4BomP6qHg3n5GEL36', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2024-03-06', null, null, null, '510704199706231519', '四川省绵阳市', '12', '汉族', '西南科技大学', '地质工程', '1', '2024-03-06', '2025-03-05', '成都市双流区新景鼎南川宇-1号楼-1单元3楼-305');
 insert into sys_user values (117, 114, '13980688458', '段文祥', '0', null, '13980688458', '0', null, '$2a$10$4ETMsgQR7HcIjqmE3SXATOxud3L/tpPiYqt0GGRHsIB55WM4rR9Ry', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '1', null, '2', null, null, null, '2022-02-07', null, null, null, '622323198508271130', '甘肃省古浪县', '13', '汉族', '成都理工大学', '计算机应用与维护', '3', '2023-02-07', '2026-02-06', '成都市成华区中海新华府');
 insert into sys_user values (118, 114, '18980006770', '张伟', '0', null, '18980006770', '0', null, '$2a$10$dtTx73vRXEnbuwbyt.Hm4uhDLRI07BOwgRMMx1/tZBBy9CFTb8Mw6', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2022-02-07', null, null, null, '513822198702090313', '四川省郫县', '13', '汉族', '郑州大学', '土木工程', '2', '2023-02-07', '2026-02-06', '四川省郫县犀浦镇校园路55号9栋1单元22楼2201号');
@@ -229,15 +229,15 @@ insert into sys_user values (126, 202, '18382319155', '谢承东', '0', null, '1
 insert into sys_user values (127, 203, '18227480379', '周炎', '0', null, '18227480379', '0', null, '$2a$10$5e7lOXqGekSSu.rKKMQJYuLJc68RZllH2ebGFEr/He6cc2zsQJPzm', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '3', null, null, null, null, null, '2019-11-29', null, null, null, '421182198902083315', '湖北省武穴市', '13', '汉族', '西北工业大学', '土木工程', '2', '2022-11-29', '2025-11-28', '成都市龙泉驿区大面街道青台山路99号万卷山小区7栋3203');
 insert into sys_user values (128, 204, '18140430240', '胡庆', '0', null, '18140430240', '0', null, '$2a$10$IckBbWNu8BS6JkdITuvMzu7G/Ztl.d.gbp1xwQqpgYDUEYEaxFUkS', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '3', null, null, null, null, null, '2021-08-23', null, null, null, '513424199708190417', '四川省德昌县', '13', '汉族', '四川文化产业职业学院', '建筑工程技术', '3', '2021-08-23', null, '四川省德昌县麻栗镇大坝村5组27号');
 insert into sys_user values (129, 203, '18780029464', '何行', '0', null, '18780029464', '0', null, '$2a$10$0BpGvlJOqHQyM//wJh3lAO/7e/s.dys5iVCGu0K/qcjsLpgveK4ou', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '3', null, '5', null, null, null, '2023-02-01', null, null, null, '511321199705135838', '四川省南部县', '12', '汉族', '成都农业科技职业学院', '汽车检测与维修技术', '3', '2023-02-01', null, '成都市郫都区安靖镇林湾名居');
-insert into sys_user values (130, 200, '18283500919', '杨良轩', '0', null, '18283500919', '0', null, '$2a$10$vUYbhAPQRZuj8S5cjvC5XODjTswaxbWr049ICezchhb4ueoNQ4S6i', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2012-01-09', null, null, null, '513124197111161618', '四川省雅安市', '13', '汉族', null, null, '5', '2016-01-08', null, '四川省雅安市汉源县九襄镇大庄村九组');
-insert into sys_user values (131, 200, '13880159142', '周建伟', '0', null, '13880159142', '0', null, '$2a$10$vY871WQd/F9BGNg1Ki2.VOYsT704ttmif5b3U1Aaj392CydaVTTfm', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2006-08-28', null, null, null, '519003197210286457', '四川省成都市', '13', '汉族', null, null, '5', '2017-04-01', null, '都江堰市奎光塔街道走马河西路下段232号兰卡威');
-insert into sys_user values (132, 200, '13980809722', '罗友权', '0', null, '13980809722', '0', null, '$2a$10$/cL8xD1pFmFxLyehpr2x1e3n/8KqKG6lWaXdjyHyaZo37oCP4wfem', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2006-03-12', null, null, null, '512922196907217475', '四川省南充市', '13', '汉族', null, null, '5', '2017-04-01', null, '四川省南充市顺庆区滨江中路1段501号天乙华府');
-insert into sys_user values (133, 200, '15228916534', '凌涛', '0', null, '15228916534', '0', null, '$2a$10$BdjU17zPn5JZpcyOBBK3X.GiQOdZfuRVmiljOJMde4/EJM67Zp7/C', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2017-10-10', null, null, null, '511022197601104253', '四川省资阳市', '13', '汉族', null, null, '5', '2021-10-10', null, '成都市成华区八里桥路245号1栋');
-insert into sys_user values (134, 200, '15928517280', '雷光泽', '0', null, '15928517280', '0', null, '$2a$10$soo68IbKDhCT0mhj.j0Nou2rsgVxLU78BsowMo7ZorasQj9FPf2OG', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2006-03-12', null, null, null, '511124196308031431', '四川省乐山市', '13', '汉族', null, null, '5', '2017-04-01', null, '四川省乐山市市中区滨江中路北段2718号铂金汇小区');
-insert into sys_user values (135, 200, '15828156243', '廖勇', '0', null, '15828156243', '0', null, '$2a$10$9QO6qXNSAiAtWFCXbvEeu.pHoBLHZig5ra.y2ZNRyRDxL0W4WU2Q2', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2019-12-02', null, null, null, '51390119870830331X', '四川省资阳市', '13', '汉族', '四川省郫县友爱技术学校', '计算机及应用', '6', '2023-12-02', null, '四川省成都市郫都区安德街道安龙村6组25号');
-insert into sys_user values (136, 200, '14726050305', '康科伟', '0', null, '14726050305', '0', null, '$2a$10$04.7zNYdTwXzlQ8J0SYNaOZMc.iarm2gBeD37na6.aAtuBzfnpnUO', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2021-07-09', null, null, null, '51322619940305271X', '四川省金川县', '13', '藏族', null, null, '5', '2022-07-09', '2025-07-08', '成都市郫都区犀浦镇润扬双铁广场6栋一单元701');
-insert into sys_user values (137, 200, '18111675896', '熊艳华', '0', null, '18111675896', '0', null, '$2a$10$uLfMqz3YfEuAO8TI0XOzE.Xn0FZA7U6zrfss6Xp.anF4xUZNXT37y', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2022-01-27', null, null, null, '510921197711167935', '四川省大英县', '13', '汉族', null, null, '5', '2023-01-27', '2026-01-26', '四川省大英县玉峰镇肖家沟村9社42号');
-insert into sys_user values (138, 200, '18982085285', '赵永来', '0', null, '18982085285', '0', null, '$2a$10$TzKjV2T1FJ7YubxeIZZnmuLBsdppYlHoxruXCh0aBhHyV/yLGaiai', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2023-10-07', null, null, null, '510108197701183312', '四川省成都市', '13', '汉族', null, null, '5', '2023-10-07', '2024-10-06', '成都市武侯区晋阳路215号2-2-501');
+insert into sys_user values (130, 200, '18283500919', '杨良轩', '0', null, '18283500919', '0', null, '$2a$10$vUYbhAPQRZuj8S5cjvC5XODjTswaxbWr049ICezchhb4ueoNQ4S6i', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2012-01-09', null, null, null, '513124197111161618', '四川省雅安市', '13', '汉族', null, null, '4', '2016-01-08', null, '四川省雅安市汉源县九襄镇大庄村九组');
+insert into sys_user values (131, 200, '13880159142', '周建伟', '0', null, '13880159142', '0', null, '$2a$10$vY871WQd/F9BGNg1Ki2.VOYsT704ttmif5b3U1Aaj392CydaVTTfm', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2006-08-28', null, null, null, '519003197210286457', '四川省成都市', '13', '汉族', null, null, '4', '2017-04-01', null, '都江堰市奎光塔街道走马河西路下段232号兰卡威');
+insert into sys_user values (132, 200, '13980809722', '罗友权', '0', null, '13980809722', '0', null, '$2a$10$/cL8xD1pFmFxLyehpr2x1e3n/8KqKG6lWaXdjyHyaZo37oCP4wfem', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2006-03-12', null, null, null, '512922196907217475', '四川省南充市', '13', '汉族', null, null, '4', '2017-04-01', null, '四川省南充市顺庆区滨江中路1段501号天乙华府');
+insert into sys_user values (133, 200, '15228916534', '凌涛', '0', null, '15228916534', '0', null, '$2a$10$BdjU17zPn5JZpcyOBBK3X.GiQOdZfuRVmiljOJMde4/EJM67Zp7/C', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2017-10-10', null, null, null, '511022197601104253', '四川省资阳市', '13', '汉族', null, null, '4', '2021-10-10', null, '成都市成华区八里桥路245号1栋');
+insert into sys_user values (134, 200, '15928517280', '雷光泽', '0', null, '15928517280', '0', null, '$2a$10$soo68IbKDhCT0mhj.j0Nou2rsgVxLU78BsowMo7ZorasQj9FPf2OG', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2006-03-12', null, null, null, '511124196308031431', '四川省乐山市', '13', '汉族', null, null, '4', '2017-04-01', null, '四川省乐山市市中区滨江中路北段2718号铂金汇小区');
+insert into sys_user values (135, 200, '15828156243', '廖勇', '0', null, '15828156243', '0', null, '$2a$10$9QO6qXNSAiAtWFCXbvEeu.pHoBLHZig5ra.y2ZNRyRDxL0W4WU2Q2', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2019-12-02', null, null, null, '51390119870830331X', '四川省资阳市', '13', '汉族', '四川省郫县友爱技术学校', '计算机及应用', '5', '2023-12-02', null, '四川省成都市郫都区安德街道安龙村6组25号');
+insert into sys_user values (136, 200, '14726050305', '康科伟', '0', null, '14726050305', '0', null, '$2a$10$04.7zNYdTwXzlQ8J0SYNaOZMc.iarm2gBeD37na6.aAtuBzfnpnUO', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2021-07-09', null, null, null, '51322619940305271X', '四川省金川县', '13', '藏族', null, null, '4', '2022-07-09', '2025-07-08', '成都市郫都区犀浦镇润扬双铁广场6栋一单元701');
+insert into sys_user values (137, 200, '18111675896', '熊艳华', '0', null, '18111675896', '0', null, '$2a$10$uLfMqz3YfEuAO8TI0XOzE.Xn0FZA7U6zrfss6Xp.anF4xUZNXT37y', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2022-01-27', null, null, null, '510921197711167935', '四川省大英县', '13', '汉族', null, null, '4', '2023-01-27', '2026-01-26', '四川省大英县玉峰镇肖家沟村9社42号');
+insert into sys_user values (138, 200, '18982085285', '赵永来', '0', null, '18982085285', '0', null, '$2a$10$TzKjV2T1FJ7YubxeIZZnmuLBsdppYlHoxruXCh0aBhHyV/yLGaiai', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2023-10-07', null, null, null, '510108197701183312', '四川省成都市', '13', '汉族', null, null, '4', '2023-10-07', '2024-10-06', '成都市武侯区晋阳路215号2-2-501');
 insert into sys_user values (139, 116, '15982167611', '刘洋', '0', null, '15982167611', '0', null, '$2a$10$qxB0MTpLA7WzUhBpQlrC5u.7JymKt2bwAJ9gupwWQeKcANtov0qn.', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '2', null, null, '4', null, null, '2020-04-04', null, null, null, '511323198907130013', '四川省南充市', '13', '汉族', '西南交通大学', '土木工程', '2', '2021-04-04', '2024-04-03', '成都市都江堰市光明街和谐家园13栋1-2号');
 insert into sys_user values (140, 116, '17345090038', '郑鹏', '0', null, '17345090038', '0', null, '$2a$10$meTOhyDbWqzhrzCFDGM3hu.cOFwinewDE1Jp3YYR/ThYBvOssce7G', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '3', null, '4', null, null, null, '2018-09-11', null, null, null, '500231199105290038', '重庆市垫江县', '13', '汉族', '重庆水利电力职业技术学院', '工程测量与监理', '3', '2021-09-11', '2024-09-10', '四川成都市彭州市致和镇南部新城置信逸景苑13栋3单元');
 insert into sys_user values (141, 116, '17612894797', '黄强', '0', null, '17612894797', '0', null, '$2a$10$JyofvRfiRj5Ug2G4ux00eOtMvQSOKu.tjo0.Juey2xMZSsAggVE76', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2021-08-01', null, null, null, '511323199501284199', '四川省蓬安县', '13', '汉族', '成都理工大学', '工程测量技术', '3', '2022-08-01', '2025-07-31', '四川省蓬安县金叶路龙角丽景');
@@ -247,7 +247,7 @@ insert into sys_user values (144, 117, '13488982667', '尹超', '0', null, '1348
 insert into sys_user values (145, 117, '15881108097', '程昊', '0', null, '15881108097', '0', null, '$2a$10$y1Z2H5Wp4yhdnmHcNO7U6u9108qE/uxqQ7OVumAtVLlgDbj/ZWo/.', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, '2', '2', null, null, null, null, null, '2011-07-05', null, null, null, '510626198909214055', '重庆市长寿县', '13', '汉族', '阿坝广播电视大学', '土木工程', '2', null, null, '成都市青羊区金沙愉景二期');
 insert into sys_user values (146, 117, '15928663470', '丁亮', '0', null, '15928663470', '0', null, '$2a$10$WYBOgIm.Y.LNSEKs3VPaX.1JpD.VLodHuug5wOeX636vln31SHII2', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '3', null, '4', null, null, null, '2018-12-06', null, null, null, '500101199510171813', '重庆市万州区', '13', '汉族', '西南交通大学', '土木工程', '2', '2022-12-06', null, '四川省成都市金牛区金泉街道103号金科苑四区10栋一单元12号');
 insert into sys_user values (147, 117, '15202868564', '夏志斌', '0', null, '15202868564', '0', null, '$2a$10$ucCDdz5DYNZy64aKKSxH/.Lib./7T5rLGECIWXzwBLalCQk0X1fka', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '3', null, null, null, null, null, '2019-02-20', null, null, null, '429004199008293198', '湖北省仙桃市', '13', '汉族', '湖北水利水电职业技术学院', '水利水电建筑工程', '3', null, null, '四川省成都市温江区海科东路688号');
-insert into sys_user values (148, 117, '18200213829', '董云勇', '0', null, '18200213829', '0', null, '$2a$10$nl2oQ1dq4Dfvg7nmk/nHAuCcR4vLoStbJHrwQQt5sJKxOzYsThrye', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2023-09-21', null, null, null, '512922197208137374', '四川省南部县', '13', '汉族', null, null, '5', null, null, '成都市郫都区友爱镇释迦桥上街');
+insert into sys_user values (148, 117, '18200213829', '董云勇', '0', null, '18200213829', '0', null, '$2a$10$nl2oQ1dq4Dfvg7nmk/nHAuCcR4vLoStbJHrwQQt5sJKxOzYsThrye', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '13', null, null, null, null, null, '2023-09-21', null, null, null, '512922197208137374', '四川省南部县', '13', '汉族', null, null, '4', null, null, '成都市郫都区友爱镇释迦桥上街');
 insert into sys_user values (149, 118, '13880644169', '林方迁', '0', null, '13880644169', '0', null, '$2a$10$VPrToUrklp3J3NtnHAy7VulN9Eck4eTuII4xmXh.JKOue9BN91Tq.', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '2', null, null, null, null, null, '2011-07-05', null, null, null, '510113198910055670', '四川省成都市', '13', '汉族', '中央广播电视大学', '土木工程', '2', '2013-07-05', null, '成都市青白江区武海中华名城一期3栋一单元1403号');
 insert into sys_user values (150, 118, '18140055216', '杨柳', '0', null, '18140055216', '1', null, '$2a$10$K1WECO/2G5tAKCr3h16CzeypD2CSVjq1MWdk1FLjhnAKD2SwanrT6', '0', '0', null, null, null, '2024-05-14 10:41:32', null, null, null, null, '1', null, null, null, null, null, '2005-03-01', null, null, null, '420321198307190041', '湖北省十堰市', '10', '汉族', '西南交通大学', '土木工程', '2', '2017-01-01', null, '成都市温江区江浦路288号洲际亚洲湾');
 
@@ -1092,15 +1092,15 @@ insert into sys_dict_data values (52, 5, '六档', '5', 'sys_user_salarylevel',
 insert into sys_dict_data values (53, 6, '七档', '6', 'sys_user_salarylevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:47:24', '', null, null);
 insert into sys_dict_data values (54, 7, '八档', '7', 'sys_user_salarylevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:47:24', '', null, null);
 insert into sys_dict_data values (55, 0, '正高级工程师', '0', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:08', '', null, null);
-insert into sys_dict_data values (56, 1, '副高级工程师', '1', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:45', '', null, null);
-insert into sys_dict_data values (57, 2, '中级工程师', '2', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:57', '', null, null);
+insert into sys_dict_data values (56, 1, '高级工程师', '1', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:45', '', null, null);
+insert into sys_dict_data values (57, 2, '工程师', '2', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:57', '', null, null);
 insert into sys_dict_data values (58, 3, '助理工程师', '3', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:49:07', '', null, null);
 insert into sys_dict_data values (59, 4, '高级会计师', '4', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:08', '', null, null);
-insert into sys_dict_data values (60, 5, '中级会计师', '5', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:45', '', null, null);
-insert into sys_dict_data values (61, 6, '初级会计师', '6', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:57', '', null, null);
+insert into sys_dict_data values (60, 5, '会计师', '5', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:45', '', null, null);
+insert into sys_dict_data values (61, 6, '助理会计师', '6', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:57', '', null, null);
 insert into sys_dict_data values (62, 7, '高级经济师', '7', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:49:07', '', null, null);
-insert into sys_dict_data values (63, 8, '中级经济师', '8', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:49:07', '', null, null);
-insert into sys_dict_data values (64, 9, '初级经济师', '9', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:49:07', '', null, null);
+insert into sys_dict_data values (63, 8, '经济师', '8', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:49:07', '', null, null);
+insert into sys_dict_data values (64, 9, '助理经济师', '9', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:49:07', '', null, null);
 insert into sys_dict_data values (65, 10, '工人高级工', '10', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:08', '', null, null);
 insert into sys_dict_data values (66, 11, '工人中级工', '11', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:08', '', null, null);
 insert into sys_dict_data values (67, 12, '工人初级工', '12', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:08', '', null, null);

oa-ui/package.json

@@ -46,6 +46,7 @@
     "core-js": "3.25.3",
     "diagram-js": "^11.4.1",
     "echarts": "5.4.0",
+    "echarts-gl": "^2.0.9",
     "element-ui": "2.15.14",
     "file-drops": "^0.4.0",
     "file-saver": "2.0.5",

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

@@ -18,6 +18,14 @@ export function getUser(userId) {
   })
 }
 
+// 查询用户变更信息
+export function getUserChangeInfo(userId) {
+  return request({
+    url: '/system/user/change/' + parseStrEmpty(userId),
+    method: 'get'
+  })
+}
+
 // 新增用户
 export function addUser(data) {
   return request({

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

@@ -59,7 +59,7 @@
           :show-overflow-tooltip="true" />
         <el-table-column label="年龄" align="center" key="age" prop="age" v-if="columns[1].visible">
           <template slot-scope="scope">
-            {{ getAgeByIdCard(scope.row.idCard)  }}
+            {{ getAgeByIdCard(scope.row.idCard) }}
           </template>
         </el-table-column>
         <el-table-column label="性别" align="center" key="sex" prop="sex" v-if="columns[2].visible"
@@ -76,7 +76,7 @@
           :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ formatLevel(scope.row.postLevel, scope.row.salaryLevel,
-      dict.type.sys_user_postlevel, dict.type.sys_user_salarylevel) }}
+              dict.type.sys_user_postlevel, dict.type.sys_user_salarylevel) }}
           </template>
         </el-table-column>
         <el-table-column label="职称" align="center" key="titles" prop="titles" v-if="columns[6].visible"
@@ -143,7 +143,7 @@
 
     <!-- 添加或修改用户配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="姓名" prop="nickName">
@@ -219,8 +219,7 @@
                 value-format="yyyy-MM" />
             </el-form-item>
             <el-form-item label="政治面貌" prop="politicalAffiliation">
-              <el-select v-model="form.politicalAffiliation" multiple clearable placeholder="请选择政治面貌"
-                style="width:100%;">
+              <el-select v-model="form.politicalAffiliation" multiple clearable placeholder="请选择政治面貌" style="width:100%;">
                 <el-option v-for="dict in dict.type.sys_user_political" :key="dict.value" :label="dict.label"
                   :value="dict.value" />
               </el-select>
@@ -243,6 +242,18 @@
                   :value="dict.value" />
               </el-select>
             </el-form-item>
+            <el-form-item label="工程师等级">
+              <el-select v-model="form.engineerLevel" placeholder="请输入工程师等级" style="width:100%;">
+                <el-option v-for="dict in dict.type.sys_user_engineerlevel" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="技工等级">
+              <el-select v-model="form.operatorLevel" placeholder="请输入技工等级" style="width:100%;">
+                <el-option v-for="dict in dict.type.sys_user_operatorlevel" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
+              </el-select>
+            </el-form-item>
             <el-form-item label="岗位">
               <el-select v-model="form.postIds" multiple placeholder="请选择岗位" style="width:100%;">
                 <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId"
@@ -313,7 +324,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_postlevel', 'sys_user_salarylevel', 'sys_user_political', 'sys_user_degree'],
+    '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 {
@@ -353,7 +364,6 @@ export default {
         { value: '0', label: '误录修改' },
         { value: '1', label: '正常调整' }
       ],
-      certificates: [],
       // 表单参数
       form: {},
       pm: false,
@@ -571,7 +581,7 @@ export default {
       getUser(userId).then(response => {
         this.form = response.data;
         if (this.form.politicalAffiliation) {
-          this.form.politicalAffiliation = this.form.politicalAffiliation.split('、')
+          this.form.politicalAffiliation = this.form.politicalAffiliation.split(',')
         }
         this.form.birthday = this.getBirthdayByIdCard(this.form.idCard);
         this.form.age = this.getAgeByIdCard(this.form.idCard);
@@ -579,10 +589,11 @@ export default {
         this.roleOptions = response.roles;
         this.$set(this.form, "postIds", response.postIds);
         this.$set(this.form, "roleIds", response.roleIds);
-        if (response.data.certificates != "" && response.data.certificates != undefined && response.data.certificates != null) {
-          for (let i = 0; i < response.data.certificates.split(",").length; i++)
-            this.certificates[i] = response.data.certificates.split(",")[i]
-          this.$set(this.form, "certificates", this.certificates);
+        if (this.form.certificates != "" && this.form.certificates != undefined && this.form.certificates != null) {
+          let certificateList = [];
+          for (let i = 0; i < this.form.certificates.split(",").length; i++)
+            certificateList[i] = this.form.certificates.split(",")[i]
+          this.$set(this.form, "certificates", certificateList);
         }
         this.open = true;
         this.title = "修改用户";
@@ -617,8 +628,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, ',');
+            this.form.politicalAffiliation = this.formatArrayToString(this.form.politicalAffiliation, ',')
             updateUser(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -733,7 +744,7 @@ export default {
       return sexAndAge.age
     },
     formatArrayToString(str, splitStr) {
-      let newStr ="";
+      let newStr = "";
       if (str) {
         newStr = str.join(splitStr)
       } else {

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

@@ -33,10 +33,18 @@
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
           v-hasPermi="['oa:salary:export']">导出</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button v-if="tabelOpen" type="info" plain icon="el-icon-data-analysis" size="mini"
+          @click="generateChart">生成图表</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button v-if="!tabelOpen" type="info" plain icon="el-icon-arrow-left" size="mini"
+          @click="generateChart">返回列表</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="salaryList" @selection-change="handleSelectionChange">
+    <el-table v-if="tabelOpen" v-loading="loading" :data="salaryList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="成本id" align="center" prop="salaryId" /> -->
       <el-table-column label="岗级" align="center" prop="postLevel">
@@ -60,8 +68,8 @@
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
+    <pagination v-if="tabelOpen" v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize" @pagination="getList" />
 
     <!-- 添加或修改cmc岗位工资对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -81,12 +89,15 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <div id="charts" style="padding: auto; height: 80vh;"></div>
   </div>
 </template>
 
 <script>
 import { listSalary, getSalary, delSalary, addSalary, updateSalary } from "@/api/oa/staff/salary";
-
+import * as echarts from 'echarts';
+import 'echarts-gl';
 export default {
   name: "Salary",
   dicts: ['sys_user_postlevel', 'sys_user_salarylevel'],
@@ -122,11 +133,19 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      tabelOpen: true,
+      option: {},
+      myChart: undefined,
     };
   },
   created() {
     this.getList();
+    this.getListAll();
+  },
+  mounted() {
+    this.myChart = echarts.init(document.getElementById('charts'));
+    document.getElementById("charts").style.display = "none";
   },
   methods: {
     /** 查询cmc岗位工资列表 */
@@ -138,6 +157,82 @@ export default {
         this.loading = false;
       });
     },
+    /** 查询cmc岗位工资列表 */
+    getListAll() {
+      this.queryParams.pageSize = 58;
+      listSalary(this.queryParams).then(response => {
+        var data = [];
+        for (let salary of response.rows) {
+          data.push([Number(salary.postLevel) + 1, Number(salary.salaryLevel) + 1, salary.salary]);
+        }
+        var salarys = ['', '一档', '二档', '三档', '四档', '五档', '六档', '七档', '八档'];
+        var posts = ['', '一岗', '二岗', '三岗', '四岗', '五岗', '六岗', '七岗', '八岗'];
+        this.option = {
+          tooltip: {},
+          backgroundColor: '#fff',
+          visualMap: {
+            max: 8000,
+            inRange: {
+              color: [
+                '#313695',
+                '#4575b4',
+                '#74add1',
+                '#abd9e9',
+                '#e0f3f8',
+                '#ffffbf',
+                '#fee090',
+                '#fdae61',
+                '#f46d43',
+                '#d73027',
+                '#a50026'
+              ]
+            }
+          },
+          xAxis3D: {
+            type: 'category',
+            data: posts,
+            min: 1,
+          },
+          yAxis3D: {
+            type: 'category',
+            data: salarys,
+            min: 1,
+          },
+          zAxis3D: {
+            type: 'value',
+          },
+          grid3D: {
+            boxWidth: 160,
+            boxDepth: 80,
+            viewControl: {
+              projection: 'orthographic',
+              alpha: 10,
+              beta: -60
+            }
+          },
+          series: [
+            {
+              name: '岗位工资',
+              type: 'bar3D',
+              shading: 'lambert',
+              data: data,
+              emphasis: {
+                label: {
+                  fontSize: 20,
+                  color: '#000'
+                },
+                itemStyle: {
+                  color: '#900'
+                }
+              }
+            }
+          ]
+        };
+        this.myChart.setOption(this.option);
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -221,6 +316,16 @@ export default {
         ...this.queryParams
       }, `salary_${new Date().getTime()}.xlsx`)
     },
+    generateChart() {
+      if (this.tabelOpen) {
+        this.tabelOpen = false;
+        document.getElementById("charts").style.display = "";
+      }
+      else {
+        this.tabelOpen = true;
+        document.getElementById("charts").style.display = "none";
+      }
+    },
     formatLevel(level, levelList) {
       if (level) {
         let levelLabel = levelList[level].label