瀏覽代碼

Merge remote-tracking branch 'origin/master'

zwj 10 月之前
父節點
當前提交
ecd92f4f8b
共有 31 個文件被更改,包括 1919 次插入99 次删除
  1. 186 0
      ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostCheckedController.java
  2. 171 65
      ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostCheckedHomePageController.java
  3. 152 0
      ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostCheckedItemsController.java
  4. 4 4
      ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostCheckedProblemController.java
  5. 207 2
      ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostListController.java
  6. 1 1
      ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/PostAssessmentRating.java
  7. 100 0
      ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/PostChecked.java
  8. 65 0
      ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/PostCheckedItems.java
  9. 1 1
      ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/PostCheckedProblem.java
  10. 37 0
      ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/homePage/AssessmentRatingView.java
  11. 33 0
      ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/homePage/DeptProblemRectificationView.java
  12. 10 8
      ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/homePage/PostCheckedProblemView.java
  13. 34 0
      ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/homePage/PostCheckedUnCheckedView.java
  14. 21 0
      ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/tools/PostCheckListType.java
  15. 62 0
      ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/mapper/PostCheckedItemsMapper.java
  16. 62 0
      ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/mapper/PostCheckedMapper.java
  17. 6 2
      ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/mapper/PostListMapper.java
  18. 62 0
      ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/IPostCheckedItemsService.java
  19. 62 0
      ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/IPostCheckedService.java
  20. 11 0
      ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/IPostListService.java
  21. 100 0
      ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/impl/PostCheckedItemsServiceImpl.java
  22. 191 0
      ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/impl/PostCheckedServiceImpl.java
  23. 14 0
      ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/impl/PostListServiceImpl.java
  24. 112 0
      ruoyi-postcheck/src/main/resources/mapper/postCheck/PostCheckedItemsMapper.xml
  25. 137 0
      ruoyi-postcheck/src/main/resources/mapper/postCheck/PostCheckedMapper.xml
  26. 31 0
      ruoyi-postcheck/src/main/resources/mapper/postCheck/PostListMapper.xml
  27. 1 1
      ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
  28. 13 13
      sql/DB_2024-01-03_17_28_57.sql
  29. 1 1
      sql/Database.sql
  30. 16 0
      sql/Menu.sql
  31. 16 1
      sql/UpdateTable.sql

+ 186 - 0
ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostCheckedController.java

@@ -0,0 +1,186 @@
1
+package com.ruoyi.postCheck.controller;
2
+
3
+import java.util.*;
4
+import javax.servlet.http.HttpServletResponse;
5
+
6
+import com.baomidou.mybatisplus.annotation.TableField;
7
+import com.ruoyi.postCheck.domain.PostCheckedItems;
8
+import io.swagger.annotations.*;
9
+import org.springframework.security.access.prepost.PreAuthorize;
10
+import org.springframework.beans.factory.annotation.Autowired;
11
+import org.springframework.web.bind.annotation.GetMapping;
12
+import org.springframework.web.bind.annotation.PostMapping;
13
+import org.springframework.web.bind.annotation.PutMapping;
14
+import org.springframework.web.bind.annotation.DeleteMapping;
15
+import org.springframework.web.bind.annotation.PathVariable;
16
+import org.springframework.web.bind.annotation.RequestBody;
17
+import org.springframework.web.bind.annotation.RequestMapping;
18
+import org.springframework.web.bind.annotation.RestController;
19
+import com.ruoyi.common.annotation.Log;
20
+import com.ruoyi.common.core.controller.BaseController;
21
+import com.ruoyi.common.core.domain.AjaxResult;
22
+import com.ruoyi.common.enums.BusinessType;
23
+import com.ruoyi.postCheck.domain.PostChecked;
24
+import com.ruoyi.postCheck.service.IPostCheckedService;
25
+import com.ruoyi.common.utils.poi.ExcelUtil;
26
+import com.ruoyi.common.core.page.TableDataInfo;
27
+
28
+/**
29
+ * 岗检表管理Controller
30
+ *
31
+ * @author csg
32
+ * @date 2024-01-05
33
+ */
34
+@Api(tags = "2.5.1-岗检表管理接口")
35
+@RestController
36
+@RequestMapping("/postCheck/postChecked")
37
+public class PostCheckedController extends BaseController {
38
+    @Autowired
39
+    private IPostCheckedService postCheckedService;
40
+
41
+    /**
42
+     * 查询岗检表管理列表
43
+     */
44
+    @ApiOperation("查询岗检表管理列表")
45
+    @ApiImplicitParams({
46
+            @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
47
+            @ApiImplicitParam(name = "checkWorkgroupId", value = "检查工作组ID", dataType = "Long", dataTypeClass = Long.class),
48
+            @ApiImplicitParam(name = "checkGroupId", value = "检查小组ID", dataType = "Long", dataTypeClass = Long.class),
49
+            @ApiImplicitParam(name = "checkedDeptId", value = "被检查部门ID", dataType = "Long", dataTypeClass = Long.class),
50
+            @ApiImplicitParam(name = "checkedPostId", value = "被检查岗位ID", dataType = "Long", dataTypeClass = Long.class),
51
+            @ApiImplicitParam(name = "printUserId", value = "打印人ID", dataType = "Long", dataTypeClass = Long.class),
52
+            @ApiImplicitParam(name = "printTime", value = "打印时间", dataType = "Date", dataTypeClass = Date.class),
53
+            @ApiImplicitParam(name = "checkedImg", value = "上传:检查后的检查表照片或PDF,磁盘相对路径", dataType = "String", dataTypeClass = String.class),
54
+            @ApiImplicitParam(name = "checkedUserName", value = "上传:检查人中文姓名(上传页面设置的值)", dataType = "String", dataTypeClass = String.class),
55
+            @ApiImplicitParam(name = "checkedTime", value = "上传:检查时间(上传页面设置的值)", dataType = "Date", dataTypeClass = Date.class),
56
+            @ApiImplicitParam(name = "uploadUserId", value = "上传:检查表上传人ID", dataType = "Long", dataTypeClass = Long.class),
57
+            @ApiImplicitParam(name = "uploadTime", value = "上传:检查表上传时间", dataType = "Date", dataTypeClass = Date.class),
58
+            @ApiImplicitParam(name = "delFlag", value = "删除标志(0代表存在 2代表删除)", dataType = "Integer", dataTypeClass = Integer.class),
59
+            @ApiImplicitParam(name = "createUserId", value = "创建者用户ID", dataType = "Long", dataTypeClass = Long.class),
60
+            @ApiImplicitParam(name = "pageNum", value = "页码从1开始", dataType = "Integer", dataTypeClass = Integer.class),
61
+            @ApiImplicitParam(name = "pageSize", value = "分页大小", dataType = "Integer", dataTypeClass = Integer.class),
62
+            @ApiImplicitParam(name = "orderBy", value = "排序字段", dataType = "String", dataTypeClass = String.class)
63
+    })
64
+    @PreAuthorize("@ss.hasPermi('postCheck:postChecked:list')")
65
+    @GetMapping("/list")
66
+    public TableDataInfo list(PostChecked postChecked) {
67
+        startPage();
68
+        List<PostChecked> list = postCheckedService.selectPostCheckedList(postChecked);
69
+        return getDataTable(list);
70
+    }
71
+
72
+    /**
73
+     * 导出岗检表管理列表
74
+     @ApiOperation("导出岗检表管理列表")
75
+     @PreAuthorize("@ss.hasPermi('postCheck:postChecked:export')")
76
+     @Log(title = "岗检表管理", businessType = BusinessType.EXPORT)
77
+     @PostMapping("/export") public void export(HttpServletResponse response, PostChecked postChecked) {
78
+     List<PostChecked> list = postCheckedService.selectPostCheckedList(postChecked);
79
+     ExcelUtil<PostChecked> util = new ExcelUtil<PostChecked>(PostChecked.class);
80
+     util.exportExcel(response, list, "岗检表管理数据");
81
+     }
82
+     */
83
+
84
+    /**
85
+     * 获取岗检表管理详细信息
86
+     */
87
+    @ApiOperation("获取岗检表管理详细信息")
88
+    @PreAuthorize("@ss.hasPermi('postCheck:postChecked:query')")
89
+    @GetMapping(value = "/{id}")
90
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
91
+        return success(postCheckedService.selectPostCheckedById(id));
92
+    }
93
+
94
+    /**
95
+     * 新增岗检表管理
96
+     *
97
+     * @ApiOperation("新增岗检表管理")
98
+     * @ApiImplicitParams({
99
+     * @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
100
+     * @ApiImplicitParam(name = "checkWorkgroupId", value = "检查工作组ID", dataType = "Long", dataTypeClass = Long.class),
101
+     * @ApiImplicitParam(name = "checkGroupId", value = "检查小组ID", dataType = "Long", dataTypeClass = Long.class),
102
+     * @ApiImplicitParam(name = "checkedDeptId", value = "被检查部门ID", dataType = "Long", dataTypeClass = Long.class),
103
+     * @ApiImplicitParam(name = "checkedPostId", value = "被检查岗位ID", dataType = "Long", dataTypeClass = Long.class),
104
+     * @ApiImplicitParam(name = "printUserId", value = "打印人ID", dataType = "Long", dataTypeClass = Long.class),
105
+     * @ApiImplicitParam(name = "printTime", value = "打印时间", dataType = "Date", dataTypeClass = Date.class),
106
+     * @ApiImplicitParam(name = "checkedImg", value = "上传:检查后的检查表照片或PDF,磁盘相对路径", dataType = "String", dataTypeClass = String.class),
107
+     * @ApiImplicitParam(name = "checkedUserName", value = "上传:检查人中文姓名(上传页面设置的值)", dataType = "String", dataTypeClass = String.class),
108
+     * @ApiImplicitParam(name = "checkedTime", value = "上传:检查时间(上传页面设置的值)", dataType = "Date", dataTypeClass = Date.class),
109
+     * @ApiImplicitParam(name = "uploadUserId", value = "上传:检查表上传人ID", dataType = "Long", dataTypeClass = Long.class),
110
+     * @ApiImplicitParam(name = "uploadTime", value = "上传:检查表上传时间", dataType = "Date", dataTypeClass = Date.class),
111
+     * @ApiImplicitParam(name = "delFlag", value = "删除标志(0代表存在 2代表删除)", dataType = "Integer", dataTypeClass = Integer.class),
112
+     * @ApiImplicitParam(name = "createUserId", value = "创建者用户ID", dataType = "Long", dataTypeClass = Long.class),
113
+     * })
114
+     * @PreAuthorize("@ss.hasPermi('postCheck:postChecked:add')")
115
+     * @Log(title = "岗检表管理", businessType = BusinessType.INSERT)
116
+     * @PostMapping public AjaxResult add(@RequestBody PostChecked postChecked) {
117
+     * return toAjax(postCheckedService.insertPostChecked(postChecked));
118
+     * }
119
+     */
120
+
121
+
122
+    @ApiOperation("新增岗检表管理")
123
+    @ApiImplicitParams({
124
+//     @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
125
+            @ApiImplicitParam(name = "checkWorkgroupId", value = "检查工作组ID", dataType = "Long", dataTypeClass = Long.class),
126
+            @ApiImplicitParam(name = "checkGroupId", value = "检查小组ID", dataType = "Long", dataTypeClass = Long.class),
127
+            @ApiImplicitParam(name = "checkedDeptId", value = "被检查部门ID", dataType = "Long", dataTypeClass = Long.class),
128
+            @ApiImplicitParam(name = "checkedPostId", value = "被检查岗位ID", dataType = "Long", dataTypeClass = Long.class),
129
+//     @ApiImplicitParam(name = "printUserId", value = "打印人ID", dataType = "Long", dataTypeClass = Long.class),
130
+//     @ApiImplicitParam(name = "printTime", value = "打印时间", dataType = "Date", dataTypeClass = Date.class),
131
+//     @ApiImplicitParam(name = "checkedImg", value = "上传:检查后的检查表照片或PDF,磁盘相对路径", dataType = "String", dataTypeClass = String.class),
132
+//     @ApiImplicitParam(name = "checkedUserName", value = "上传:检查人中文姓名(上传页面设置的值)", dataType = "String", dataTypeClass = String.class),
133
+//     @ApiImplicitParam(name = "checkedTime", value = "上传:检查时间(上传页面设置的值)", dataType = "Date", dataTypeClass = Date.class),
134
+//     @ApiImplicitParam(name = "uploadUserId", value = "上传:检查表上传人ID", dataType = "Long", dataTypeClass = Long.class),
135
+//     @ApiImplicitParam(name = "uploadTime", value = "上传:检查表上传时间", dataType = "Date", dataTypeClass = Date.class),
136
+//     @ApiImplicitParam(name = "delFlag", value = "删除标志(0代表存在 2代表删除)", dataType = "Integer", dataTypeClass = Integer.class),
137
+//     @ApiImplicitParam(name = "createUserId", value = "创建者用户ID", dataType = "Long", dataTypeClass = Long.class),
138
+            @ApiImplicitParam(name = "children", value = "检查表明细数组", dataType = "List", dataTypeClass = PostCheckedItems.class),
139
+    })
140
+
141
+
142
+    @PreAuthorize("@ss.hasPermi('postCheck:postChecked:add')")
143
+    @Log(title = "岗检表管理", businessType = BusinessType.INSERT)
144
+    @PostMapping
145
+    public AjaxResult add(@RequestBody PostChecked postChecked) {
146
+        return toAjax(postCheckedService.insertPostChecked(postChecked));
147
+    }
148
+
149
+    /**
150
+     * 修改岗检表管理
151
+     @ApiOperation("修改岗检表管理")
152
+     @ApiImplicitParams({
153
+     @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
154
+     @ApiImplicitParam(name = "checkWorkgroupId", value = "检查工作组ID", dataType = "Long", dataTypeClass = Long.class),
155
+     @ApiImplicitParam(name = "checkGroupId", value = "检查小组ID", dataType = "Long", dataTypeClass = Long.class),
156
+     @ApiImplicitParam(name = "checkedDeptId", value = "被检查部门ID", dataType = "Long", dataTypeClass = Long.class),
157
+     @ApiImplicitParam(name = "checkedPostId", value = "被检查岗位ID", dataType = "Long", dataTypeClass = Long.class),
158
+     @ApiImplicitParam(name = "printUserId", value = "打印人ID", dataType = "Long", dataTypeClass = Long.class),
159
+     @ApiImplicitParam(name = "printTime", value = "打印时间", dataType = "Date", dataTypeClass = Date.class),
160
+     @ApiImplicitParam(name = "checkedImg", value = "上传:检查后的检查表照片或PDF,磁盘相对路径", dataType = "String", dataTypeClass = String.class),
161
+     @ApiImplicitParam(name = "checkedUserName", value = "上传:检查人中文姓名(上传页面设置的值)", dataType = "String", dataTypeClass = String.class),
162
+     @ApiImplicitParam(name = "checkedTime", value = "上传:检查时间(上传页面设置的值)", dataType = "Date", dataTypeClass = Date.class),
163
+     @ApiImplicitParam(name = "uploadUserId", value = "上传:检查表上传人ID", dataType = "Long", dataTypeClass = Long.class),
164
+     @ApiImplicitParam(name = "uploadTime", value = "上传:检查表上传时间", dataType = "Date", dataTypeClass = Date.class),
165
+     @ApiImplicitParam(name = "delFlag", value = "删除标志(0代表存在 2代表删除)", dataType = "Integer", dataTypeClass = Integer.class),
166
+     @ApiImplicitParam(name = "createUserId", value = "创建者用户ID", dataType = "Long", dataTypeClass = Long.class),
167
+     })
168
+     @PreAuthorize("@ss.hasPermi('postCheck:postChecked:edit')")
169
+     @Log(title = "岗检表管理", businessType = BusinessType.UPDATE)
170
+     @PutMapping public AjaxResult edit(@RequestBody PostChecked postChecked) {
171
+     return toAjax(postCheckedService.updatePostChecked(postChecked));
172
+     }
173
+     */
174
+
175
+    /**
176
+     * 删除岗检表管理
177
+     */
178
+    @ApiOperation("删除岗检表管理")
179
+    @ApiImplicitParam(name = "ids", value = "Long类型的主键数组", dataType = "Long[]", dataTypeClass = Long[].class)
180
+    @PreAuthorize("@ss.hasPermi('postCheck:postChecked:remove')")
181
+    @Log(title = "岗检表管理", businessType = BusinessType.DELETE)
182
+    @DeleteMapping("/{ids}")
183
+    public AjaxResult remove(@PathVariable Long[] ids) {
184
+        return toAjax(postCheckedService.deletePostCheckedByIds(ids));
185
+    }
186
+}

文件差異過大導致無法顯示
+ 171 - 65
ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostCheckedHomePageController.java


+ 152 - 0
ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostCheckedItemsController.java

@@ -0,0 +1,152 @@
1
+package com.ruoyi.postCheck.controller;
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.postCheck.domain.PostCheckedItems;
20
+import com.ruoyi.postCheck.service.IPostCheckedItemsService;
21
+import com.ruoyi.common.utils.poi.ExcelUtil;
22
+import com.ruoyi.common.core.page.TableDataInfo;
23
+import io.swagger.annotations.Api;
24
+import io.swagger.annotations.ApiOperation;
25
+import io.swagger.annotations.ApiImplicitParams;
26
+import io.swagger.annotations.ApiImplicitParam;
27
+
28
+/**
29
+ * 岗检表管理明细Controller
30
+ *
31
+ * @author csg
32
+ * @date 2024-01-05
33
+ */
34
+@Api(tags = "2.5.2-岗检表管理明细接口(废弃不调)")
35
+@RestController
36
+@RequestMapping("/postCheck/postCheckedItems")
37
+public class PostCheckedItemsController extends BaseController
38
+{
39
+    @Autowired
40
+    private IPostCheckedItemsService postCheckedItemsService;
41
+
42
+    /**
43
+     * 查询岗检表管理明细列表
44
+     */
45
+    @ApiOperation("查询岗检表管理明细列表")
46
+    @ApiImplicitParams({
47
+                    @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
48
+                    @ApiImplicitParam(name = "postCheckedId", value = "岗位责任制检查表ID", dataType = "Long", dataTypeClass = Long.class),
49
+                    @ApiImplicitParam(name = "type", value = "检查项目:参考post_list_info表;类型(1-业务职责;2-党建及党风廉政建设职责;3-安全环保职责;4-合规保密职;5-任职资格与能力素质要求)", dataType = "Integer", dataTypeClass = Integer.class),
50
+                    @ApiImplicitParam(name = "delFlag", value = "删除标志(0代表存在 2代表删除)", dataType = "Integer", dataTypeClass = Integer.class),
51
+                    @ApiImplicitParam(name = "createUserId", value = "创建者用户ID", dataType = "Long", dataTypeClass = Long.class),
52
+                    @ApiImplicitParam(name = "postCheckedContent", value = "检查内容", dataType = "String", dataTypeClass = String.class),
53
+                    @ApiImplicitParam(name = "postCheckedStandard", value = "检查标准", dataType = "String", dataTypeClass = String.class),
54
+                    @ApiImplicitParam(name = "postCheckedMethod", value = "检查方法", dataType = "String", dataTypeClass = String.class),
55
+                    @ApiImplicitParam(name = "postCheckedResult", value = "检查结果", dataType = "String", dataTypeClass = String.class),
56
+                @ApiImplicitParam(name = "pageNum", value = "页码从1开始", dataType = "Integer", dataTypeClass = Integer.class),
57
+                @ApiImplicitParam(name = "pageSize", value = "分页大小", dataType = "Integer", dataTypeClass = Integer.class),
58
+                @ApiImplicitParam(name = "orderBy", value = "排序字段", dataType = "String", dataTypeClass = String.class)
59
+    })
60
+    @PreAuthorize("@ss.hasPermi('postCheck:postCheckedItems:list')")
61
+    @GetMapping("/list")
62
+    public TableDataInfo list(PostCheckedItems postCheckedItems)
63
+    {
64
+        startPage();
65
+        List<PostCheckedItems> list = postCheckedItemsService.selectPostCheckedItemsList(postCheckedItems);
66
+        return getDataTable(list);
67
+    }
68
+
69
+    /**
70
+     * 导出岗检表管理明细列表
71
+     */
72
+    @ApiOperation("导出岗检表管理明细列表")
73
+    @PreAuthorize("@ss.hasPermi('postCheck:postCheckedItems:export')")
74
+    @Log(title = "岗检表管理明细", businessType = BusinessType.EXPORT)
75
+    @PostMapping("/export")
76
+    public void export(HttpServletResponse response, PostCheckedItems postCheckedItems)
77
+    {
78
+        List<PostCheckedItems> list = postCheckedItemsService.selectPostCheckedItemsList(postCheckedItems);
79
+        ExcelUtil<PostCheckedItems> util = new ExcelUtil<PostCheckedItems>(PostCheckedItems.class);
80
+        util.exportExcel(response, list, "岗检表管理明细数据");
81
+    }
82
+
83
+    /**
84
+     * 获取岗检表管理明细详细信息
85
+     */
86
+    @ApiOperation("获取岗检表管理明细详细信息")
87
+    @PreAuthorize("@ss.hasPermi('postCheck:postCheckedItems:query')")
88
+    @GetMapping(value = "/{id}")
89
+    public AjaxResult getInfo(@PathVariable("id") Long id)
90
+    {
91
+        return success(postCheckedItemsService.selectPostCheckedItemsById(id));
92
+    }
93
+
94
+    /**
95
+     * 新增岗检表管理明细
96
+     */
97
+    @ApiOperation("新增岗检表管理明细")
98
+    @ApiImplicitParams({
99
+        @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
100
+        @ApiImplicitParam(name = "postCheckedId", value = "岗位责任制检查表ID", dataType = "Long", dataTypeClass = Long.class),
101
+        @ApiImplicitParam(name = "type", value = "检查项目:参考post_list_info表;类型(1-业务职责;2-党建及党风廉政建设职责;3-安全环保职责;4-合规保密职;5-任职资格与能力素质要求)", dataType = "Integer", dataTypeClass = Integer.class),
102
+        @ApiImplicitParam(name = "delFlag", value = "删除标志(0代表存在 2代表删除)", dataType = "Integer", dataTypeClass = Integer.class),
103
+        @ApiImplicitParam(name = "createUserId", value = "创建者用户ID", dataType = "Long", dataTypeClass = Long.class),
104
+        @ApiImplicitParam(name = "postCheckedContent", value = "检查内容", dataType = "String", dataTypeClass = String.class),
105
+        @ApiImplicitParam(name = "postCheckedStandard", value = "检查标准", dataType = "String", dataTypeClass = String.class),
106
+        @ApiImplicitParam(name = "postCheckedMethod", value = "检查方法", dataType = "String", dataTypeClass = String.class),
107
+        @ApiImplicitParam(name = "postCheckedResult", value = "检查结果", dataType = "String", dataTypeClass = String.class),
108
+    })
109
+    @PreAuthorize("@ss.hasPermi('postCheck:postCheckedItems:add')")
110
+    @Log(title = "岗检表管理明细", businessType = BusinessType.INSERT)
111
+    @PostMapping
112
+    public AjaxResult add(@RequestBody PostCheckedItems postCheckedItems)
113
+    {
114
+        return toAjax(postCheckedItemsService.insertPostCheckedItems(postCheckedItems));
115
+    }
116
+
117
+    /**
118
+     * 修改岗检表管理明细
119
+     */
120
+    @ApiOperation("修改岗检表管理明细")
121
+    @ApiImplicitParams({
122
+                    @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
123
+                    @ApiImplicitParam(name = "postCheckedId", value = "岗位责任制检查表ID", dataType = "Long", dataTypeClass = Long.class),
124
+                    @ApiImplicitParam(name = "type", value = "检查项目:参考post_list_info表;类型(1-业务职责;2-党建及党风廉政建设职责;3-安全环保职责;4-合规保密职;5-任职资格与能力素质要求)", dataType = "Integer", dataTypeClass = Integer.class),
125
+                    @ApiImplicitParam(name = "delFlag", value = "删除标志(0代表存在 2代表删除)", dataType = "Integer", dataTypeClass = Integer.class),
126
+                    @ApiImplicitParam(name = "createUserId", value = "创建者用户ID", dataType = "Long", dataTypeClass = Long.class),
127
+                    @ApiImplicitParam(name = "postCheckedContent", value = "检查内容", dataType = "String", dataTypeClass = String.class),
128
+                    @ApiImplicitParam(name = "postCheckedStandard", value = "检查标准", dataType = "String", dataTypeClass = String.class),
129
+                    @ApiImplicitParam(name = "postCheckedMethod", value = "检查方法", dataType = "String", dataTypeClass = String.class),
130
+                    @ApiImplicitParam(name = "postCheckedResult", value = "检查结果", dataType = "String", dataTypeClass = String.class),
131
+    })
132
+    @PreAuthorize("@ss.hasPermi('postCheck:postCheckedItems:edit')")
133
+    @Log(title = "岗检表管理明细", businessType = BusinessType.UPDATE)
134
+    @PutMapping
135
+    public AjaxResult edit(@RequestBody PostCheckedItems postCheckedItems)
136
+    {
137
+        return toAjax(postCheckedItemsService.updatePostCheckedItems(postCheckedItems));
138
+    }
139
+
140
+    /**
141
+     * 删除岗检表管理明细
142
+     */
143
+    @ApiOperation("删除岗检表管理明细")
144
+    @ApiImplicitParam(name = "ids", value = "Long类型的主键数组", dataType = "Long[]", dataTypeClass = Long[].class)
145
+    @PreAuthorize("@ss.hasPermi('postCheck:postCheckedItems:remove')")
146
+    @Log(title = "岗检表管理明细", businessType = BusinessType.DELETE)
147
+	@DeleteMapping("/{ids}")
148
+    public AjaxResult remove(@PathVariable Long[] ids)
149
+    {
150
+        return toAjax(postCheckedItemsService.deletePostCheckedItemsByIds(ids));
151
+    }
152
+}

+ 4 - 4
ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostCheckedProblemController.java

@@ -54,7 +54,7 @@ public class PostCheckedProblemController extends BaseController {
54 54
             @ApiImplicitParam(name = "problemLevel", value = "问题等级(一般、重要)", dataType = "String", dataTypeClass = String.class),
55 55
             @ApiImplicitParam(name = "dutyType", value = "职责类别:1-业务职责;2-党建及党风廉政;3-安全环保职责;4-合规保密职;", dataType = "Integer", dataTypeClass = Integer.class),
56 56
             @ApiImplicitParam(name = "problemAttribute", value = "问题属性(完整问题、有效性问题、适宜性问题)", dataType = "String", dataTypeClass = String.class),
57
-            @ApiImplicitParam(name = "problemCategory", value = "问题类别(职责权限问题、工作内容问题、工作标准问题、考核奖励问题、考核奖励问题、任职资格问题、其他)", dataType = "String", dataTypeClass = String.class),
57
+            @ApiImplicitParam(name = "problemCategory", value = "问题类别(职责权限问题、工作内容问题、工作标准问题、考核奖励问题、任职资格问题、其他)", dataType = "String", dataTypeClass = String.class),
58 58
             @ApiImplicitParam(name = "description", value = "问题描述", dataType = "String", dataTypeClass = String.class),
59 59
             @ApiImplicitParam(name = "problemCause", value = "问题原因", dataType = "String", dataTypeClass = String.class),
60 60
             @ApiImplicitParam(name = "isImmediatelyCorrected", value = "是否立行立改(1-Yes;2-No;)", dataType = "Integer", dataTypeClass = Integer.class),
@@ -121,7 +121,7 @@ public class PostCheckedProblemController extends BaseController {
121 121
             @ApiImplicitParam(name = "problemLevel", value = "问题等级(一般、重要)", dataType = "String", dataTypeClass = String.class),
122 122
             @ApiImplicitParam(name = "dutyType", value = "职责类别:1-业务职责;2-党建及党风廉政;3-安全环保职责;4-合规保密职;", dataType = "Integer", dataTypeClass = Integer.class),
123 123
             @ApiImplicitParam(name = "problemAttribute", value = "问题属性(完整问题、有效性问题、适宜性问题)", dataType = "String", dataTypeClass = String.class),
124
-            @ApiImplicitParam(name = "problemCategory", value = "问题类别(职责权限问题、工作内容问题、工作标准问题、考核奖励问题、考核奖励问题、任职资格问题、其他)", dataType = "String", dataTypeClass = String.class),
124
+            @ApiImplicitParam(name = "problemCategory", value = "问题类别(职责权限问题、工作内容问题、工作标准问题、考核奖励问题、任职资格问题、其他)", dataType = "String", dataTypeClass = String.class),
125 125
             @ApiImplicitParam(name = "description", value = "问题描述", dataType = "String", dataTypeClass = String.class),
126 126
             @ApiImplicitParam(name = "problemCause", value = "问题原因", dataType = "String", dataTypeClass = String.class),
127 127
             @ApiImplicitParam(name = "isImmediatelyCorrected", value = "是否立行立改(1-Yes;2-No;)", dataType = "Integer", dataTypeClass = Integer.class),
@@ -167,7 +167,7 @@ public class PostCheckedProblemController extends BaseController {
167 167
             @ApiImplicitParam(name = "problemLevel", value = "问题等级(一般、重要)", dataType = "String", dataTypeClass = String.class),
168 168
             @ApiImplicitParam(name = "dutyType", value = "职责类别:1-业务职责;2-党建及党风廉政;3-安全环保职责;4-合规保密职;", dataType = "Integer", dataTypeClass = Integer.class),
169 169
             @ApiImplicitParam(name = "problemAttribute", value = "问题属性(完整问题、有效性问题、适宜性问题)", dataType = "String", dataTypeClass = String.class),
170
-            @ApiImplicitParam(name = "problemCategory", value = "问题类别(职责权限问题、工作内容问题、工作标准问题、考核奖励问题、考核奖励问题、任职资格问题、其他)", dataType = "String", dataTypeClass = String.class),
170
+            @ApiImplicitParam(name = "problemCategory", value = "问题类别(职责权限问题、工作内容问题、工作标准问题、考核奖励问题、任职资格问题、其他)", dataType = "String", dataTypeClass = String.class),
171 171
             @ApiImplicitParam(name = "description", value = "问题描述", dataType = "String", dataTypeClass = String.class),
172 172
 //            @ApiImplicitParam(name = "problemCause", value = "问题原因", dataType = "String", dataTypeClass = String.class),
173 173
 //            @ApiImplicitParam(name = "isImmediatelyCorrected", value = "是否立行立改(1-Yes;2-No;)", dataType = "Integer", dataTypeClass = Integer.class),
@@ -213,7 +213,7 @@ public class PostCheckedProblemController extends BaseController {
213 213
             @ApiImplicitParam(name = "checkUserName", value = "检查人姓名", dataType = "String", dataTypeClass = String.class),
214 214
             @ApiImplicitParam(name = "problemLevel", value = "问题等级(一般、重要)", dataType = "String", dataTypeClass = String.class),
215 215
             @ApiImplicitParam(name = "problemAttribute", value = "问题属性(完整问题、有效性问题、适宜性问题)", dataType = "String", dataTypeClass = String.class),
216
-            @ApiImplicitParam(name = "problemCategory", value = "问题类别(职责权限问题、工作内容问题、工作标准问题、考核奖励问题、考核奖励问题、任职资格问题、其他)", dataType = "String", dataTypeClass = String.class),
216
+            @ApiImplicitParam(name = "problemCategory", value = "问题类别(职责权限问题、工作内容问题、工作标准问题、考核奖励问题、任职资格问题、其他)", dataType = "String", dataTypeClass = String.class),
217 217
             @ApiImplicitParam(name = "description", value = "问题描述", dataType = "String", dataTypeClass = String.class),
218 218
             @ApiImplicitParam(name = "problemCause", value = "问题原因", dataType = "String", dataTypeClass = String.class),
219 219
             @ApiImplicitParam(name = "isImmediatelyCorrected", value = "是否立行立改(1-Yes;2-No;)", dataType = "Integer", dataTypeClass = Integer.class),

+ 207 - 2
ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostListController.java

@@ -1,10 +1,11 @@
1 1
 package com.ruoyi.postCheck.controller;
2 2
 
3
-import java.util.Date;
4
-import java.util.List;
3
+import java.util.*;
5 4
 import javax.servlet.http.HttpServletResponse;
6 5
 
6
+import com.ruoyi.postCheck.domain.PostCheckedItems;
7 7
 import com.ruoyi.postCheck.domain.PostListInfo;
8
+import com.ruoyi.postCheck.domain.tools.PostCheckListType;
8 9
 import org.springframework.security.access.prepost.PreAuthorize;
9 10
 import org.springframework.beans.factory.annotation.Autowired;
10 11
 import org.springframework.web.bind.annotation.GetMapping;
@@ -131,4 +132,208 @@ public class PostListController extends BaseController {
131 132
     public AjaxResult remove(@PathVariable Long[] ids) {
132 133
         return toAjax(postListService.deletePostListByIds(ids));
133 134
     }
135
+
136
+
137
+    @ApiOperation("1、检查项目下拉框(不需要参数)")
138
+    @GetMapping("/typeList")
139
+    public AjaxResult typeList(PostCheckListType postCheckListType) {
140
+      /*  List<Map<Integer, String>> list = new ArrayList<>();
141
+        Map<Integer, String> map = new HashMap<>();
142
+        map.put(6, "岗位责任制文件完整性与适宜性");
143
+        map.put(5, "任职资格与能力素质要求符合性");
144
+        map.put(1, "业务职责有效性");
145
+        map.put(2, "党建及党风廉政建设职责有效性");
146
+        map.put(3, "安全环保职责有效性");
147
+        map.put(4, "合规与保密职责有效性");
148
+        map.forEach(
149
+                (k, v) -> {
150
+                    Map<Integer, String> data = new HashMap<>();
151
+                    data.put(k, v);
152
+                    list.add(data);
153
+                }
154
+        );*/
155
+
156
+        List<PostCheckListType> list = new ArrayList<>();
157
+
158
+        Map<Integer, String> map = new HashMap<>();
159
+        PostCheckListType data6 = new PostCheckListType(6, "岗位责任制文件完整性与适宜性");
160
+        PostCheckListType data5 = new PostCheckListType(5, "任职资格与能力素质要求符合性");
161
+        PostCheckListType data1 = new PostCheckListType(1, "业务职责有效性");
162
+        PostCheckListType data2 = new PostCheckListType(2, "党建及党风廉政建设职责有效性");
163
+        PostCheckListType data3 = new PostCheckListType(3, "安全环保职责有效性");
164
+        PostCheckListType data4 = new PostCheckListType(4, "合规与保密职责有效性");
165
+        list.add(data6);
166
+        list.add(data5);
167
+        list.add(data1);
168
+        list.add(data2);
169
+        list.add(data3);
170
+        list.add(data4);
171
+        return success(list);
172
+    }
173
+
174
+    /**
175
+     * 检查表生成时,根据“检查项目”查询“检查内容”
176
+     * 岗检表生成页面,根据岗检清单中的“区域划分”(业务职责、党建党风、安全环保……)查询“事项”中最后有值事项(一级事项、……、五级事项)
177
+     * 清单中的区域 = 岗检表的检查“检查项目”
178
+     *
179
+     * @return
180
+     */
181
+    @ApiOperation("2、检查内容:参数是检查项目下拉框")
182
+    @GetMapping("/contentListByType")
183
+    @ApiImplicitParams({
184
+            @ApiImplicitParam(name = "deptId", value = "参数->部门ID", dataType = "Integer", dataTypeClass = Integer.class),
185
+            @ApiImplicitParam(name = "postId", value = "参数->岗位ID", dataType = "Integer", dataTypeClass = Integer.class),
186
+            @ApiImplicitParam(name = "type", value = "参数->检查项目(业务职责、党建党风、安全环保……)", dataType = "Integer", dataTypeClass = Integer.class),
187
+            @ApiImplicitParam(name = "postCheckedContent", value = "返回->检查内容", dataType = "String", dataTypeClass = String.class),
188
+            @ApiImplicitParam(name = "postCheckedStandard", value = "返回->检查标准", dataType = "String", dataTypeClass = String.class),
189
+    })
190
+    public AjaxResult contentListByType(Long deptId, Long postId, Integer type) {
191
+
192
+
193
+        List<PostCheckedItems> itemsList = postListService.contentListByType(deptId, postId, type);
194
+
195
+        //写死的假数据
196
+        if (false) {
197
+
198
+//            String aa = "";
199
+//            aa.trim()
200
+//        Integer type
201
+//        sequence_project  level_one、level_two、level_three、level_four、level_five
202
+//       work_standard(工作标准)  requirement(要求(2))
203
+            if (type == 6) {
204
+                PostCheckedItems item = new PostCheckedItems();
205
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
206
+                item.setPostCheckedContent("完整性->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
207
+                item.setPostCheckedStandard("1.是否有岗位基本信息;2.岗位职责是否为全要素;3.是否有明确的任职或上岗条件;4.工作标准是否有定性指标->伪代码返回-检查标准");  //检查标准 ->  工作标准(work_standard)  要求2(requirement)
208
+                itemsList.add(item);
209
+
210
+                item = new PostCheckedItems();
211
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
212
+                item.setPostCheckedContent("适宜性->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
213
+                item.setPostCheckedStandard("1.职责与权限;2.任职或上岗条件;……7.是否对岗位职责落实情况进行检查,检查是否有检查记录。->伪代码返回-检查标准");  //检查标准 ->  工作标准(work_standard)  要求2(requirement)
214
+                itemsList.add(item);
215
+            }
216
+            // 按类型
217
+            else if (type == 5) {
218
+                PostCheckedItems item = new PostCheckedItems();
219
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
220
+                item.setPostCheckedContent("政治要求->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
221
+                item.setPostCheckedStandard("大学本科->伪代码返回-检查标准");  //检查标准 ->  工作标准(work_standard)  要求2(requirement)
222
+                itemsList.add(item);
223
+
224
+                item = new PostCheckedItems();
225
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
226
+                item.setPostCheckedContent("最低学历要求->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
227
+                item.setPostCheckedStandard("无->伪代码返回-检查标准");  //检查标准 ->  工作标准(work_standard)  要求2(requirement)
228
+                itemsList.add(item);
229
+
230
+                item = new PostCheckedItems();
231
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
232
+                item.setPostCheckedContent("最低学位要求->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
233
+                item.setPostCheckedStandard("1.职责与权限;2.任职或上岗条件;……7.是否对岗位职责落实情况进行检查,检查是否有检查记录。->伪代码返回-检查标准");  //检查标准 ->  工作标准(work_standard)  要求2(requirement)
234
+                itemsList.add(item);
235
+
236
+
237
+                item = new PostCheckedItems();
238
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
239
+                item.setPostCheckedContent("工作经验->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
240
+                item.setPostCheckedStandard("岗位工作累计5年以上->伪代码返回-检查标准");  //检查标准 ->  工作标准(work_standard)  要求2(requirement)
241
+                itemsList.add(item);
242
+
243
+                item = new PostCheckedItems();
244
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
245
+                item.setPostCheckedContent("职称要求->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
246
+                item.setPostCheckedStandard("高级职称。->伪代码返回-检查标准");  //检查标准 ->  工作标准(work_standard)  要求2(requirement)
247
+                itemsList.add(item);
248
+
249
+                item = new PostCheckedItems();
250
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
251
+                item.setPostCheckedContent("专业要求->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
252
+                item.setPostCheckedStandard("石油主干专业、企业管理或相关专业。->伪代码返回-检查标准");  //检查标准 ->  工作标准(work_standard)  要求2(requirement)
253
+                itemsList.add(item);
254
+            }
255
+            // 按类型
256
+            else if (type == 1) {
257
+                PostCheckedItems item = new PostCheckedItems();
258
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
259
+                item.setPostCheckedContent("党委会、董事会管理->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
260
+                item.setPostCheckedStandard("抓好三重一大管理,确保党委会、董事会合规运行->伪代码返回-检查标准");  //检查标准 ->  工作标准(work_standard)  要求2(requirement)
261
+                itemsList.add(item);
262
+
263
+                item = new PostCheckedItems();
264
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
265
+                item.setPostCheckedContent("保密、信访及维稳管理->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
266
+                item.setPostCheckedStandard("按照要求做好保密教育、不发生重大泄密事件;不发生大规模群访闹访事件,限时办结信访事项->伪代码返回-检查标准");  //检查标准 ->  工作标准(work_standard)  要求2(requirement)
267
+                itemsList.add(item);
268
+
269
+
270
+            }
271
+
272
+            // 按类型
273
+            else if (type == 2) {
274
+                PostCheckedItems item = new PostCheckedItems();
275
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
276
+                item.setPostCheckedContent("个人廉洁从业情况->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
277
+                item.setPostCheckedStandard("检查时间范围内未受到处理处分(诫勉以上)(以公司发文为准)。->伪代码返回-检查标准");  //检查标准 ->  工作标准(work_standard)  要求2(requirement)
278
+                itemsList.add(item);
279
+
280
+                item = new PostCheckedItems();
281
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
282
+                item.setPostCheckedContent("党风廉政建设和反腐败责任落实情况->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
283
+                item.setPostCheckedStandard("1.按要求组织开展部门党风廉政建设宣传月活动;2.推动作风建设情况->伪代码返回-检查标准");  //检查标准 ->  工作标准(work_standard)  要求2(requirement)
284
+                itemsList.add(item);
285
+
286
+            }
287
+            // 按类型
288
+            else if (type == 3) {
289
+                PostCheckedItems item = new PostCheckedItems();
290
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
291
+                item.setPostCheckedContent("安全会议->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
292
+                item.setPostCheckedStandard("按时参加公司安委会、安全生产工作例会,汇报部门相关安全工作。->伪代码返回-检查标准");  //检查标准 ->  工作标准(work_standard)  要求2(requirement)
293
+                itemsList.add(item);
294
+
295
+                item = new PostCheckedItems();
296
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
297
+                item.setPostCheckedContent("安全工作落实->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
298
+                item.setPostCheckedStandard("负责部门安全管理,落实公司领导及相关会议中布置的涉及本部门安全方面的各项工作。->伪代码返回-检查标准");  //检查标准 ->  工作标准(work_standard)  要求2(requirement)
299
+                itemsList.add(item);
300
+
301
+                item = new PostCheckedItems();
302
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
303
+                item.setPostCheckedContent("环境应急->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
304
+                item.setPostCheckedStandard("环境应急xxxxxxxxxxxx->伪代码返回-检查标准");  //检查标准 ->  工作标准(work_standard)  要求2(requirement)
305
+                itemsList.add(item);
306
+            }
307
+            // 按类型
308
+            else if (type == 4) {
309
+                PostCheckedItems item = new PostCheckedItems();
310
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
311
+                item.setPostCheckedContent("建立健全本部门业务合规管理制度和流程,开展合规风险识别评估,编制风险清单和应对预案。对本部门保密国安工作负全面领导责任。->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
312
+                item.setPostCheckedStandard("1.及时组织本部门员工学习相关法律法规、监管规定、行业规范及公司规章制度,清楚公司各项管理要求、本职工作合规基本义务及违规应承担的责任。\n" +
313
+                        "2.按要求组织开展法律法规、标准和其它要求识别评估,建立健全本部门法律法规等识别评价清单,及时更新完善相关管理制度和流程,及时组织业务管理制度宣贯。\n" +
314
+                        "3.按要求组织开展合规风险识别评估,建立健全本部门合规管理清单。                                        \n" +
315
+                        "4.严格执行党的保密、国家安全工作方针政策以及集团公司党组、炼化公司党委和惠州石化党委工作部署、中海炼化保密“十四五”工作计划、惠州石化年度保密工作要点等要求。->伪代码返回-检查标准");  //检查标准 ->  工作标准(work_standard)  要求2(requirement)
316
+                itemsList.add(item);
317
+
318
+                item = new PostCheckedItems();
319
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
320
+                item.setPostCheckedContent("定期梳理重点岗位合规风险,将合规要求纳入岗位职责。坚持“业务谁主管,保密国安谁负责”原则,严格落实保密国安工作责任制。->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
321
+                item.setPostCheckedStandard("根据业务管理实际,及时更新本部门关键岗位及相关合规风险,纳入岗位责任制清单。严格落实保密国安主体责任。->伪代码返回-检查标准");  //检查标准 ->  工作标准(work_standard)  要求2(requirement)
322
+                itemsList.add(item);
323
+
324
+                item = new PostCheckedItems();
325
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
326
+                item.setPostCheckedContent("负责本部门经营管理行为的合规审查。加强保密国安人防、物防、技防措施;强化网络保密管理,加强对微博、微信、QQ、钉钉等社交媒体保密管理。->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
327
+                item.setPostCheckedStandard("1.及时组织对本领域内制度、文件、合同及经营管理行为等进行合规性审查,审查率100%。\n" +
328
+                        "2.严格落实“三重一大”事项合规审查和审议决策程序,执行率100%。\n" +
329
+                        "3.自觉抵制和纠正上级或其它职能部门违章指挥或违规行为,杜绝对本部门员工和承包商进行违章指挥,及时发现和干预本部门员工和承包商违规行为,做到守法合规。\n" +
330
+                        "4.定期组织检查与考核本部门员工遵章守纪情况。                           \n" +
331
+                        "5.严格执行“涉密不上网、上网不涉密”。->伪代码返回-检查标准");  //检查标准 ->  工作标准(work_standard)  要求2(requirement)
332
+                itemsList.add(item);
333
+            }
334
+        }
335
+
336
+
337
+        return success(itemsList);
338
+    }
134 339
 }

+ 1 - 1
ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/PostAssessmentRating.java

@@ -22,7 +22,7 @@ import lombok.EqualsAndHashCode;
22 22
  */
23 23
 @EqualsAndHashCode(callSuper = true)
24 24
 @Data
25
-@ApiModel(value = "4.1.1-考核评比对象")
25
+@ApiModel(value = "考核评比对象")
26 26
 @TableName("post_assessment_rating") // 数据库表名
27 27
 public class PostAssessmentRating extends BaseEntity
28 28
 {

+ 100 - 0
ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/PostChecked.java

@@ -0,0 +1,100 @@
1
+package com.ruoyi.postCheck.domain;
2
+
3
+import java.util.ArrayList;
4
+import java.util.Date;
5
+import java.util.List;
6
+
7
+import com.fasterxml.jackson.annotation.JsonFormat;
8
+import org.apache.commons.lang3.builder.ToStringBuilder;
9
+import org.apache.commons.lang3.builder.ToStringStyle;
10
+import com.ruoyi.common.annotation.Excel;
11
+import com.ruoyi.common.core.domain.BaseEntity;
12
+import com.baomidou.mybatisplus.annotation.TableField;
13
+import io.swagger.annotations.ApiModel;
14
+import io.swagger.annotations.ApiModelProperty;
15
+import com.baomidou.mybatisplus.annotation.TableName;
16
+import lombok.Data;
17
+import lombok.EqualsAndHashCode;
18
+
19
+/**
20
+ * 岗检表管理对象 post_checked
21
+ *
22
+ * @author csg
23
+ * @date 2024-01-05
24
+ */
25
+@EqualsAndHashCode(callSuper = true)
26
+@Data
27
+@ApiModel(value = "岗检表管理对象")
28
+@TableName("post_checked") // 数据库表名
29
+public class PostChecked extends BaseEntity
30
+{
31
+    private static final long serialVersionUID = 1L;
32
+
33
+    private Long id;
34
+
35
+    @ApiModelProperty("检查工作组ID")
36
+    @TableField(value = "check_workgroup_id")
37
+    @Excel(name = "检查工作组ID")
38
+    private Long checkWorkgroupId;
39
+
40
+    @ApiModelProperty("检查小组ID")
41
+    @TableField(value = "check_group_id")
42
+    @Excel(name = "检查小组ID")
43
+    private Long checkGroupId;
44
+
45
+    @ApiModelProperty("被检查部门ID")
46
+    @TableField(value = "checked_dept_id")
47
+    @Excel(name = "被检查部门ID")
48
+    private Long checkedDeptId;
49
+
50
+    @ApiModelProperty("被检查岗位ID")
51
+    @TableField(value = "checked_post_id")
52
+    @Excel(name = "被检查岗位ID")
53
+    private Long checkedPostId;
54
+
55
+    @ApiModelProperty("打印人ID")
56
+    @TableField(value = "print_user_id")
57
+    @Excel(name = "打印人ID")
58
+    private Long printUserId;
59
+
60
+    @ApiModelProperty("打印时间")
61
+    @TableField(value = "print_time")
62
+    @Excel(name = "打印时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
63
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
64
+    private Date printTime;
65
+
66
+    @ApiModelProperty("上传:检查后的检查表照片或PDF,磁盘相对路径")
67
+    @TableField(value = "checked_img")
68
+    @Excel(name = "上传:检查后的检查表照片或PDF,磁盘相对路径")
69
+    private String checkedImg;
70
+
71
+    @ApiModelProperty("上传:检查人中文姓名")
72
+    @TableField(value = "checked_user_name")
73
+    @Excel(name = "上传:检查人中文姓名", readConverterExp = "上=传页面设置的值")
74
+    private String checkedUserName;
75
+
76
+    @ApiModelProperty("上传:检查时间")
77
+    @TableField(value = "checked_time")
78
+    @Excel(name = "上传:检查时间", readConverterExp = "上=传页面设置的值")
79
+    private Date checkedTime;
80
+
81
+    @ApiModelProperty("上传:检查表上传人ID")
82
+    @TableField(value = "upload_user_id")
83
+    @Excel(name = "上传:检查表上传人ID")
84
+    private Long uploadUserId;
85
+
86
+    @ApiModelProperty("上传:检查表上传时间")
87
+    @TableField(value = "upload_time")
88
+    @Excel(name = "上传:检查表上传时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
89
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
90
+    private Date uploadTime;
91
+
92
+    @ApiModelProperty("创建者用户ID")
93
+    @TableField(value = "create_user_id")
94
+    @Excel(name = "创建者用户ID")
95
+    private Long createUserId;
96
+
97
+    @ApiModelProperty("检查表明细")
98
+    @TableField(exist = false)
99
+    private List<PostCheckedItems> children = new ArrayList<>();
100
+}

+ 65 - 0
ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/PostCheckedItems.java

@@ -0,0 +1,65 @@
1
+package com.ruoyi.postCheck.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
+import com.baomidou.mybatisplus.annotation.TableField;
8
+import io.swagger.annotations.ApiModel;
9
+import io.swagger.annotations.ApiModelProperty;
10
+import com.baomidou.mybatisplus.annotation.TableName;
11
+import lombok.Data;
12
+import lombok.EqualsAndHashCode;
13
+
14
+/**
15
+ * 岗检表管理明细对象 post_checked_items
16
+ *
17
+ * @author csg
18
+ * @date 2024-01-05
19
+ */
20
+@EqualsAndHashCode(callSuper = true)
21
+@Data
22
+@ApiModel(value = "岗检表管理明细对象")
23
+@TableName("post_checked_items") // 数据库表名
24
+public class PostCheckedItems extends BaseEntity
25
+{
26
+    private static final long serialVersionUID = 1L;
27
+
28
+    private Long id;
29
+
30
+    @ApiModelProperty("岗位责任制检查表ID")
31
+    @TableField(value = "post_checked_id")
32
+    @Excel(name = "岗位责任制检查表ID")
33
+    private Long postCheckedId;
34
+
35
+    @ApiModelProperty("检查项目:参考post_list_info表;类型")
36
+    @TableField(value = "type")
37
+    @Excel(name = "检查项目:参考post_list_info表;类型", readConverterExp = "1=-业务职责;2-党建及党风廉政建设职责;3-安全环保职责;4-合规保密职;5-任职资格与能力素质要求")
38
+    private Integer type;
39
+
40
+    @ApiModelProperty("创建者用户ID")
41
+    @TableField(value = "create_user_id")
42
+    @Excel(name = "创建者用户ID")
43
+    private Long createUserId;
44
+
45
+    @ApiModelProperty("检查内容")
46
+    @TableField(value = "post_checked_content")
47
+    @Excel(name = "检查内容")
48
+    private String postCheckedContent;
49
+
50
+    @ApiModelProperty("检查标准")
51
+    @TableField(value = "post_checked_standard")
52
+    @Excel(name = "检查标准")
53
+    private String postCheckedStandard;
54
+
55
+    @ApiModelProperty("检查方法")
56
+    @TableField(value = "post_checked_method")
57
+    @Excel(name = "检查方法")
58
+    private String postCheckedMethod;
59
+
60
+    @ApiModelProperty("检查结果")
61
+    @TableField(value = "post_checked_result")
62
+    @Excel(name = "检查结果")
63
+    private String postCheckedResult;
64
+
65
+}

+ 1 - 1
ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/PostCheckedProblem.java

@@ -106,7 +106,7 @@ public class PostCheckedProblem extends BaseEntity {
106 106
 
107 107
     @ApiModelProperty("问题类别")
108 108
     @TableField(value = "problem_category")
109
-    @Excel(name = "问题类别", readConverterExp = "职责权限问题、工作内容问题、工作标准问题、考核奖励问题、考核奖励问题、任职资格问题、其他")
109
+    @Excel(name = "问题类别", readConverterExp = "职责权限问题、工作内容问题、工作标准问题、考核奖励问题、任职资格问题、其他")
110 110
     private String problemCategory;
111 111
 
112 112
     @ApiModelProperty("问题描述")

+ 37 - 0
ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/homePage/AssessmentRatingView.java

@@ -0,0 +1,37 @@
1
+package com.ruoyi.postCheck.domain.homePage;
2
+
3
+import io.swagger.annotations.ApiModel;
4
+import io.swagger.annotations.ApiModelProperty;
5
+import lombok.Data;
6
+import lombok.EqualsAndHashCode;
7
+
8
+import java.io.Serializable;
9
+import java.math.BigDecimal;
10
+
11
+@EqualsAndHashCode
12
+@Data
13
+@ApiModel(value = "首页-评比排名")
14
+public class AssessmentRatingView implements Serializable {
15
+
16
+
17
+    private static final long serialVersionUID = 1296736926345529777L;
18
+
19
+    @ApiModelProperty("排名")
20
+    private Integer rating;
21
+
22
+    @ApiModelProperty("部门ID")
23
+    private Long deptId;
24
+
25
+    @ApiModelProperty("部门名称")
26
+    private String deptName;
27
+
28
+    @ApiModelProperty("岗位ID")
29
+    private Long postId;
30
+
31
+    @ApiModelProperty("岗位名称")
32
+    private String postName;
33
+
34
+    @ApiModelProperty("得分")
35
+    private BigDecimal score;
36
+
37
+}

+ 33 - 0
ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/homePage/DeptProblemRectificationView.java

@@ -0,0 +1,33 @@
1
+package com.ruoyi.postCheck.domain.homePage;
2
+
3
+import io.swagger.annotations.ApiModel;
4
+import io.swagger.annotations.ApiModelProperty;
5
+import lombok.Data;
6
+import lombok.EqualsAndHashCode;
7
+
8
+import java.io.Serializable;
9
+import java.math.BigDecimal;
10
+
11
+@EqualsAndHashCode
12
+@Data
13
+@ApiModel(value = "首页-岗检部门整改率")
14
+public class DeptProblemRectificationView implements Serializable {
15
+
16
+
17
+    private static final long serialVersionUID = 1296736926345529777L;
18
+
19
+    @ApiModelProperty("部门ID")
20
+    private Long deptId;
21
+
22
+    @ApiModelProperty("部门名称")
23
+    private String deptName;
24
+
25
+    @ApiModelProperty("问题总数量")
26
+    private Integer problemTotal;
27
+
28
+    @ApiModelProperty("问题整改完成数量")
29
+    private Integer problemComplete;
30
+
31
+    @ApiModelProperty("问题整改率")
32
+    private BigDecimal problemRectificationRate;
33
+}

+ 10 - 8
ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/homePage/PostCheckedProblemView.java

@@ -14,16 +14,18 @@ public class PostCheckedProblemView implements Serializable {
14 14
 
15 15
     private static final long serialVersionUID = -4567465960543504158L;
16 16
 
17
-    @ApiModelProperty("责任制清单数量")
18
-    private Integer listCount;
17
+    @ApiModelProperty("数量")
18
+    private Integer problemTotal;
19 19
 
20
-    @ApiModelProperty("检查出的问题数量")
21
-    private Integer problemCount;
20
+    @ApiModelProperty("完整性数量")
21
+    private Integer problemComplete;
22
+
23
+    @ApiModelProperty("适宜性数量")
24
+    private Integer problemSuitable;
25
+
26
+    @ApiModelProperty("有效性数量")
27
+    private Integer problemEffective;
22 28
 
23
-    @ApiModelProperty("岗检数量-已查")
24
-    private Integer checkedPostCount;
25 29
 
26
-    @ApiModelProperty("岗检数量-未查")
27
-    private Integer uncheckedPostCount;
28 30
 
29 31
 }

+ 34 - 0
ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/homePage/PostCheckedUnCheckedView.java

@@ -0,0 +1,34 @@
1
+package com.ruoyi.postCheck.domain.homePage;
2
+
3
+import io.swagger.annotations.ApiModel;
4
+import io.swagger.annotations.ApiModelProperty;
5
+import lombok.Data;
6
+import lombok.EqualsAndHashCode;
7
+
8
+import java.io.Serializable;
9
+import java.math.BigDecimal;
10
+
11
+@EqualsAndHashCode
12
+@Data
13
+@ApiModel(value = "首页-岗检已查/岗检未查")
14
+public class PostCheckedUnCheckedView implements Serializable {
15
+
16
+
17
+    private static final long serialVersionUID = 1296736926345529777L;
18
+
19
+    @ApiModelProperty("部门ID")
20
+    private Long deptId;
21
+
22
+    @ApiModelProperty("部门名称")
23
+    private String deptName;
24
+
25
+    @ApiModelProperty("岗位ID")
26
+    private Long postId;
27
+
28
+    @ApiModelProperty("岗位名称")
29
+    private String postName;
30
+
31
+    @ApiModelProperty("岗位下人数")
32
+    private Integer userCount;
33
+
34
+}

+ 21 - 0
ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/tools/PostCheckListType.java

@@ -0,0 +1,21 @@
1
+package com.ruoyi.postCheck.domain.tools;
2
+
3
+import io.swagger.annotations.Api;
4
+import io.swagger.annotations.ApiModel;
5
+import io.swagger.annotations.ApiModelProperty;
6
+import lombok.Data;
7
+
8
+@ApiModel(value = "检查项目下拉框对象")
9
+@Data
10
+public class PostCheckListType {
11
+    @ApiModelProperty("key:检查项目 -> 业务职责、党建党风、安全环保……")
12
+    private Integer type;
13
+
14
+    @ApiModelProperty("value:检查项目 -> 业务职责、党建党风、安全环保……")
15
+    private String typeView;
16
+
17
+    public PostCheckListType(Integer type, String typeView) {
18
+        this.type = type;
19
+        this.typeView = typeView;
20
+    }
21
+}

+ 62 - 0
ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/mapper/PostCheckedItemsMapper.java

@@ -0,0 +1,62 @@
1
+package com.ruoyi.postCheck.mapper;
2
+
3
+import java.util.List;
4
+import com.ruoyi.postCheck.domain.PostCheckedItems;
5
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
6
+
7
+/**
8
+ * 岗检表管理明细Mapper接口
9
+ *
10
+ * @author csg
11
+ * @date 2024-01-05
12
+ */
13
+public interface PostCheckedItemsMapper extends BaseMapper<PostCheckedItems>
14
+{
15
+    /**
16
+     * 查询岗检表管理明细
17
+     *
18
+     * @param id 岗检表管理明细主键
19
+     * @return 岗检表管理明细
20
+     */
21
+    public PostCheckedItems selectPostCheckedItemsById(Long id);
22
+
23
+    /**
24
+     * 查询岗检表管理明细列表
25
+     *
26
+     * @param postCheckedItems 岗检表管理明细
27
+     * @return 岗检表管理明细集合
28
+     */
29
+    public List<PostCheckedItems> selectPostCheckedItemsList(PostCheckedItems postCheckedItems);
30
+
31
+    /**
32
+     * 新增岗检表管理明细
33
+     *
34
+     * @param postCheckedItems 岗检表管理明细
35
+     * @return 结果
36
+     */
37
+    public int insertPostCheckedItems(PostCheckedItems postCheckedItems);
38
+
39
+    /**
40
+     * 修改岗检表管理明细
41
+     *
42
+     * @param postCheckedItems 岗检表管理明细
43
+     * @return 结果
44
+     */
45
+    public int updatePostCheckedItems(PostCheckedItems postCheckedItems);
46
+
47
+    /**
48
+     * 删除岗检表管理明细
49
+     *
50
+     * @param id 岗检表管理明细主键
51
+     * @return 结果
52
+     */
53
+    public int deletePostCheckedItemsById(Long id);
54
+
55
+    /**
56
+     * 批量删除岗检表管理明细
57
+     *
58
+     * @param ids 需要删除的数据主键集合
59
+     * @return 结果
60
+     */
61
+    public int deletePostCheckedItemsByIds(Long[] ids);
62
+}

+ 62 - 0
ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/mapper/PostCheckedMapper.java

@@ -0,0 +1,62 @@
1
+package com.ruoyi.postCheck.mapper;
2
+
3
+import java.util.List;
4
+import com.ruoyi.postCheck.domain.PostChecked;
5
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
6
+
7
+/**
8
+ * 岗检表管理Mapper接口
9
+ *
10
+ * @author csg
11
+ * @date 2024-01-05
12
+ */
13
+public interface PostCheckedMapper extends BaseMapper<PostChecked>
14
+{
15
+    /**
16
+     * 查询岗检表管理
17
+     *
18
+     * @param id 岗检表管理主键
19
+     * @return 岗检表管理
20
+     */
21
+    public PostChecked selectPostCheckedById(Long id);
22
+
23
+    /**
24
+     * 查询岗检表管理列表
25
+     *
26
+     * @param postChecked 岗检表管理
27
+     * @return 岗检表管理集合
28
+     */
29
+    public List<PostChecked> selectPostCheckedList(PostChecked postChecked);
30
+
31
+    /**
32
+     * 新增岗检表管理
33
+     *
34
+     * @param postChecked 岗检表管理
35
+     * @return 结果
36
+     */
37
+    public int insertPostChecked(PostChecked postChecked);
38
+
39
+    /**
40
+     * 修改岗检表管理
41
+     *
42
+     * @param postChecked 岗检表管理
43
+     * @return 结果
44
+     */
45
+    public int updatePostChecked(PostChecked postChecked);
46
+
47
+    /**
48
+     * 删除岗检表管理
49
+     *
50
+     * @param id 岗检表管理主键
51
+     * @return 结果
52
+     */
53
+    public int deletePostCheckedById(Long id);
54
+
55
+    /**
56
+     * 批量删除岗检表管理
57
+     *
58
+     * @param ids 需要删除的数据主键集合
59
+     * @return 结果
60
+     */
61
+    public int deletePostCheckedByIds(Long[] ids);
62
+}

+ 6 - 2
ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/mapper/PostListMapper.java

@@ -1,9 +1,12 @@
1 1
 package com.ruoyi.postCheck.mapper;
2 2
 
3 3
 import java.util.List;
4
+
5
+import com.ruoyi.postCheck.domain.PostCheckedItems;
4 6
 import com.ruoyi.postCheck.domain.PostList;
5 7
 import com.ruoyi.postCheck.domain.PostListInfo;
6 8
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
9
+import org.apache.ibatis.annotations.Param;
7 10
 
8 11
 /**
9 12
  * 岗检责任制清单Mapper接口
@@ -11,8 +14,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
11 14
  * @author csg
12 15
  * @date 2023-12-20
13 16
  */
14
-public interface PostListMapper extends BaseMapper<PostList>
15
-{
17
+public interface PostListMapper extends BaseMapper<PostList> {
16 18
     /**
17 19
      * 查询岗检责任制清单
18 20
      *
@@ -85,4 +87,6 @@ public interface PostListMapper extends BaseMapper<PostList>
85 87
      * @return 结果
86 88
      */
87 89
     public int deletePostListInfoByPostListId(Long id);
90
+
91
+    List<PostCheckedItems> contentListByType(@Param("deptId")Long deptId, @Param("postId")Long postId, @Param("type")Integer type);
88 92
 }

+ 62 - 0
ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/IPostCheckedItemsService.java

@@ -0,0 +1,62 @@
1
+package com.ruoyi.postCheck.service;
2
+
3
+import java.util.List;
4
+import com.ruoyi.postCheck.domain.PostCheckedItems;
5
+import com.baomidou.mybatisplus.extension.service.IService;
6
+
7
+/**
8
+ * 岗检表管理明细Service接口
9
+ *
10
+ * @author csg
11
+ * @date 2024-01-05
12
+ */
13
+public interface IPostCheckedItemsService extends IService<PostCheckedItems>
14
+{
15
+    /**
16
+     * 查询岗检表管理明细
17
+     *
18
+     * @param id 岗检表管理明细主键
19
+     * @return 岗检表管理明细
20
+     */
21
+    public PostCheckedItems selectPostCheckedItemsById(Long id);
22
+
23
+    /**
24
+     * 查询岗检表管理明细列表
25
+     *
26
+     * @param postCheckedItems 岗检表管理明细
27
+     * @return 岗检表管理明细集合
28
+     */
29
+    public List<PostCheckedItems> selectPostCheckedItemsList(PostCheckedItems postCheckedItems);
30
+
31
+    /**
32
+     * 新增岗检表管理明细
33
+     *
34
+     * @param postCheckedItems 岗检表管理明细
35
+     * @return 结果
36
+     */
37
+    public int insertPostCheckedItems(PostCheckedItems postCheckedItems);
38
+
39
+    /**
40
+     * 修改岗检表管理明细
41
+     *
42
+     * @param postCheckedItems 岗检表管理明细
43
+     * @return 结果
44
+     */
45
+    public int updatePostCheckedItems(PostCheckedItems postCheckedItems);
46
+
47
+    /**
48
+     * 批量删除岗检表管理明细
49
+     *
50
+     * @param ids 需要删除的岗检表管理明细主键集合
51
+     * @return 结果
52
+     */
53
+    public int deletePostCheckedItemsByIds(Long[] ids);
54
+
55
+    /**
56
+     * 删除岗检表管理明细信息
57
+     *
58
+     * @param id 岗检表管理明细主键
59
+     * @return 结果
60
+     */
61
+    public int deletePostCheckedItemsById(Long id);
62
+}

+ 62 - 0
ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/IPostCheckedService.java

@@ -0,0 +1,62 @@
1
+package com.ruoyi.postCheck.service;
2
+
3
+import java.util.List;
4
+
5
+import com.ruoyi.postCheck.domain.PostChecked;
6
+import com.baomidou.mybatisplus.extension.service.IService;
7
+
8
+/**
9
+ * 岗检表管理Service接口
10
+ *
11
+ * @author csg
12
+ * @date 2024-01-05
13
+ */
14
+public interface IPostCheckedService extends IService<PostChecked> {
15
+    /**
16
+     * 查询岗检表管理
17
+     *
18
+     * @param id 岗检表管理主键
19
+     * @return 岗检表管理
20
+     */
21
+    public PostChecked selectPostCheckedById(Long id);
22
+
23
+    /**
24
+     * 查询岗检表管理列表
25
+     *
26
+     * @param postChecked 岗检表管理
27
+     * @return 岗检表管理集合
28
+     */
29
+    public List<PostChecked> selectPostCheckedList(PostChecked postChecked);
30
+
31
+    /**
32
+     * 新增岗检表管理
33
+     *
34
+     * @param postChecked 岗检表管理
35
+     * @return 结果
36
+     */
37
+    public int insertPostChecked(PostChecked postChecked);
38
+
39
+    /**
40
+     * 修改岗检表管理
41
+     *
42
+     * @param postChecked 岗检表管理
43
+     * @return 结果
44
+     */
45
+    public int updatePostChecked(PostChecked postChecked);
46
+
47
+    /**
48
+     * 批量删除岗检表管理
49
+     *
50
+     * @param ids 需要删除的岗检表管理主键集合
51
+     * @return 结果
52
+     */
53
+    public int deletePostCheckedByIds(Long[] ids);
54
+
55
+    /**
56
+     * 删除岗检表管理信息
57
+     *
58
+     * @param id 岗检表管理主键
59
+     * @return 结果
60
+     */
61
+    public int deletePostCheckedById(Long id);
62
+}

+ 11 - 0
ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/IPostListService.java

@@ -1,6 +1,8 @@
1 1
 package com.ruoyi.postCheck.service;
2 2
 
3 3
 import java.util.List;
4
+
5
+import com.ruoyi.postCheck.domain.PostCheckedItems;
4 6
 import com.ruoyi.postCheck.domain.PostList;
5 7
 import com.baomidou.mybatisplus.extension.service.IService;
6 8
 
@@ -59,4 +61,13 @@ public interface IPostListService extends IService<PostList>
59 61
      * @return 结果
60 62
      */
61 63
     public int deletePostListById(Long id);
64
+
65
+    /**
66
+     *
67
+     * @param deptId 部门ID
68
+     * @param postId 岗位ID
69
+     * @param type 检查项目(业务职责、党建党风、安全环保……)
70
+     * @return
71
+     */
72
+    List<PostCheckedItems> contentListByType(Long deptId, Long postId, Integer type);
62 73
 }

+ 100 - 0
ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/impl/PostCheckedItemsServiceImpl.java

@@ -0,0 +1,100 @@
1
+package com.ruoyi.postCheck.service.impl;
2
+
3
+import java.util.List;
4
+
5
+import com.ruoyi.common.utils.DateUtils;
6
+import com.ruoyi.common.utils.SecurityUtils;
7
+import org.springframework.beans.factory.annotation.Autowired;
8
+import org.springframework.stereotype.Service;
9
+import com.ruoyi.postCheck.mapper.PostCheckedItemsMapper;
10
+import com.ruoyi.postCheck.domain.PostCheckedItems;
11
+import com.ruoyi.postCheck.service.IPostCheckedItemsService;
12
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
13
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
14
+
15
+/**
16
+ * 岗检表管理明细Service业务层处理
17
+ *
18
+ * @author csg
19
+ * @date 2024-01-05
20
+ */
21
+@Service
22
+public class PostCheckedItemsServiceImpl extends ServiceImpl<PostCheckedItemsMapper, PostCheckedItems> implements IPostCheckedItemsService {
23
+    @Autowired
24
+    private PostCheckedItemsMapper postCheckedItemsMapper;
25
+
26
+    /**
27
+     * 查询岗检表管理明细
28
+     *
29
+     * @param id 岗检表管理明细主键
30
+     * @return 岗检表管理明细
31
+     */
32
+    @Override
33
+    public PostCheckedItems selectPostCheckedItemsById(Long id) {
34
+        return postCheckedItemsMapper.selectPostCheckedItemsById(id);
35
+    }
36
+
37
+    /**
38
+     * 查询岗检表管理明细列表
39
+     *
40
+     * @param postCheckedItems 岗检表管理明细
41
+     * @return 岗检表管理明细
42
+     */
43
+    @Override
44
+    public List<PostCheckedItems> selectPostCheckedItemsList(PostCheckedItems postCheckedItems) {
45
+        return postCheckedItemsMapper.selectPostCheckedItemsList(postCheckedItems);
46
+    }
47
+
48
+    /**
49
+     * 新增岗检表管理明细
50
+     *
51
+     * @param postCheckedItems 岗检表管理明细
52
+     * @return 结果
53
+     */
54
+    @Override
55
+    public int insertPostCheckedItems(PostCheckedItems postCheckedItems) {
56
+        //TODO 自增主键修改为-MyBatis-Plus雪花算法(截取5位解决VUE精度丢失BUG)-系统登录日志
57
+//        if (postCheckedItems.getId() == null)
58
+            postCheckedItems.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
59
+        // postCheckedItems.setCreateTime(DateUtils.getNowDate());
60
+        postCheckedItems.setCreateDefault();
61
+//        postCheckedItems.setStatus(PostCheckedItemsEnum.STATUS_WAIT.getValue()); // 去创建自己的枚举类
62
+        postCheckedItems.setCreateUserId(SecurityUtils.getUserId());
63
+        return postCheckedItemsMapper.insertPostCheckedItems(postCheckedItems);
64
+    }
65
+
66
+    /**
67
+     * 修改岗检表管理明细
68
+     *
69
+     * @param postCheckedItems 岗检表管理明细
70
+     * @return 结果
71
+     */
72
+    @Override
73
+    public int updatePostCheckedItems(PostCheckedItems postCheckedItems) {
74
+        // postCheckedItems.setUpdateTime(DateUtils.getNowDate());
75
+        postCheckedItems.setUpdateDefault();
76
+        return postCheckedItemsMapper.updatePostCheckedItems(postCheckedItems);
77
+    }
78
+
79
+    /**
80
+     * 批量删除岗检表管理明细
81
+     *
82
+     * @param ids 需要删除的岗检表管理明细主键
83
+     * @return 结果
84
+     */
85
+    @Override
86
+    public int deletePostCheckedItemsByIds(Long[] ids) {
87
+        return postCheckedItemsMapper.deletePostCheckedItemsByIds(ids);
88
+    }
89
+
90
+    /**
91
+     * 删除岗检表管理明细信息
92
+     *
93
+     * @param id 岗检表管理明细主键
94
+     * @return 结果
95
+     */
96
+    @Override
97
+    public int deletePostCheckedItemsById(Long id) {
98
+        return postCheckedItemsMapper.deletePostCheckedItemsById(id);
99
+    }
100
+}

+ 191 - 0
ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/impl/PostCheckedServiceImpl.java

@@ -0,0 +1,191 @@
1
+package com.ruoyi.postCheck.service.impl;
2
+
3
+import java.util.List;
4
+
5
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
6
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
7
+import com.ruoyi.common.exception.base.BaseException;
8
+import com.ruoyi.common.utils.DateUtils;
9
+import com.ruoyi.common.utils.SecurityUtils;
10
+import com.ruoyi.postCheck.domain.PostCheckedItems;
11
+import com.ruoyi.postCheck.service.IPostCheckedItemsService;
12
+import lombok.Data;
13
+import lombok.extern.slf4j.Slf4j;
14
+import org.springframework.beans.factory.annotation.Autowired;
15
+import org.springframework.stereotype.Service;
16
+import com.ruoyi.postCheck.mapper.PostCheckedMapper;
17
+import com.ruoyi.postCheck.domain.PostChecked;
18
+import com.ruoyi.postCheck.service.IPostCheckedService;
19
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
20
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
21
+import org.springframework.transaction.annotation.Transactional;
22
+import org.springframework.util.CollectionUtils;
23
+
24
+/**
25
+ * 岗检表管理Service业务层处理
26
+ *
27
+ * @author csg
28
+ * @date 2024-01-05
29
+ */
30
+@Service
31
+@Slf4j
32
+public class PostCheckedServiceImpl extends ServiceImpl<PostCheckedMapper, PostChecked> implements IPostCheckedService {
33
+    @Autowired
34
+    private PostCheckedMapper postCheckedMapper;
35
+    @Autowired
36
+    private IPostCheckedItemsService postCheckedItemsService;
37
+
38
+    /**
39
+     * 查询岗检表管理
40
+     *
41
+     * @param id 岗检表管理主键
42
+     * @return 岗检表管理
43
+     */
44
+    @Override
45
+    public PostChecked selectPostCheckedById(Long id) {
46
+        PostChecked data = postCheckedMapper.selectPostCheckedById(id);
47
+        if (data != null) {
48
+//            Long id = data.getId();
49
+//            if (id != null) {
50
+
51
+            PostCheckedItems param = new PostCheckedItems();
52
+            param.setPostCheckedId(id);
53
+            List<PostCheckedItems> children = postCheckedItemsService.selectPostCheckedItemsList(param);
54
+            data.setChildren(children);
55
+//            }
56
+        }
57
+        return data;
58
+    }
59
+
60
+    /**
61
+     * 查询岗检表管理列表
62
+     *
63
+     * @param postChecked 岗检表管理
64
+     * @return 岗检表管理
65
+     */
66
+    @Override
67
+    public List<PostChecked> selectPostCheckedList(PostChecked postChecked) {
68
+        List<PostChecked> dataList = postCheckedMapper.selectPostCheckedList(postChecked);
69
+        if (!CollectionUtils.isEmpty(dataList)) {
70
+            for (PostChecked data : dataList) {
71
+                Long id = data.getId();
72
+                if (id != null) {
73
+
74
+                    PostCheckedItems param = new PostCheckedItems();
75
+                    param.setPostCheckedId(id);
76
+                    List<PostCheckedItems> children = postCheckedItemsService.selectPostCheckedItemsList(param);
77
+                    data.setChildren(children);
78
+                }
79
+            }
80
+        }
81
+        return dataList;
82
+    }
83
+
84
+    /**
85
+     * 新增岗检表管理
86
+     *
87
+     * @param postChecked 岗检表管理
88
+     * @return 结果
89
+     */
90
+    @Override
91
+    @Transactional(rollbackFor = Exception.class)
92
+    public int insertPostChecked(PostChecked postChecked) {
93
+
94
+        List<PostCheckedItems> children = postChecked.getChildren();
95
+        if (CollectionUtils.isEmpty(children)) {
96
+            log.error("【岗检表】-add:未设置检查内容,请在页面选择需要检查的项目,再提交!");
97
+            throw new BaseException("未设置检查内容,请在页面选择需要检查的项目,再提交!");
98
+        }
99
+        //TODO 自增主键修改为-MyBatis-Plus雪花算法(截取5位解决VUE精度丢失BUG)-系统登录日志
100
+//        if (postChecked.getId() == null)
101
+        postChecked.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
102
+        // postChecked.setCreateTime(DateUtils.getNowDate());
103
+        postChecked.setCreateDefault();
104
+//        postChecked.setStatus(PostCheckedEnum.STATUS_WAIT.getValue()); // 去创建自己的枚举类
105
+        postChecked.setCreateUserId(SecurityUtils.getUserId());
106
+        int row = postCheckedMapper.insertPostChecked(postChecked);
107
+        if (row > 0) {
108
+            for (PostCheckedItems child : children) {
109
+                child.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
110
+                child.setCreateDefault();
111
+            }
112
+            postCheckedItemsService.saveBatch(children);
113
+        }
114
+        return row;
115
+    }
116
+
117
+    /**
118
+     * 修改岗检表管理
119
+     *
120
+     * @param postChecked 岗检表管理
121
+     * @return 结果
122
+     */
123
+    @Override
124
+    public int updatePostChecked(PostChecked postChecked) {
125
+        Long id = postChecked.getId();
126
+
127
+        if (id == null) {
128
+            log.error("【岗检表】-edit:未设置id,请联系管理员!");
129
+            throw new BaseException("未设置id,请联系管理员!");
130
+        }
131
+
132
+        List<PostCheckedItems> children = postChecked.getChildren();
133
+        if (CollectionUtils.isEmpty(children) || id == null) {
134
+            log.error("【岗检表】-edit:未设置检查内容,请在页面选择需要检查的项目,再提交!");
135
+            throw new BaseException("未设置检查内容,请在页面选择需要检查的项目,再提交!");
136
+        }
137
+
138
+
139
+        postChecked.setUpdateDefault();
140
+        int row = postCheckedMapper.updatePostChecked(postChecked);
141
+        if (row > 0) {
142
+            //删除明细
143
+            LambdaUpdateWrapper<PostCheckedItems> updateWrapper = new LambdaUpdateWrapper<>();
144
+            updateWrapper.eq(PostCheckedItems::getPostCheckedId, id);
145
+            postCheckedItemsService.remove(updateWrapper);
146
+
147
+            //插入明细
148
+            for (PostCheckedItems child : children) {
149
+                child.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
150
+                child.setCreateDefault();
151
+            }
152
+            postCheckedItemsService.saveBatch(children);
153
+        }
154
+
155
+        return row;
156
+    }
157
+
158
+    /**
159
+     * 批量删除岗检表管理
160
+     *
161
+     * @param ids 需要删除的岗检表管理主键
162
+     * @return 结果
163
+     */
164
+    @Override
165
+    public int deletePostCheckedByIds(Long[] ids) {
166
+        int row = postCheckedMapper.deletePostCheckedByIds(ids);
167
+
168
+        //删除明细
169
+        LambdaUpdateWrapper<PostCheckedItems> updateWrapper = new LambdaUpdateWrapper<>();
170
+        updateWrapper.in(PostCheckedItems::getPostCheckedId, ids);
171
+        postCheckedItemsService.remove(updateWrapper);
172
+
173
+        return row;
174
+    }
175
+
176
+    /**
177
+     * 删除岗检表管理信息
178
+     *
179
+     * @param id 岗检表管理主键
180
+     * @return 结果
181
+     */
182
+    @Override
183
+    public int deletePostCheckedById(Long id) {
184
+        int row = postCheckedMapper.deletePostCheckedById(id);
185
+        //删除明细
186
+        LambdaUpdateWrapper<PostCheckedItems> updateWrapper = new LambdaUpdateWrapper<>();
187
+        updateWrapper.eq(PostCheckedItems::getPostCheckedId, id);
188
+        postCheckedItemsService.remove(updateWrapper);
189
+        return row;
190
+    }
191
+}

+ 14 - 0
ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/impl/PostListServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
9 9
 import com.ruoyi.common.constant.PostListEnum;
10 10
 import com.ruoyi.common.utils.DateUtils;
11 11
 import com.ruoyi.common.utils.SecurityUtils;
12
+import com.ruoyi.postCheck.domain.PostCheckedItems;
12 13
 import com.ruoyi.postCheck.service.IPostListInfoService;
13 14
 import org.springframework.beans.factory.annotation.Autowired;
14 15
 import org.springframework.stereotype.Service;
@@ -187,4 +188,17 @@ public class PostListServiceImpl extends ServiceImpl<PostListMapper, PostList> i
187 188
             }
188 189
         }
189 190
     }
191
+
192
+
193
+    /**
194
+     * @param deptId 部门ID
195
+     * @param postId 岗位ID
196
+     * @param type   检查项目(业务职责、党建党风、安全环保……)
197
+     * @return
198
+     */
199
+    @Override
200
+    public List<PostCheckedItems> contentListByType(Long deptId, Long postId, Integer type) {
201
+
202
+        return postListMapper.contentListByType(deptId,postId,type);
203
+    }
190 204
 }

+ 112 - 0
ruoyi-postcheck/src/main/resources/mapper/postCheck/PostCheckedItemsMapper.xml

@@ -0,0 +1,112 @@
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.postCheck.mapper.PostCheckedItemsMapper">
6
+    
7
+    <resultMap type="PostCheckedItems" id="PostCheckedItemsResult">
8
+        <result property="id"    column="id"    />
9
+        <result property="postCheckedId"    column="post_checked_id"    />
10
+        <result property="type"    column="type"    />
11
+        <result property="remark"    column="remark"    />
12
+        <result property="delFlag"    column="del_flag"    />
13
+        <result property="createTime"    column="create_time"    />
14
+        <result property="createBy"    column="create_by"    />
15
+        <result property="updateTime"    column="update_time"    />
16
+        <result property="updateBy"    column="update_by"    />
17
+        <result property="createUserId"    column="create_user_id"    />
18
+        <result property="postCheckedContent"    column="post_checked_content"    />
19
+        <result property="postCheckedStandard"    column="post_checked_standard"    />
20
+        <result property="postCheckedMethod"    column="post_checked_method"    />
21
+        <result property="postCheckedResult"    column="post_checked_result"    />
22
+    </resultMap>
23
+
24
+    <sql id="selectPostCheckedItemsVo">
25
+        select id, post_checked_id, type, remark, del_flag, create_time, create_by, update_time, update_by, create_user_id, post_checked_content, post_checked_standard, post_checked_method, post_checked_result from post_checked_items
26
+    </sql>
27
+
28
+    <select id="selectPostCheckedItemsList" parameterType="PostCheckedItems" resultMap="PostCheckedItemsResult">
29
+        <include refid="selectPostCheckedItemsVo"/>
30
+        <where>  
31
+            <if test="postCheckedId != null "> and post_checked_id = #{postCheckedId}</if>
32
+            <if test="type != null "> and type = #{type}</if>
33
+            <if test="createUserId != null "> and create_user_id = #{createUserId}</if>
34
+            <if test="postCheckedContent != null  and postCheckedContent != ''"> and post_checked_content = #{postCheckedContent}</if>
35
+            <if test="postCheckedStandard != null  and postCheckedStandard != ''"> and post_checked_standard = #{postCheckedStandard}</if>
36
+            <if test="postCheckedMethod != null  and postCheckedMethod != ''"> and post_checked_method = #{postCheckedMethod}</if>
37
+            <if test="postCheckedResult != null  and postCheckedResult != ''"> and post_checked_result = #{postCheckedResult}</if>
38
+        </where>
39
+    </select>
40
+    
41
+    <select id="selectPostCheckedItemsById" parameterType="Long" resultMap="PostCheckedItemsResult">
42
+        <include refid="selectPostCheckedItemsVo"/>
43
+        where id = #{id}
44
+    </select>
45
+        
46
+    <insert id="insertPostCheckedItems" parameterType="PostCheckedItems">
47
+        insert into post_checked_items
48
+        <trim prefix="(" suffix=")" suffixOverrides=",">
49
+            <if test="id != null">id,</if>
50
+            <if test="postCheckedId != null">post_checked_id,</if>
51
+            <if test="type != null">type,</if>
52
+            <if test="remark != null">remark,</if>
53
+            <if test="delFlag != null">del_flag,</if>
54
+            <if test="createTime != null">create_time,</if>
55
+            <if test="createBy != null and createBy != ''">create_by,</if>
56
+            <if test="updateTime != null">update_time,</if>
57
+            <if test="updateBy != null and updateBy != ''">update_by,</if>
58
+            <if test="createUserId != null">create_user_id,</if>
59
+            <if test="postCheckedContent != null">post_checked_content,</if>
60
+            <if test="postCheckedStandard != null">post_checked_standard,</if>
61
+            <if test="postCheckedMethod != null">post_checked_method,</if>
62
+            <if test="postCheckedResult != null">post_checked_result,</if>
63
+         </trim>
64
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
65
+            <if test="id != null">#{id},</if>
66
+            <if test="postCheckedId != null">#{postCheckedId},</if>
67
+            <if test="type != null">#{type},</if>
68
+            <if test="remark != null">#{remark},</if>
69
+            <if test="delFlag != null">#{delFlag},</if>
70
+            <if test="createTime != null">#{createTime},</if>
71
+            <if test="createBy != null and createBy != ''">#{createBy},</if>
72
+            <if test="updateTime != null">#{updateTime},</if>
73
+            <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
74
+            <if test="createUserId != null">#{createUserId},</if>
75
+            <if test="postCheckedContent != null">#{postCheckedContent},</if>
76
+            <if test="postCheckedStandard != null">#{postCheckedStandard},</if>
77
+            <if test="postCheckedMethod != null">#{postCheckedMethod},</if>
78
+            <if test="postCheckedResult != null">#{postCheckedResult},</if>
79
+         </trim>
80
+    </insert>
81
+
82
+    <update id="updatePostCheckedItems" parameterType="PostCheckedItems">
83
+        update post_checked_items
84
+        <trim prefix="SET" suffixOverrides=",">
85
+            <if test="postCheckedId != null">post_checked_id = #{postCheckedId},</if>
86
+            <if test="type != null">type = #{type},</if>
87
+            <if test="remark != null">remark = #{remark},</if>
88
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
89
+            <if test="createTime != null">create_time = #{createTime},</if>
90
+            <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
91
+            <if test="updateTime != null">update_time = #{updateTime},</if>
92
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
93
+            <if test="createUserId != null">create_user_id = #{createUserId},</if>
94
+            <if test="postCheckedContent != null">post_checked_content = #{postCheckedContent},</if>
95
+            <if test="postCheckedStandard != null">post_checked_standard = #{postCheckedStandard},</if>
96
+            <if test="postCheckedMethod != null">post_checked_method = #{postCheckedMethod},</if>
97
+            <if test="postCheckedResult != null">post_checked_result = #{postCheckedResult},</if>
98
+        </trim>
99
+        where id = #{id}
100
+    </update>
101
+
102
+    <delete id="deletePostCheckedItemsById" parameterType="Long">
103
+        delete from post_checked_items where id = #{id}
104
+    </delete>
105
+
106
+    <delete id="deletePostCheckedItemsByIds" parameterType="String">
107
+        delete from post_checked_items where id in 
108
+        <foreach item="id" collection="array" open="(" separator="," close=")">
109
+            #{id}
110
+        </foreach>
111
+    </delete>
112
+</mapper>

+ 137 - 0
ruoyi-postcheck/src/main/resources/mapper/postCheck/PostCheckedMapper.xml

@@ -0,0 +1,137 @@
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.postCheck.mapper.PostCheckedMapper">
6
+    
7
+    <resultMap type="PostChecked" id="PostCheckedResult">
8
+        <result property="id"    column="id"    />
9
+        <result property="checkWorkgroupId"    column="check_workgroup_id"    />
10
+        <result property="checkGroupId"    column="check_group_id"    />
11
+        <result property="checkedDeptId"    column="checked_dept_id"    />
12
+        <result property="checkedPostId"    column="checked_post_id"    />
13
+        <result property="printUserId"    column="print_user_id"    />
14
+        <result property="printTime"    column="print_time"    />
15
+        <result property="checkedImg"    column="checked_img"    />
16
+        <result property="checkedUserName"    column="checked_user_name"    />
17
+        <result property="checkedTime"    column="checked_time"    />
18
+        <result property="uploadUserId"    column="upload_user_id"    />
19
+        <result property="uploadTime"    column="upload_time"    />
20
+        <result property="remark"    column="remark"    />
21
+        <result property="delFlag"    column="del_flag"    />
22
+        <result property="createTime"    column="create_time"    />
23
+        <result property="createBy"    column="create_by"    />
24
+        <result property="updateTime"    column="update_time"    />
25
+        <result property="updateBy"    column="update_by"    />
26
+        <result property="createUserId"    column="create_user_id"    />
27
+    </resultMap>
28
+
29
+    <sql id="selectPostCheckedVo">
30
+        select id, check_workgroup_id, check_group_id, checked_dept_id, checked_post_id, print_user_id, print_time, checked_img, checked_user_name, checked_time, upload_user_id, upload_time, remark, del_flag, create_time, create_by, update_time, update_by, create_user_id from post_checked
31
+    </sql>
32
+
33
+    <select id="selectPostCheckedList" parameterType="PostChecked" resultMap="PostCheckedResult">
34
+        <include refid="selectPostCheckedVo"/>
35
+        <where>  
36
+            <if test="checkWorkgroupId != null "> and check_workgroup_id = #{checkWorkgroupId}</if>
37
+            <if test="checkGroupId != null "> and check_group_id = #{checkGroupId}</if>
38
+            <if test="checkedDeptId != null "> and checked_dept_id = #{checkedDeptId}</if>
39
+            <if test="checkedPostId != null "> and checked_post_id = #{checkedPostId}</if>
40
+            <if test="printUserId != null "> and print_user_id = #{printUserId}</if>
41
+            <if test="printTime != null "> and print_time = #{printTime}</if>
42
+            <if test="checkedImg != null  and checkedImg != ''"> and checked_img = #{checkedImg}</if>
43
+            <if test="checkedUserName != null  and checkedUserName != ''"> and checked_user_name like concat('%', #{checkedUserName}, '%')</if>
44
+            <if test="checkedTime != null "> and checked_time = #{checkedTime}</if>
45
+            <if test="uploadUserId != null "> and upload_user_id = #{uploadUserId}</if>
46
+            <if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
47
+            <if test="createUserId != null "> and create_user_id = #{createUserId}</if>
48
+        </where>
49
+    </select>
50
+    
51
+    <select id="selectPostCheckedById" parameterType="Long" resultMap="PostCheckedResult">
52
+        <include refid="selectPostCheckedVo"/>
53
+        where id = #{id}
54
+    </select>
55
+        
56
+    <insert id="insertPostChecked" parameterType="PostChecked">
57
+        insert into post_checked
58
+        <trim prefix="(" suffix=")" suffixOverrides=",">
59
+            <if test="id != null">id,</if>
60
+            <if test="checkWorkgroupId != null">check_workgroup_id,</if>
61
+            <if test="checkGroupId != null">check_group_id,</if>
62
+            <if test="checkedDeptId != null">checked_dept_id,</if>
63
+            <if test="checkedPostId != null">checked_post_id,</if>
64
+            <if test="printUserId != null">print_user_id,</if>
65
+            <if test="printTime != null">print_time,</if>
66
+            <if test="checkedImg != null">checked_img,</if>
67
+            <if test="checkedUserName != null">checked_user_name,</if>
68
+            <if test="checkedTime != null">checked_time,</if>
69
+            <if test="uploadUserId != null">upload_user_id,</if>
70
+            <if test="uploadTime != null">upload_time,</if>
71
+            <if test="remark != null">remark,</if>
72
+            <if test="delFlag != null">del_flag,</if>
73
+            <if test="createTime != null">create_time,</if>
74
+            <if test="createBy != null and createBy != ''">create_by,</if>
75
+            <if test="updateTime != null">update_time,</if>
76
+            <if test="updateBy != null and updateBy != ''">update_by,</if>
77
+            <if test="createUserId != null">create_user_id,</if>
78
+         </trim>
79
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
80
+            <if test="id != null">#{id},</if>
81
+            <if test="checkWorkgroupId != null">#{checkWorkgroupId},</if>
82
+            <if test="checkGroupId != null">#{checkGroupId},</if>
83
+            <if test="checkedDeptId != null">#{checkedDeptId},</if>
84
+            <if test="checkedPostId != null">#{checkedPostId},</if>
85
+            <if test="printUserId != null">#{printUserId},</if>
86
+            <if test="printTime != null">#{printTime},</if>
87
+            <if test="checkedImg != null">#{checkedImg},</if>
88
+            <if test="checkedUserName != null">#{checkedUserName},</if>
89
+            <if test="checkedTime != null">#{checkedTime},</if>
90
+            <if test="uploadUserId != null">#{uploadUserId},</if>
91
+            <if test="uploadTime != null">#{uploadTime},</if>
92
+            <if test="remark != null">#{remark},</if>
93
+            <if test="delFlag != null">#{delFlag},</if>
94
+            <if test="createTime != null">#{createTime},</if>
95
+            <if test="createBy != null and createBy != ''">#{createBy},</if>
96
+            <if test="updateTime != null">#{updateTime},</if>
97
+            <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
98
+            <if test="createUserId != null">#{createUserId},</if>
99
+         </trim>
100
+    </insert>
101
+
102
+    <update id="updatePostChecked" parameterType="PostChecked">
103
+        update post_checked
104
+        <trim prefix="SET" suffixOverrides=",">
105
+            <if test="checkWorkgroupId != null">check_workgroup_id = #{checkWorkgroupId},</if>
106
+            <if test="checkGroupId != null">check_group_id = #{checkGroupId},</if>
107
+            <if test="checkedDeptId != null">checked_dept_id = #{checkedDeptId},</if>
108
+            <if test="checkedPostId != null">checked_post_id = #{checkedPostId},</if>
109
+            <if test="printUserId != null">print_user_id = #{printUserId},</if>
110
+            <if test="printTime != null">print_time = #{printTime},</if>
111
+            <if test="checkedImg != null">checked_img = #{checkedImg},</if>
112
+            <if test="checkedUserName != null">checked_user_name = #{checkedUserName},</if>
113
+            <if test="checkedTime != null">checked_time = #{checkedTime},</if>
114
+            <if test="uploadUserId != null">upload_user_id = #{uploadUserId},</if>
115
+            <if test="uploadTime != null">upload_time = #{uploadTime},</if>
116
+            <if test="remark != null">remark = #{remark},</if>
117
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
118
+            <if test="createTime != null">create_time = #{createTime},</if>
119
+            <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
120
+            <if test="updateTime != null">update_time = #{updateTime},</if>
121
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
122
+            <if test="createUserId != null">create_user_id = #{createUserId},</if>
123
+        </trim>
124
+        where id = #{id}
125
+    </update>
126
+
127
+    <delete id="deletePostCheckedById" parameterType="Long">
128
+        delete from post_checked where id = #{id}
129
+    </delete>
130
+
131
+    <delete id="deletePostCheckedByIds" parameterType="String">
132
+        delete from post_checked where id in 
133
+        <foreach item="id" collection="array" open="(" separator="," close=")">
134
+            #{id}
135
+        </foreach>
136
+    </delete>
137
+</mapper>

+ 31 - 0
ruoyi-postcheck/src/main/resources/mapper/postCheck/PostListMapper.xml

@@ -262,4 +262,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
262 262
             ( #{item.id}, #{item.status}, #{item.statusByUserId}, #{item.statusByUserName}, #{item.postListId}, #{item.type}, #{item.sequenceProject}, #{item.levelOne}, #{item.levelTwo}, #{item.levelThree}, #{item.levelFour}, #{item.levelFive}, #{item.workStandard}, #{item.requirement}, #{item.remark}, #{item.delFlag}, #{item.createTime}, #{item.createBy}, #{item.updateTime}, #{item.updateBy}, #{item.createUserId})
263 263
         </foreach>
264 264
     </insert>
265
+
266
+    <select id="contentListByType" resultType="PostCheckedItems">
267
+        SELECT
268
+            t2.type,
269
+            t2.level_one  as levelOne,
270
+            t2.level_two as levelTwo,
271
+            t2.level_three as levelThre,
272
+            t2.level_four as levelFour,
273
+            t2.level_five as levelFive,
274
+            case
275
+                when t2.level_five IS NOT NULL AND CHAR_LENGTH(TRIM(t2.level_five)) > 0 then TRIM(t2.level_five)
276
+                when t2.level_four IS NOT NULL AND CHAR_LENGTH(TRIM(t2.level_four)) > 0  then TRIM(t2.level_four)
277
+                when t2.level_three IS NOT NULL AND CHAR_LENGTH(TRIM(t2.level_three)) > 0  then TRIM(t2.level_three)
278
+                when t2.level_two IS NOT NULL AND CHAR_LENGTH(TRIM(t2.level_two)) > 0  then TRIM(t2.level_two)
279
+                when t2.level_one IS NOT NULL AND CHAR_LENGTH(TRIM(t2.level_one)) > 0  then TRIM(t2.level_one)
280
+               <!--
281
+                when t2.level_five IS NOT NULL then t2.level_five
282
+                when t2.level_four IS NOT NULL then t2.level_four
283
+                when t2.level_three IS NOT NULL then t2.level_three
284
+                when t2.level_two IS NOT NULL then t2.level_two
285
+                when t2.level_one IS NOT NULL then t2.level_one
286
+               -->
287
+                else 'Other'
288
+            END AS postCheckedContent,
289
+            t2.work_standard as postCheckedStandard
290
+        FROM "post_list" t1
291
+        INNER JOIN "post_list_info" t2 ON t2."post_list_id" = t1."id"
292
+        WHERE t1."dept_id" = #{deptId}
293
+        AND t1."post_id" = #{postId}
294
+        AND t2."type" = #{type}
295
+    </select>
265 296
 </mapper>

+ 1 - 1
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -256,7 +256,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
256 256
 		LEFT JOIN "public".sys_user_post sup ON sup.user_id  = u.user_id
257 257
 		LEFT JOIN "public".sys_post sp ON sp.post_id = sup.post_id
258 258
 		WHERE u.del_flag = '0'
259
-		<if test="deptId != null and deptId != 0">AND u.dept_id = #{deptId},</if>
259
+		<if test="deptId != null and deptId != 0">AND u.dept_id = #{deptId}</if>
260 260
 		<if test="postName != null and postName != ''">
261 261
 			AND sp.post_name like concat('%', #{postName}, '%')
262 262
 		</if>

文件差異過大導致無法顯示
+ 13 - 13
sql/DB_2024-01-03_17_28_57.sql


+ 1 - 1
sql/Database.sql

@@ -1020,7 +1020,7 @@ COMMENT ON COLUMN public.post_checked_problem.problem_attribute IS '问题属性
1020 1020
 -- Name: COLUMN post_checked_problem.problem_category; Type: COMMENT; Schema: public; Owner: postcheckuser
1021 1021
 --
1022 1022
 
1023
-COMMENT ON COLUMN public.post_checked_problem.problem_category IS '问题类别(职责权限问题、工作内容问题、工作标准问题、考核奖励问题、考核奖励问题、任职资格问题、其他)';
1023
+COMMENT ON COLUMN public.post_checked_problem.problem_category IS '问题类别(职责权限问题、工作内容问题、工作标准问题、考核奖励问题、任职资格问题、其他)';
1024 1024
 
1025 1025
 
1026 1026
 --

+ 16 - 0
sql/Menu.sql

@@ -37,8 +37,24 @@ values('298192019214341', '岗检计划删除', '298192019214337', '4',  '#', ''
37 37
 insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
38 38
 values('298192019214342', '岗检计划导出', '298192019214337', '5',  '#', '', 1, 0, 'F', '0', '0', 'postCheck:postPlan:export',       '#', 'admin', CURRENT_TIMESTAMP, '', null, '');
39 39
 
40
+-- 菜单 SQL:岗检表管理
41
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
42
+values('201116134002689', '岗检表管理', '17355455216040', '1', 'postChecked', 'postCheck/postChecked/index', 1, 0, 'C', '0', '0', 'postCheck:postChecked:list', '#', 'admin', CURRENT_TIMESTAMP, '', null, '岗检表管理菜单');
43
+-- 按钮 SQL:岗检表管理
44
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
45
+values('201116134002690', '岗检表管理查询', '201116134002689', '1',  '#', '', 1, 0, 'F', '0', '0', 'postCheck:postChecked:query',        '#', 'admin', CURRENT_TIMESTAMP, '', null, '');
46
+
47
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
48
+values('201116134002691', '岗检表管理新增', '201116134002689', '2',  '#', '', 1, 0, 'F', '0', '0', 'postCheck:postChecked:add',          '#', 'admin', CURRENT_TIMESTAMP, '', null, '');
40 49
 
50
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
51
+values('201116134002692', '岗检表管理修改', '201116134002689', '3',  '#', '', 1, 0, 'F', '0', '0', 'postCheck:postChecked:edit',         '#', 'admin', CURRENT_TIMESTAMP, '', null, '');
52
+
53
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
54
+values('201116134002693', '岗检表管理删除', '201116134002689', '4',  '#', '', 1, 0, 'F', '0', '0', 'postCheck:postChecked:remove',       '#', 'admin', CURRENT_TIMESTAMP, '', null, '');
41 55
 
56
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
57
+values('201116134002694', '岗检表管理导出', '201116134002689', '5',  '#', '', 1, 0, 'F', '0', '0', 'postCheck:postChecked:export',       '#', 'admin', CURRENT_TIMESTAMP, '', null, '');
42 58
 
43 59
 
44 60
 -- 菜单 SQL:岗检记录上传

+ 16 - 1
sql/UpdateTable.sql

@@ -356,7 +356,7 @@ ALTER TABLE "public"."post_checked_problem" MODIFY "speciality_department_review
356 356
 ALTER TABLE "public"."post_checked_problem" MODIFY "speciality_department_review_time" COMMENT '审核2:专业部门审核人审核时间';
357 357
 ALTER TABLE "public"."post_checked_problem" MODIFY "problem_level" COMMENT '问题等级(一般、重要)';
358 358
 ALTER TABLE "public"."post_checked_problem" MODIFY "problem_attribute" COMMENT '问题属性(完整问题、有效性问题、适宜性问题)';
359
-ALTER TABLE "public"."post_checked_problem" MODIFY "problem_category" COMMENT '问题类别(职责权限问题、工作内容问题、工作标准问题、考核奖励问题、考核奖励问题、任职资格问题、其他)';
359
+ALTER TABLE "public"."post_checked_problem" MODIFY "problem_category" COMMENT '问题类别(职责权限问题、工作内容问题、工作标准问题、考核奖励问题、任职资格问题、其他)';
360 360
 ALTER TABLE "public"."post_checked_problem" MODIFY "description" COMMENT '问题描述';
361 361
 ALTER TABLE "public"."post_checked_problem" MODIFY "problem_cause" COMMENT '问题原因';
362 362
 ALTER TABLE "public"."post_checked_problem" MODIFY "is_immediately_corrected" COMMENT '是否立行立改(1-Yes;2-No;)';
@@ -711,3 +711,18 @@ ALTER TABLE "public"."post_assessment_rating_other_info" MODIFY "update_by" COMM
711 711
     ALTER TABLE "public"."post_assessment_rating_other" ADD COLUMN create_by varying(64 char) NULL COMMENT '创建者';
712 712
     ALTER TABLE "public"."post_assessment_rating_other" ADD COLUMN update_time DATETIME NULL COMMENT '更新时间';
713 713
     ALTER TABLE "public"."post_assessment_rating_other" ADD COLUMN update_by varying(64 char) NULL COMMENT '更新者';
714
+
715
+
716
+
717
+ALTER TABLE "public"."post_checked" RENAME COLUMN "checked_user_id" TO checked_user_name;
718
+ALTER TABLE "public"."post_checked" MODIFY COLUMN "checked_user_name" varchar(64);
719
+ALTER TABLE "public"."post_checked" MODIFY COLUMN "checked_user_name" varchar COMMENT '检查人中文姓名(上传页面设置的值)';
720
+ALTER TABLE "public"."post_checked" MODIFY COLUMN "checked_time" timestamp WITH time ZONE COMMENT '检查时间(上传页面设置的值)';
721
+ALTER TABLE "public"."post_checked" MODIFY COLUMN "upload_user_id" bigint COMMENT '检查表上传人ID';
722
+ALTER TABLE "public"."post_checked" MODIFY COLUMN "upload_time" timestamp WITH time ZONE COMMENT '检查表上传时间';
723
+
724
+ALTER TABLE "public"."post_checked_items" MODIFY COLUMN "type" integer COMMENT '检查项目:参考post_list_info表;类型(1-业务职责;2-党建及党风廉政建设职责;3-安全环保职责;4-合规保密职;5-任职资格与能力素质要求)';
725
+ALTER TABLE "public"."post_checked_items" ADD COLUMN post_checked_content varchar(1000) COMMENT '检查内容';
726
+ALTER TABLE "public"."post_checked_items" ADD COLUMN post_checked_standard varchar(1000) COMMENT '检查标准';
727
+ALTER TABLE "public"."post_checked_items" ADD COLUMN post_checked_method varchar(1000) COMMENT '检查方法';
728
+ALTER TABLE "public"."post_checked_items" ADD COLUMN post_checked_result varchar(1000) COMMENT '检查结果';