新增用户成本表

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

@@ -79,7 +79,7 @@ public class SysUser extends BaseEntity
     private String postLevel;
 
     /** 薪档 */
-    @Excel(name = "薪档", readConverterExp = "0=一级,1=二级,2=三级,3=四级,4=五级,5=六级,6=七级,7=八级")
+    @Excel(name = "薪档", readConverterExp = "0=一档,1=二档,2=三档,3=四档,4=五档,5=六档,6=七档,7=八档")
     private String salaryLevel;
 
     /** 工程师岗级 */

oa-back/sql/sql.sql

@@ -985,14 +985,14 @@ insert into sys_dict_data values (43, 4, '五岗', '4', 'sys_user_postlevel', nu
 insert into sys_dict_data values (44, 5, '六岗', '5', 'sys_user_postlevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:47:24', '', null, null);
 insert into sys_dict_data values (45, 6, '七岗', '6', 'sys_user_postlevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:47:24', '', null, null);
 insert into sys_dict_data values (46, 7, '八岗', '7', 'sys_user_postlevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:47:24', '', null, null);
-insert into sys_dict_data values (47, 0, '一级', '0', 'sys_user_salarylevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:46:44', '', null, null);
-insert into sys_dict_data values (48, 1, '二级', '1', 'sys_user_salarylevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:47:24', '', null, null);
-insert into sys_dict_data values (49, 2, '三级', '2', 'sys_user_salarylevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:47:24', '', null, null);
-insert into sys_dict_data values (50, 3, '四级', '3', 'sys_user_salarylevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:47:24', '', null, null);
-insert into sys_dict_data values (51, 4, '五级', '4', 'sys_user_salarylevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:47:24', '', null, null);
-insert into sys_dict_data values (52, 5, '六级', '5', 'sys_user_salarylevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:47:24', '', null, null);
-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 (47, 0, '一档', '0', 'sys_user_salarylevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:46:44', '', null, null);
+insert into sys_dict_data values (48, 1, '二档', '1', 'sys_user_salarylevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:47:24', '', null, null);
+insert into sys_dict_data values (49, 2, '三档', '2', 'sys_user_salarylevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:47:24', '', null, null);
+insert into sys_dict_data values (50, 3, '四档', '3', 'sys_user_salarylevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:47:24', '', null, null);
+insert into sys_dict_data values (51, 4, '五档', '4', 'sys_user_salarylevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:47:24', '', null, null);
+insert into sys_dict_data values (52, 5, '六档', '5', 'sys_user_salarylevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:47:24', '', null, null);
+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);
@@ -1493,7 +1493,9 @@ create table `cmc_user_history`  (
   `user_id`			bigint			default null				comment '用户id',
   `titiles`			varchar(9)		default null				comment '技术职称（0正高、1副高、2中级、3助工、4注测、5注规、6注岩、7注安、8注会）',
   `pm_level`		char(1)			default null				comment '项目经理级别（0一、1二、2三）',
-  `engineer_level`	char(1) 		default null				comment '岗级（0一、1二、2三、3四、4五、5六、6七、7八）',
+  `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八）',
   `update_time`		datetime		default null				comment '更新时间',
   `update_reason`	char(1) 		default null				comment '更新原因（0误录修改、1正常调整）',
   primary key (`history_id`)
@@ -1502,24 +1504,79 @@ create table `cmc_user_history`  (
 -- ----------------------------
 -- 初始化-用户历史表数据
 -- ----------------------------
-/*
- Navicat Premium Data Transfer
 
- Source Server         : localhost
- Source Server Type    : MySQL
- Source Server Version : 50731 (5.7.31)
- Source Host           : localhost:3306
- Source Schema         : tony-flowable
-
- Target Server Type    : MySQL
- Target Server Version : 50731 (5.7.31)
- File Encoding         : 65001
-
- Date: 28/12/2022 16:39:00
-*/
+-- ----------------------------
+-- 30、cmc用户成本表
+-- ----------------------------
+drop table if exists `cmc_user_cost`;
+create table `cmc_user_cost`  (
+  `cost_id`			int				not null	auto_increment	comment '成本id',
+  `name`			varchar(10)		default null				comment '项名',
+  `month_cost`		decimal(10, 2)	default null				comment '月成本',
+  primary key (`cost_id`)
+) engine = innodb comment = 'cmc用户历史表';
 
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
+-- ----------------------------
+-- 初始化-用户成本表数据
+-- ----------------------------
+insert into `cmc_cost` values (1, '一岗一档', 300.00);
+insert into `cmc_cost` values (2, '一岗二档', 340.00);
+insert into `cmc_cost` values (3, '一岗三档', 380.00);
+insert into `cmc_cost` values (4, '一岗四档', 420.00);
+insert into `cmc_cost` values (5, '二岗一档', 440.00);
+insert into `cmc_cost` values (6, '二岗二档', 500.00);
+insert into `cmc_cost` values (7, '二岗三档', 560.00);
+insert into `cmc_cost` values (8, '二岗四档', 620.00);
+insert into `cmc_cost` values (9, '二岗五档', 680.00);
+insert into `cmc_cost` values (10, '二岗六档', 740.00);
+insert into `cmc_cost` values (11, '三岗一档', 560.00);
+insert into `cmc_cost` values (12, '三岗二档', 640.00);
+insert into `cmc_cost` values (13, '三岗三档', 720.00);
+insert into `cmc_cost` values (14, '三岗四档', 800.00);
+insert into `cmc_cost` values (15, '三岗五档', 880.00);
+insert into `cmc_cost` values (16, '三岗六档', 960.00);
+insert into `cmc_cost` values (17, '三岗七档', 1040.00);
+insert into `cmc_cost` values (18, '三岗八档', 1120.00);
+insert into `cmc_cost` values (19, '四岗一档', 880.00);
+insert into `cmc_cost` values (20, '四岗二档', 1020.00);
+insert into `cmc_cost` values (21, '四岗三档', 1160.00);
+insert into `cmc_cost` values (22, '四岗四档', 1300.00);
+insert into `cmc_cost` values (23, '四岗五档', 1440.00);
+insert into `cmc_cost` values (24, '四岗六档', 1580.00);
+insert into `cmc_cost` values (25, '四岗七档', 1720.00);
+insert into `cmc_cost` values (26, '四岗八档', 1860.00);
+insert into `cmc_cost` values (27, '五岗一档', 1700.00);
+insert into `cmc_cost` values (28, '五岗二档', 1860.00);
+insert into `cmc_cost` values (29, '五岗三档', 2020.00);
+insert into `cmc_cost` values (30, '五岗四档', 2180.00);
+insert into `cmc_cost` values (31, '五岗五档', 2340.00);
+insert into `cmc_cost` values (32, '五岗六档', 2500.00);
+insert into `cmc_cost` values (33, '五岗七档', 2660.00);
+insert into `cmc_cost` values (34, '五岗八档', 2820.00);
+insert into `cmc_cost` values (35, '六岗一档', 2640.00);
+insert into `cmc_cost` values (36, '六岗二档', 2820.00);
+insert into `cmc_cost` values (37, '六岗三档', 3000.00);
+insert into `cmc_cost` values (38, '六岗四档', 3180.00);
+insert into `cmc_cost` values (39, '六岗五档', 3360.00);
+insert into `cmc_cost` values (40, '六岗六档', 3540.00);
+insert into `cmc_cost` values (41, '六岗七档', 3720.00);
+insert into `cmc_cost` values (42, '六岗八档', 3900.00);
+insert into `cmc_cost` values (43, '七岗一档', 3700.00);
+insert into `cmc_cost` values (44, '七岗二档', 3900.00);
+insert into `cmc_cost` values (45, '七岗三档', 4100.00);
+insert into `cmc_cost` values (46, '七岗四档', 4300.00);
+insert into `cmc_cost` values (47, '七岗五档', 4500.00);
+insert into `cmc_cost` values (48, '七岗六档', 4700.00);
+insert into `cmc_cost` values (49, '七岗七档', 4900.00);
+insert into `cmc_cost` values (50, '七岗八档', 5100.00);
+insert into `cmc_cost` values (51, '八岗一档', 4880.00);
+insert into `cmc_cost` values (52, '八岗二档', 5100.00);
+insert into `cmc_cost` values (53, '八岗三档', 5320.00);
+insert into `cmc_cost` values (54, '八岗四档', 5540.00);
+insert into `cmc_cost` values (55, '八岗五档', 5760.00);
+insert into `cmc_cost` values (56, '八岗六档', 5980.00);
+insert into `cmc_cost` values (57, '八岗七档', 6200.00);
+insert into `cmc_cost` values (58, '八岗八档', 6420.00);
 
 -- ----------------------------
 -- Table structure for ACT_APP_APPDEF