Explorar el Código

后台数据库更新:修改用户表,增加审核表,录入用户数据

lamphua hace 1 año
padre
commit
8db4baee43
Se han modificado 23 ficheros con 2464 adiciones y 59 borrados
  1. 104
    0
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcAssessContentController.java
  2. 104
    0
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcAssessContentWorkController.java
  3. 104
    0
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcAssessController.java
  4. 70
    0
      oa-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
  5. 224
    0
      oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcAssess.java
  6. 136
    0
      oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcAssessContent.java
  7. 65
    0
      oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcAssessContentWork.java
  8. 61
    0
      oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcAssessContentMapper.java
  9. 61
    0
      oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcAssessContentWorkMapper.java
  10. 61
    0
      oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcAssessMapper.java
  11. 61
    0
      oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcAssessContentService.java
  12. 61
    0
      oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcAssessContentWorkService.java
  13. 61
    0
      oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcAssessService.java
  14. 93
    0
      oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcAssessContentServiceImpl.java
  15. 93
    0
      oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcAssessContentWorkServiceImpl.java
  16. 93
    0
      oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcAssessServiceImpl.java
  17. 92
    0
      oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcAssessContentMapper.xml
  18. 63
    0
      oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcAssessContentWorkMapper.xml
  19. 118
    0
      oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcAssessMapper.xml
  20. 23
    2
      oa-back/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
  21. 656
    53
      oa-back/sql/ry_20231130.sql
  22. 1
    1
      oa-ui/src/views/flowable/definition/index.vue
  23. 59
    3
      oa-ui/src/views/system/user/index.vue

+ 104
- 0
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcAssessContentController.java Ver fichero

@@ -0,0 +1,104 @@
1
+package com.ruoyi.web.controller.oa;
2
+
3
+import java.util.List;
4
+import javax.servlet.http.HttpServletResponse;
5
+import org.springframework.security.access.prepost.PreAuthorize;
6
+import org.springframework.beans.factory.annotation.Autowired;
7
+import org.springframework.web.bind.annotation.GetMapping;
8
+import org.springframework.web.bind.annotation.PostMapping;
9
+import org.springframework.web.bind.annotation.PutMapping;
10
+import org.springframework.web.bind.annotation.DeleteMapping;
11
+import org.springframework.web.bind.annotation.PathVariable;
12
+import org.springframework.web.bind.annotation.RequestBody;
13
+import org.springframework.web.bind.annotation.RequestMapping;
14
+import org.springframework.web.bind.annotation.RestController;
15
+import com.ruoyi.common.annotation.Log;
16
+import com.ruoyi.common.core.controller.BaseController;
17
+import com.ruoyi.common.core.domain.AjaxResult;
18
+import com.ruoyi.common.enums.BusinessType;
19
+import com.ruoyi.oa.domain.CmcAssessContent;
20
+import com.ruoyi.oa.service.ICmcAssessContentService;
21
+import com.ruoyi.common.utils.poi.ExcelUtil;
22
+import com.ruoyi.common.core.page.TableDataInfo;
23
+
24
+/**
25
+ * 考核内容Controller
26
+ * 
27
+ * @author cmc
28
+ * @date 2024-01-09
29
+ */
30
+@RestController
31
+@RequestMapping("/oa/assessContent")
32
+public class CmcAssessContentController extends BaseController
33
+{
34
+    @Autowired
35
+    private ICmcAssessContentService cmcAssessContentService;
36
+
37
+    /**
38
+     * 查询考核内容列表
39
+     */
40
+    @PreAuthorize("@ss.hasPermi('oa:assessContent:list')")
41
+    @GetMapping("/list")
42
+    public TableDataInfo list(CmcAssessContent cmcAssessContent)
43
+    {
44
+        startPage();
45
+        List<CmcAssessContent> list = cmcAssessContentService.selectCmcAssessContentList(cmcAssessContent);
46
+        return getDataTable(list);
47
+    }
48
+
49
+    /**
50
+     * 导出考核内容列表
51
+     */
52
+    @PreAuthorize("@ss.hasPermi('oa:assessContent:export')")
53
+    @Log(title = "考核内容", businessType = BusinessType.EXPORT)
54
+    @PostMapping("/export")
55
+    public void export(HttpServletResponse response, CmcAssessContent cmcAssessContent)
56
+    {
57
+        List<CmcAssessContent> list = cmcAssessContentService.selectCmcAssessContentList(cmcAssessContent);
58
+        ExcelUtil<CmcAssessContent> util = new ExcelUtil<CmcAssessContent>(CmcAssessContent.class);
59
+        util.exportExcel(response, list, "考核内容数据");
60
+    }
61
+
62
+    /**
63
+     * 获取考核内容详细信息
64
+     */
65
+    @PreAuthorize("@ss.hasPermi('oa:assessContent:query')")
66
+    @GetMapping(value = "/{contentId}")
67
+    public AjaxResult getInfo(@PathVariable("contentId") String contentId)
68
+    {
69
+        return success(cmcAssessContentService.selectCmcAssessContentByContentId(contentId));
70
+    }
71
+
72
+    /**
73
+     * 新增考核内容
74
+     */
75
+    @PreAuthorize("@ss.hasPermi('oa:assessContent:add')")
76
+    @Log(title = "考核内容", businessType = BusinessType.INSERT)
77
+    @PostMapping
78
+    public AjaxResult add(@RequestBody CmcAssessContent cmcAssessContent)
79
+    {
80
+        return toAjax(cmcAssessContentService.insertCmcAssessContent(cmcAssessContent));
81
+    }
82
+
83
+    /**
84
+     * 修改考核内容
85
+     */
86
+    @PreAuthorize("@ss.hasPermi('oa:assessContent:edit')")
87
+    @Log(title = "考核内容", businessType = BusinessType.UPDATE)
88
+    @PutMapping
89
+    public AjaxResult edit(@RequestBody CmcAssessContent cmcAssessContent)
90
+    {
91
+        return toAjax(cmcAssessContentService.updateCmcAssessContent(cmcAssessContent));
92
+    }
93
+
94
+    /**
95
+     * 删除考核内容
96
+     */
97
+    @PreAuthorize("@ss.hasPermi('oa:assessContent:remove')")
98
+    @Log(title = "考核内容", businessType = BusinessType.DELETE)
99
+	@DeleteMapping("/{contentIds}")
100
+    public AjaxResult remove(@PathVariable String[] contentIds)
101
+    {
102
+        return toAjax(cmcAssessContentService.deleteCmcAssessContentByContentIds(contentIds));
103
+    }
104
+}

+ 104
- 0
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcAssessContentWorkController.java Ver fichero

@@ -0,0 +1,104 @@
1
+package com.ruoyi.web.controller.oa;
2
+
3
+import java.util.List;
4
+import javax.servlet.http.HttpServletResponse;
5
+import org.springframework.security.access.prepost.PreAuthorize;
6
+import org.springframework.beans.factory.annotation.Autowired;
7
+import org.springframework.web.bind.annotation.GetMapping;
8
+import org.springframework.web.bind.annotation.PostMapping;
9
+import org.springframework.web.bind.annotation.PutMapping;
10
+import org.springframework.web.bind.annotation.DeleteMapping;
11
+import org.springframework.web.bind.annotation.PathVariable;
12
+import org.springframework.web.bind.annotation.RequestBody;
13
+import org.springframework.web.bind.annotation.RequestMapping;
14
+import org.springframework.web.bind.annotation.RestController;
15
+import com.ruoyi.common.annotation.Log;
16
+import com.ruoyi.common.core.controller.BaseController;
17
+import com.ruoyi.common.core.domain.AjaxResult;
18
+import com.ruoyi.common.enums.BusinessType;
19
+import com.ruoyi.oa.domain.CmcAssessContentWork;
20
+import com.ruoyi.oa.service.ICmcAssessContentWorkService;
21
+import com.ruoyi.common.utils.poi.ExcelUtil;
22
+import com.ruoyi.common.core.page.TableDataInfo;
23
+
24
+/**
25
+ * 考核工作内容Controller
26
+ * 
27
+ * @author cmc
28
+ * @date 2024-01-09
29
+ */
30
+@RestController
31
+@RequestMapping("/oa/assessContentWork")
32
+public class CmcAssessContentWorkController extends BaseController
33
+{
34
+    @Autowired
35
+    private ICmcAssessContentWorkService cmcAssessContentWorkService;
36
+
37
+    /**
38
+     * 查询考核工作内容列表
39
+     */
40
+    @PreAuthorize("@ss.hasPermi('oa:assessContentWork:list')")
41
+    @GetMapping("/list")
42
+    public TableDataInfo list(CmcAssessContentWork cmcAssessContentWork)
43
+    {
44
+        startPage();
45
+        List<CmcAssessContentWork> list = cmcAssessContentWorkService.selectCmcAssessContentWorkList(cmcAssessContentWork);
46
+        return getDataTable(list);
47
+    }
48
+
49
+    /**
50
+     * 导出考核工作内容列表
51
+     */
52
+    @PreAuthorize("@ss.hasPermi('oa:assessContentWork:export')")
53
+    @Log(title = "考核工作内容", businessType = BusinessType.EXPORT)
54
+    @PostMapping("/export")
55
+    public void export(HttpServletResponse response, CmcAssessContentWork cmcAssessContentWork)
56
+    {
57
+        List<CmcAssessContentWork> list = cmcAssessContentWorkService.selectCmcAssessContentWorkList(cmcAssessContentWork);
58
+        ExcelUtil<CmcAssessContentWork> util = new ExcelUtil<CmcAssessContentWork>(CmcAssessContentWork.class);
59
+        util.exportExcel(response, list, "考核工作内容数据");
60
+    }
61
+
62
+    /**
63
+     * 获取考核工作内容详细信息
64
+     */
65
+    @PreAuthorize("@ss.hasPermi('oa:assessContentWork:query')")
66
+    @GetMapping(value = "/{workId}")
67
+    public AjaxResult getInfo(@PathVariable("workId") String workId)
68
+    {
69
+        return success(cmcAssessContentWorkService.selectCmcAssessContentWorkByWorkId(workId));
70
+    }
71
+
72
+    /**
73
+     * 新增考核工作内容
74
+     */
75
+    @PreAuthorize("@ss.hasPermi('oa:assessContentWork:add')")
76
+    @Log(title = "考核工作内容", businessType = BusinessType.INSERT)
77
+    @PostMapping
78
+    public AjaxResult add(@RequestBody CmcAssessContentWork cmcAssessContentWork)
79
+    {
80
+        return toAjax(cmcAssessContentWorkService.insertCmcAssessContentWork(cmcAssessContentWork));
81
+    }
82
+
83
+    /**
84
+     * 修改考核工作内容
85
+     */
86
+    @PreAuthorize("@ss.hasPermi('oa:assessContentWork:edit')")
87
+    @Log(title = "考核工作内容", businessType = BusinessType.UPDATE)
88
+    @PutMapping
89
+    public AjaxResult edit(@RequestBody CmcAssessContentWork cmcAssessContentWork)
90
+    {
91
+        return toAjax(cmcAssessContentWorkService.updateCmcAssessContentWork(cmcAssessContentWork));
92
+    }
93
+
94
+    /**
95
+     * 删除考核工作内容
96
+     */
97
+    @PreAuthorize("@ss.hasPermi('oa:assessContentWork:remove')")
98
+    @Log(title = "考核工作内容", businessType = BusinessType.DELETE)
99
+	@DeleteMapping("/{workIds}")
100
+    public AjaxResult remove(@PathVariable String[] workIds)
101
+    {
102
+        return toAjax(cmcAssessContentWorkService.deleteCmcAssessContentWorkByWorkIds(workIds));
103
+    }
104
+}

+ 104
- 0
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcAssessController.java Ver fichero

@@ -0,0 +1,104 @@
1
+package com.ruoyi.web.controller.oa;
2
+
3
+import java.util.List;
4
+import javax.servlet.http.HttpServletResponse;
5
+import org.springframework.security.access.prepost.PreAuthorize;
6
+import org.springframework.beans.factory.annotation.Autowired;
7
+import org.springframework.web.bind.annotation.GetMapping;
8
+import org.springframework.web.bind.annotation.PostMapping;
9
+import org.springframework.web.bind.annotation.PutMapping;
10
+import org.springframework.web.bind.annotation.DeleteMapping;
11
+import org.springframework.web.bind.annotation.PathVariable;
12
+import org.springframework.web.bind.annotation.RequestBody;
13
+import org.springframework.web.bind.annotation.RequestMapping;
14
+import org.springframework.web.bind.annotation.RestController;
15
+import com.ruoyi.common.annotation.Log;
16
+import com.ruoyi.common.core.controller.BaseController;
17
+import com.ruoyi.common.core.domain.AjaxResult;
18
+import com.ruoyi.common.enums.BusinessType;
19
+import com.ruoyi.oa.domain.CmcAssess;
20
+import com.ruoyi.oa.service.ICmcAssessService;
21
+import com.ruoyi.common.utils.poi.ExcelUtil;
22
+import com.ruoyi.common.core.page.TableDataInfo;
23
+
24
+/**
25
+ * 考核表Controller
26
+ * 
27
+ * @author cmc
28
+ * @date 2024-01-09
29
+ */
30
+@RestController
31
+@RequestMapping("/oa/assess")
32
+public class CmcAssessController extends BaseController
33
+{
34
+    @Autowired
35
+    private ICmcAssessService cmcAssessService;
36
+
37
+    /**
38
+     * 查询考核表列表
39
+     */
40
+    @PreAuthorize("@ss.hasPermi('oa:assess:list')")
41
+    @GetMapping("/list")
42
+    public TableDataInfo list(CmcAssess cmcAssess)
43
+    {
44
+        startPage();
45
+        List<CmcAssess> list = cmcAssessService.selectCmcAssessList(cmcAssess);
46
+        return getDataTable(list);
47
+    }
48
+
49
+    /**
50
+     * 导出考核表列表
51
+     */
52
+    @PreAuthorize("@ss.hasPermi('oa:assess:export')")
53
+    @Log(title = "考核表", businessType = BusinessType.EXPORT)
54
+    @PostMapping("/export")
55
+    public void export(HttpServletResponse response, CmcAssess cmcAssess)
56
+    {
57
+        List<CmcAssess> list = cmcAssessService.selectCmcAssessList(cmcAssess);
58
+        ExcelUtil<CmcAssess> util = new ExcelUtil<CmcAssess>(CmcAssess.class);
59
+        util.exportExcel(response, list, "考核表数据");
60
+    }
61
+
62
+    /**
63
+     * 获取考核表详细信息
64
+     */
65
+    @PreAuthorize("@ss.hasPermi('oa:assess:query')")
66
+    @GetMapping(value = "/{assessId}")
67
+    public AjaxResult getInfo(@PathVariable("assessId") String assessId)
68
+    {
69
+        return success(cmcAssessService.selectCmcAssessByAssessId(assessId));
70
+    }
71
+
72
+    /**
73
+     * 新增考核表
74
+     */
75
+    @PreAuthorize("@ss.hasPermi('oa:assess:add')")
76
+    @Log(title = "考核表", businessType = BusinessType.INSERT)
77
+    @PostMapping
78
+    public AjaxResult add(@RequestBody CmcAssess cmcAssess)
79
+    {
80
+        return toAjax(cmcAssessService.insertCmcAssess(cmcAssess));
81
+    }
82
+
83
+    /**
84
+     * 修改考核表
85
+     */
86
+    @PreAuthorize("@ss.hasPermi('oa:assess:edit')")
87
+    @Log(title = "考核表", businessType = BusinessType.UPDATE)
88
+    @PutMapping
89
+    public AjaxResult edit(@RequestBody CmcAssess cmcAssess)
90
+    {
91
+        return toAjax(cmcAssessService.updateCmcAssess(cmcAssess));
92
+    }
93
+
94
+    /**
95
+     * 删除考核表
96
+     */
97
+    @PreAuthorize("@ss.hasPermi('oa:assess:remove')")
98
+    @Log(title = "考核表", businessType = BusinessType.DELETE)
99
+	@DeleteMapping("/{assessIds}")
100
+    public AjaxResult remove(@PathVariable String[] assessIds)
101
+    {
102
+        return toAjax(cmcAssessService.deleteCmcAssessByAssessIds(assessIds));
103
+    }
104
+}

+ 70
- 0
oa-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java Ver fichero

@@ -70,6 +70,26 @@ public class SysUser extends BaseEntity
70 70
     @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
71 71
     private Date loginDate;
72 72
 
73
+    /** 部门经理级别 */
74
+    @Excel(name = "部门经理级别", readConverterExp = "0=一级,1=二级,2=三级")
75
+    private String pmLevel;
76
+
77
+    /** 岗位级别 */
78
+    @Excel(name = "岗位级别", readConverterExp = "0=二岗,1=三岗,2=四岗,3=五岗,4=六岗")
79
+    private String engineerLevel;
80
+
81
+    /** 技术职称 */
82
+    @Excel(name = "技术职称", readConverterExp = "0=正高,1=副高,2=中级,3=助工,4=注测,5=注规,6=注岩,7=注安,8=注会")
83
+    private String titles;
84
+
85
+    /** 入职时间 */
86
+    @Excel(name = "入职时间", width = 30, dateFormat = "yyyy-MM", type = Type.EXPORT)
87
+    private Date entryDate;
88
+
89
+    /** 年龄 */
90
+    @Excel(name = "年龄")
91
+    private int age;
92
+
73 93
     /** 部门对象 */
74 94
     @Excels({
75 95
         @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
@@ -247,6 +267,56 @@ public class SysUser extends BaseEntity
247 267
         this.loginDate = loginDate;
248 268
     }
249 269
 
270
+    public String getPmLevel()
271
+    {
272
+        return pmLevel;
273
+    }
274
+
275
+    public void setPmLevel(String pmLevel)
276
+    {
277
+        this.pmLevel = pmLevel;
278
+    }
279
+
280
+    public String getEngineerLevel()
281
+    {
282
+        return engineerLevel;
283
+    }
284
+
285
+    public void setEngineerLevel(String engineerLevel)
286
+    {
287
+        this.engineerLevel = engineerLevel;
288
+    }
289
+
290
+    public String getTitles()
291
+    {
292
+        return titles;
293
+    }
294
+
295
+    public void setTitles(String titles)
296
+    {
297
+        this.titles = titles;
298
+    }
299
+
300
+    public Date getEntryDate()
301
+    {
302
+        return entryDate;
303
+    }
304
+
305
+    public void setEntryDate(Date entryDate)
306
+    {
307
+        this.entryDate = entryDate;
308
+    }
309
+
310
+    public int getAge()
311
+    {
312
+        return age;
313
+    }
314
+
315
+    public void setAge(int roleId)
316
+    {
317
+        this.age = age;
318
+    }
319
+
250 320
     public SysDept getDept()
251 321
     {
252 322
         return dept;

+ 224
- 0
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcAssess.java Ver fichero

@@ -0,0 +1,224 @@
1
+package com.ruoyi.oa.domain;
2
+
3
+import java.util.Date;
4
+import com.fasterxml.jackson.annotation.JsonFormat;
5
+import org.apache.commons.lang3.builder.ToStringBuilder;
6
+import org.apache.commons.lang3.builder.ToStringStyle;
7
+import com.ruoyi.common.annotation.Excel;
8
+import com.ruoyi.common.core.domain.BaseEntity;
9
+
10
+/**
11
+ * 考核表对象 cmc_assess
12
+ * 
13
+ * @author cmc
14
+ * @date 2024-01-09
15
+ */
16
+public class CmcAssess extends BaseEntity
17
+{
18
+    private static final long serialVersionUID = 1L;
19
+
20
+    /** 总考核表id */
21
+    private String assessId;
22
+
23
+    /** 用户id */
24
+    @Excel(name = "用户id")
25
+    private Long userId;
26
+
27
+    /** 项目id */
28
+    @Excel(name = "项目id")
29
+    private Long projectId;
30
+
31
+    /** 考核时间(月份) */
32
+    @Excel(name = "考核时间", dateFormat = "yyyy-MM")
33
+    private Date assessTime;
34
+
35
+    /** 部门考核等级(不合格、合格、良好、优秀) */
36
+    @Excel(name = "部门考核等级", readConverterExp = "0=不合格、1=合格、2=良好、3=优秀")
37
+    private String deptAssessment;
38
+
39
+    /** 部门考核意见 */
40
+    @Excel(name = "部门考核意见")
41
+    private String deptAdvice;
42
+
43
+    /** 部门考核时间 */
44
+    @JsonFormat(pattern = "yyyy-MM-dd")
45
+    @Excel(name = "部门考核时间", width = 30, dateFormat = "yyyy-MM-dd")
46
+    private Date deptTime;
47
+
48
+    /** 部门考核负责人 */
49
+    @Excel(name = "部门考核负责人")
50
+    private String deptAssesser;
51
+
52
+    /** 分管考核等级(不合格、合格、良好、优秀) */
53
+    @Excel(name = "分管考核等级", readConverterExp = "不=合格、合格、良好、优秀")
54
+    private String managerAssessment;
55
+
56
+    /** 分管考核意见 */
57
+    @Excel(name = "分管考核意见")
58
+    private String managerAdvice;
59
+
60
+    /** 分管考核时间 */
61
+    @JsonFormat(pattern = "yyyy-MM-dd")
62
+    @Excel(name = "分管考核时间", width = 30, dateFormat = "yyyy-MM-dd")
63
+    private Date managerTime;
64
+
65
+    /** 分管考核负责人 */
66
+    @Excel(name = "分管考核负责人")
67
+    private String managerAssesser;
68
+
69
+    /** 自述 */
70
+    @Excel(name = "自述")
71
+    private String selfAssess;
72
+
73
+    /** 考核填报时间 */
74
+    @JsonFormat(pattern = "yyyy-MM-dd")
75
+    @Excel(name = "考核填报时间", width = 30, dateFormat = "yyyy-MM-dd")
76
+    private Date fillTime;
77
+
78
+    public void setAssessId(String assessId) 
79
+    {
80
+        this.assessId = assessId;
81
+    }
82
+
83
+    public String getAssessId() 
84
+    {
85
+        return assessId;
86
+    }
87
+    public void setUserId(Long userId) 
88
+    {
89
+        this.userId = userId;
90
+    }
91
+
92
+    public Long getUserId() 
93
+    {
94
+        return userId;
95
+    }
96
+    public void setProjectId(Long projectId) 
97
+    {
98
+        this.projectId = projectId;
99
+    }
100
+
101
+    public Long getProjectId() 
102
+    {
103
+        return projectId;
104
+    }
105
+    public void setAssessTime(Date assessTime) 
106
+    {
107
+        this.assessTime = assessTime;
108
+    }
109
+
110
+    public Date getAssessTime() 
111
+    {
112
+        return assessTime;
113
+    }
114
+    public void setDeptAssessment(String deptAssessment) 
115
+    {
116
+        this.deptAssessment = deptAssessment;
117
+    }
118
+
119
+    public String getDeptAssessment() 
120
+    {
121
+        return deptAssessment;
122
+    }
123
+    public void setDeptAdvice(String deptAdvice) 
124
+    {
125
+        this.deptAdvice = deptAdvice;
126
+    }
127
+
128
+    public String getDeptAdvice() 
129
+    {
130
+        return deptAdvice;
131
+    }
132
+    public void setDeptTime(Date deptTime) 
133
+    {
134
+        this.deptTime = deptTime;
135
+    }
136
+
137
+    public Date getDeptTime() 
138
+    {
139
+        return deptTime;
140
+    }
141
+    public void setDeptAssesser(String deptAssesser) 
142
+    {
143
+        this.deptAssesser = deptAssesser;
144
+    }
145
+
146
+    public String getDeptAssesser() 
147
+    {
148
+        return deptAssesser;
149
+    }
150
+    public void setManagerAssessment(String managerAssessment) 
151
+    {
152
+        this.managerAssessment = managerAssessment;
153
+    }
154
+
155
+    public String getManagerAssessment() 
156
+    {
157
+        return managerAssessment;
158
+    }
159
+    public void setManagerAdvice(String managerAdvice) 
160
+    {
161
+        this.managerAdvice = managerAdvice;
162
+    }
163
+
164
+    public String getManagerAdvice() 
165
+    {
166
+        return managerAdvice;
167
+    }
168
+    public void setManagerTime(Date managerTime) 
169
+    {
170
+        this.managerTime = managerTime;
171
+    }
172
+
173
+    public Date getManagerTime() 
174
+    {
175
+        return managerTime;
176
+    }
177
+    public void setManagerAssesser(String managerAssesser) 
178
+    {
179
+        this.managerAssesser = managerAssesser;
180
+    }
181
+
182
+    public String getManagerAssesser() 
183
+    {
184
+        return managerAssesser;
185
+    }
186
+    public void setSelfAssess(String selfAssess) 
187
+    {
188
+        this.selfAssess = selfAssess;
189
+    }
190
+
191
+    public String getSelfAssess() 
192
+    {
193
+        return selfAssess;
194
+    }
195
+    public void setFillTime(Date fillTime) 
196
+    {
197
+        this.fillTime = fillTime;
198
+    }
199
+
200
+    public Date getFillTime() 
201
+    {
202
+        return fillTime;
203
+    }
204
+
205
+    @Override
206
+    public String toString() {
207
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
208
+            .append("assessId", getAssessId())
209
+            .append("userId", getUserId())
210
+            .append("projectId", getProjectId())
211
+            .append("assessTime", getAssessTime())
212
+            .append("deptAssessment", getDeptAssessment())
213
+            .append("deptAdvice", getDeptAdvice())
214
+            .append("deptTime", getDeptTime())
215
+            .append("deptAssesser", getDeptAssesser())
216
+            .append("managerAssessment", getManagerAssessment())
217
+            .append("managerAdvice", getManagerAdvice())
218
+            .append("managerTime", getManagerTime())
219
+            .append("managerAssesser", getManagerAssesser())
220
+            .append("selfAssess", getSelfAssess())
221
+            .append("fillTime", getFillTime())
222
+            .toString();
223
+    }
224
+}

+ 136
- 0
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcAssessContent.java Ver fichero

@@ -0,0 +1,136 @@
1
+package com.ruoyi.oa.domain;
2
+
3
+import org.apache.commons.lang3.builder.ToStringBuilder;
4
+import org.apache.commons.lang3.builder.ToStringStyle;
5
+import com.ruoyi.common.annotation.Excel;
6
+import com.ruoyi.common.core.domain.BaseEntity;
7
+
8
+/**
9
+ * 考核内容对象 cmc_assess_content
10
+ * 
11
+ * @author cmc
12
+ * @date 2024-01-09
13
+ */
14
+public class CmcAssessContent extends BaseEntity
15
+{
16
+    private static final long serialVersionUID = 1L;
17
+
18
+    /** 考核内容id(总考核表id+2位) */
19
+    private String contentId;
20
+
21
+    /** 承担角色 */
22
+    @Excel(name = "承担角色")
23
+    private String role;
24
+
25
+    /** 熟练程度(生疏、熟练、精通) */
26
+    @Excel(name = "熟练程度", readConverterExp = "0=生疏、1=熟练、2=精通")
27
+    private String familiar;
28
+
29
+    /** 工作量(较少、正常、较多) */
30
+    @Excel(name = "工作量", readConverterExp = "0=较少、1=正常、2=较多")
31
+    private String workload;
32
+
33
+    /** 技能掌握(生疏、较熟练、熟练) */
34
+    @Excel(name = "技能掌握", readConverterExp = "0=生疏、1=较熟练、2=熟练")
35
+    private String skill;
36
+
37
+    /** 产品质量(不合格、合格、良好、优秀) */
38
+    @Excel(name = "产品质量", readConverterExp = "0=不合格、1=合格、2=良好、3=优秀")
39
+    private String quality;
40
+
41
+    /** 岗位表现(不合格、合格、良好、优秀) */
42
+    @Excel(name = "岗位表现", readConverterExp = "0=不合格、1=合格、2=良好、3=优秀")
43
+    private String assessment;
44
+
45
+    /** 考核建议 */
46
+    @Excel(name = "考核建议")
47
+    private String advice;
48
+
49
+    public void setContentId(String contentId) 
50
+    {
51
+        this.contentId = contentId;
52
+    }
53
+
54
+    public String getContentId() 
55
+    {
56
+        return contentId;
57
+    }
58
+    public void setRole(String role) 
59
+    {
60
+        this.role = role;
61
+    }
62
+
63
+    public String getRole() 
64
+    {
65
+        return role;
66
+    }
67
+    public void setFamiliar(String familiar) 
68
+    {
69
+        this.familiar = familiar;
70
+    }
71
+
72
+    public String getFamiliar() 
73
+    {
74
+        return familiar;
75
+    }
76
+    public void setWorkload(String workload) 
77
+    {
78
+        this.workload = workload;
79
+    }
80
+
81
+    public String getWorkload() 
82
+    {
83
+        return workload;
84
+    }
85
+    public void setSkill(String skill) 
86
+    {
87
+        this.skill = skill;
88
+    }
89
+
90
+    public String getSkill() 
91
+    {
92
+        return skill;
93
+    }
94
+    public void setQuality(String quality) 
95
+    {
96
+        this.quality = quality;
97
+    }
98
+
99
+    public String getQuality() 
100
+    {
101
+        return quality;
102
+    }
103
+    public void setAssessment(String assessment) 
104
+    {
105
+        this.assessment = assessment;
106
+    }
107
+
108
+    public String getAssessment() 
109
+    {
110
+        return assessment;
111
+    }
112
+    public void setAdvice(String advice) 
113
+    {
114
+        this.advice = advice;
115
+    }
116
+
117
+    public String getAdvice() 
118
+    {
119
+        return advice;
120
+    }
121
+
122
+    @Override
123
+    public String toString() {
124
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
125
+            .append("contentId", getContentId())
126
+            .append("role", getRole())
127
+            .append("familiar", getFamiliar())
128
+            .append("remark", getRemark())
129
+            .append("workload", getWorkload())
130
+            .append("skill", getSkill())
131
+            .append("quality", getQuality())
132
+            .append("assessment", getAssessment())
133
+            .append("advice", getAdvice())
134
+            .toString();
135
+    }
136
+}

+ 65
- 0
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcAssessContentWork.java Ver fichero

@@ -0,0 +1,65 @@
1
+package com.ruoyi.oa.domain;
2
+
3
+import org.apache.commons.lang3.builder.ToStringBuilder;
4
+import org.apache.commons.lang3.builder.ToStringStyle;
5
+import com.ruoyi.common.annotation.Excel;
6
+import com.ruoyi.common.core.domain.BaseEntity;
7
+
8
+/**
9
+ * 考核工作内容对象 cmc_assess_content_work
10
+ * 
11
+ * @author cmc
12
+ * @date 2024-01-09
13
+ */
14
+public class CmcAssessContentWork extends BaseEntity
15
+{
16
+    private static final long serialVersionUID = 1L;
17
+
18
+    /** 工作内容id(考核内容id+2位) */
19
+    private String workId;
20
+
21
+    /** 工作项数 */
22
+    @Excel(name = "工作项数")
23
+    private Long workCount;
24
+
25
+    /** 工作量 */
26
+    @Excel(name = "工作量")
27
+    private String workLoad;
28
+
29
+    public void setWorkId(String workId) 
30
+    {
31
+        this.workId = workId;
32
+    }
33
+
34
+    public String getWorkId() 
35
+    {
36
+        return workId;
37
+    }
38
+    public void setWorkCount(Long workCount) 
39
+    {
40
+        this.workCount = workCount;
41
+    }
42
+
43
+    public Long getWorkCount() 
44
+    {
45
+        return workCount;
46
+    }
47
+    public void setWorkLoad(String workLoad) 
48
+    {
49
+        this.workLoad = workLoad;
50
+    }
51
+
52
+    public String getWorkLoad() 
53
+    {
54
+        return workLoad;
55
+    }
56
+
57
+    @Override
58
+    public String toString() {
59
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
60
+            .append("workId", getWorkId())
61
+            .append("workCount", getWorkCount())
62
+            .append("workLoad", getWorkLoad())
63
+            .toString();
64
+    }
65
+}

+ 61
- 0
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcAssessContentMapper.java Ver fichero

@@ -0,0 +1,61 @@
1
+package com.ruoyi.oa.mapper;
2
+
3
+import java.util.List;
4
+import com.ruoyi.oa.domain.CmcAssessContent;
5
+
6
+/**
7
+ * 考核内容Mapper接口
8
+ * 
9
+ * @author cmc
10
+ * @date 2024-01-09
11
+ */
12
+public interface CmcAssessContentMapper 
13
+{
14
+    /**
15
+     * 查询考核内容
16
+     * 
17
+     * @param contentId 考核内容主键
18
+     * @return 考核内容
19
+     */
20
+    public CmcAssessContent selectCmcAssessContentByContentId(String contentId);
21
+
22
+    /**
23
+     * 查询考核内容列表
24
+     * 
25
+     * @param cmcAssessContent 考核内容
26
+     * @return 考核内容集合
27
+     */
28
+    public List<CmcAssessContent> selectCmcAssessContentList(CmcAssessContent cmcAssessContent);
29
+
30
+    /**
31
+     * 新增考核内容
32
+     * 
33
+     * @param cmcAssessContent 考核内容
34
+     * @return 结果
35
+     */
36
+    public int insertCmcAssessContent(CmcAssessContent cmcAssessContent);
37
+
38
+    /**
39
+     * 修改考核内容
40
+     * 
41
+     * @param cmcAssessContent 考核内容
42
+     * @return 结果
43
+     */
44
+    public int updateCmcAssessContent(CmcAssessContent cmcAssessContent);
45
+
46
+    /**
47
+     * 删除考核内容
48
+     * 
49
+     * @param contentId 考核内容主键
50
+     * @return 结果
51
+     */
52
+    public int deleteCmcAssessContentByContentId(String contentId);
53
+
54
+    /**
55
+     * 批量删除考核内容
56
+     * 
57
+     * @param contentIds 需要删除的数据主键集合
58
+     * @return 结果
59
+     */
60
+    public int deleteCmcAssessContentByContentIds(String[] contentIds);
61
+}

+ 61
- 0
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcAssessContentWorkMapper.java Ver fichero

@@ -0,0 +1,61 @@
1
+package com.ruoyi.oa.mapper;
2
+
3
+import java.util.List;
4
+import com.ruoyi.oa.domain.CmcAssessContentWork;
5
+
6
+/**
7
+ * 考核工作内容Mapper接口
8
+ * 
9
+ * @author cmc
10
+ * @date 2024-01-09
11
+ */
12
+public interface CmcAssessContentWorkMapper 
13
+{
14
+    /**
15
+     * 查询考核工作内容
16
+     * 
17
+     * @param workId 考核工作内容主键
18
+     * @return 考核工作内容
19
+     */
20
+    public CmcAssessContentWork selectCmcAssessContentWorkByWorkId(String workId);
21
+
22
+    /**
23
+     * 查询考核工作内容列表
24
+     * 
25
+     * @param cmcAssessContentWork 考核工作内容
26
+     * @return 考核工作内容集合
27
+     */
28
+    public List<CmcAssessContentWork> selectCmcAssessContentWorkList(CmcAssessContentWork cmcAssessContentWork);
29
+
30
+    /**
31
+     * 新增考核工作内容
32
+     * 
33
+     * @param cmcAssessContentWork 考核工作内容
34
+     * @return 结果
35
+     */
36
+    public int insertCmcAssessContentWork(CmcAssessContentWork cmcAssessContentWork);
37
+
38
+    /**
39
+     * 修改考核工作内容
40
+     * 
41
+     * @param cmcAssessContentWork 考核工作内容
42
+     * @return 结果
43
+     */
44
+    public int updateCmcAssessContentWork(CmcAssessContentWork cmcAssessContentWork);
45
+
46
+    /**
47
+     * 删除考核工作内容
48
+     * 
49
+     * @param workId 考核工作内容主键
50
+     * @return 结果
51
+     */
52
+    public int deleteCmcAssessContentWorkByWorkId(String workId);
53
+
54
+    /**
55
+     * 批量删除考核工作内容
56
+     * 
57
+     * @param workIds 需要删除的数据主键集合
58
+     * @return 结果
59
+     */
60
+    public int deleteCmcAssessContentWorkByWorkIds(String[] workIds);
61
+}

+ 61
- 0
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcAssessMapper.java Ver fichero

@@ -0,0 +1,61 @@
1
+package com.ruoyi.oa.mapper;
2
+
3
+import java.util.List;
4
+import com.ruoyi.oa.domain.CmcAssess;
5
+
6
+/**
7
+ * 考核表Mapper接口
8
+ * 
9
+ * @author cmc
10
+ * @date 2024-01-09
11
+ */
12
+public interface CmcAssessMapper 
13
+{
14
+    /**
15
+     * 查询考核表
16
+     * 
17
+     * @param assessId 考核表主键
18
+     * @return 考核表
19
+     */
20
+    public CmcAssess selectCmcAssessByAssessId(String assessId);
21
+
22
+    /**
23
+     * 查询考核表列表
24
+     * 
25
+     * @param cmcAssess 考核表
26
+     * @return 考核表集合
27
+     */
28
+    public List<CmcAssess> selectCmcAssessList(CmcAssess cmcAssess);
29
+
30
+    /**
31
+     * 新增考核表
32
+     * 
33
+     * @param cmcAssess 考核表
34
+     * @return 结果
35
+     */
36
+    public int insertCmcAssess(CmcAssess cmcAssess);
37
+
38
+    /**
39
+     * 修改考核表
40
+     * 
41
+     * @param cmcAssess 考核表
42
+     * @return 结果
43
+     */
44
+    public int updateCmcAssess(CmcAssess cmcAssess);
45
+
46
+    /**
47
+     * 删除考核表
48
+     * 
49
+     * @param assessId 考核表主键
50
+     * @return 结果
51
+     */
52
+    public int deleteCmcAssessByAssessId(String assessId);
53
+
54
+    /**
55
+     * 批量删除考核表
56
+     * 
57
+     * @param assessIds 需要删除的数据主键集合
58
+     * @return 结果
59
+     */
60
+    public int deleteCmcAssessByAssessIds(String[] assessIds);
61
+}

+ 61
- 0
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcAssessContentService.java Ver fichero

@@ -0,0 +1,61 @@
1
+package com.ruoyi.oa.service;
2
+
3
+import java.util.List;
4
+import com.ruoyi.oa.domain.CmcAssessContent;
5
+
6
+/**
7
+ * 考核内容Service接口
8
+ * 
9
+ * @author cmc
10
+ * @date 2024-01-09
11
+ */
12
+public interface ICmcAssessContentService 
13
+{
14
+    /**
15
+     * 查询考核内容
16
+     * 
17
+     * @param contentId 考核内容主键
18
+     * @return 考核内容
19
+     */
20
+    public CmcAssessContent selectCmcAssessContentByContentId(String contentId);
21
+
22
+    /**
23
+     * 查询考核内容列表
24
+     * 
25
+     * @param cmcAssessContent 考核内容
26
+     * @return 考核内容集合
27
+     */
28
+    public List<CmcAssessContent> selectCmcAssessContentList(CmcAssessContent cmcAssessContent);
29
+
30
+    /**
31
+     * 新增考核内容
32
+     * 
33
+     * @param cmcAssessContent 考核内容
34
+     * @return 结果
35
+     */
36
+    public int insertCmcAssessContent(CmcAssessContent cmcAssessContent);
37
+
38
+    /**
39
+     * 修改考核内容
40
+     * 
41
+     * @param cmcAssessContent 考核内容
42
+     * @return 结果
43
+     */
44
+    public int updateCmcAssessContent(CmcAssessContent cmcAssessContent);
45
+
46
+    /**
47
+     * 批量删除考核内容
48
+     * 
49
+     * @param contentIds 需要删除的考核内容主键集合
50
+     * @return 结果
51
+     */
52
+    public int deleteCmcAssessContentByContentIds(String[] contentIds);
53
+
54
+    /**
55
+     * 删除考核内容信息
56
+     * 
57
+     * @param contentId 考核内容主键
58
+     * @return 结果
59
+     */
60
+    public int deleteCmcAssessContentByContentId(String contentId);
61
+}

+ 61
- 0
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcAssessContentWorkService.java Ver fichero

@@ -0,0 +1,61 @@
1
+package com.ruoyi.oa.service;
2
+
3
+import java.util.List;
4
+import com.ruoyi.oa.domain.CmcAssessContentWork;
5
+
6
+/**
7
+ * 考核工作内容Service接口
8
+ * 
9
+ * @author cmc
10
+ * @date 2024-01-09
11
+ */
12
+public interface ICmcAssessContentWorkService 
13
+{
14
+    /**
15
+     * 查询考核工作内容
16
+     * 
17
+     * @param workId 考核工作内容主键
18
+     * @return 考核工作内容
19
+     */
20
+    public CmcAssessContentWork selectCmcAssessContentWorkByWorkId(String workId);
21
+
22
+    /**
23
+     * 查询考核工作内容列表
24
+     * 
25
+     * @param cmcAssessContentWork 考核工作内容
26
+     * @return 考核工作内容集合
27
+     */
28
+    public List<CmcAssessContentWork> selectCmcAssessContentWorkList(CmcAssessContentWork cmcAssessContentWork);
29
+
30
+    /**
31
+     * 新增考核工作内容
32
+     * 
33
+     * @param cmcAssessContentWork 考核工作内容
34
+     * @return 结果
35
+     */
36
+    public int insertCmcAssessContentWork(CmcAssessContentWork cmcAssessContentWork);
37
+
38
+    /**
39
+     * 修改考核工作内容
40
+     * 
41
+     * @param cmcAssessContentWork 考核工作内容
42
+     * @return 结果
43
+     */
44
+    public int updateCmcAssessContentWork(CmcAssessContentWork cmcAssessContentWork);
45
+
46
+    /**
47
+     * 批量删除考核工作内容
48
+     * 
49
+     * @param workIds 需要删除的考核工作内容主键集合
50
+     * @return 结果
51
+     */
52
+    public int deleteCmcAssessContentWorkByWorkIds(String[] workIds);
53
+
54
+    /**
55
+     * 删除考核工作内容信息
56
+     * 
57
+     * @param workId 考核工作内容主键
58
+     * @return 结果
59
+     */
60
+    public int deleteCmcAssessContentWorkByWorkId(String workId);
61
+}

+ 61
- 0
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcAssessService.java Ver fichero

@@ -0,0 +1,61 @@
1
+package com.ruoyi.oa.service;
2
+
3
+import java.util.List;
4
+import com.ruoyi.oa.domain.CmcAssess;
5
+
6
+/**
7
+ * 考核表Service接口
8
+ * 
9
+ * @author cmc
10
+ * @date 2024-01-09
11
+ */
12
+public interface ICmcAssessService 
13
+{
14
+    /**
15
+     * 查询考核表
16
+     * 
17
+     * @param assessId 考核表主键
18
+     * @return 考核表
19
+     */
20
+    public CmcAssess selectCmcAssessByAssessId(String assessId);
21
+
22
+    /**
23
+     * 查询考核表列表
24
+     * 
25
+     * @param cmcAssess 考核表
26
+     * @return 考核表集合
27
+     */
28
+    public List<CmcAssess> selectCmcAssessList(CmcAssess cmcAssess);
29
+
30
+    /**
31
+     * 新增考核表
32
+     * 
33
+     * @param cmcAssess 考核表
34
+     * @return 结果
35
+     */
36
+    public int insertCmcAssess(CmcAssess cmcAssess);
37
+
38
+    /**
39
+     * 修改考核表
40
+     * 
41
+     * @param cmcAssess 考核表
42
+     * @return 结果
43
+     */
44
+    public int updateCmcAssess(CmcAssess cmcAssess);
45
+
46
+    /**
47
+     * 批量删除考核表
48
+     * 
49
+     * @param assessIds 需要删除的考核表主键集合
50
+     * @return 结果
51
+     */
52
+    public int deleteCmcAssessByAssessIds(String[] assessIds);
53
+
54
+    /**
55
+     * 删除考核表信息
56
+     * 
57
+     * @param assessId 考核表主键
58
+     * @return 结果
59
+     */
60
+    public int deleteCmcAssessByAssessId(String assessId);
61
+}

+ 93
- 0
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcAssessContentServiceImpl.java Ver fichero

@@ -0,0 +1,93 @@
1
+package com.ruoyi.oa.service.impl;
2
+
3
+import java.util.List;
4
+import org.springframework.beans.factory.annotation.Autowired;
5
+import org.springframework.stereotype.Service;
6
+import com.ruoyi.oa.mapper.CmcAssessContentMapper;
7
+import com.ruoyi.oa.domain.CmcAssessContent;
8
+import com.ruoyi.oa.service.ICmcAssessContentService;
9
+
10
+/**
11
+ * 考核内容Service业务层处理
12
+ * 
13
+ * @author cmc
14
+ * @date 2024-01-09
15
+ */
16
+@Service
17
+public class CmcAssessContentServiceImpl implements ICmcAssessContentService 
18
+{
19
+    @Autowired
20
+    private CmcAssessContentMapper cmcAssessContentMapper;
21
+
22
+    /**
23
+     * 查询考核内容
24
+     * 
25
+     * @param contentId 考核内容主键
26
+     * @return 考核内容
27
+     */
28
+    @Override
29
+    public CmcAssessContent selectCmcAssessContentByContentId(String contentId)
30
+    {
31
+        return cmcAssessContentMapper.selectCmcAssessContentByContentId(contentId);
32
+    }
33
+
34
+    /**
35
+     * 查询考核内容列表
36
+     * 
37
+     * @param cmcAssessContent 考核内容
38
+     * @return 考核内容
39
+     */
40
+    @Override
41
+    public List<CmcAssessContent> selectCmcAssessContentList(CmcAssessContent cmcAssessContent)
42
+    {
43
+        return cmcAssessContentMapper.selectCmcAssessContentList(cmcAssessContent);
44
+    }
45
+
46
+    /**
47
+     * 新增考核内容
48
+     * 
49
+     * @param cmcAssessContent 考核内容
50
+     * @return 结果
51
+     */
52
+    @Override
53
+    public int insertCmcAssessContent(CmcAssessContent cmcAssessContent)
54
+    {
55
+        return cmcAssessContentMapper.insertCmcAssessContent(cmcAssessContent);
56
+    }
57
+
58
+    /**
59
+     * 修改考核内容
60
+     * 
61
+     * @param cmcAssessContent 考核内容
62
+     * @return 结果
63
+     */
64
+    @Override
65
+    public int updateCmcAssessContent(CmcAssessContent cmcAssessContent)
66
+    {
67
+        return cmcAssessContentMapper.updateCmcAssessContent(cmcAssessContent);
68
+    }
69
+
70
+    /**
71
+     * 批量删除考核内容
72
+     * 
73
+     * @param contentIds 需要删除的考核内容主键
74
+     * @return 结果
75
+     */
76
+    @Override
77
+    public int deleteCmcAssessContentByContentIds(String[] contentIds)
78
+    {
79
+        return cmcAssessContentMapper.deleteCmcAssessContentByContentIds(contentIds);
80
+    }
81
+
82
+    /**
83
+     * 删除考核内容信息
84
+     * 
85
+     * @param contentId 考核内容主键
86
+     * @return 结果
87
+     */
88
+    @Override
89
+    public int deleteCmcAssessContentByContentId(String contentId)
90
+    {
91
+        return cmcAssessContentMapper.deleteCmcAssessContentByContentId(contentId);
92
+    }
93
+}

+ 93
- 0
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcAssessContentWorkServiceImpl.java Ver fichero

@@ -0,0 +1,93 @@
1
+package com.ruoyi.oa.service.impl;
2
+
3
+import java.util.List;
4
+import org.springframework.beans.factory.annotation.Autowired;
5
+import org.springframework.stereotype.Service;
6
+import com.ruoyi.oa.mapper.CmcAssessContentWorkMapper;
7
+import com.ruoyi.oa.domain.CmcAssessContentWork;
8
+import com.ruoyi.oa.service.ICmcAssessContentWorkService;
9
+
10
+/**
11
+ * 考核工作内容Service业务层处理
12
+ * 
13
+ * @author cmc
14
+ * @date 2024-01-09
15
+ */
16
+@Service
17
+public class CmcAssessContentWorkServiceImpl implements ICmcAssessContentWorkService 
18
+{
19
+    @Autowired
20
+    private CmcAssessContentWorkMapper cmcAssessContentWorkMapper;
21
+
22
+    /**
23
+     * 查询考核工作内容
24
+     * 
25
+     * @param workId 考核工作内容主键
26
+     * @return 考核工作内容
27
+     */
28
+    @Override
29
+    public CmcAssessContentWork selectCmcAssessContentWorkByWorkId(String workId)
30
+    {
31
+        return cmcAssessContentWorkMapper.selectCmcAssessContentWorkByWorkId(workId);
32
+    }
33
+
34
+    /**
35
+     * 查询考核工作内容列表
36
+     * 
37
+     * @param cmcAssessContentWork 考核工作内容
38
+     * @return 考核工作内容
39
+     */
40
+    @Override
41
+    public List<CmcAssessContentWork> selectCmcAssessContentWorkList(CmcAssessContentWork cmcAssessContentWork)
42
+    {
43
+        return cmcAssessContentWorkMapper.selectCmcAssessContentWorkList(cmcAssessContentWork);
44
+    }
45
+
46
+    /**
47
+     * 新增考核工作内容
48
+     * 
49
+     * @param cmcAssessContentWork 考核工作内容
50
+     * @return 结果
51
+     */
52
+    @Override
53
+    public int insertCmcAssessContentWork(CmcAssessContentWork cmcAssessContentWork)
54
+    {
55
+        return cmcAssessContentWorkMapper.insertCmcAssessContentWork(cmcAssessContentWork);
56
+    }
57
+
58
+    /**
59
+     * 修改考核工作内容
60
+     * 
61
+     * @param cmcAssessContentWork 考核工作内容
62
+     * @return 结果
63
+     */
64
+    @Override
65
+    public int updateCmcAssessContentWork(CmcAssessContentWork cmcAssessContentWork)
66
+    {
67
+        return cmcAssessContentWorkMapper.updateCmcAssessContentWork(cmcAssessContentWork);
68
+    }
69
+
70
+    /**
71
+     * 批量删除考核工作内容
72
+     * 
73
+     * @param workIds 需要删除的考核工作内容主键
74
+     * @return 结果
75
+     */
76
+    @Override
77
+    public int deleteCmcAssessContentWorkByWorkIds(String[] workIds)
78
+    {
79
+        return cmcAssessContentWorkMapper.deleteCmcAssessContentWorkByWorkIds(workIds);
80
+    }
81
+
82
+    /**
83
+     * 删除考核工作内容信息
84
+     * 
85
+     * @param workId 考核工作内容主键
86
+     * @return 结果
87
+     */
88
+    @Override
89
+    public int deleteCmcAssessContentWorkByWorkId(String workId)
90
+    {
91
+        return cmcAssessContentWorkMapper.deleteCmcAssessContentWorkByWorkId(workId);
92
+    }
93
+}

+ 93
- 0
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcAssessServiceImpl.java Ver fichero

@@ -0,0 +1,93 @@
1
+package com.ruoyi.oa.service.impl;
2
+
3
+import java.util.List;
4
+import org.springframework.beans.factory.annotation.Autowired;
5
+import org.springframework.stereotype.Service;
6
+import com.ruoyi.oa.mapper.CmcAssessMapper;
7
+import com.ruoyi.oa.domain.CmcAssess;
8
+import com.ruoyi.oa.service.ICmcAssessService;
9
+
10
+/**
11
+ * 考核表Service业务层处理
12
+ * 
13
+ * @author cmc
14
+ * @date 2024-01-09
15
+ */
16
+@Service
17
+public class CmcAssessServiceImpl implements ICmcAssessService 
18
+{
19
+    @Autowired
20
+    private CmcAssessMapper cmcAssessMapper;
21
+
22
+    /**
23
+     * 查询考核表
24
+     * 
25
+     * @param assessId 考核表主键
26
+     * @return 考核表
27
+     */
28
+    @Override
29
+    public CmcAssess selectCmcAssessByAssessId(String assessId)
30
+    {
31
+        return cmcAssessMapper.selectCmcAssessByAssessId(assessId);
32
+    }
33
+
34
+    /**
35
+     * 查询考核表列表
36
+     * 
37
+     * @param cmcAssess 考核表
38
+     * @return 考核表
39
+     */
40
+    @Override
41
+    public List<CmcAssess> selectCmcAssessList(CmcAssess cmcAssess)
42
+    {
43
+        return cmcAssessMapper.selectCmcAssessList(cmcAssess);
44
+    }
45
+
46
+    /**
47
+     * 新增考核表
48
+     * 
49
+     * @param cmcAssess 考核表
50
+     * @return 结果
51
+     */
52
+    @Override
53
+    public int insertCmcAssess(CmcAssess cmcAssess)
54
+    {
55
+        return cmcAssessMapper.insertCmcAssess(cmcAssess);
56
+    }
57
+
58
+    /**
59
+     * 修改考核表
60
+     * 
61
+     * @param cmcAssess 考核表
62
+     * @return 结果
63
+     */
64
+    @Override
65
+    public int updateCmcAssess(CmcAssess cmcAssess)
66
+    {
67
+        return cmcAssessMapper.updateCmcAssess(cmcAssess);
68
+    }
69
+
70
+    /**
71
+     * 批量删除考核表
72
+     * 
73
+     * @param assessIds 需要删除的考核表主键
74
+     * @return 结果
75
+     */
76
+    @Override
77
+    public int deleteCmcAssessByAssessIds(String[] assessIds)
78
+    {
79
+        return cmcAssessMapper.deleteCmcAssessByAssessIds(assessIds);
80
+    }
81
+
82
+    /**
83
+     * 删除考核表信息
84
+     * 
85
+     * @param assessId 考核表主键
86
+     * @return 结果
87
+     */
88
+    @Override
89
+    public int deleteCmcAssessByAssessId(String assessId)
90
+    {
91
+        return cmcAssessMapper.deleteCmcAssessByAssessId(assessId);
92
+    }
93
+}

+ 92
- 0
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcAssessContentMapper.xml Ver fichero

@@ -0,0 +1,92 @@
1
+<?xml version="1.0" encoding="UTF-8" ?>
2
+<!DOCTYPE mapper
3
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
4
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
5
+<mapper namespace="com.ruoyi.oa.mapper.CmcAssessContentMapper">
6
+    
7
+    <resultMap type="CmcAssessContent" id="CmcAssessContentResult">
8
+        <result property="contentId"    column="content_id"    />
9
+        <result property="role"    column="role"    />
10
+        <result property="familiar"    column="familiar"    />
11
+        <result property="remark"    column="remark"    />
12
+        <result property="workload"    column="workload"    />
13
+        <result property="skill"    column="skill"    />
14
+        <result property="quality"    column="quality"    />
15
+        <result property="assessment"    column="assessment"    />
16
+        <result property="advice"    column="advice"    />
17
+    </resultMap>
18
+
19
+    <sql id="selectCmcAssessContentVo">
20
+        select content_id, role, familiar, remark, workload, skill, quality, assessment, advice from cmc_assess_content
21
+    </sql>
22
+
23
+    <select id="selectCmcAssessContentList" parameterType="CmcAssessContent" resultMap="CmcAssessContentResult">
24
+        <include refid="selectCmcAssessContentVo"/>
25
+        <where>  
26
+            <if test="role != null  and role != ''"> and role = #{role}</if>
27
+            <if test="familiar != null  and familiar != ''"> and familiar = #{familiar}</if>
28
+            <if test="workload != null  and workload != ''"> and workload = #{workload}</if>
29
+            <if test="skill != null  and skill != ''"> and skill = #{skill}</if>
30
+            <if test="quality != null  and quality != ''"> and quality = #{quality}</if>
31
+            <if test="assessment != null  and assessment != ''"> and assessment = #{assessment}</if>
32
+            <if test="advice != null  and advice != ''"> and advice = #{advice}</if>
33
+        </where>
34
+    </select>
35
+    
36
+    <select id="selectCmcAssessContentByContentId" parameterType="String" resultMap="CmcAssessContentResult">
37
+        <include refid="selectCmcAssessContentVo"/>
38
+        where content_id = #{contentId}
39
+    </select>
40
+        
41
+    <insert id="insertCmcAssessContent" parameterType="CmcAssessContent">
42
+        insert into cmc_assess_content
43
+        <trim prefix="(" suffix=")" suffixOverrides=",">
44
+            <if test="contentId != null">content_id,</if>
45
+            <if test="role != null">role,</if>
46
+            <if test="familiar != null">familiar,</if>
47
+            <if test="remark != null">remark,</if>
48
+            <if test="workload != null">workload,</if>
49
+            <if test="skill != null">skill,</if>
50
+            <if test="quality != null">quality,</if>
51
+            <if test="assessment != null">assessment,</if>
52
+            <if test="advice != null">advice,</if>
53
+         </trim>
54
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
55
+            <if test="contentId != null">#{contentId},</if>
56
+            <if test="role != null">#{role},</if>
57
+            <if test="familiar != null">#{familiar},</if>
58
+            <if test="remark != null">#{remark},</if>
59
+            <if test="workload != null">#{workload},</if>
60
+            <if test="skill != null">#{skill},</if>
61
+            <if test="quality != null">#{quality},</if>
62
+            <if test="assessment != null">#{assessment},</if>
63
+            <if test="advice != null">#{advice},</if>
64
+         </trim>
65
+    </insert>
66
+
67
+    <update id="updateCmcAssessContent" parameterType="CmcAssessContent">
68
+        update cmc_assess_content
69
+        <trim prefix="SET" suffixOverrides=",">
70
+            <if test="role != null">role = #{role},</if>
71
+            <if test="familiar != null">familiar = #{familiar},</if>
72
+            <if test="remark != null">remark = #{remark},</if>
73
+            <if test="workload != null">workload = #{workload},</if>
74
+            <if test="skill != null">skill = #{skill},</if>
75
+            <if test="quality != null">quality = #{quality},</if>
76
+            <if test="assessment != null">assessment = #{assessment},</if>
77
+            <if test="advice != null">advice = #{advice},</if>
78
+        </trim>
79
+        where content_id = #{contentId}
80
+    </update>
81
+
82
+    <delete id="deleteCmcAssessContentByContentId" parameterType="String">
83
+        delete from cmc_assess_content where content_id = #{contentId}
84
+    </delete>
85
+
86
+    <delete id="deleteCmcAssessContentByContentIds" parameterType="String">
87
+        delete from cmc_assess_content where content_id in 
88
+        <foreach item="contentId" collection="array" open="(" separator="," close=")">
89
+            #{contentId}
90
+        </foreach>
91
+    </delete>
92
+</mapper>

+ 63
- 0
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcAssessContentWorkMapper.xml Ver fichero

@@ -0,0 +1,63 @@
1
+<?xml version="1.0" encoding="UTF-8" ?>
2
+<!DOCTYPE mapper
3
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
4
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
5
+<mapper namespace="com.ruoyi.oa.mapper.CmcAssessContentWorkMapper">
6
+    
7
+    <resultMap type="CmcAssessContentWork" id="CmcAssessContentWorkResult">
8
+        <result property="workId"    column="work_id"    />
9
+        <result property="workCount"    column="work_count"    />
10
+        <result property="workLoad"    column="work_load"    />
11
+    </resultMap>
12
+
13
+    <sql id="selectCmcAssessContentWorkVo">
14
+        select work_id, work_count, work_load from cmc_assess_content_work
15
+    </sql>
16
+
17
+    <select id="selectCmcAssessContentWorkList" parameterType="CmcAssessContentWork" resultMap="CmcAssessContentWorkResult">
18
+        <include refid="selectCmcAssessContentWorkVo"/>
19
+        <where>  
20
+            <if test="workCount != null "> and work_count = #{workCount}</if>
21
+            <if test="workLoad != null  and workLoad != ''"> and work_load = #{workLoad}</if>
22
+        </where>
23
+    </select>
24
+    
25
+    <select id="selectCmcAssessContentWorkByWorkId" parameterType="String" resultMap="CmcAssessContentWorkResult">
26
+        <include refid="selectCmcAssessContentWorkVo"/>
27
+        where work_id = #{workId}
28
+    </select>
29
+        
30
+    <insert id="insertCmcAssessContentWork" parameterType="CmcAssessContentWork">
31
+        insert into cmc_assess_content_work
32
+        <trim prefix="(" suffix=")" suffixOverrides=",">
33
+            <if test="workId != null">work_id,</if>
34
+            <if test="workCount != null">work_count,</if>
35
+            <if test="workLoad != null">work_load,</if>
36
+         </trim>
37
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
38
+            <if test="workId != null">#{workId},</if>
39
+            <if test="workCount != null">#{workCount},</if>
40
+            <if test="workLoad != null">#{workLoad},</if>
41
+         </trim>
42
+    </insert>
43
+
44
+    <update id="updateCmcAssessContentWork" parameterType="CmcAssessContentWork">
45
+        update cmc_assess_content_work
46
+        <trim prefix="SET" suffixOverrides=",">
47
+            <if test="workCount != null">work_count = #{workCount},</if>
48
+            <if test="workLoad != null">work_load = #{workLoad},</if>
49
+        </trim>
50
+        where work_id = #{workId}
51
+    </update>
52
+
53
+    <delete id="deleteCmcAssessContentWorkByWorkId" parameterType="String">
54
+        delete from cmc_assess_content_work where work_id = #{workId}
55
+    </delete>
56
+
57
+    <delete id="deleteCmcAssessContentWorkByWorkIds" parameterType="String">
58
+        delete from cmc_assess_content_work where work_id in 
59
+        <foreach item="workId" collection="array" open="(" separator="," close=")">
60
+            #{workId}
61
+        </foreach>
62
+    </delete>
63
+</mapper>

+ 118
- 0
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcAssessMapper.xml Ver fichero

@@ -0,0 +1,118 @@
1
+<?xml version="1.0" encoding="UTF-8" ?>
2
+<!DOCTYPE mapper
3
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
4
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
5
+<mapper namespace="com.ruoyi.oa.mapper.CmcAssessMapper">
6
+    
7
+    <resultMap type="CmcAssess" id="CmcAssessResult">
8
+        <result property="assessId"    column="assess_id"    />
9
+        <result property="userId"    column="user_id"    />
10
+        <result property="projectId"    column="project_id"    />
11
+        <result property="assessTime"    column="assess_time"    />
12
+        <result property="deptAssessment"    column="dept_assessment"    />
13
+        <result property="deptAdvice"    column="dept_advice"    />
14
+        <result property="deptTime"    column="dept_time"    />
15
+        <result property="deptAssesser"    column="dept_assesser"    />
16
+        <result property="managerAssessment"    column="manager_assessment"    />
17
+        <result property="managerAdvice"    column="manager_advice"    />
18
+        <result property="managerTime"    column="manager_time"    />
19
+        <result property="managerAssesser"    column="manager_assesser"    />
20
+        <result property="selfAssess"    column="self_assess"    />
21
+        <result property="fillTime"    column="fill_time"    />
22
+    </resultMap>
23
+
24
+    <sql id="selectCmcAssessVo">
25
+        select assess_id, user_id, project_id, assess_time, dept_assessment, dept_advice, dept_time, dept_assesser, manager_assessment, manager_advice, manager_time, manager_assesser, self_assess, fill_time from cmc_assess
26
+    </sql>
27
+
28
+    <select id="selectCmcAssessList" parameterType="CmcAssess" resultMap="CmcAssessResult">
29
+        <include refid="selectCmcAssessVo"/>
30
+        <where>  
31
+            <if test="userId != null "> and user_id = #{userId}</if>
32
+            <if test="projectId != null "> and project_id = #{projectId}</if>
33
+            <if test="assessTime != null "> and assess_time = #{assessTime}</if>
34
+            <if test="deptAssessment != null  and deptAssessment != ''"> and dept_assessment = #{deptAssessment}</if>
35
+            <if test="deptAdvice != null  and deptAdvice != ''"> and dept_advice = #{deptAdvice}</if>
36
+            <if test="deptTime != null "> and dept_time = #{deptTime}</if>
37
+            <if test="deptAssesser != null  and deptAssesser != ''"> and dept_assesser = #{deptAssesser}</if>
38
+            <if test="managerAssessment != null  and managerAssessment != ''"> and manager_assessment = #{managerAssessment}</if>
39
+            <if test="managerAdvice != null  and managerAdvice != ''"> and manager_advice = #{managerAdvice}</if>
40
+            <if test="managerTime != null "> and manager_time = #{managerTime}</if>
41
+            <if test="managerAssesser != null  and managerAssesser != ''"> and manager_assesser = #{managerAssesser}</if>
42
+            <if test="selfAssess != null  and selfAssess != ''"> and self_assess = #{selfAssess}</if>
43
+            <if test="fillTime != null "> and fill_time = #{fillTime}</if>
44
+        </where>
45
+    </select>
46
+    
47
+    <select id="selectCmcAssessByAssessId" parameterType="String" resultMap="CmcAssessResult">
48
+        <include refid="selectCmcAssessVo"/>
49
+        where assess_id = #{assessId}
50
+    </select>
51
+        
52
+    <insert id="insertCmcAssess" parameterType="CmcAssess">
53
+        insert into cmc_assess
54
+        <trim prefix="(" suffix=")" suffixOverrides=",">
55
+            <if test="assessId != null">assess_id,</if>
56
+            <if test="userId != null">user_id,</if>
57
+            <if test="projectId != null">project_id,</if>
58
+            <if test="assessTime != null">assess_time,</if>
59
+            <if test="deptAssessment != null">dept_assessment,</if>
60
+            <if test="deptAdvice != null">dept_advice,</if>
61
+            <if test="deptTime != null">dept_time,</if>
62
+            <if test="deptAssesser != null">dept_assesser,</if>
63
+            <if test="managerAssessment != null">manager_assessment,</if>
64
+            <if test="managerAdvice != null">manager_advice,</if>
65
+            <if test="managerTime != null">manager_time,</if>
66
+            <if test="managerAssesser != null">manager_assesser,</if>
67
+            <if test="selfAssess != null">self_assess,</if>
68
+            <if test="fillTime != null">fill_time,</if>
69
+         </trim>
70
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
71
+            <if test="assessId != null">#{assessId},</if>
72
+            <if test="userId != null">#{userId},</if>
73
+            <if test="projectId != null">#{projectId},</if>
74
+            <if test="assessTime != null">#{assessTime},</if>
75
+            <if test="deptAssessment != null">#{deptAssessment},</if>
76
+            <if test="deptAdvice != null">#{deptAdvice},</if>
77
+            <if test="deptTime != null">#{deptTime},</if>
78
+            <if test="deptAssesser != null">#{deptAssesser},</if>
79
+            <if test="managerAssessment != null">#{managerAssessment},</if>
80
+            <if test="managerAdvice != null">#{managerAdvice},</if>
81
+            <if test="managerTime != null">#{managerTime},</if>
82
+            <if test="managerAssesser != null">#{managerAssesser},</if>
83
+            <if test="selfAssess != null">#{selfAssess},</if>
84
+            <if test="fillTime != null">#{fillTime},</if>
85
+         </trim>
86
+    </insert>
87
+
88
+    <update id="updateCmcAssess" parameterType="CmcAssess">
89
+        update cmc_assess
90
+        <trim prefix="SET" suffixOverrides=",">
91
+            <if test="userId != null">user_id = #{userId},</if>
92
+            <if test="projectId != null">project_id = #{projectId},</if>
93
+            <if test="assessTime != null">assess_time = #{assessTime},</if>
94
+            <if test="deptAssessment != null">dept_assessment = #{deptAssessment},</if>
95
+            <if test="deptAdvice != null">dept_advice = #{deptAdvice},</if>
96
+            <if test="deptTime != null">dept_time = #{deptTime},</if>
97
+            <if test="deptAssesser != null">dept_assesser = #{deptAssesser},</if>
98
+            <if test="managerAssessment != null">manager_assessment = #{managerAssessment},</if>
99
+            <if test="managerAdvice != null">manager_advice = #{managerAdvice},</if>
100
+            <if test="managerTime != null">manager_time = #{managerTime},</if>
101
+            <if test="managerAssesser != null">manager_assesser = #{managerAssesser},</if>
102
+            <if test="selfAssess != null">self_assess = #{selfAssess},</if>
103
+            <if test="fillTime != null">fill_time = #{fillTime},</if>
104
+        </trim>
105
+        where assess_id = #{assessId}
106
+    </update>
107
+
108
+    <delete id="deleteCmcAssessByAssessId" parameterType="String">
109
+        delete from cmc_assess where assess_id = #{assessId}
110
+    </delete>
111
+
112
+    <delete id="deleteCmcAssessByAssessIds" parameterType="String">
113
+        delete from cmc_assess where assess_id in 
114
+        <foreach item="assessId" collection="array" open="(" separator="," close=")">
115
+            #{assessId}
116
+        </foreach>
117
+    </delete>
118
+</mapper>

+ 23
- 2
oa-back/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml Ver fichero

@@ -23,6 +23,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
23 23
         <result property="updateBy"     column="update_by"    />
24 24
         <result property="updateTime"   column="update_time"  />
25 25
         <result property="remark"       column="remark"       />
26
+        <result property="pmLevel"       column="pm_level"       />
27
+        <result property="titles"       column="titles"       />
28
+        <result property="titles"       column="titles"       />
29
+        <result property="engineerLevel"       column="engineer_level"       />
30
+        <result property="entryDate"       column="entry_date"       />
31
+        <result property="age"       column="age"       />
26 32
         <association property="dept"    javaType="SysDept"         resultMap="deptResult" />
27 33
         <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
28 34
     </resultMap>
@@ -47,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
47 53
     </resultMap>
48 54
 	
49 55
 	<sql id="selectUserVo">
50
-        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, 
56
+        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.pm_level, u.titles, u.engineer_level, u.entry_date, u.age,
51 57
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
52 58
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
53 59
         from sys_user u
@@ -57,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
57 63
     </sql>
58 64
     
59 65
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
60
-		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
66
+		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.pm_level, u.titles, u.engineer_level, u.entry_date, u.age, d.dept_name, d.leader from sys_user u
61 67
 		left join sys_dept d on u.dept_id = d.dept_id
62 68
 		where u.del_flag = '0'
63 69
 		<if test="userId != null and userId != 0">
@@ -156,6 +162,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
156 162
  			<if test="status != null and status != ''">status,</if>
157 163
  			<if test="createBy != null and createBy != ''">create_by,</if>
158 164
  			<if test="remark != null and remark != ''">remark,</if>
165
+ 			<if test="pmLevel != null and pmLevel != ''">pm_level,</if>
166
+ 			<if test="titles != null and titles != ''">remark,</if>
167
+ 			<if test="engineerLevel != null and engineerLevel != ''">engineer_level,</if>
168
+ 			<if test="entryDate != null and entryDate != ''">entry_date,</if>
169
+ 			<if test="age != null and age != ''">age,</if>
159 170
  			create_time
160 171
  		)values(
161 172
  			<if test="userId != null and userId != ''">#{userId},</if>
@@ -170,6 +181,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
170 181
  			<if test="status != null and status != ''">#{status},</if>
171 182
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
172 183
  			<if test="remark != null and remark != ''">#{remark},</if>
184
+ 			<if test="pmLevel != null and pmLevel != ''">#{pmLevel},</if>
185
+ 			<if test="titles != null and titles != ''">#{titles},</if>
186
+ 			<if test="engineerLevel != null and engineerLevel != ''">#{engineerLevel},</if>
187
+ 			<if test="entryDate != null and entryDate != ''">#{entryDate},</if>
188
+ 			<if test="age != null and age != ''">#{age},</if>
173 189
  			sysdate()
174 190
  		)
175 191
 	</insert>
@@ -190,6 +206,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
190 206
  			<if test="loginDate != null">login_date = #{loginDate},</if>
191 207
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
192 208
  			<if test="remark != null">remark = #{remark},</if>
209
+ 			<if test="pmLevel != null">pmLevel = #{pmLevel},</if>
210
+ 			<if test="titles != null">titles = #{titles},</if>
211
+ 			<if test="engineerLevel != null">engineerLevel = #{engineerLevel},</if>
212
+ 			<if test="entryDate != null">entryDate = #{entryDate},</if>
213
+ 			<if test="age != null">age = #{age},</if>
193 214
  			update_time = sysdate()
194 215
  		</set>
195 216
  		where user_id = #{userId}

+ 656
- 53
oa-back/sql/ry_20231130.sql Ver fichero

@@ -23,16 +23,24 @@ create table sys_dept (
23 23
 -- ----------------------------
24 24
 -- 初始化-部门表数据
25 25
 -- ----------------------------
26
-insert into sys_dept values(100,  0,   '0',          '若依科技',   0, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
27
-insert into sys_dept values(101,  100, '0,100',      '深圳总公司', 1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
28
-insert into sys_dept values(102,  100, '0,100',      '长沙分公司', 2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
29
-insert into sys_dept values(103,  101, '0,100,101',  '研发部门',   1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
30
-insert into sys_dept values(104,  101, '0,100,101',  '市场部门',   2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
31
-insert into sys_dept values(105,  101, '0,100,101',  '测试部门',   3, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
32
-insert into sys_dept values(106,  101, '0,100,101',  '财务部门',   4, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
33
-insert into sys_dept values(107,  101, '0,100,101',  '运维部门',   5, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
34
-insert into sys_dept values(108,  102, '0,100,102',  '市场部门',   1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
35
-insert into sys_dept values(109,  102, '0,100,102',  '财务部门',   2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null);
26
+INSERT INTO sys_dept VALUES (100, 0, '0', '四川中水成勘院测绘工程有限责任公司', 0, NULL, NULL, NULL, '0', '0', 'admin', '2024-01-04 11:34:52', NULL, NULL);
27
+INSERT INTO sys_dept VALUES (101, 100, '0,100', '董事会', 1, NULL, NULL, NULL, '0', '0', 'admin', '2024-01-04 11:34:52', NULL, NULL);
28
+INSERT INTO sys_dept VALUES (102, 100, '0,100', '经营管理层', 2, NULL, NULL, NULL, '0', '0', 'admin', '2024-01-04 11:36:52', NULL, NULL);
29
+INSERT INTO sys_dept VALUES (103, 100, '0,100', '综合事务部', 3, NULL, NULL, NULL, '0', '0', 'admin', '2024-01-04 11:38:16', NULL, NULL);
30
+INSERT INTO sys_dept VALUES (104, 100, '0,100', '经营发展部', 4, NULL, NULL, NULL, '0', '0', 'admin', '2024-01-04 11:38:32', NULL, NULL);
31
+INSERT INTO sys_dept VALUES (105, 100, '0,100', '财务部', 5, NULL, NULL, NULL, '0', '0', 'admin', '2024-01-04 11:38:44', NULL, NULL);
32
+INSERT INTO sys_dept VALUES (106, 100, '0,100', '项目管理部', 6, NULL, NULL, NULL, '0', '0', 'admin', '2024-01-04 11:39:02', NULL, NULL);
33
+INSERT INTO sys_dept VALUES (107, 100, '0,100', '激光技术中心', 7, NULL, NULL, NULL, '0', '0', 'admin', '2024-01-04 11:39:21', NULL, NULL);
34
+INSERT INTO sys_dept VALUES (108, 100, '0,100', '地理信息中心', 8, NULL, NULL, NULL, '0', '0', 'admin', '2024-01-04 11:39:31', NULL, NULL);
35
+INSERT INTO sys_dept VALUES (109, 100, '0,100', '技术质量部', 9, NULL, NULL, NULL, '0', '0', 'admin', '2024-01-04 11:39:50', NULL, NULL);
36
+INSERT INTO sys_dept VALUES (110, 100, '0,100', '航测遥感中心', 10, NULL, NULL, NULL, '0', '0', 'admin', '2024-01-04 11:40:03', NULL, NULL);
37
+INSERT INTO sys_dept VALUES (111, 100, '0,100', '测绘工程中心', 11, NULL, NULL, NULL, '0', '0', 'admin', '2024-01-04 11:40:16', NULL, NULL);
38
+INSERT INTO sys_dept VALUES (112, 100, '0,100', '工程监测中心', 12, NULL, NULL, NULL, '0', '0', 'admin', '2024-01-04 11:40:35', NULL, NULL);
39
+INSERT INTO sys_dept VALUES (113, 100, '0,100', '勘察设计事业部', 13, NULL, NULL, NULL, '0', '0', 'admin', '2024-01-04 11:40:59', NULL, NULL);
40
+INSERT INTO sys_dept VALUES (114, 100, '0,100', '测量中心', 14, NULL, NULL, NULL, '0', '0', 'admin', '2024-01-04 11:41:14', NULL, NULL);
41
+INSERT INTO sys_dept VALUES (115, 100, '0,100', '重庆分公司', 15, NULL, NULL, NULL, '0', '0', 'admin', '2024-01-04 11:42:31', NULL, NULL);
42
+INSERT INTO sys_dept VALUES (116, 100, '0,100', '德方子公司', 16, NULL, NULL, NULL, '0', '0', 'admin', '2024-01-04 11:42:56', NULL, NULL);
43
+INSERT INTO sys_dept VALUES (117, 100, '0,100', '云南子公司', 17, NULL, NULL, NULL, '0', '0', 'admin', '2024-01-04 11:43:16', NULL, NULL);
36 44
 
37 45
 
38 46
 -- ----------------------------
@@ -58,15 +66,167 @@ create table sys_user (
58 66
   create_time       datetime                                   comment '创建时间',
59 67
   update_by         varchar(64)     default ''                 comment '更新者',
60 68
   update_time       datetime                                   comment '更新时间',
61
-  remark            varchar(500)    default null               comment '备注',
69
+  remark            varchar(500)    default null               comment '备注(作业类别)',
70
+  pm_level			char(2)			default null			   comment '项目经理级别(0一、1二、2三)',
71
+  titles			char(1)			default null			   comment '技术职称(0正高、1副高、2中级、3助工、4注测、5注规、6注岩、7注安、8注会)',
72
+  engineer_level	char(2)			default null			   comment '岗级(0二、1三、2四、3五、4六)',
73
+  entry_date		datetime								   comment '入职时间',
74
+  age				int				default null			   comment '年龄',
62 75
   primary key (user_id)
63
-) engine=innodb auto_increment=100 comment = '用户信息表';
76
+) engine=innodb auto_increment=1 comment = '用户信息表';
64 77
 
65 78
 -- ----------------------------
66 79
 -- 初始化-用户信息表数据
67 80
 -- ----------------------------
68
-insert into sys_user values(1,  103, 'admin', '若依', '00', 'ry@163.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '管理员');
69
-insert into sys_user values(2,  105, 'ry',    '若依', '00', 'ry@qq.com',  '15666666666', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '测试员');
81
+INSERT INTO sys_user VALUES (1, 103, 'admin', 'admin', '00', '', 'admin', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2024-01-08 10:07:29', NULL, '2024-01-04 17:22:48', NULL, '2024-01-08 10:07:29', '管理员', NULL, NULL, NULL, NULL, NULL);
82
+INSERT INTO sys_user VALUES (2, 101, '13982275233', '刘光庆', '00', '', '13982275233', '0', '', '$2a$10$pcdc8BbNDNiWaQUU14BC3eGWxB4sSJOQZBL9QFftkhkjcbYU03DNi', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
83
+INSERT INTO sys_user VALUES (3, 101, '13808211356', '向发廷', '00', '', '13808211356', '0', '', '$2a$10$zynAhjpaUxERmH4yo9R9s.O.oUgpxwRKtKA6X74ncn0z1ajFxqMyq', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
84
+INSERT INTO sys_user VALUES (4, 101, '13608089391', '王 渊', '00', '', '13608089391', '0', '', '$2a$10$sKWfjdS0vJMA194/pu9q/e8Etz6kNBTzlURGDtKreBE8oHsRWP9hW', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
85
+INSERT INTO sys_user VALUES (5, 101, '13808210959', '饶兴贵', '00', '', '13808210959', '0', '', '$2a$10$oyppe5szUKvS7tmJGPEMAOokXiWFJys5MMfOWFc6.ETpyBgCDo/42', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
86
+INSERT INTO sys_user VALUES (6, 101, '13308085432', '阴学军', '00', '', '13308085432', '0', '', '$2a$10$nb/NapsXWQd/IfPbrqXKjefXlOKmRB5ScgVneGxPgEyo4FZ8.RMOi', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
87
+INSERT INTO sys_user VALUES (7, 101, '13908178105', '樊宽林', '00', '', '13908178105', '0', '', '$2a$10$wnFsEXdHdJCgVYffXW7FRerg0c3v3S.aVqtdiWrtSAt9KntmW6iIu', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
88
+INSERT INTO sys_user VALUES (8, 103, '18034708068', '徐 婷', '00', '', '18034708068', '1', '', '$2a$10$3NJkNMrq0/vwnw5E3z6wI.TutQnqhwSuMFDPxV/OMe9IXt0fTobNW', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
89
+INSERT INTO sys_user VALUES (9, 102, '13880963113', '陈 洪', '00', '', '13880963113', '0', '', '$2a$10$xVZmDdG0DUlGjuGMFi6WEem4pWuLKlqrg27VuBRbn3vfKq8ATWzVa', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
90
+INSERT INTO sys_user VALUES (10, 102, '13981868188', '刘 非', '00', '', '13981868188', '0', '', '$2a$10$XCXSEHjvWp9IFbQIXfh/gu5i8R87DjKMHsEu.qioLaZLVDB3wr1z2', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
91
+INSERT INTO sys_user VALUES (11, 102, '13882236733', '杨 卫', '00', '', '13882236733', '0', '', '$2a$10$buRf8Vh0f4./GVx9WV6zkO1LOKSIEnTK4tzXefEh6gcY2JfcI4gPO', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
92
+INSERT INTO sys_user VALUES (12, 102, '13980583883', '宁 瑶', '00', '', '13980583883', '0', '', '$2a$10$srx9flT57EE/f2euaLgrIeud6Ujnz3HS3qfNYm7DXFY6XZ5p5Aai2', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
93
+INSERT INTO sys_user VALUES (13, 104, '18190819097', '贾春华', '00', '', '18190819097', '0', '', '$2a$10$QSI1Pl1YK6kGt0zLDNv1COQyK8UDLWhBq26QSXEPpikIDArtqjeau', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
94
+INSERT INTO sys_user VALUES (14, 105, '15928150405', '刘 楠', '00', '', '15928150405', '0', '', '$2a$10$6tmHn6r5Dy6/qdu/ZotiSObzEr7zymkKL/g/VkcdUjV16OezZFALu', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
95
+INSERT INTO sys_user VALUES (15, 103, '13678018998', '张明勇', '00', '', '13678018998', '0', '', '$2a$10$TKhy.bdUf4CmSN4nnVGZIeuQvtaFc1V/cXKT87sCjpOwvLOGpDuC.', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
96
+INSERT INTO sys_user VALUES (16, 103, '13683488600', '陈建贤', '00', '', '13683488600', '0', '', '$2a$10$/2zL9VLX21iPxTVPklI11uOanp0bcR90mgCc9tIz6.Ux1/tegzFBG', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
97
+INSERT INTO sys_user VALUES (17, 103, '13438165216', '张国芳', '00', '', '13438165216', '1', '', '$2a$10$sKkER/2RwOhIcufS8ceg..D9TchtO/R4nFCP1cDpW4BsS47TcqqRC', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
98
+INSERT INTO sys_user VALUES (18, 103, '15181125323', '简   鑫', '00', '', '15181125323', '1', '', '$2a$10$v2mVQvW5BsZnrxJ6j.AHRebGVQMRI3jaDlX0lDQnpBD.Y86VSnf9K', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
99
+INSERT INTO sys_user VALUES (19, 103, '13378256139', '谢辉波', '00', '', '13378256139', '0', '', '$2a$10$mZT.3thlsNmtiGXrgJxIm.QbktUAa9blLqwOq7LhGfy1XG1xnAzEm', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
100
+INSERT INTO sys_user VALUES (20, 104, '13550342375', '李胜才', '00', '', '13550342375', '0', '', '$2a$10$lUhqpfwHzoVXPDC6qRu8su8HWlLJ49SCEo1NDXyFf2q5C8hThZbXi', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
101
+INSERT INTO sys_user VALUES (21, 104, '13568885428', '杨   俊', '00', '', '13568885428', '0', '', '$2a$10$CSpKNIxy1hlgONyLZNk9hupaQXiwpGEJYv8DFcSebuIp81J6aheeO', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
102
+INSERT INTO sys_user VALUES (22, 104, '13882200825', '夏   夏', '00', '', '13882200825', '0', '', '$2a$10$WMD98fLsImPZ9rJwyIely.j5AKiQyUt/I3qT/Xcg5EdQCIkxx4kq2', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
103
+INSERT INTO sys_user VALUES (23, 104, '18373705527', '柯   枭', '00', '', '18373705527', '1', '', '$2a$10$EMikBVL2M4b97n.MJmMCNO1YiFl49bjWWXZkFDZqvVkOpYhb5FEe6', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
104
+INSERT INTO sys_user VALUES (24, 104, '18202833529', '黎   超', '00', '', '18202833529', '0', '', '$2a$10$MkPiNt69sG3HQg9EY3cpv.0Sw1iq53NMq/kdplK9W8ohqqY/dlUxC', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
105
+INSERT INTO sys_user VALUES (25, 104, '13111885671', '刘   兴', '00', '', '13111885671', '0', '', '$2a$10$Ag2jfz8ppoSP4bpohVVD1evq8glP6O4tY0HD9DoXXhsPpxSP8egSy', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
106
+INSERT INTO sys_user VALUES (26, 104, '18782949671', '梁   洁', '00', '', '18782949671', '1', '', '$2a$10$BZurM7Hzy/aquuAlLkk/pOD.y0Ks.BtYcCTTyEwtJHY3QEgFdwRBe', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
107
+INSERT INTO sys_user VALUES (27, 104, '18681251027', '高天沄', '00', '', '18681251027', '0', '', '$2a$10$xk96PJpjcUIWEo9RTTOKYubqeSXETSUSbRYFjpCgSr1z9PPKUSKsu', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
108
+INSERT INTO sys_user VALUES (28, 105, '18202802155', '彭   敏', '00', '', '18202802155', '1', '', '$2a$10$ozjePPQbsp9YORLj7r4.K.lTC/9E/ANgDsOHsEyHlQ9DP2MtggiAO', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
109
+INSERT INTO sys_user VALUES (29, 105, '13699682119', '苟   丹', '00', '', '13699682119', '1', '', '$2a$10$Jt.lg9CXVwlm0puSYFS6IOjxrSPAAHuf5gFmRtRX89IAwJlL8bm4e', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
110
+INSERT INTO sys_user VALUES (30, 105, '18780223280', '周文婷*', '00', '', '18780223280', '1', '', '$2a$10$pg.prMidA.76KkPRsZsOQuKStpl74J29heNpxCtJbZqDl7i9DjIuu', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
111
+INSERT INTO sys_user VALUES (31, 105, '15102831685', '宋丹丹', '00', '', '15102831685', '1', '', '$2a$10$/j4MpWKxCUekgxiTD1yyyOpOVJme5YbfJz042FuNJLuccxkC2yJSm', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
112
+INSERT INTO sys_user VALUES (32, 106, '15802829286', '向艳雄', '00', '', '15802829286', '0', '', '$2a$10$FQo1zf1ss2OZw4eIlzzxwOyPV0FkkLDN0ZBxqRSIijNpUCCSxBjQy', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
113
+INSERT INTO sys_user VALUES (33, 106, '18828096127', '朱   静', '00', '', '18828096127', '0', '', '$2a$10$PrXuWRk4u9d05TNI9MAGjeGwmsSglOtGNKX.fjDuRwmTfVSFr4x9C', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
114
+INSERT INTO sys_user VALUES (34, 106, '13882148315', '陈尚云', '00', '', '13882148315', '0', '', '$2a$10$I7CDnjCXqmbFmxdgcsoZ/uhgvEahRGZ/u3P4bdIU1Kic49Itu97JG', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
115
+INSERT INTO sys_user VALUES (35, 106, '18113169528', '蒲   帆', '00', '', '18113169528', '0', '', '$2a$10$Z.3Y46kvgMCHpVSsXl3WJO4OOLJhr5IlzXTQqWx1a8yR1HaJQJQQW', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
116
+INSERT INTO sys_user VALUES (36, 106, '18408201550', '邹帅民', '00', '', '18408201550', '0', '', '$2a$10$VC/JGLy.P6yJ5LJHmuq2dur.wnHYDzzxjyaizC8fYVNRq5DBmjjIm', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
117
+INSERT INTO sys_user VALUES (37, 106, '13808178930', '周   芝', '00', '', '13808178930', '1', '', '$2a$10$4SuEJ.5YZSnk3UlpISWBmer7UZVMBKuMNBiG2/lUKafwNr1jI1UF2', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
118
+INSERT INTO sys_user VALUES (38, 106, '18780290087', '苟   旭', '00', '', '18780290087', '0', '', '$2a$10$QCU/ERPaKSs5CAuWWB2WZ.13fxht6GKgGORCBS8DUy3qBmJybgzM.', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
119
+INSERT INTO sys_user VALUES (39, 107, '18280462009', '刘媛媛', '00', '', '18280462009', '1', '', '$2a$10$SWNBLt43nQQJPC58DZmZcuHqkhre8lOMfl87AnM5UKuMrMfuPpaO6', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
120
+INSERT INTO sys_user VALUES (40, 107, '18200194440', '吴   振', '00', '', '18200194440', '0', '', '$2a$10$a3ozNbqM6BYYISEJGIpx5O83L1RpMXNc4A9gpPu93qZ9PahUzx24u', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
121
+INSERT INTO sys_user VALUES (41, 107, '15892280776', '王   刚', '00', '', '15892280776', '0', '', '$2a$10$ulhCOUUylhfnX7iccme6I.zpwLdnvU3zXXuMJ9LtRILnviD6Pvg9u', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
122
+INSERT INTO sys_user VALUES (42, 107, '18140026972', '朱倪强', '00', '', '18140026972', '0', '', '$2a$10$HLRPkMz/orRnHouLjKNoH.Mn..dH97urH6up1x5AO0ZmtL64wp5XG', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
123
+INSERT INTO sys_user VALUES (43, 107, '18408248664', '李   圆', '00', '', '18408248664', '1', '', '$2a$10$nMUdzmsF1Tk1FOR7k92kMulRN31LkiWV45F3eAAvNwCS8acu9endK', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
124
+INSERT INTO sys_user VALUES (44, 107, '18783205676', '李泳龙', '00', '', '18783205676', '0', '', '$2a$10$LHQQe3UHQgaJDCnPl.gujuBKgRhrMN88kPKRxev2HSvOrV2IDRAfG', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
125
+INSERT INTO sys_user VALUES (45, 108, '13402863790', '何   杰', '00', '', '13402863790', '0', '', '$2a$10$XZhKTnoYh.zS/TczIVjJyOVMvwjQ.fiH3QtTpB9M2OaHnhpIiOYWS', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
126
+INSERT INTO sys_user VALUES (46, 108, '18224091291', '杨玉婧', '00', '', '18224091291', '1', '', '$2a$10$goGcN9K63wIO7t8Rkw95kuMb1twHzRU51Dk6q31/.Hejl2Aro0kVq', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
127
+INSERT INTO sys_user VALUES (47, 108, '15196615885', '余思翰', '00', '', '15196615885', '1', '', '$2a$10$IjogDx43u3xmI2TigAo6CugCKh.AAmwOSf1nKBCWlJ/cEhgpX.H3e', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
128
+INSERT INTO sys_user VALUES (48, 108, '17716873691', '阮梦妍', '00', '', '17716873691', '1', '', '$2a$10$XXlN3NzrRMBmMudrV3ZgOOtEq.RML/KrrVhN/uh.rpP7chAqy8QTe', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
129
+INSERT INTO sys_user VALUES (49, 108, '15881196342', '赵   芩', '00', '', '15881196342', '1', '', '$2a$10$x2pMljHso1uFHnjDpFu0/OPGrU1ITvl7hnv/bwFFQVUIH/mQ39k2G', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
130
+INSERT INTO sys_user VALUES (50, 108, '18502889383', '王荣华', '00', '', '18502889383', '0', '', '$2a$10$G7uXmOzRgagbI2jske8meuu8p0QgvTvMxLDzV0gQWHVaKJTsW6e3i', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
131
+INSERT INTO sys_user VALUES (51, 108, '19982093641', '屈亚星', '00', '', '19982093641', '1', '', '$2a$10$gklMWtGS2E8tdWakJpNk9OyEv2g/2MGuQupEH0Q7zCpZI9XJPMxyC', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
132
+INSERT INTO sys_user VALUES (52, 109, '13880509805', '吴   凯', '00', '', '13880509805', '0', '', '$2a$10$AN5g8asAyLLW9.POKvkh8.WPCKqzf4Ze71ltLA.wIbEqIH3fQSj0q', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
133
+INSERT INTO sys_user VALUES (53, 109, '13981911565', '李   旭', '00', '', '13981911565', '0', '', '$2a$10$j4GUGW8LwJVW5kS98xis3.PYbeMsqjJwiJBnmj1lYpS04hqp7IvMi', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
134
+INSERT INTO sys_user VALUES (54, 109, '13708077449', '马如坤', '00', '', '13708077449', '0', '', '$2a$10$SO9HTWCXPMBbHiMUs73YdON7RYGfi0LbB/Tfyq5e7BZaxSbJvTB3S', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
135
+INSERT INTO sys_user VALUES (55, 109, '13684088875', '张   进', '00', '', '13684088875', '0', '', '$2a$10$TMJoxh5FamkqFR7crz.eh.1/jwx9JdyAm9SAE/wzZdwgzfqjljvGC', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
136
+INSERT INTO sys_user VALUES (56, 109, '13550225550', '冉洪芳', '00', '', '13550225550', '1', '', '$2a$10$N0iuZU3JhPqLBogqtMbmeuL1aGb/D3E0Yh3UUoJX6yV.iaVT1WBhq', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
137
+INSERT INTO sys_user VALUES (57, 109, '13880738350', '周文婷', '00', '', '13880738350', '1', '', '$2a$10$Z8hiF47EMxhCXq9I/xbLbuJloSnoARKeiRgodgBcer7lq1VsYE3fC', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
138
+INSERT INTO sys_user VALUES (58, 109, '13558636992', '谭   君', '00', '', '13558636992', '1', '', '$2a$10$uBsL6WPQpYCbT0oddsoll.VrLlMDrRWU2my.VdnNovu9c.thOXR1e', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
139
+INSERT INTO sys_user VALUES (59, 109, '13658078979', '王晶丽', '00', '', '13658078979', '1', '', '$2a$10$PBNCy8SQPudxBTigEEXVAuIot2PoUDMz6KV1u8TeXBvXiS0CAUMtW', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
140
+INSERT INTO sys_user VALUES (60, 109, '13488986700', '罗业华', '00', '', '13488986700', '0', '', '$2a$10$8np5PzaPEkMQwRYUzSnUX.pDQSRdbpFXyzhtYvBj11OzTaNmGAEtG', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
141
+INSERT INTO sys_user VALUES (61, 109, '13540297596', '郎悟灵', '00', '', '13540297596', '1', '', '$2a$10$BU3usTExEEbFa7VGIbnOgeAJ3CsJXPkzV6ZTH2xRtu70Es76RP5j.', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
142
+INSERT INTO sys_user VALUES (62, 109, '18030862435', '黄俊峰', '00', '', '18030862435', '0', '', '$2a$10$gBqKUDSxjc4mHUp6Pcrp8evF1BVhgkpq8cm65iqWtHkkDP1wk/Jaa', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
143
+INSERT INTO sys_user VALUES (63, 110, '15881027005', '赵   洪', '00', '', '15881027005', '0', '', '$2a$10$HbyEXT7JR0HMv/rqi9YuQOKCyDxZg/uYgayoSOcE2.tDSVNS0OBpW', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
144
+INSERT INTO sys_user VALUES (64, 110, '18782047395', '雷情情', '00', '', '18782047395', '1', '', '$2a$10$DLeq2ePfvTS9cAarUu87LuM8d1nwJR5t/OBI3kc5nT858nIo0vpR2', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
145
+INSERT INTO sys_user VALUES (65, 110, '13668275672', '刘向东', '00', '', '13668275672', '0', '', '$2a$10$GUkGxa.u4jsBVE5mAXVTcetM0t6JIxMPUthi6v5IitkVSZUlpzf5.', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
146
+INSERT INTO sys_user VALUES (66, 110, '13880738396', '徐志勇', '00', '', '13880738396', '0', '', '$2a$10$toSkneflSQedWXrjbim6lut03gEx1HlV4FV1UFYocdtDpEhpbbLam', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
147
+INSERT INTO sys_user VALUES (67, 110, '15828108217', '李   敏', '00', '', '15828108217', '1', '', '$2a$10$c8ADHg87uPh0KaTXl.hWm.5z4hVDRtFmTprgfAJ1y.yVj27mEvV8i', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
148
+INSERT INTO sys_user VALUES (68, 110, '13689063294', '何   玲', '00', '', '13689063294', '1', '', '$2a$10$v1/ZnLyGAQwuQ7fUjy/kdeklmPo7e3uR/ogj5KmvjIPEQF7mqM/BS', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
149
+INSERT INTO sys_user VALUES (69, 110, '15982266763', '谭天宇', '00', '', '15982266763', '0', '', '$2a$10$QNa18og32fQ979WGRWGFTOLgHszwXzvE.a9dSnuqMqQ4hABt5MBRa', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
150
+INSERT INTO sys_user VALUES (70, 110, '18384964273', '李丽昕', '00', '', '18384964273', '1', '', '$2a$10$f7M7gFzNtCxjBCDZjXlvz.ROHw7vedqYtpX1BRLmT9X/5OouCXna2', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
151
+INSERT INTO sys_user VALUES (71, 110, '15108259951', '陈   波', '00', '', '15108259951', '0', '', '$2a$10$nkbLOjwcHqge.kwX4bTSWOxX6owLTazGVVrthxxPiun9zLP8NpYTW', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
152
+INSERT INTO sys_user VALUES (72, 110, '18483229925', '张   敏', '00', '', '18483229925', '1', '', '$2a$10$UodO6Pu05eUct21vfnuQIOIwHhuEw3xkmZPEFjaeP378YoiQ/86Ee', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
153
+INSERT INTO sys_user VALUES (73, 110, '15308209119', '李   磊', '00', '', '15308209119', '0', '', '$2a$10$DYNX/J5XG6CCniWthrA3KOau0kWEw8gtMSnS7dhtofuCpZLQfyRsG', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
154
+INSERT INTO sys_user VALUES (74, 110, '18190687602', '杨为康', '00', '', '18190687602', '0', '', '$2a$10$Vzo2gOmvHdI6TZxZCO2iTePU8fa9oVN6xPmyT2ZapQ2sZEJRM.tWa', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
155
+INSERT INTO sys_user VALUES (75, 110, '15202868564', '夏志斌', '00', '', '15202868564', '0', '', '$2a$10$ucCDdz5DYNZy64aKKSxH/.Lib./7T5rLGECIWXzwBLalCQk0X1fka', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
156
+INSERT INTO sys_user VALUES (76, 110, '18048613219', '刘轩庭', '00', '', '18048613219', '0', '', '$2a$10$.pSSK43SDZGc3tt1sjZREe/d0hCAbHpmUKvyFzJ1vtctvSZpdf.ka', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
157
+INSERT INTO sys_user VALUES (77, 110, '18482156612', '廖友福', '00', '', '18482156612', '0', '', '$2a$10$47nqvaqoPpAbcR9wH.ar9.nBCbKshOpTP0HwgBxsFWt3wqSaW/U0y', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
158
+INSERT INTO sys_user VALUES (78, 110, '13880417112', '潘林海', '00', '', '13880417112', '0', '', '$2a$10$z1iuKFb6q9SSiXoELcrfjuYWLnAbPorD42T.5nCEmLUXwL0/Ahe8m', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
159
+INSERT INTO sys_user VALUES (79, 110, '13518119939', '邓锡全', '00', '', '13518119939', '0', '', '$2a$10$auJq1XFdaj.2.WXKS98mxOWcprpL3LGl5h3Fd1sBwAoUfh1c6zlrK', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
160
+INSERT INTO sys_user VALUES (80, 110, '15208122776', '张   杰', '00', '', '15208122776', '0', '', '$2a$10$HcC7iiq4GR1Ca0JRrJntOemcBW3vO.tt9/EUbmvQJ9M.QIs1j6IJC', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
161
+INSERT INTO sys_user VALUES (81, 110, '17345094889', '廖   双', '00', '', '17345094889', '0', '', '$2a$10$AA3hI9GxRBB3XD9N/NthD.nqYf487wG3BvJQgYsSTublKos1Gy1Km', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
162
+INSERT INTO sys_user VALUES (82, 110, '15520996706', '廖吉兴', '00', '', '15520996706', '0', '', '$2a$10$/KNuVYgY/iKADZZg.iykyuJK/rrgi/CpbZy.ZFv3NKm4MrpqBnCFu', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
163
+INSERT INTO sys_user VALUES (83, 110, '15692823805', '王海宾', '00', '', '15692823805', '0', '', '$2a$10$OF1jB2LgFMeaakI6NTPqx.nTTe4bKzZeaP9dYccOk0v0rdCzja7Jy', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
164
+INSERT INTO sys_user VALUES (84, 111, '13540773353', '杨   振', '00', '', '13540773353', '0', '', '$2a$10$m8MnVkkjv9DT7GRaVDfG9e0lQM79NJPBwFQL3eckGh32qylKlNeky', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
165
+INSERT INTO sys_user VALUES (85, 111, '18380220140', '甘雨婷', '00', '', '18380220140', '1', '', '$2a$10$HXgw5OtU9uUCiKbSAPG0xe5PwGiZWlCIlJtltgXdtCYIZxIcKw01S', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
166
+INSERT INTO sys_user VALUES (86, 111, '13608005983', '周   强', '00', '', '13608005983', '0', '', '$2a$10$jIiDO3ighwg51nlJe4WbZet365ysf61KTuqrDNsF9YD90fHAMf9cy', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
167
+INSERT INTO sys_user VALUES (87, 111, '13540422960', '邹   霞', '00', '', '13540422960', '1', '', '$2a$10$JGmiiO3vjhEF5e2BXubE1uE/DRzpcmK3SMBZo/EDExsd8L9TWqEHm', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
168
+INSERT INTO sys_user VALUES (88, 111, '13488985627', '罗声燕', '00', '', '13488985627', '1', '', '$2a$10$.lFR.S8c/i3550O88zhk4OIyeYF2vmulknGqBvE/hi8b9id1RLNry', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
169
+INSERT INTO sys_user VALUES (89, 111, '18227609102', '王   琴', '00', '', '18227609102', '1', '', '$2a$10$hW41I3wMpnM.GiPO85jv3eyr6uJglfpj2SV/fU9etfXuBjHgIIveO', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
170
+INSERT INTO sys_user VALUES (90, 111, '15281034798', '李   静', '00', '', '15281034798', '1', '', '$2a$10$BIV.X9sgXwCLmnx0MjvbN.xnJ0d9mSv7Fe1HsB.d5UvqhYBux4aRK', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
171
+INSERT INTO sys_user VALUES (91, 111, '18380143305', '刘   垚', '00', '', '18380143305', '1', '', '$2a$10$9pXNh3pit.p.3lCv.1vIAeqm594O0y2ycUVTK5aXqbf1.DD9ckHr6', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
172
+INSERT INTO sys_user VALUES (92, 111, '15208298451', '李   杨', '00', '', '15208298451', '0', '', '$2a$10$K25fAdfUGilTZz9BHlKBnezcMkD/Pv.uJKM1H0/jn.cOOas5jDVea', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
173
+INSERT INTO sys_user VALUES (93, 111, '18990913384', '朱   姝', '00', '', '18990913384', '1', '', '$2a$10$GXcpkSxBeuM1tj66W6M50.YPQKMOccRTD64wikP5LuRW0PMhJ2Z5q', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
174
+INSERT INTO sys_user VALUES (94, 111, '18483229950', '唐   浩', '00', '', '18483229950', '0', '', '$2a$10$B..WW48a/JzGIgxdKoQEuu70YDGVmqJf/PV/WzcWjhatTZMA9Ch..', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
175
+INSERT INTO sys_user VALUES (95, 111, '15108355309', '张   韦', '00', '', '15108355309', '0', '', '$2a$10$2aepTeKqlbUhb1x6i0K88OxLlZohvIf5JZ2xhgZO8It5MagkvLHHC', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
176
+INSERT INTO sys_user VALUES (96, 111, '18108260500', '黄建春', '00', '', '18108260500', '0', '', '$2a$10$sfPuHSWY3AytrF7.o/cMAeXwb.GU1/wk4VJw4FLKgEnLNKlMdIRee', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
177
+INSERT INTO sys_user VALUES (97, 111, '13881755761', '廖绍毅', '00', '', '13881755761', '0', '', '$2a$10$g9/NOZbNS6eIcqnEg6Z2geNyQIMNJtTJrahTvIYeDis68GaQ.McJG', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
178
+INSERT INTO sys_user VALUES (98, 111, '15700353317', '杨   晶', '00', '', '15700353317', '0', '', '$2a$10$Efj2FINLArOIOgEKa3vqp.k0gpwmJKlWWlXwTrQmSIO2qsVlIWZAa', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
179
+INSERT INTO sys_user VALUES (99, 111, '13618069959', '蒋剑虹', '00', '', '13618069959', '0', '', '$2a$10$5osgmB9ZInuTYvyMUedKqe2aDJM91i/KjOxGWWCZb9WO/45U7Zok.', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
180
+INSERT INTO sys_user VALUES (100, 111, '13882487125', '赵明焱', '00', '', '13882487125', '0', '', '$2a$10$zs4QH/xd0JDuYgrftHUhRedB5SWCE.d7pdTxhUmdo/OYVxx2fSFWq', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
181
+INSERT INTO sys_user VALUES (101, 111, '18228226661', '董旭鹏', '00', '', '18228226661', '0', '', '$2a$10$yaBpFaISskiafcOa/k28VeSQSMiYhCxbtmMoXN/fruESTkMs4RwA6', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
182
+INSERT INTO sys_user VALUES (102, 111, '15775308748', '邓汶滨', '00', '', '15775308748', '0', '', '$2a$10$5L36DYl/Q.wmGKsolG/x0u4vnK78sVY59Qjx6fQA3z9n4dl62ykM.', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
183
+INSERT INTO sys_user VALUES (103, 112, '13688460154', '周   全', '00', '', '13688460154', '0', '', '$2a$10$TQMgM2lTRkeTB4YY5IHQ0.xvCGZlnd774UdWe.OPGElTkRuLAsEz6', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
184
+INSERT INTO sys_user VALUES (104, 112, '13688404696', '柏金川', '00', '', '13688404696', '0', '', '$2a$10$4ih05H.SB537jI2sHx756.hQvWBbm.4ViXs7HFKndjDQDCyvYz1rO', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
185
+INSERT INTO sys_user VALUES (105, 112, '13594658239', '黄安堂', '00', '', '13594658239', '0', '', '$2a$10$uSefDVQx.kottALOIZptjO0RnZhvITS4QTnXjSBJddqYfOftdZ8Pa', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
186
+INSERT INTO sys_user VALUES (106, 112, '13408566079', '李学勇', '00', '', '13408566079', '0', '', '$2a$10$8ru4dmjHBh21h8C3FTpdMeqsG4RHVyvqmqUFRFCDCUok2uH2ZLjiy', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
187
+INSERT INTO sys_user VALUES (107, 112, '15881283512', '陈俊恺', '00', '', '15881283512', '0', '', '$2a$10$eqX3G0LjlptoBsMefxIjXuzSEaq5opPJjzqoitrp4Dhun3u1o1F1i', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
188
+INSERT INTO sys_user VALUES (108, 112, '15883351306', '彭永红', '00', '', '15883351306', '0', '', '$2a$10$Tlq6UDINB73aeR8MCW6emOO7MHLRUGkTZ0ud/oNvTrJllwwDpxhGe', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
189
+INSERT INTO sys_user VALUES (109, 112, '18281010079', '邓   静', '00', '', '18281010079', '0', '', '$2a$10$pstdOImPwTHv54sONZEyBObA1RySMTJx2rx5btFUq6WF3qkkeP2Y6', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
190
+INSERT INTO sys_user VALUES (110, 112, '18328739381', '刘庆波', '00', '', '18328739381', '0', '', '$2a$10$p72rrc68EO/XkCYDVVTNDurHcg4z64VgyedcadnOiX7RWV2GU7pv.', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
191
+INSERT INTO sys_user VALUES (111, 112, '18205207306', '高   强', '00', '', '18205207306', '0', '', '$2a$10$p9WM4wlg34eq7yb9GAe.a.yvZhqsUBVQ.DIFIrBWZ5ufrUsu5oIKm', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
192
+INSERT INTO sys_user VALUES (112, 112, '18380411075', '韩兴国', '00', '', '18380411075', '0', '', '$2a$10$0RNiRPmnuFMvCbRsSAQ4COgX0GRbi304ZpcNuV/gzAoZFYwv1fNYS', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
193
+INSERT INTO sys_user VALUES (113, 112, '13693480782', '何   安', '00', '', '13693480782', '0', '', '$2a$10$vPcVlPiTH2nOO48/JTeXt.FpFoc9V407XxcCUmbt23Fe3pL5AvqYK', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
194
+INSERT INTO sys_user VALUES (114, 113, '18628072166', '李春生', '00', '', '18628072166', '0', '', '$2a$10$Nojkqmf0J0e2ZG/7H/RNAOLQvtoCgOB.zqf52oCXnbW7XlN6VzaOe', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
195
+INSERT INTO sys_user VALUES (115, 113, '13980688458', '段文祥', '00', '', '13980688458', '0', '', '$2a$10$4ETMsgQR7HcIjqmE3SXATOxud3L/tpPiYqt0GGRHsIB55WM4rR9Ry', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
196
+INSERT INTO sys_user VALUES (116, 113, '18980006770', '张   伟', '00', '', '18980006770', '0', '', '$2a$10$dtTx73vRXEnbuwbyt.Hm4uhDLRI07BOwgRMMx1/tZBBy9CFTb8Mw6', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
197
+INSERT INTO sys_user VALUES (117, 113, '15298033499', '万   明', '00', '', '15298033499', '0', '', '$2a$10$D9KhWl1cXJd7X8ejB8cZmODrpw.7CY0QROlXYc20zy/tyhGAbFZcW', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
198
+INSERT INTO sys_user VALUES (118, 113, '18345595350', '王雨地', '00', '', '18345595350', '0', '', '$2a$10$pwU00C244h.JM52gYAwXDemz8GD6G8QQL81ZIHHswR6owx3JJQzf2', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
199
+INSERT INTO sys_user VALUES (119, 113, '13881710080', '陈   兰', '00', '', '13881710080', '1', '', '$2a$10$sXVsn5kxi5rNd5mYJW.MrOKfY1YY/eFYYUNAm6f8A9Ak9JbF2Js0y', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
200
+INSERT INTO sys_user VALUES (120, 113, '18582552495', '张   可', '00', '', '18582552495', '0', '', '$2a$10$..LijGqYettSPi41oAdLnehfukhiYKPpI9t1EKaYhrTyuW/y.v.By', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
201
+INSERT INTO sys_user VALUES (121, 114, '13551823637', '李   锋', '00', '', '13551823637', '0', '', '$2a$10$/T1kLMSSFMAmoy4QhkTzFO1vVm8/csHuuaeAKsjeEx/w1d3SsA2pi', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
202
+INSERT INTO sys_user VALUES (122, 114, '13881397406', '张元锋', '00', '', '13881397406', '0', '', '$2a$10$3L/5ASJal42wccw7BhyIaOcedcj6IOadjnUGymzWH/kbYYQmA/K3y', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
203
+INSERT INTO sys_user VALUES (123, 114, '18602865330', '钱俊锦', '00', '', '18602865330', '0', '', '$2a$10$YuF2Yk6rCdCIu0c5Q6Uw4eBdh3vcTmbCpmETgd.FI.RVUVL.uTLEq', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
204
+INSERT INTO sys_user VALUES (124, 114, '17311677347', '陈   伟', '00', '', '17311677347', '0', '', '$2a$10$fbrbmyWNFA7aiCbOtCqaDONw7qDgdS4UZDS95BUOHJ88eUzVtr3/S', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
205
+INSERT INTO sys_user VALUES (125, 114, '13628057328', '薛   帅', '00', '', '13628057328', '0', '', '$2a$10$ND.pJthbdY1tY8LHYtJkpeADmaTDJNvwPClaERSAyKIcLd4xT5uyq', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
206
+INSERT INTO sys_user VALUES (126, 114, '18482173451', '冉凉南', '00', '', '18482173451', '0', '', '$2a$10$IyIeQtlKtZTNpidzX4R.7OOWt21XkMBiHZn92F/f8oT94QfMUKoA6', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
207
+INSERT INTO sys_user VALUES (127, 114, '18382319155', '谢承东', '00', '', '18382319155', '0', '', '$2a$10$AkWugwBKCG7oKIKPIn9mBOaFtuCtTw3cJvz78ryEMUTTjfG/fDYgy', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
208
+INSERT INTO sys_user VALUES (128, 114, '18227480379', '周   炎', '00', '', '18227480379', '0', '', '$2a$10$5e7lOXqGekSSu.rKKMQJYuLJc68RZllH2ebGFEr/He6cc2zsQJPzm', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
209
+INSERT INTO sys_user VALUES (129, 114, '18140430240', '胡   庆', '00', '', '18140430240', '0', '', '$2a$10$IckBbWNu8BS6JkdITuvMzu7G/Ztl.d.gbp1xwQqpgYDUEYEaxFUkS', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
210
+INSERT INTO sys_user VALUES (130, 114, '18780029464', '何   行', '00', '', '18780029464', '0', '', '$2a$10$0BpGvlJOqHQyM//wJh3lAO/7e/s.dys5iVCGu0K/qcjsLpgveK4ou', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
211
+INSERT INTO sys_user VALUES (131, 103, '18283500919', '杨良轩', '00', '', '18283500919', '0', '', '$2a$10$vUYbhAPQRZuj8S5cjvC5XODjTswaxbWr049ICezchhb4ueoNQ4S6i', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
212
+INSERT INTO sys_user VALUES (132, 103, '13880159142', '周建伟', '00', '', '13880159142', '0', '', '$2a$10$vY871WQd/F9BGNg1Ki2.VOYsT704ttmif5b3U1Aaj392CydaVTTfm', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
213
+INSERT INTO sys_user VALUES (133, 103, '13980809722', '罗友权', '00', '', '13980809722', '0', '', '$2a$10$/cL8xD1pFmFxLyehpr2x1e3n/8KqKG6lWaXdjyHyaZo37oCP4wfem', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
214
+INSERT INTO sys_user VALUES (134, 103, '15228916534', '凌   涛', '00', '', '15228916534', '0', '', '$2a$10$BdjU17zPn5JZpcyOBBK3X.GiQOdZfuRVmiljOJMde4/EJM67Zp7/C', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
215
+INSERT INTO sys_user VALUES (135, 103, '15928517280', '雷光泽', '00', '', '15928517280', '0', '', '$2a$10$soo68IbKDhCT0mhj.j0Nou2rsgVxLU78BsowMo7ZorasQj9FPf2OG', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
216
+INSERT INTO sys_user VALUES (136, 103, '15828156243', '廖   勇', '00', '', '15828156243', '0', '', '$2a$10$9QO6qXNSAiAtWFCXbvEeu.pHoBLHZig5ra.y2ZNRyRDxL0W4WU2Q2', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
217
+INSERT INTO sys_user VALUES (137, 103, '14726050305', '康科伟', '00', '', '14726050305', '0', '', '$2a$10$04.7zNYdTwXzlQ8J0SYNaOZMc.iarm2gBeD37na6.aAtuBzfnpnUO', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
218
+INSERT INTO sys_user VALUES (138, 103, '18111675896', '熊艳华', '00', '', '18111675896', '0', '', '$2a$10$uLfMqz3YfEuAO8TI0XOzE.Xn0FZA7U6zrfss6Xp.anF4xUZNXT37y', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
219
+INSERT INTO sys_user VALUES (139, 103, '18982085285', '赵永来', '00', '', '18982085285', '0', '', '$2a$10$TzKjV2T1FJ7YubxeIZZnmuLBsdppYlHoxruXCh0aBhHyV/yLGaiai', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
220
+INSERT INTO sys_user VALUES (140, 115, '15982167611', '刘   洋', '00', '', '15982167611', '0', '', '$2a$10$qxB0MTpLA7WzUhBpQlrC5u.7JymKt2bwAJ9gupwWQeKcANtov0qn.', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
221
+INSERT INTO sys_user VALUES (141, 115, '17345090038', '郑   鹏', '00', '', '17345090038', '0', '', '$2a$10$meTOhyDbWqzhrzCFDGM3hu.cOFwinewDE1Jp3YYR/ThYBvOssce7G', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
222
+INSERT INTO sys_user VALUES (142, 115, '17612894797', '黄   强', '00', '', '17612894797', '0', '', '$2a$10$JyofvRfiRj5Ug2G4ux00eOtMvQSOKu.tjo0.Juey2xMZSsAggVE76', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
223
+INSERT INTO sys_user VALUES (143, 116, '13980977233', '李   禺', '00', '', '13980977233', '0', '', '$2a$10$AiciBrz84EwU3G3KxW9bCOZXgxraa74RRzAvyetSEjC30Zvq2ooH2', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
224
+INSERT INTO sys_user VALUES (144, 116, '18602830814', '黄梅琳', '00', '', '18602830814', '1', '', '$2a$10$Ij6SqoLMDrpLBJ87rKqIh.8JDRNMROQQyHQSZV5wsUn7ybJ53ip86', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
225
+INSERT INTO sys_user VALUES (145, 116, '13488982667', '尹   超', '00', '', '13488982667', '0', '', '$2a$10$F.REC7OQ2uNCFeUOpopqaeSsDn9MR/a01G4TTG.uaCgq2OukjBXrO', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
226
+INSERT INTO sys_user VALUES (146, 116, '15881108097', '程   昊', '00', '', '15881108097', '0', '', '$2a$10$y1Z2H5Wp4yhdnmHcNO7U6u9108qE/uxqQ7OVumAtVLlgDbj/ZWo/.', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
227
+INSERT INTO sys_user VALUES (147, 116, '15928663470', '丁   亮', '00', '', '15928663470', '0', '', '$2a$10$WYBOgIm.Y.LNSEKs3VPaX.1JpD.VLodHuug5wOeX636vln31SHII2', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
228
+INSERT INTO sys_user VALUES (148, 117, '13880644169', '林方迁', '00', '', '13880644169', '0', '', '$2a$10$VPrToUrklp3J3NtnHAy7VulN9Eck4eTuII4xmXh.JKOue9BN91Tq.', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
229
+INSERT INTO sys_user VALUES (149, 117, '18140055216', '杨   柳', '00', '', '18140055216', '1', '', '$2a$10$K1WECO/2G5tAKCr3h16CzeypD2CSVjq1MWdk1FLjhnAKD2SwanrT6', '0', '0', '', NULL, NULL, '2024-01-04 17:22:48', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
70 230
 
71 231
 
72 232
 -- ----------------------------
@@ -91,10 +251,33 @@ create table sys_post
91 251
 -- ----------------------------
92 252
 -- 初始化-岗位信息表数据
93 253
 -- ----------------------------
94
-insert into sys_post values(1, 'ceo',  '董事长',    1, '0', 'admin', sysdate(), '', null, '');
95
-insert into sys_post values(2, 'se',   '项目经理',  2, '0', 'admin', sysdate(), '', null, '');
96
-insert into sys_post values(3, 'hr',   '人力资源',  3, '0', 'admin', sysdate(), '', null, '');
97
-insert into sys_post values(4, 'user', '普通员工',  4, '0', 'admin', sysdate(), '', null, '');
254
+INSERT INTO sys_post VALUES (1, '1', '董事长', 1, '0', 'admin', '2024-01-04 14:21:52', NULL, NULL, NULL);
255
+INSERT INTO sys_post VALUES (2, '2', '总经理', 2, '0', 'admin', '2024-01-04 14:22:52', NULL, NULL, NULL);
256
+INSERT INTO sys_post VALUES (3, '3', '董事', 3, '0', 'admin', '2024-01-04 14:32:11', NULL, NULL, NULL);
257
+INSERT INTO sys_post VALUES (4, '4', '总支书记', 4, '0', 'admin', '2024-01-04 14:34:43', NULL, NULL, NULL);
258
+INSERT INTO sys_post VALUES (5, '5', '高级顾问', 5, '0', 'admin', '2024-01-04 14:35:34', NULL, NULL, NULL);
259
+INSERT INTO sys_post VALUES (6, '6', '副总经理', 6, '0', 'admin', '2024-01-04 14:35:48', NULL, NULL, NULL);
260
+INSERT INTO sys_post VALUES (7, '7', '秘书', 7, '0', 'admin', '2024-01-04 14:36:08', NULL, NULL, NULL);
261
+INSERT INTO sys_post VALUES (8, '8', '总支干事', 8, '0', 'admin', '2024-01-04 14:37:29', NULL, NULL, NULL);
262
+INSERT INTO sys_post VALUES (9, '9', '总工程师', 9, '0', 'admin', '2024-01-04 14:37:43', NULL, NULL, NULL);
263
+INSERT INTO sys_post VALUES (10, '10', '总经理助理', 10, '0', 'admin', '2024-01-04 14:38:00', NULL, NULL, NULL);
264
+INSERT INTO sys_post VALUES (11, '11', '副总工程师', 11, '0', 'admin', '2024-01-04 14:42:07', NULL, NULL, NULL);
265
+INSERT INTO sys_post VALUES (12, '12', '主任', 12, '0', 'admin', '2024-01-04 14:39:20', NULL, NULL, NULL);
266
+INSERT INTO sys_post VALUES (13, '13', '副主任', 13, '0', 'admin', '2024-01-04 14:39:34', NULL, NULL, NULL);
267
+INSERT INTO sys_post VALUES (14, '14', '专总', 14, '0', 'admin', '2024-01-04 14:40:44', NULL, NULL, NULL);
268
+INSERT INTO sys_post VALUES (15, '15', '经理', 15, '0', 'admin', '2024-01-04 14:48:57', NULL, NULL, NULL);
269
+INSERT INTO sys_post VALUES (16, '16', '副经理', 16, '0', 'admin', '2024-01-04 16:50:16', '', NULL, NULL);
270
+INSERT INTO sys_post VALUES (17, '17', '项目主任', 17, '0', 'admin', '2024-01-04 16:49:08', '', NULL, NULL);
271
+INSERT INTO sys_post VALUES (18, '18', '项目副主任', 18, '0', 'admin', '2024-01-04 16:49:58', '', NULL, NULL);
272
+INSERT INTO sys_post VALUES (19, '19', '专职安全员', 19, '0', 'admin', '2024-01-04 15:32:52', '', NULL, NULL);
273
+INSERT INTO sys_post VALUES (20, '20', '工会干事', 20, '0', 'admin', '2024-01-04 14:49:48', NULL, NULL, NULL);
274
+INSERT INTO sys_post VALUES (21, '21', '业务主管', 21, '0', 'admin', '2024-01-04 14:50:20', NULL, NULL, NULL);
275
+INSERT INTO sys_post VALUES (22, '22', '业务助理', 22, '0', 'admin', '2024-01-04 14:51:41', NULL, NULL, NULL);
276
+INSERT INTO sys_post VALUES (23, '23', '文秘、办事员', 23, '0', 'admin', '2024-01-04 14:52:29', NULL, NULL, NULL);
277
+INSERT INTO sys_post VALUES (24, '24', '会计', 24, '0', 'admin', '2024-01-04 14:53:13', NULL, NULL, NULL);
278
+INSERT INTO sys_post VALUES (25, '25', '出纳', 25, '0', 'admin', '2024-01-04 14:53:27', NULL, NULL, NULL);
279
+INSERT INTO sys_post VALUES (26, '26', '员工', 26, '0', 'admin', '2024-01-04 14:53:34', NULL, NULL, NULL);
280
+INSERT INTO sys_post VALUES (27, '27', '驾驶员', 27, '0', 'admin', '2024-01-04 14:53:50', NULL, NULL, NULL);
98 281
 
99 282
 
100 283
 -- ----------------------------
@@ -272,8 +455,155 @@ create table sys_user_role (
272 455
 -- ----------------------------
273 456
 -- 初始化-用户和角色关联表数据
274 457
 -- ----------------------------
275
-insert into sys_user_role values ('1', '1');
276
-insert into sys_user_role values ('2', '2');
458
+insert into sys_user_role values (1, 1);
459
+insert into sys_user_role values (2, 2);
460
+insert into sys_user_role values (3, 2);
461
+insert into sys_user_role values (4, 2);
462
+insert into sys_user_role values (5, 2);
463
+insert into sys_user_role values (6, 2);
464
+insert into sys_user_role values (7, 2);
465
+insert into sys_user_role values (8, 2);
466
+insert into sys_user_role values (9, 2);
467
+insert into sys_user_role values (10, 2);
468
+insert into sys_user_role values (11, 2);
469
+insert into sys_user_role values (12, 2);
470
+insert into sys_user_role values (13, 2);
471
+insert into sys_user_role values (14, 2);
472
+insert into sys_user_role values (15, 2);
473
+insert into sys_user_role values (16, 2);
474
+insert into sys_user_role values (17, 2);
475
+insert into sys_user_role values (18, 2);
476
+insert into sys_user_role values (19, 2);
477
+insert into sys_user_role values (20, 2);
478
+insert into sys_user_role values (21, 2);
479
+insert into sys_user_role values (22, 2);
480
+insert into sys_user_role values (23, 2);
481
+insert into sys_user_role values (24, 2);
482
+insert into sys_user_role values (25, 2);
483
+insert into sys_user_role values (26, 2);
484
+insert into sys_user_role values (27, 2);
485
+insert into sys_user_role values (28, 2);
486
+insert into sys_user_role values (29, 2);
487
+insert into sys_user_role values (30, 2);
488
+insert into sys_user_role values (31, 2);
489
+insert into sys_user_role values (32, 2);
490
+insert into sys_user_role values (33, 2);
491
+insert into sys_user_role values (34, 2);
492
+insert into sys_user_role values (35, 2);
493
+insert into sys_user_role values (36, 2);
494
+insert into sys_user_role values (37, 2);
495
+insert into sys_user_role values (38, 2);
496
+insert into sys_user_role values (39, 2);
497
+insert into sys_user_role values (40, 2);
498
+insert into sys_user_role values (41, 2);
499
+insert into sys_user_role values (42, 2);
500
+insert into sys_user_role values (43, 2);
501
+insert into sys_user_role values (44, 2);
502
+insert into sys_user_role values (45, 2);
503
+insert into sys_user_role values (46, 2);
504
+insert into sys_user_role values (47, 2);
505
+insert into sys_user_role values (48, 2);
506
+insert into sys_user_role values (49, 2);
507
+insert into sys_user_role values (50, 2);
508
+insert into sys_user_role values (51, 2);
509
+insert into sys_user_role values (52, 2);
510
+insert into sys_user_role values (53, 2);
511
+insert into sys_user_role values (54, 2);
512
+insert into sys_user_role values (55, 2);
513
+insert into sys_user_role values (56, 2);
514
+insert into sys_user_role values (57, 2);
515
+insert into sys_user_role values (58, 2);
516
+insert into sys_user_role values (59, 2);
517
+insert into sys_user_role values (60, 2);
518
+insert into sys_user_role values (61, 2);
519
+insert into sys_user_role values (62, 2);
520
+insert into sys_user_role values (63, 2);
521
+insert into sys_user_role values (64, 2);
522
+insert into sys_user_role values (65, 2);
523
+insert into sys_user_role values (66, 2);
524
+insert into sys_user_role values (67, 2);
525
+insert into sys_user_role values (68, 2);
526
+insert into sys_user_role values (69, 2);
527
+insert into sys_user_role values (70, 2);
528
+insert into sys_user_role values (71, 2);
529
+insert into sys_user_role values (72, 2);
530
+insert into sys_user_role values (73, 2);
531
+insert into sys_user_role values (74, 2);
532
+insert into sys_user_role values (75, 2);
533
+insert into sys_user_role values (76, 2);
534
+insert into sys_user_role values (77, 2);
535
+insert into sys_user_role values (78, 2);
536
+insert into sys_user_role values (79, 2);
537
+insert into sys_user_role values (80, 2);
538
+insert into sys_user_role values (81, 2);
539
+insert into sys_user_role values (82, 2);
540
+insert into sys_user_role values (83, 2);
541
+insert into sys_user_role values (84, 2);
542
+insert into sys_user_role values (85, 2);
543
+insert into sys_user_role values (86, 2);
544
+insert into sys_user_role values (87, 2);
545
+insert into sys_user_role values (88, 2);
546
+insert into sys_user_role values (89, 2);
547
+insert into sys_user_role values (90, 2);
548
+insert into sys_user_role values (91, 2);
549
+insert into sys_user_role values (92, 2);
550
+insert into sys_user_role values (93, 2);
551
+insert into sys_user_role values (94, 2);
552
+insert into sys_user_role values (95, 2);
553
+insert into sys_user_role values (96, 2);
554
+insert into sys_user_role values (97, 2);
555
+insert into sys_user_role values (98, 2);
556
+insert into sys_user_role values (99, 2);
557
+insert into sys_user_role values (100, 2);
558
+insert into sys_user_role values (101, 2);
559
+insert into sys_user_role values (102, 2);
560
+insert into sys_user_role values (103, 2);
561
+insert into sys_user_role values (104, 2);
562
+insert into sys_user_role values (105, 2);
563
+insert into sys_user_role values (106, 2);
564
+insert into sys_user_role values (107, 2);
565
+insert into sys_user_role values (108, 2);
566
+insert into sys_user_role values (109, 2);
567
+insert into sys_user_role values (110, 2);
568
+insert into sys_user_role values (111, 2);
569
+insert into sys_user_role values (112, 2);
570
+insert into sys_user_role values (113, 2);
571
+insert into sys_user_role values (114, 2);
572
+insert into sys_user_role values (115, 2);
573
+insert into sys_user_role values (116, 2);
574
+insert into sys_user_role values (117, 2);
575
+insert into sys_user_role values (118, 2);
576
+insert into sys_user_role values (119, 2);
577
+insert into sys_user_role values (120, 2);
578
+insert into sys_user_role values (121, 2);
579
+insert into sys_user_role values (122, 2);
580
+insert into sys_user_role values (123, 2);
581
+insert into sys_user_role values (124, 2);
582
+insert into sys_user_role values (125, 2);
583
+insert into sys_user_role values (126, 2);
584
+insert into sys_user_role values (127, 2);
585
+insert into sys_user_role values (128, 2);
586
+insert into sys_user_role values (129, 2);
587
+insert into sys_user_role values (130, 2);
588
+insert into sys_user_role values (131, 2);
589
+insert into sys_user_role values (132, 2);
590
+insert into sys_user_role values (133, 2);
591
+insert into sys_user_role values (134, 2);
592
+insert into sys_user_role values (135, 2);
593
+insert into sys_user_role values (136, 2);
594
+insert into sys_user_role values (137, 2);
595
+insert into sys_user_role values (138, 2);
596
+insert into sys_user_role values (139, 2);
597
+insert into sys_user_role values (140, 2);
598
+insert into sys_user_role values (141, 2);
599
+insert into sys_user_role values (142, 2);
600
+insert into sys_user_role values (143, 2);
601
+insert into sys_user_role values (144, 2);
602
+insert into sys_user_role values (145, 2);
603
+insert into sys_user_role values (146, 2);
604
+insert into sys_user_role values (147, 2);
605
+insert into sys_user_role values (148, 2);
606
+insert into sys_user_role values (149, 2);
277 607
 
278 608
 
279 609
 -- ----------------------------
@@ -407,8 +737,162 @@ create table sys_user_post
407 737
 -- ----------------------------
408 738
 -- 初始化-用户与岗位关联表数据
409 739
 -- ----------------------------
410
-insert into sys_user_post values ('1', '1');
411
-insert into sys_user_post values ('2', '2');
740
+INSERT INTO sys_user_post VALUES (1, 1);
741
+INSERT INTO sys_user_post VALUES (2, 1);
742
+INSERT INTO sys_user_post VALUES (2, 2);
743
+INSERT INTO sys_user_post VALUES (3, 3);
744
+INSERT INTO sys_user_post VALUES (4, 4);
745
+INSERT INTO sys_user_post VALUES (5, 5);
746
+INSERT INTO sys_user_post VALUES (6, 5);
747
+INSERT INTO sys_user_post VALUES (7, 6);
748
+INSERT INTO sys_user_post VALUES (8, 7);
749
+INSERT INTO sys_user_post VALUES (8, 8);
750
+INSERT INTO sys_user_post VALUES (8, 12);
751
+INSERT INTO sys_user_post VALUES (9, 9);
752
+INSERT INTO sys_user_post VALUES (10, 6);
753
+INSERT INTO sys_user_post VALUES (11, 6);
754
+INSERT INTO sys_user_post VALUES (12, 6);
755
+INSERT INTO sys_user_post VALUES (13, 10);
756
+INSERT INTO sys_user_post VALUES (13, 12);
757
+INSERT INTO sys_user_post VALUES (14, 10);
758
+INSERT INTO sys_user_post VALUES (14, 12);
759
+INSERT INTO sys_user_post VALUES (15, 19);
760
+INSERT INTO sys_user_post VALUES (16, 23);
761
+INSERT INTO sys_user_post VALUES (17, 23);
762
+INSERT INTO sys_user_post VALUES (18, 23);
763
+INSERT INTO sys_user_post VALUES (19, 23);
764
+INSERT INTO sys_user_post VALUES (20, 13);
765
+INSERT INTO sys_user_post VALUES (21, 13);
766
+INSERT INTO sys_user_post VALUES (22, 20);
767
+INSERT INTO sys_user_post VALUES (22, 23);
768
+INSERT INTO sys_user_post VALUES (23, 23);
769
+INSERT INTO sys_user_post VALUES (24, 23);
770
+INSERT INTO sys_user_post VALUES (25, 23);
771
+INSERT INTO sys_user_post VALUES (26, 23);
772
+INSERT INTO sys_user_post VALUES (27, 23);
773
+INSERT INTO sys_user_post VALUES (28, 25);
774
+INSERT INTO sys_user_post VALUES (29, 24);
775
+INSERT INTO sys_user_post VALUES (30, 24);
776
+INSERT INTO sys_user_post VALUES (31, 25);
777
+INSERT INTO sys_user_post VALUES (32, 12);
778
+INSERT INTO sys_user_post VALUES (33, 13);
779
+INSERT INTO sys_user_post VALUES (34, 11);
780
+INSERT INTO sys_user_post VALUES (35, 21);
781
+INSERT INTO sys_user_post VALUES (36, 21);
782
+INSERT INTO sys_user_post VALUES (37, 23);
783
+INSERT INTO sys_user_post VALUES (38, 21);
784
+INSERT INTO sys_user_post VALUES (39, 12);
785
+INSERT INTO sys_user_post VALUES (40, 13);
786
+INSERT INTO sys_user_post VALUES (41, 26);
787
+INSERT INTO sys_user_post VALUES (42, 26);
788
+INSERT INTO sys_user_post VALUES (43, 26);
789
+INSERT INTO sys_user_post VALUES (44, 26);
790
+INSERT INTO sys_user_post VALUES (45, 12);
791
+INSERT INTO sys_user_post VALUES (46, 26);
792
+INSERT INTO sys_user_post VALUES (47, 26);
793
+INSERT INTO sys_user_post VALUES (48, 26);
794
+INSERT INTO sys_user_post VALUES (49, 26);
795
+INSERT INTO sys_user_post VALUES (50, 26);
796
+INSERT INTO sys_user_post VALUES (51, 26);
797
+INSERT INTO sys_user_post VALUES (52, 11);
798
+INSERT INTO sys_user_post VALUES (52, 12);
799
+INSERT INTO sys_user_post VALUES (53, 11);
800
+INSERT INTO sys_user_post VALUES (54, 11);
801
+INSERT INTO sys_user_post VALUES (55, 14);
802
+INSERT INTO sys_user_post VALUES (56, 14);
803
+INSERT INTO sys_user_post VALUES (57, 26);
804
+INSERT INTO sys_user_post VALUES (58, 26);
805
+INSERT INTO sys_user_post VALUES (59, 26);
806
+INSERT INTO sys_user_post VALUES (60, 26);
807
+INSERT INTO sys_user_post VALUES (61, 26);
808
+INSERT INTO sys_user_post VALUES (62, 26);
809
+INSERT INTO sys_user_post VALUES (63, 13);
810
+INSERT INTO sys_user_post VALUES (64, 13);
811
+INSERT INTO sys_user_post VALUES (65, 26);
812
+INSERT INTO sys_user_post VALUES (66, 26);
813
+INSERT INTO sys_user_post VALUES (67, 26);
814
+INSERT INTO sys_user_post VALUES (68, 26);
815
+INSERT INTO sys_user_post VALUES (69, 26);
816
+INSERT INTO sys_user_post VALUES (70, 26);
817
+INSERT INTO sys_user_post VALUES (71, 26);
818
+INSERT INTO sys_user_post VALUES (72, 26);
819
+INSERT INTO sys_user_post VALUES (73, 26);
820
+INSERT INTO sys_user_post VALUES (74, 26);
821
+INSERT INTO sys_user_post VALUES (75, 26);
822
+INSERT INTO sys_user_post VALUES (76, 26);
823
+INSERT INTO sys_user_post VALUES (77, 26);
824
+INSERT INTO sys_user_post VALUES (78, 26);
825
+INSERT INTO sys_user_post VALUES (79, 26);
826
+INSERT INTO sys_user_post VALUES (80, 26);
827
+INSERT INTO sys_user_post VALUES (81, 26);
828
+INSERT INTO sys_user_post VALUES (82, 26);
829
+INSERT INTO sys_user_post VALUES (83, 26);
830
+INSERT INTO sys_user_post VALUES (84, 12);
831
+INSERT INTO sys_user_post VALUES (85, 13);
832
+INSERT INTO sys_user_post VALUES (86, 26);
833
+INSERT INTO sys_user_post VALUES (87, 26);
834
+INSERT INTO sys_user_post VALUES (88, 26);
835
+INSERT INTO sys_user_post VALUES (89, 26);
836
+INSERT INTO sys_user_post VALUES (90, 26);
837
+INSERT INTO sys_user_post VALUES (91, 26);
838
+INSERT INTO sys_user_post VALUES (92, 26);
839
+INSERT INTO sys_user_post VALUES (93, 26);
840
+INSERT INTO sys_user_post VALUES (94, 26);
841
+INSERT INTO sys_user_post VALUES (95, 26);
842
+INSERT INTO sys_user_post VALUES (96, 26);
843
+INSERT INTO sys_user_post VALUES (97, 26);
844
+INSERT INTO sys_user_post VALUES (98, 26);
845
+INSERT INTO sys_user_post VALUES (99, 26);
846
+INSERT INTO sys_user_post VALUES (100, 26);
847
+INSERT INTO sys_user_post VALUES (101, 26);
848
+INSERT INTO sys_user_post VALUES (102, 26);
849
+INSERT INTO sys_user_post VALUES (103, 12);
850
+INSERT INTO sys_user_post VALUES (104, 13);
851
+INSERT INTO sys_user_post VALUES (105, 26);
852
+INSERT INTO sys_user_post VALUES (106, 26);
853
+INSERT INTO sys_user_post VALUES (107, 26);
854
+INSERT INTO sys_user_post VALUES (108, 26);
855
+INSERT INTO sys_user_post VALUES (109, 26);
856
+INSERT INTO sys_user_post VALUES (110, 26);
857
+INSERT INTO sys_user_post VALUES (111, 26);
858
+INSERT INTO sys_user_post VALUES (112, 26);
859
+INSERT INTO sys_user_post VALUES (113, 26);
860
+INSERT INTO sys_user_post VALUES (114, 15);
861
+INSERT INTO sys_user_post VALUES (115, 26);
862
+INSERT INTO sys_user_post VALUES (116, 26);
863
+INSERT INTO sys_user_post VALUES (117, 26);
864
+INSERT INTO sys_user_post VALUES (118, 26);
865
+INSERT INTO sys_user_post VALUES (119, 26);
866
+INSERT INTO sys_user_post VALUES (120, 26);
867
+INSERT INTO sys_user_post VALUES (121, 17);
868
+INSERT INTO sys_user_post VALUES (122, 17);
869
+INSERT INTO sys_user_post VALUES (123, 18);
870
+INSERT INTO sys_user_post VALUES (124, 26);
871
+INSERT INTO sys_user_post VALUES (125, 26);
872
+INSERT INTO sys_user_post VALUES (126, 26);
873
+INSERT INTO sys_user_post VALUES (127, 26);
874
+INSERT INTO sys_user_post VALUES (128, 26);
875
+INSERT INTO sys_user_post VALUES (129, 26);
876
+INSERT INTO sys_user_post VALUES (130, 26);
877
+INSERT INTO sys_user_post VALUES (131, 27);
878
+INSERT INTO sys_user_post VALUES (132, 27);
879
+INSERT INTO sys_user_post VALUES (133, 27);
880
+INSERT INTO sys_user_post VALUES (134, 27);
881
+INSERT INTO sys_user_post VALUES (135, 27);
882
+INSERT INTO sys_user_post VALUES (136, 27);
883
+INSERT INTO sys_user_post VALUES (137, 27);
884
+INSERT INTO sys_user_post VALUES (138, 27);
885
+INSERT INTO sys_user_post VALUES (139, 27);
886
+INSERT INTO sys_user_post VALUES (140, 16);
887
+INSERT INTO sys_user_post VALUES (141, 26);
888
+INSERT INTO sys_user_post VALUES (142, 26);
889
+INSERT INTO sys_user_post VALUES (143, 1);
890
+INSERT INTO sys_user_post VALUES (144, 2);
891
+INSERT INTO sys_user_post VALUES (145, 26);
892
+INSERT INTO sys_user_post VALUES (146, 26);
893
+INSERT INTO sys_user_post VALUES (147, 26);
894
+INSERT INTO sys_user_post VALUES (148, 26);
895
+INSERT INTO sys_user_post VALUES (149, 26);
412 896
 
413 897
 
414 898
 -- ----------------------------
@@ -469,7 +953,13 @@ insert into sys_dict_type values(7,  '通知类型', 'sys_notice_type',     '0',
469 953
 insert into sys_dict_type values(8,  '通知状态', 'sys_notice_status',   '0', 'admin', sysdate(), '', null, '通知状态列表');
470 954
 insert into sys_dict_type values(9,  '操作类型', 'sys_oper_type',       '0', 'admin', sysdate(), '', null, '操作类型列表');
471 955
 insert into sys_dict_type values(10, '系统状态', 'sys_common_status',   '0', 'admin', sysdate(), '', null, '登录状态列表');
472
-
956
+insert into sys_dict_type values (11, '项目经理级别', 'sys_user_pmlevel', '0', 'admin', '2024-01-08 15:42:02', '', null, null);
957
+insert into sys_dict_type values (12, '岗位级别', 'sys_user_engineerlevel', '0', 'admin', '2024-01-08 15:43:30', '', null, null);
958
+insert into sys_dict_type values (13, '技术职称', 'sys_user_titles', '0', 'admin', '2024-01-08 15:47:47', '', null, null);
959
+insert into sys_dict_type values (14, '考核等级', 'cmc_accessment', '0', 'admin', '2024-01-08 15:58:22', '', null, null);
960
+insert into sys_dict_type values (15, '技能掌握', 'cmc_skill', '0', 'admin', '2024-01-08 16:07:43', '', null, null);
961
+insert into sys_dict_type values (16, '工作量', 'cmc_workload', '0', 'admin', '2024-01-08 16:08:51', '', null, null);
962
+insert into sys_dict_type values (17, '承担角色', 'cmc_role', '0', 'admin', '2024-01-08 16:10:07', '', null, null);
473 963
 
474 964
 -- ----------------------------
475 965
 -- 12、字典数据表
@@ -494,35 +984,95 @@ create table sys_dict_data
494 984
   primary key (dict_code)
495 985
 ) engine=innodb auto_increment=100 comment = '字典数据表';
496 986
 
497
-insert into sys_dict_data values(1,  1,  '男',       '0',       'sys_user_sex',        '',   '',        'Y', '0', 'admin', sysdate(), '', null, '性别男');
498
-insert into sys_dict_data values(2,  2,  '女',       '1',       'sys_user_sex',        '',   '',        'N', '0', 'admin', sysdate(), '', null, '性别女');
499
-insert into sys_dict_data values(3,  3,  '未知',     '2',       'sys_user_sex',        '',   '',        'N', '0', 'admin', sysdate(), '', null, '性别未知');
500
-insert into sys_dict_data values(4,  1,  '显示',     '0',       'sys_show_hide',       '',   'primary', 'Y', '0', 'admin', sysdate(), '', null, '显示菜单');
501
-insert into sys_dict_data values(5,  2,  '隐藏',     '1',       'sys_show_hide',       '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '隐藏菜单');
502
-insert into sys_dict_data values(6,  1,  '正常',     '0',       'sys_normal_disable',  '',   'primary', 'Y', '0', 'admin', sysdate(), '', null, '正常状态');
503
-insert into sys_dict_data values(7,  2,  '停用',     '1',       'sys_normal_disable',  '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '停用状态');
504
-insert into sys_dict_data values(8,  1,  '正常',     '0',       'sys_job_status',      '',   'primary', 'Y', '0', 'admin', sysdate(), '', null, '正常状态');
505
-insert into sys_dict_data values(9,  2,  '暂停',     '1',       'sys_job_status',      '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '停用状态');
506
-insert into sys_dict_data values(10, 1,  '默认',     'DEFAULT', 'sys_job_group',       '',   '',        'Y', '0', 'admin', sysdate(), '', null, '默认分组');
507
-insert into sys_dict_data values(11, 2,  '系统',     'SYSTEM',  'sys_job_group',       '',   '',        'N', '0', 'admin', sysdate(), '', null, '系统分组');
508
-insert into sys_dict_data values(12, 1,  '是',       'Y',       'sys_yes_no',          '',   'primary', 'Y', '0', 'admin', sysdate(), '', null, '系统默认是');
509
-insert into sys_dict_data values(13, 2,  '否',       'N',       'sys_yes_no',          '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '系统默认否');
510
-insert into sys_dict_data values(14, 1,  '通知',     '1',       'sys_notice_type',     '',   'warning', 'Y', '0', 'admin', sysdate(), '', null, '通知');
511
-insert into sys_dict_data values(15, 2,  '公告',     '2',       'sys_notice_type',     '',   'success', 'N', '0', 'admin', sysdate(), '', null, '公告');
512
-insert into sys_dict_data values(16, 1,  '正常',     '0',       'sys_notice_status',   '',   'primary', 'Y', '0', 'admin', sysdate(), '', null, '正常状态');
513
-insert into sys_dict_data values(17, 2,  '关闭',     '1',       'sys_notice_status',   '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '关闭状态');
514
-insert into sys_dict_data values(18, 99, '其他',     '0',       'sys_oper_type',       '',   'info',    'N', '0', 'admin', sysdate(), '', null, '其他操作');
515
-insert into sys_dict_data values(19, 1,  '新增',     '1',       'sys_oper_type',       '',   'info',    'N', '0', 'admin', sysdate(), '', null, '新增操作');
516
-insert into sys_dict_data values(20, 2,  '修改',     '2',       'sys_oper_type',       '',   'info',    'N', '0', 'admin', sysdate(), '', null, '修改操作');
517
-insert into sys_dict_data values(21, 3,  '删除',     '3',       'sys_oper_type',       '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '删除操作');
518
-insert into sys_dict_data values(22, 4,  '授权',     '4',       'sys_oper_type',       '',   'primary', 'N', '0', 'admin', sysdate(), '', null, '授权操作');
519
-insert into sys_dict_data values(23, 5,  '导出',     '5',       'sys_oper_type',       '',   'warning', 'N', '0', 'admin', sysdate(), '', null, '导出操作');
520
-insert into sys_dict_data values(24, 6,  '导入',     '6',       'sys_oper_type',       '',   'warning', 'N', '0', 'admin', sysdate(), '', null, '导入操作');
521
-insert into sys_dict_data values(25, 7,  '强退',     '7',       'sys_oper_type',       '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '强退操作');
522
-insert into sys_dict_data values(26, 8,  '生成代码', '8',       'sys_oper_type',       '',   'warning', 'N', '0', 'admin', sysdate(), '', null, '生成操作');
523
-insert into sys_dict_data values(27, 9,  '清空数据', '9',       'sys_oper_type',       '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '清空操作');
524
-insert into sys_dict_data values(28, 1,  '成功',     '0',       'sys_common_status',   '',   'primary', 'N', '0', 'admin', sysdate(), '', null, '正常状态');
525
-insert into sys_dict_data values(29, 2,  '失败',     '1',       'sys_common_status',   '',   'danger',  'N', '0', 'admin', sysdate(), '', null, '停用状态');
987
+insert into sys_dict_data values (1, 1, '男', '0', 'sys_user_sex', '', '', 'Y', '0', 'admin', '2022-12-11 16:51:52', '', null, '性别男');
988
+insert into sys_dict_data values (2, 2, '女', '1', 'sys_user_sex', '', '', 'N', '0', 'admin', '2022-12-11 16:51:52', '', null, '性别女');
989
+insert into sys_dict_data values (3, 3, '未知', '2', 'sys_user_sex', '', '', 'N', '0', 'admin', '2022-12-11 16:51:52', '', null, '性别未知');
990
+insert into sys_dict_data values (4, 1, '显示', '0', 'sys_show_hide', '', 'primary', 'Y', '0', 'admin', '2022-12-11 16:51:52', '', null, '显示菜单');
991
+insert into sys_dict_data values (5, 2, '隐藏', '1', 'sys_show_hide', '', 'danger', 'N', '0', 'admin', '2022-12-11 16:51:52', '', null, '隐藏菜单');
992
+insert into sys_dict_data values (6, 1, '正常', '0', 'sys_normal_disable', '', 'primary', 'Y', '0', 'admin', '2022-12-11 16:51:52', '', null, '正常状态');
993
+insert into sys_dict_data values (7, 2, '停用', '1', 'sys_normal_disable', '', 'danger', 'N', '0', 'admin', '2022-12-11 16:51:52', '', null, '停用状态');
994
+insert into sys_dict_data values (8, 1, '正常', '0', 'sys_job_status', '', 'primary', 'Y', '0', 'admin', '2022-12-11 16:51:52', '', null, '正常状态');
995
+insert into sys_dict_data values (9, 2, '暂停', '1', 'sys_job_status', '', 'danger', 'N', '0', 'admin', '2022-12-11 16:51:52', '', null, '停用状态');
996
+insert into sys_dict_data values (10, 1, '默认', 'DEFAULT', 'sys_job_group', '', '', 'Y', '0', 'admin', '2022-12-11 16:51:52', '', null, '默认分组');
997
+insert into sys_dict_data values (11, 2, '系统', 'SYSTEM', 'sys_job_group', '', '', 'N', '0', 'admin', '2022-12-11 16:51:52', '', null, '系统分组');
998
+insert into sys_dict_data values (12, 1, '是', 'Y', 'sys_yes_no', '', 'primary', 'Y', '0', 'admin', '2022-12-11 16:51:52', '', null, '系统默认是');
999
+insert into sys_dict_data values (13, 2, '否', 'N', 'sys_yes_no', '', 'danger', 'N', '0', 'admin', '2022-12-11 16:51:52', '', null, '系统默认否');
1000
+insert into sys_dict_data values (14, 1, '通知', '1', 'sys_notice_type', '', 'warning', 'Y', '0', 'admin', '2022-12-11 16:51:52', '', null, '通知');
1001
+insert into sys_dict_data values (15, 2, '公告', '2', 'sys_notice_type', '', 'success', 'N', '0', 'admin', '2022-12-11 16:51:52', '', null, '公告');
1002
+insert into sys_dict_data values (16, 1, '正常', '0', 'sys_notice_status', '', 'primary', 'Y', '0', 'admin', '2022-12-11 16:51:52', '', null, '正常状态');
1003
+insert into sys_dict_data values (17, 2, '关闭', '1', 'sys_notice_status', '', 'danger', 'N', '0', 'admin', '2022-12-11 16:51:52', '', null, '关闭状态');
1004
+insert into sys_dict_data values (18, 99, '其他', '0', 'sys_oper_type', '', 'info', 'N', '0', 'admin', '2022-12-11 16:51:52', '', null, '其他操作');
1005
+insert into sys_dict_data values (19, 1, '新增', '1', 'sys_oper_type', '', 'info', 'N', '0', 'admin', '2022-12-11 16:51:52', '', null, '新增操作');
1006
+insert into sys_dict_data values (20, 2, '修改', '2', 'sys_oper_type', '', 'info', 'N', '0', 'admin', '2022-12-11 16:51:52', '', null, '修改操作');
1007
+insert into sys_dict_data values (21, 3, '删除', '3', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', '2022-12-11 16:51:52', '', null, '删除操作');
1008
+insert into sys_dict_data values (22, 4, '授权', '4', 'sys_oper_type', '', 'primary', 'N', '0', 'admin', '2022-12-11 16:51:52', '', null, '授权操作');
1009
+insert into sys_dict_data values (23, 5, '导出', '5', 'sys_oper_type', '', 'warning', 'N', '0', 'admin', '2022-12-11 16:51:52', '', null, '导出操作');
1010
+insert into sys_dict_data values (24, 6, '导入', '6', 'sys_oper_type', '', 'warning', 'N', '0', 'admin', '2022-12-11 16:51:52', '', null, '导入操作');
1011
+insert into sys_dict_data values (25, 7, '强退', '7', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', '2022-12-11 16:51:52', '', null, '强退操作');
1012
+insert into sys_dict_data values (26, 8, '生成代码', '8', 'sys_oper_type', '', 'warning', 'N', '0', 'admin', '2022-12-11 16:51:52', '', null, '生成操作');
1013
+insert into sys_dict_data values (27, 9, '清空数据', '9', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', '2022-12-11 16:51:52', '', null, '清空操作');
1014
+insert into sys_dict_data values (28, 1, '成功', '0', 'sys_common_status', '', 'primary', 'N', '0', 'admin', '2022-12-11 16:51:52', '', null, '正常状态');
1015
+insert into sys_dict_data values (29, 2, '失败', '1', 'sys_common_status', '', 'danger', 'N', '0', 'admin', '2022-12-11 16:51:52', '', null, '停用状态');
1016
+insert into sys_dict_data values (30, 0, '一级', '0', 'sys_user_pmlevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:42:30', '', null, null);
1017
+insert into sys_dict_data values (31, 1, '二级', '1', 'sys_user_pmlevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:42:42', '', null, null);
1018
+insert into sys_dict_data values (32, 2, '三级', '2', 'sys_user_pmlevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:42:57', '', null, null);
1019
+insert into sys_dict_data values (33, 0, '二岗', '0', 'sys_user_engineerlevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:45:24', '', null, null);
1020
+insert into sys_dict_data values (34, 1, '三岗', '1', 'sys_user_engineerlevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:45:37', '', null, null);
1021
+insert into sys_dict_data values (35, 2, '四岗', '2', 'sys_user_engineerlevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:46:02', '', null, null);
1022
+insert into sys_dict_data values (36, 3, '五岗', '3', 'sys_user_engineerlevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:46:24', '', null, null);
1023
+insert into sys_dict_data values (37, 4, '六岗', '4', 'sys_user_engineerlevel', null, 'default', 'N', '0', 'admin', '2024-01-08 15:46:35', '', null, null);
1024
+insert into sys_dict_data values (38, 0, '正高', '0', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:08', '', null, null);
1025
+insert into sys_dict_data values (39, 1, '副高', '1', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:45', '', null, null);
1026
+insert into sys_dict_data values (40, 2, '中级', '2', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:48:57', '', null, null);
1027
+insert into sys_dict_data values (41, 3, '助工', '3', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:49:07', '', null, null);
1028
+insert into sys_dict_data values (42, 4, '注册测绘师', '4', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:49:30', '', null, null);
1029
+insert into sys_dict_data values (43, 5, '注册城乡规划师', '5', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:50:11', '', null, null);
1030
+insert into sys_dict_data values (44, 6, '注册岩土工程师', '6', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:50:58', '', null, null);
1031
+insert into sys_dict_data values (45, 7, '注册安全工程师', '7', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:51:13', '', null, null);
1032
+insert into sys_dict_data values (46, 8, '注册会计师', '8', 'sys_user_titles', null, 'default', 'N', '0', 'admin', '2024-01-08 15:51:36', '', null, null);
1033
+insert into sys_dict_data values (47, 0, '不合格', '0', 'cmc_accessment', null, 'default', 'N', '0', 'admin', '2024-01-08 15:58:47', '', null, null);
1034
+insert into sys_dict_data values (48, 1, '合格', '1', 'cmc_accessment', null, 'default', 'N', '0', 'admin', '2024-01-08 15:58:56', '', null, null);
1035
+insert into sys_dict_data values (49, 2, '良好', '2', 'cmc_accessment', null, 'default', 'N', '0', 'admin', '2024-01-08 15:59:08', '', null, null);
1036
+insert into sys_dict_data values (50, 3, '优秀', '3', 'cmc_accessment', null, 'default', 'N', '0', 'admin', '2024-01-08 15:59:23', '', null, null);
1037
+insert into sys_dict_data values (51, 0, '生疏', '0', 'cmc_skill', null, 'default', 'N', '0', 'admin', '2024-01-08 16:08:12', '', null, null);
1038
+insert into sys_dict_data values (52, 1, '较熟练', '1', 'cmc_skill', null, 'default', 'N', '0', 'admin', '2024-01-08 16:08:20', '', null, null);
1039
+insert into sys_dict_data values (53, 2, '熟练', '2', 'cmc_skill', null, 'default', 'N', '0', 'admin', '2024-01-08 16:08:28', '', null, null);
1040
+insert into sys_dict_data values (54, 3, '精通', '3', 'cmc_skill', null, 'default', 'N', '0', 'admin', '2024-01-08 16:09:06', '', null, null);
1041
+insert into sys_dict_data values (55, 0, '较少', '0', 'cmc_workload', null, 'default', 'N', '0', 'admin', '2024-01-08 16:09:14', '', null, null);
1042
+insert into sys_dict_data values (56, 1, '正常', '1', 'cmc_workload', null, 'default', 'N', '0', 'admin', '2024-01-08 16:09:22', '', null, null);
1043
+insert into sys_dict_data values (57, 2, '较多', '2', 'cmc_workload', null, 'default', 'N', '0', 'admin', '2024-01-08 16:09:30', '', null, null);
1044
+insert into sys_dict_data values (58, 0, '主办', '0', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-08 16:11:04', '', null, '00');
1045
+insert into sys_dict_data values (59, 1, '参与', '1', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-08 16:11:15', '', null, '00');
1046
+insert into sys_dict_data values (60, 2, '协办', '2', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-08 16:11:39', '', null, '00');
1047
+insert into sys_dict_data values (61, 3, '常规项目', '3', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:15:45', '', null, '01');
1048
+insert into sys_dict_data values (62, 4, '监测项目', '4', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:16:47', '', null, '01');
1049
+insert into sys_dict_data values (63, 5, '调查项目', '5', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:19:17', '', null, '01');
1050
+insert into sys_dict_data values (64, 6, '测量项目', '6', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:20:20', '', null, '01');
1051
+insert into sys_dict_data values (65, 7, '其他项目', '7', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:20:32', '', null, '01');
1052
+insert into sys_dict_data values (66, 8, '选点', '8', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:23:11', '', null, '0206');
1053
+insert into sys_dict_data values (67, 9, '埋石', '9', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:23:28', '', null, '0206');
1054
+insert into sys_dict_data values (68, 10, '观测', '10', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:23:44', '', null, '0203040506');
1055
+insert into sys_dict_data values (69, 11, '计算', '11', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:24:21', '', null, '0203040506');
1056
+insert into sys_dict_data values (70, 12, '检查', '12', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:24:33', '', null, '02');
1057
+insert into sys_dict_data values (71, 13, '负责', '13', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:24:41', '', null, '02');
1058
+insert into sys_dict_data values (72, 14, '前视', '14', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:48:05', '', null, '030405');
1059
+insert into sys_dict_data values (73, 15, '后视', '15', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:48:14', '', null, '030405');
1060
+insert into sys_dict_data values (74, 16, '水准', '16', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:48:38', '', null, '030405');
1061
+insert into sys_dict_data values (75, 17, '三角高程', '17', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:48:52', '', null, '030405');
1062
+insert into sys_dict_data values (76, 18, '实测', '18', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:49:09', '', null, '07');
1063
+insert into sys_dict_data values (77, 19, '相控', '19', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 09:49:29', '', null, '07');
1064
+insert into sys_dict_data values (78, 20, '调绘', '20', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:31:53', '', null, '07');
1065
+insert into sys_dict_data values (79, 21, '测量', '21', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:32:57', '', null, '08');
1066
+insert into sys_dict_data values (80, 22, '整理', '22', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:33:08', '', null, '08');
1067
+insert into sys_dict_data values (81, 23, '主飞', '23', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:35:22', '', null, '09');
1068
+insert into sys_dict_data values (82, 24, '协飞', '24', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:35:48', '', null, '09');
1069
+insert into sys_dict_data values (83, 25, '作业', '25', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:43:01', '', null, '10111213141516171820');
1070
+insert into sys_dict_data values (84, 26, '检查', '26', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:44:59', '', null, '10111213141516171820');
1071
+insert into sys_dict_data values (85, 27, '负责', '27', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:45:12', '', null, '101112131415161718');
1072
+insert into sys_dict_data values (86, 28, '空三', '28', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:46:14', '', null, '19');
1073
+insert into sys_dict_data values (87, 29, '建模', '29', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:46:42', '', null, '19');
1074
+insert into sys_dict_data values (88, 30, '修模', '30', 'cmc_role', null, 'default', 'N', '0', 'admin', '2024-01-09 10:46:55', '', null, '19');
1075
+
526 1076
 
527 1077
 
528 1078
 -- ----------------------------
@@ -697,4 +1247,57 @@ create table gen_table_column (
697 1247
   update_by         varchar(64)     default ''                 comment '更新者',
698 1248
   update_time       datetime                                   comment '更新时间',
699 1249
   primary key (column_id)
700
-) engine=innodb auto_increment=1 comment = '代码生成业务表字段';
1250
+) engine=innodb auto_increment=1 comment = '代码生成业务表字段';
1251
+
1252
+
1253
+-- ----------------------------
1254
+-- 20、cmc考核表
1255
+-- ----------------------------
1256
+drop table if exists cmc_assess;
1257
+create table cmc_assess (
1258
+  assess_id				char(19)		not null		comment '总考核表id',
1259
+  user_id				bigint			default null	comment '用户id',
1260
+  project_id			bigint			default null	comment '项目id',
1261
+  assess_time			datetime		default null	comment '考核时间(月份)',
1262
+  dept_assessment		char(1)			default null	comment '部门考核等级(不合格、合格、良好、优秀)',
1263
+  dept_advice			varchar(255)	default null	comment '部门考核意见',
1264
+  dept_time				datetime		default null	comment '部门考核时间',
1265
+  dept_assesser			varchar(30)		default null	comment '部门考核负责人',
1266
+  manager_assessment	char(1)			default null	comment '分管考核等级(不合格、合格、良好、优秀)',
1267
+  manager_advice		varchar(255)	default null	comment '分管考核意见',
1268
+  manager_time			datetime		default null	comment '分管考核时间',
1269
+  manager_assesser		varchar(30)		default null	comment '分管考核负责人',
1270
+  self_assess			varchar(255)	default null	comment '自述',
1271
+  fill_time				datetime		default null	comment '考核填报时间',
1272
+  PRIMARY KEY (assess_id)
1273
+) engine=innodb	comment = 'cmc考核表';
1274
+
1275
+
1276
+-- ----------------------------
1277
+-- 21、cmc考核内容表
1278
+-- ----------------------------
1279
+drop table if exists cmc_assess_content;
1280
+create table cmc_assess_content (
1281
+  content_id			char(21)		not null		comment '考核内容id(总考核表id+2位)',
1282
+  role					char(2)			default null	comment '承担角色',
1283
+  familiar				char(1)			default null	comment '熟练程度(生疏、熟练、精通)',
1284
+  remark				varchar(255)	default null	comment '备注',
1285
+  workload				char(1)			default null	comment '工作量(较少、正常、较多)',
1286
+  skill					char(1)			default null	comment '技能掌握(生疏、较熟练、熟练)',
1287
+  quality				char(1)			default null	comment '产品质量(不合格、合格、良好、优秀)',
1288
+  assessment			char(1)			default null	comment '岗位表现(不合格、合格、良好、优秀)',
1289
+  advice				varchar(255)	default null	comment '考核建议',
1290
+  PRIMARY KEY (content_id)
1291
+) engine=innodb	comment = 'cmc考核内容表';
1292
+
1293
+
1294
+-- ----------------------------
1295
+-- 22、cmc考核工作内容表
1296
+-- ----------------------------
1297
+drop table if exists cmc_assess_content_work;
1298
+create table cmc_assess_content_work (
1299
+  work_id				char(23)		not null		comment '工作内容id(考核内容id+2位)',
1300
+  work_count			int				default null	comment '工作项数',
1301
+  work_load				varchar(255)	default null	comment '工作量',
1302
+  PRIMARY KEY (work_id)
1303
+) engine=innodb	comment = 'cmc考核工作内容表';

+ 1
- 1
oa-ui/src/views/flowable/definition/index.vue Ver fichero

@@ -97,7 +97,7 @@
97 97
         </template>
98 98
       </el-table-column>
99 99
       <el-table-column label="部署时间" align="center" prop="deploymentTime" width="180"/>
100
-      <el-table-column label="操作" width="250" fixed="right"class-name="small-padding fixed-width">
100
+      <el-table-column label="操作" width="250" fixed="right" class-name="small-padding fixed-width">
101 101
         <template slot-scope="scope">
102 102
           <el-button @click="handleLoadXml(scope.row)" icon="el-icon-edit-outline" type="text" size="small">设计</el-button>
103 103
           <el-button @click="handleAddForm(scope.row)" icon="el-icon-edit-el-icon-s-promotion" type="text" size="small" v-if="scope.row.formId == null">配置主表单</el-button>

+ 59
- 3
oa-ui/src/views/system/user/index.vue Ver fichero

@@ -223,10 +223,15 @@
223 223
               <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
224 224
             </el-form-item>
225 225
           </el-col>
226
-          <el-col :span="12">
226
+          <!-- <el-col :span="12">
227 227
             <el-form-item label="邮箱" prop="email">
228 228
               <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
229 229
             </el-form-item>
230
+          </el-col> -->
231
+          <el-col :span="12">
232
+            <el-form-item label="入职年月" prop="entryDate">
233
+              <el-date-picker v-model="form.entryDate" type="month" placeholder="请输入入职年月" />
234
+            </el-form-item>
230 235
           </el-col>
231 236
         </el-row>
232 237
         <el-row>
@@ -266,6 +271,25 @@
266 271
             </el-form-item>
267 272
           </el-col>
268 273
         </el-row>
274
+        <el-row>
275
+          <el-col :span="12">
276
+            <el-form-item label="技术职称" prop="titles">
277
+              <el-select v-model="form.titles" placeholder="请输入技术职称">
278
+                <el-option
279
+                  v-for="dict in dict.type.sys_user_titles"
280
+                  :key="dict.value"
281
+                  :label="dict.label"
282
+                  :value="dict.value"
283
+                />
284
+              </el-select>
285
+            </el-form-item>
286
+          </el-col>
287
+          <el-col :span="12">
288
+            <el-form-item label="年龄" prop="age">
289
+              <el-input v-model="form.age" placeholder="请输入年龄" />
290
+            </el-form-item>
291
+          </el-col>
292
+        </el-row>
269 293
         <el-row>
270 294
           <el-col :span="12">
271 295
             <el-form-item label="岗位">
@@ -281,6 +305,37 @@
281 305
             </el-form-item>
282 306
           </el-col>
283 307
           <el-col :span="12">
308
+            <el-form-item label="岗级" prop="engineerLevel">
309
+              <el-select v-model="form.engineerLevel" placeholder="请输入岗级">
310
+                <el-option
311
+                  v-for="dict in dict.type.sys_user_engineerlevel"
312
+                  :key="dict.value"
313
+                  :label="dict.label"
314
+                  :value="dict.value"
315
+                />
316
+              </el-select>
317
+            </el-form-item>
318
+          </el-col>          
319
+        </el-row>
320
+        <el-row>
321
+          <el-col :span="12">
322
+            <el-form-item label="项目经理">
323
+              <el-switch v-model="pm" />
324
+            </el-form-item>
325
+          </el-col>
326
+          <el-col :span="12" v-if="pm">
327
+            <el-form-item label="等级" prop="pmLevel">
328
+              <el-select v-model="form.pmLevel" placeholder="请输入项目经理等级">
329
+                <el-option
330
+                  v-for="dict in dict.type.sys_user_pmlevel"
331
+                  :key="dict.value"
332
+                  :label="dict.label"
333
+                  :value="dict.value"
334
+                />
335
+              </el-select>
336
+            </el-form-item>
337
+          </el-col>
338
+          <!-- <el-col :span="12">
284 339
             <el-form-item label="角色">
285 340
               <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
286 341
                 <el-option
@@ -292,7 +347,7 @@
292 347
                 ></el-option>
293 348
               </el-select>
294 349
             </el-form-item>
295
-          </el-col>
350
+          </el-col> -->
296 351
         </el-row>
297 352
         <el-row>
298 353
           <el-col :span="24">
@@ -348,7 +403,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
348 403
 
349 404
 export default {
350 405
   name: "User",
351
-  dicts: ['sys_normal_disable', 'sys_user_sex'],
406
+  dicts: ['sys_normal_disable', 'sys_user_sex', 'sys_user_titles', 'sys_user_pmlevel', 'sys_user_engineerlevel'],
352 407
   components: { Treeselect },
353 408
   data() {
354 409
     return {
@@ -384,6 +439,7 @@ export default {
384 439
       roleOptions: [],
385 440
       // 表单参数
386 441
       form: {},
442
+      pm: false,
387 443
       defaultProps: {
388 444
         children: "children",
389 445
         label: "label"

Loading…
Cancelar
Guardar