Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,186 @@
+package com.ruoyi.postCheck.controller;
+
+import java.util.*;
+import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.postCheck.domain.PostCheckedItems;
+import io.swagger.annotations.*;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.postCheck.domain.PostChecked;
+import com.ruoyi.postCheck.service.IPostCheckedService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 岗检表管理Controller
+ *
+ * @author csg
+ * @date 2024-01-05
+ */
+@Api(tags = "2.5.1-岗检表管理接口")
+@RestController
+@RequestMapping("/postCheck/postChecked")
+public class PostCheckedController extends BaseController {
+    @Autowired
+    private IPostCheckedService postCheckedService;
+
+    /**
+     * 查询岗检表管理列表
+     */
+    @ApiOperation("查询岗检表管理列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "checkWorkgroupId", value = "检查工作组ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "checkGroupId", value = "检查小组ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "checkedDeptId", value = "被检查部门ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "checkedPostId", value = "被检查岗位ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "printUserId", value = "打印人ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "printTime", value = "打印时间", dataType = "Date", dataTypeClass = Date.class),
+            @ApiImplicitParam(name = "checkedImg", value = "上传：检查后的检查表照片或PDF，磁盘相对路径", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "checkedUserName", value = "上传：检查人中文姓名（上传页面设置的值）", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "checkedTime", value = "上传：检查时间（上传页面设置的值）", dataType = "Date", dataTypeClass = Date.class),
+            @ApiImplicitParam(name = "uploadUserId", value = "上传：检查表上传人ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "uploadTime", value = "上传：检查表上传时间", dataType = "Date", dataTypeClass = Date.class),
+            @ApiImplicitParam(name = "delFlag", value = "删除标志（0代表存在 2代表删除）", dataType = "Integer", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = "createUserId", value = "创建者用户ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "pageNum", value = "页码从1开始", dataType = "Integer", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = "pageSize", value = "分页大小", dataType = "Integer", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = "orderBy", value = "排序字段", dataType = "String", dataTypeClass = String.class)
+    })
+    @PreAuthorize("@ss.hasPermi('postCheck:postChecked:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(PostChecked postChecked) {
+        startPage();
+        List<PostChecked> list = postCheckedService.selectPostCheckedList(postChecked);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出岗检表管理列表
+     @ApiOperation("导出岗检表管理列表")
+     @PreAuthorize("@ss.hasPermi('postCheck:postChecked:export')")
+     @Log(title = "岗检表管理", businessType = BusinessType.EXPORT)
+     @PostMapping("/export") public void export(HttpServletResponse response, PostChecked postChecked) {
+     List<PostChecked> list = postCheckedService.selectPostCheckedList(postChecked);
+     ExcelUtil<PostChecked> util = new ExcelUtil<PostChecked>(PostChecked.class);
+     util.exportExcel(response, list, "岗检表管理数据");
+     }
+     */
+
+    /**
+     * 获取岗检表管理详细信息
+     */
+    @ApiOperation("获取岗检表管理详细信息")
+    @PreAuthorize("@ss.hasPermi('postCheck:postChecked:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(postCheckedService.selectPostCheckedById(id));
+    }
+
+    /**
+     * 新增岗检表管理
+     *
+     * @ApiOperation("新增岗检表管理")
+     * @ApiImplicitParams({
+     * @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
+     * @ApiImplicitParam(name = "checkWorkgroupId", value = "检查工作组ID", dataType = "Long", dataTypeClass = Long.class),
+     * @ApiImplicitParam(name = "checkGroupId", value = "检查小组ID", dataType = "Long", dataTypeClass = Long.class),
+     * @ApiImplicitParam(name = "checkedDeptId", value = "被检查部门ID", dataType = "Long", dataTypeClass = Long.class),
+     * @ApiImplicitParam(name = "checkedPostId", value = "被检查岗位ID", dataType = "Long", dataTypeClass = Long.class),
+     * @ApiImplicitParam(name = "printUserId", value = "打印人ID", dataType = "Long", dataTypeClass = Long.class),
+     * @ApiImplicitParam(name = "printTime", value = "打印时间", dataType = "Date", dataTypeClass = Date.class),
+     * @ApiImplicitParam(name = "checkedImg", value = "上传：检查后的检查表照片或PDF，磁盘相对路径", dataType = "String", dataTypeClass = String.class),
+     * @ApiImplicitParam(name = "checkedUserName", value = "上传：检查人中文姓名（上传页面设置的值）", dataType = "String", dataTypeClass = String.class),
+     * @ApiImplicitParam(name = "checkedTime", value = "上传：检查时间（上传页面设置的值）", dataType = "Date", dataTypeClass = Date.class),
+     * @ApiImplicitParam(name = "uploadUserId", value = "上传：检查表上传人ID", dataType = "Long", dataTypeClass = Long.class),
+     * @ApiImplicitParam(name = "uploadTime", value = "上传：检查表上传时间", dataType = "Date", dataTypeClass = Date.class),
+     * @ApiImplicitParam(name = "delFlag", value = "删除标志（0代表存在 2代表删除）", dataType = "Integer", dataTypeClass = Integer.class),
+     * @ApiImplicitParam(name = "createUserId", value = "创建者用户ID", dataType = "Long", dataTypeClass = Long.class),
+     * })
+     * @PreAuthorize("@ss.hasPermi('postCheck:postChecked:add')")
+     * @Log(title = "岗检表管理", businessType = BusinessType.INSERT)
+     * @PostMapping public AjaxResult add(@RequestBody PostChecked postChecked) {
+     * return toAjax(postCheckedService.insertPostChecked(postChecked));
+     * }
+     */
+
+
+    @ApiOperation("新增岗检表管理")
+    @ApiImplicitParams({
+//     @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "checkWorkgroupId", value = "检查工作组ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "checkGroupId", value = "检查小组ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "checkedDeptId", value = "被检查部门ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "checkedPostId", value = "被检查岗位ID", dataType = "Long", dataTypeClass = Long.class),
+//     @ApiImplicitParam(name = "printUserId", value = "打印人ID", dataType = "Long", dataTypeClass = Long.class),
+//     @ApiImplicitParam(name = "printTime", value = "打印时间", dataType = "Date", dataTypeClass = Date.class),
+//     @ApiImplicitParam(name = "checkedImg", value = "上传：检查后的检查表照片或PDF，磁盘相对路径", dataType = "String", dataTypeClass = String.class),
+//     @ApiImplicitParam(name = "checkedUserName", value = "上传：检查人中文姓名（上传页面设置的值）", dataType = "String", dataTypeClass = String.class),
+//     @ApiImplicitParam(name = "checkedTime", value = "上传：检查时间（上传页面设置的值）", dataType = "Date", dataTypeClass = Date.class),
+//     @ApiImplicitParam(name = "uploadUserId", value = "上传：检查表上传人ID", dataType = "Long", dataTypeClass = Long.class),
+//     @ApiImplicitParam(name = "uploadTime", value = "上传：检查表上传时间", dataType = "Date", dataTypeClass = Date.class),
+//     @ApiImplicitParam(name = "delFlag", value = "删除标志（0代表存在 2代表删除）", dataType = "Integer", dataTypeClass = Integer.class),
+//     @ApiImplicitParam(name = "createUserId", value = "创建者用户ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "children", value = "检查表明细数组", dataType = "List", dataTypeClass = PostCheckedItems.class),
+    })
+
+
+    @PreAuthorize("@ss.hasPermi('postCheck:postChecked:add')")
+    @Log(title = "岗检表管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody PostChecked postChecked) {
+        return toAjax(postCheckedService.insertPostChecked(postChecked));
+    }
+
+    /**
+     * 修改岗检表管理
+     @ApiOperation("修改岗检表管理")
+     @ApiImplicitParams({
+     @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
+     @ApiImplicitParam(name = "checkWorkgroupId", value = "检查工作组ID", dataType = "Long", dataTypeClass = Long.class),
+     @ApiImplicitParam(name = "checkGroupId", value = "检查小组ID", dataType = "Long", dataTypeClass = Long.class),
+     @ApiImplicitParam(name = "checkedDeptId", value = "被检查部门ID", dataType = "Long", dataTypeClass = Long.class),
+     @ApiImplicitParam(name = "checkedPostId", value = "被检查岗位ID", dataType = "Long", dataTypeClass = Long.class),
+     @ApiImplicitParam(name = "printUserId", value = "打印人ID", dataType = "Long", dataTypeClass = Long.class),
+     @ApiImplicitParam(name = "printTime", value = "打印时间", dataType = "Date", dataTypeClass = Date.class),
+     @ApiImplicitParam(name = "checkedImg", value = "上传：检查后的检查表照片或PDF，磁盘相对路径", dataType = "String", dataTypeClass = String.class),
+     @ApiImplicitParam(name = "checkedUserName", value = "上传：检查人中文姓名（上传页面设置的值）", dataType = "String", dataTypeClass = String.class),
+     @ApiImplicitParam(name = "checkedTime", value = "上传：检查时间（上传页面设置的值）", dataType = "Date", dataTypeClass = Date.class),
+     @ApiImplicitParam(name = "uploadUserId", value = "上传：检查表上传人ID", dataType = "Long", dataTypeClass = Long.class),
+     @ApiImplicitParam(name = "uploadTime", value = "上传：检查表上传时间", dataType = "Date", dataTypeClass = Date.class),
+     @ApiImplicitParam(name = "delFlag", value = "删除标志（0代表存在 2代表删除）", dataType = "Integer", dataTypeClass = Integer.class),
+     @ApiImplicitParam(name = "createUserId", value = "创建者用户ID", dataType = "Long", dataTypeClass = Long.class),
+     })
+     @PreAuthorize("@ss.hasPermi('postCheck:postChecked:edit')")
+     @Log(title = "岗检表管理", businessType = BusinessType.UPDATE)
+     @PutMapping public AjaxResult edit(@RequestBody PostChecked postChecked) {
+     return toAjax(postCheckedService.updatePostChecked(postChecked));
+     }
+     */
+
+    /**
+     * 删除岗检表管理
+     */
+    @ApiOperation("删除岗检表管理")
+    @ApiImplicitParam(name = "ids", value = "Long类型的主键数组", dataType = "Long[]", dataTypeClass = Long[].class)
+    @PreAuthorize("@ss.hasPermi('postCheck:postChecked:remove')")
+    @Log(title = "岗检表管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(postCheckedService.deletePostCheckedByIds(ids));
+    }
+}

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

@@ -0,0 +1,152 @@
+package com.ruoyi.postCheck.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.postCheck.domain.PostCheckedItems;
+import com.ruoyi.postCheck.service.IPostCheckedItemsService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiImplicitParam;
+
+/**
+ * 岗检表管理明细Controller
+ *
+ * @author csg
+ * @date 2024-01-05
+ */
+@Api(tags = "2.5.2-岗检表管理明细接口（废弃不调）")
+@RestController
+@RequestMapping("/postCheck/postCheckedItems")
+public class PostCheckedItemsController extends BaseController
+{
+    @Autowired
+    private IPostCheckedItemsService postCheckedItemsService;
+
+    /**
+     * 查询岗检表管理明细列表
+     */
+    @ApiOperation("查询岗检表管理明细列表")
+    @ApiImplicitParams({
+                    @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
+                    @ApiImplicitParam(name = "postCheckedId", value = "岗位责任制检查表ID", dataType = "Long", dataTypeClass = Long.class),
+                    @ApiImplicitParam(name = "type", value = "检查项目：参考post_list_info表；类型（1-业务职责；2-党建及党风廉政建设职责；3-安全环保职责；4-合规保密职；5-任职资格与能力素质要求）", dataType = "Integer", dataTypeClass = Integer.class),
+                    @ApiImplicitParam(name = "delFlag", value = "删除标志（0代表存在 2代表删除）", dataType = "Integer", dataTypeClass = Integer.class),
+                    @ApiImplicitParam(name = "createUserId", value = "创建者用户ID", dataType = "Long", dataTypeClass = Long.class),
+                    @ApiImplicitParam(name = "postCheckedContent", value = "检查内容", dataType = "String", dataTypeClass = String.class),
+                    @ApiImplicitParam(name = "postCheckedStandard", value = "检查标准", dataType = "String", dataTypeClass = String.class),
+                    @ApiImplicitParam(name = "postCheckedMethod", value = "检查方法", dataType = "String", dataTypeClass = String.class),
+                    @ApiImplicitParam(name = "postCheckedResult", value = "检查结果", dataType = "String", dataTypeClass = String.class),
+                @ApiImplicitParam(name = "pageNum", value = "页码从1开始", dataType = "Integer", dataTypeClass = Integer.class),
+                @ApiImplicitParam(name = "pageSize", value = "分页大小", dataType = "Integer", dataTypeClass = Integer.class),
+                @ApiImplicitParam(name = "orderBy", value = "排序字段", dataType = "String", dataTypeClass = String.class)
+    })
+    @PreAuthorize("@ss.hasPermi('postCheck:postCheckedItems:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(PostCheckedItems postCheckedItems)
+    {
+        startPage();
+        List<PostCheckedItems> list = postCheckedItemsService.selectPostCheckedItemsList(postCheckedItems);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出岗检表管理明细列表
+     */
+    @ApiOperation("导出岗检表管理明细列表")
+    @PreAuthorize("@ss.hasPermi('postCheck:postCheckedItems:export')")
+    @Log(title = "岗检表管理明细", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, PostCheckedItems postCheckedItems)
+    {
+        List<PostCheckedItems> list = postCheckedItemsService.selectPostCheckedItemsList(postCheckedItems);
+        ExcelUtil<PostCheckedItems> util = new ExcelUtil<PostCheckedItems>(PostCheckedItems.class);
+        util.exportExcel(response, list, "岗检表管理明细数据");
+    }
+
+    /**
+     * 获取岗检表管理明细详细信息
+     */
+    @ApiOperation("获取岗检表管理明细详细信息")
+    @PreAuthorize("@ss.hasPermi('postCheck:postCheckedItems:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(postCheckedItemsService.selectPostCheckedItemsById(id));
+    }
+
+    /**
+     * 新增岗检表管理明细
+     */
+    @ApiOperation("新增岗检表管理明细")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
+        @ApiImplicitParam(name = "postCheckedId", value = "岗位责任制检查表ID", dataType = "Long", dataTypeClass = Long.class),
+        @ApiImplicitParam(name = "type", value = "检查项目：参考post_list_info表；类型（1-业务职责；2-党建及党风廉政建设职责；3-安全环保职责；4-合规保密职；5-任职资格与能力素质要求）", dataType = "Integer", dataTypeClass = Integer.class),
+        @ApiImplicitParam(name = "delFlag", value = "删除标志（0代表存在 2代表删除）", dataType = "Integer", dataTypeClass = Integer.class),
+        @ApiImplicitParam(name = "createUserId", value = "创建者用户ID", dataType = "Long", dataTypeClass = Long.class),
+        @ApiImplicitParam(name = "postCheckedContent", value = "检查内容", dataType = "String", dataTypeClass = String.class),
+        @ApiImplicitParam(name = "postCheckedStandard", value = "检查标准", dataType = "String", dataTypeClass = String.class),
+        @ApiImplicitParam(name = "postCheckedMethod", value = "检查方法", dataType = "String", dataTypeClass = String.class),
+        @ApiImplicitParam(name = "postCheckedResult", value = "检查结果", dataType = "String", dataTypeClass = String.class),
+    })
+    @PreAuthorize("@ss.hasPermi('postCheck:postCheckedItems:add')")
+    @Log(title = "岗检表管理明细", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody PostCheckedItems postCheckedItems)
+    {
+        return toAjax(postCheckedItemsService.insertPostCheckedItems(postCheckedItems));
+    }
+
+    /**
+     * 修改岗检表管理明细
+     */
+    @ApiOperation("修改岗检表管理明细")
+    @ApiImplicitParams({
+                    @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
+                    @ApiImplicitParam(name = "postCheckedId", value = "岗位责任制检查表ID", dataType = "Long", dataTypeClass = Long.class),
+                    @ApiImplicitParam(name = "type", value = "检查项目：参考post_list_info表；类型（1-业务职责；2-党建及党风廉政建设职责；3-安全环保职责；4-合规保密职；5-任职资格与能力素质要求）", dataType = "Integer", dataTypeClass = Integer.class),
+                    @ApiImplicitParam(name = "delFlag", value = "删除标志（0代表存在 2代表删除）", dataType = "Integer", dataTypeClass = Integer.class),
+                    @ApiImplicitParam(name = "createUserId", value = "创建者用户ID", dataType = "Long", dataTypeClass = Long.class),
+                    @ApiImplicitParam(name = "postCheckedContent", value = "检查内容", dataType = "String", dataTypeClass = String.class),
+                    @ApiImplicitParam(name = "postCheckedStandard", value = "检查标准", dataType = "String", dataTypeClass = String.class),
+                    @ApiImplicitParam(name = "postCheckedMethod", value = "检查方法", dataType = "String", dataTypeClass = String.class),
+                    @ApiImplicitParam(name = "postCheckedResult", value = "检查结果", dataType = "String", dataTypeClass = String.class),
+    })
+    @PreAuthorize("@ss.hasPermi('postCheck:postCheckedItems:edit')")
+    @Log(title = "岗检表管理明细", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody PostCheckedItems postCheckedItems)
+    {
+        return toAjax(postCheckedItemsService.updatePostCheckedItems(postCheckedItems));
+    }
+
+    /**
+     * 删除岗检表管理明细
+     */
+    @ApiOperation("删除岗检表管理明细")
+    @ApiImplicitParam(name = "ids", value = "Long类型的主键数组", dataType = "Long[]", dataTypeClass = Long[].class)
+    @PreAuthorize("@ss.hasPermi('postCheck:postCheckedItems:remove')")
+    @Log(title = "岗检表管理明细", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(postCheckedItemsService.deletePostCheckedItemsByIds(ids));
+    }
+}

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

@@ -54,7 +54,7 @@ public class PostCheckedProblemController extends BaseController {
             @ApiImplicitParam(name = "problemLevel", value = "问题等级（一般、重要）", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "dutyType", value = "职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；", dataType = "Integer", dataTypeClass = Integer.class),
             @ApiImplicitParam(name = "problemAttribute", value = "问题属性（完整问题、有效性问题、适宜性问题）", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "problemCategory", value = "问题类别（职责权限问题、工作内容问题、工作标准问题、考核奖励问题、考核奖励问题、任职资格问题、其他）", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "problemCategory", value = "问题类别（职责权限问题、工作内容问题、工作标准问题、考核奖励问题、任职资格问题、其他）", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "description", value = "问题描述", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "problemCause", value = "问题原因", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "isImmediatelyCorrected", value = "是否立行立改(1-Yes；2-No；)", dataType = "Integer", dataTypeClass = Integer.class),
@@ -121,7 +121,7 @@ public class PostCheckedProblemController extends BaseController {
             @ApiImplicitParam(name = "problemLevel", value = "问题等级（一般、重要）", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "dutyType", value = "职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；", dataType = "Integer", dataTypeClass = Integer.class),
             @ApiImplicitParam(name = "problemAttribute", value = "问题属性（完整问题、有效性问题、适宜性问题）", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "problemCategory", value = "问题类别（职责权限问题、工作内容问题、工作标准问题、考核奖励问题、考核奖励问题、任职资格问题、其他）", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "problemCategory", value = "问题类别（职责权限问题、工作内容问题、工作标准问题、考核奖励问题、任职资格问题、其他）", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "description", value = "问题描述", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "problemCause", value = "问题原因", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "isImmediatelyCorrected", value = "是否立行立改(1-Yes；2-No；)", dataType = "Integer", dataTypeClass = Integer.class),
@@ -167,7 +167,7 @@ public class PostCheckedProblemController extends BaseController {
             @ApiImplicitParam(name = "problemLevel", value = "问题等级（一般、重要）", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "dutyType", value = "职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；", dataType = "Integer", dataTypeClass = Integer.class),
             @ApiImplicitParam(name = "problemAttribute", value = "问题属性（完整问题、有效性问题、适宜性问题）", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "problemCategory", value = "问题类别（职责权限问题、工作内容问题、工作标准问题、考核奖励问题、考核奖励问题、任职资格问题、其他）", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "problemCategory", value = "问题类别（职责权限问题、工作内容问题、工作标准问题、考核奖励问题、任职资格问题、其他）", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "description", value = "问题描述", dataType = "String", dataTypeClass = String.class),
 //            @ApiImplicitParam(name = "problemCause", value = "问题原因", dataType = "String", dataTypeClass = String.class),
 //            @ApiImplicitParam(name = "isImmediatelyCorrected", value = "是否立行立改(1-Yes；2-No；)", dataType = "Integer", dataTypeClass = Integer.class),
@@ -213,7 +213,7 @@ public class PostCheckedProblemController extends BaseController {
             @ApiImplicitParam(name = "checkUserName", value = "检查人姓名", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "problemLevel", value = "问题等级（一般、重要）", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "problemAttribute", value = "问题属性（完整问题、有效性问题、适宜性问题）", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "problemCategory", value = "问题类别（职责权限问题、工作内容问题、工作标准问题、考核奖励问题、考核奖励问题、任职资格问题、其他）", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "problemCategory", value = "问题类别（职责权限问题、工作内容问题、工作标准问题、考核奖励问题、任职资格问题、其他）", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "description", value = "问题描述", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "problemCause", value = "问题原因", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "isImmediatelyCorrected", value = "是否立行立改(1-Yes；2-No；)", dataType = "Integer", dataTypeClass = Integer.class),

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

@@ -1,10 +1,11 @@
 package com.ruoyi.postCheck.controller;
 
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.postCheck.domain.PostCheckedItems;
 import com.ruoyi.postCheck.domain.PostListInfo;
+import com.ruoyi.postCheck.domain.tools.PostCheckListType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -131,4 +132,208 @@ public class PostListController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(postListService.deletePostListByIds(ids));
     }
+
+
+    @ApiOperation("1、检查项目下拉框（不需要参数）")
+    @GetMapping("/typeList")
+    public AjaxResult typeList(PostCheckListType postCheckListType) {
+      /*  List<Map<Integer, String>> list = new ArrayList<>();
+        Map<Integer, String> map = new HashMap<>();
+        map.put(6, "岗位责任制文件完整性与适宜性");
+        map.put(5, "任职资格与能力素质要求符合性");
+        map.put(1, "业务职责有效性");
+        map.put(2, "党建及党风廉政建设职责有效性");
+        map.put(3, "安全环保职责有效性");
+        map.put(4, "合规与保密职责有效性");
+        map.forEach(
+                (k, v) -> {
+                    Map<Integer, String> data = new HashMap<>();
+                    data.put(k, v);
+                    list.add(data);
+                }
+        );*/
+
+        List<PostCheckListType> list = new ArrayList<>();
+
+        Map<Integer, String> map = new HashMap<>();
+        PostCheckListType data6 = new PostCheckListType(6, "岗位责任制文件完整性与适宜性");
+        PostCheckListType data5 = new PostCheckListType(5, "任职资格与能力素质要求符合性");
+        PostCheckListType data1 = new PostCheckListType(1, "业务职责有效性");
+        PostCheckListType data2 = new PostCheckListType(2, "党建及党风廉政建设职责有效性");
+        PostCheckListType data3 = new PostCheckListType(3, "安全环保职责有效性");
+        PostCheckListType data4 = new PostCheckListType(4, "合规与保密职责有效性");
+        list.add(data6);
+        list.add(data5);
+        list.add(data1);
+        list.add(data2);
+        list.add(data3);
+        list.add(data4);
+        return success(list);
+    }
+
+    /**
+     * 检查表生成时，根据“检查项目”查询“检查内容”
+     * 岗检表生成页面，根据岗检清单中的“区域划分”（业务职责、党建党风、安全环保……）查询“事项”中最后有值事项（一级事项、……、五级事项）
+     * 清单中的区域 = 岗检表的检查“检查项目”
+     *
+     * @return
+     */
+    @ApiOperation("2、检查内容：参数是检查项目下拉框")
+    @GetMapping("/contentListByType")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "deptId", value = "参数->部门ID", dataType = "Integer", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = "postId", value = "参数->岗位ID", dataType = "Integer", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = "type", value = "参数->检查项目（业务职责、党建党风、安全环保……）", dataType = "Integer", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = "postCheckedContent", value = "返回->检查内容", dataType = "String", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "postCheckedStandard", value = "返回->检查标准", dataType = "String", dataTypeClass = String.class),
+    })
+    public AjaxResult contentListByType(Long deptId, Long postId, Integer type) {
+
+
+        List<PostCheckedItems> itemsList = postListService.contentListByType(deptId, postId, type);
+
+        //写死的假数据
+        if (false) {
+
+//            String aa = "";
+//            aa.trim()
+//        Integer type
+//        sequence_project  level_one、level_two、level_three、level_four、level_five
+//       work_standard(工作标准)  requirement（要求（2））
+            if (type == 6) {
+                PostCheckedItems item = new PostCheckedItems();
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
+                item.setPostCheckedContent("完整性->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
+                item.setPostCheckedStandard("1.是否有岗位基本信息；2.岗位职责是否为全要素；3.是否有明确的任职或上岗条件；4.工作标准是否有定性指标->伪代码返回-检查标准");  //检查标准 ->  工作标准（work_standard）  要求2（requirement）
+                itemsList.add(item);
+
+                item = new PostCheckedItems();
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
+                item.setPostCheckedContent("适宜性->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
+                item.setPostCheckedStandard("1.职责与权限；2.任职或上岗条件；……7.是否对岗位职责落实情况进行检查，检查是否有检查记录。->伪代码返回-检查标准");  //检查标准 ->  工作标准（work_standard）  要求2（requirement）
+                itemsList.add(item);
+            }
+            // 按类型
+            else if (type == 5) {
+                PostCheckedItems item = new PostCheckedItems();
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
+                item.setPostCheckedContent("政治要求->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
+                item.setPostCheckedStandard("大学本科->伪代码返回-检查标准");  //检查标准 ->  工作标准（work_standard）  要求2（requirement）
+                itemsList.add(item);
+
+                item = new PostCheckedItems();
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
+                item.setPostCheckedContent("最低学历要求->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
+                item.setPostCheckedStandard("无->伪代码返回-检查标准");  //检查标准 ->  工作标准（work_standard）  要求2（requirement）
+                itemsList.add(item);
+
+                item = new PostCheckedItems();
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
+                item.setPostCheckedContent("最低学位要求->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
+                item.setPostCheckedStandard("1.职责与权限；2.任职或上岗条件；……7.是否对岗位职责落实情况进行检查，检查是否有检查记录。->伪代码返回-检查标准");  //检查标准 ->  工作标准（work_standard）  要求2（requirement）
+                itemsList.add(item);
+
+
+                item = new PostCheckedItems();
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
+                item.setPostCheckedContent("工作经验->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
+                item.setPostCheckedStandard("岗位工作累计5年以上->伪代码返回-检查标准");  //检查标准 ->  工作标准（work_standard）  要求2（requirement）
+                itemsList.add(item);
+
+                item = new PostCheckedItems();
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
+                item.setPostCheckedContent("职称要求->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
+                item.setPostCheckedStandard("高级职称。->伪代码返回-检查标准");  //检查标准 ->  工作标准（work_standard）  要求2（requirement）
+                itemsList.add(item);
+
+                item = new PostCheckedItems();
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
+                item.setPostCheckedContent("专业要求->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
+                item.setPostCheckedStandard("石油主干专业、企业管理或相关专业。->伪代码返回-检查标准");  //检查标准 ->  工作标准（work_standard）  要求2（requirement）
+                itemsList.add(item);
+            }
+            // 按类型
+            else if (type == 1) {
+                PostCheckedItems item = new PostCheckedItems();
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
+                item.setPostCheckedContent("党委会、董事会管理->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
+                item.setPostCheckedStandard("抓好三重一大管理，确保党委会、董事会合规运行->伪代码返回-检查标准");  //检查标准 ->  工作标准（work_standard）  要求2（requirement）
+                itemsList.add(item);
+
+                item = new PostCheckedItems();
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
+                item.setPostCheckedContent("保密、信访及维稳管理->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
+                item.setPostCheckedStandard("按照要求做好保密教育、不发生重大泄密事件；不发生大规模群访闹访事件，限时办结信访事项->伪代码返回-检查标准");  //检查标准 ->  工作标准（work_standard）  要求2（requirement）
+                itemsList.add(item);
+
+
+            }
+
+            // 按类型
+            else if (type == 2) {
+                PostCheckedItems item = new PostCheckedItems();
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
+                item.setPostCheckedContent("个人廉洁从业情况->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
+                item.setPostCheckedStandard("检查时间范围内未受到处理处分（诫勉以上）（以公司发文为准）。->伪代码返回-检查标准");  //检查标准 ->  工作标准（work_standard）  要求2（requirement）
+                itemsList.add(item);
+
+                item = new PostCheckedItems();
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
+                item.setPostCheckedContent("党风廉政建设和反腐败责任落实情况->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
+                item.setPostCheckedStandard("1.按要求组织开展部门党风廉政建设宣传月活动;2.推动作风建设情况->伪代码返回-检查标准");  //检查标准 ->  工作标准（work_standard）  要求2（requirement）
+                itemsList.add(item);
+
+            }
+            // 按类型
+            else if (type == 3) {
+                PostCheckedItems item = new PostCheckedItems();
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
+                item.setPostCheckedContent("安全会议->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
+                item.setPostCheckedStandard("按时参加公司安委会、安全生产工作例会，汇报部门相关安全工作。->伪代码返回-检查标准");  //检查标准 ->  工作标准（work_standard）  要求2（requirement）
+                itemsList.add(item);
+
+                item = new PostCheckedItems();
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
+                item.setPostCheckedContent("安全工作落实->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
+                item.setPostCheckedStandard("负责部门安全管理，落实公司领导及相关会议中布置的涉及本部门安全方面的各项工作。->伪代码返回-检查标准");  //检查标准 ->  工作标准（work_standard）  要求2（requirement）
+                itemsList.add(item);
+
+                item = new PostCheckedItems();
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
+                item.setPostCheckedContent("环境应急->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
+                item.setPostCheckedStandard("环境应急xxxxxxxxxxxx->伪代码返回-检查标准");  //检查标准 ->  工作标准（work_standard）  要求2（requirement）
+                itemsList.add(item);
+            }
+            // 按类型
+            else if (type == 4) {
+                PostCheckedItems item = new PostCheckedItems();
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
+                item.setPostCheckedContent("建立健全本部门业务合规管理制度和流程，开展合规风险识别评估，编制风险清单和应对预案。对本部门保密国安工作负全面领导责任。->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
+                item.setPostCheckedStandard("1.及时组织本部门员工学习相关法律法规、监管规定、行业规范及公司规章制度，清楚公司各项管理要求、本职工作合规基本义务及违规应承担的责任。\n" +
+                        "2.按要求组织开展法律法规、标准和其它要求识别评估，建立健全本部门法律法规等识别评价清单，及时更新完善相关管理制度和流程，及时组织业务管理制度宣贯。\n" +
+                        "3.按要求组织开展合规风险识别评估，建立健全本部门合规管理清单。                                        \n" +
+                        "4.严格执行党的保密、国家安全工作方针政策以及集团公司党组、炼化公司党委和惠州石化党委工作部署、中海炼化保密“十四五”工作计划、惠州石化年度保密工作要点等要求。->伪代码返回-检查标准");  //检查标准 ->  工作标准（work_standard）  要求2（requirement）
+                itemsList.add(item);
+
+                item = new PostCheckedItems();
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
+                item.setPostCheckedContent("定期梳理重点岗位合规风险，将合规要求纳入岗位职责。坚持“业务谁主管，保密国安谁负责”原则，严格落实保密国安工作责任制。->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
+                item.setPostCheckedStandard("根据业务管理实际，及时更新本部门关键岗位及相关合规风险，纳入岗位责任制清单。严格落实保密国安主体责任。->伪代码返回-检查标准");  //检查标准 ->  工作标准（work_standard）  要求2（requirement）
+                itemsList.add(item);
+
+                item = new PostCheckedItems();
+                item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
+                item.setPostCheckedContent("负责本部门经营管理行为的合规审查。加强保密国安人防、物防、技防措施；强化网络保密管理，加强对微博、微信、QQ、钉钉等社交媒体保密管理。->伪代码返回-检查内容"); //检查内容 -> 一级事项、……、五级事项
+                item.setPostCheckedStandard("1.及时组织对本领域内制度、文件、合同及经营管理行为等进行合规性审查，审查率100%。\n" +
+                        "2.严格落实“三重一大”事项合规审查和审议决策程序，执行率100%。\n" +
+                        "3.自觉抵制和纠正上级或其它职能部门违章指挥或违规行为，杜绝对本部门员工和承包商进行违章指挥，及时发现和干预本部门员工和承包商违规行为，做到守法合规。\n" +
+                        "4.定期组织检查与考核本部门员工遵章守纪情况。                           \n" +
+                        "5.严格执行“涉密不上网、上网不涉密”。->伪代码返回-检查标准");  //检查标准 ->  工作标准（work_standard）  要求2（requirement）
+                itemsList.add(item);
+            }
+        }
+
+
+        return success(itemsList);
+    }
 }

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

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

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

@@ -0,0 +1,100 @@
+package com.ruoyi.postCheck.domain;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 岗检表管理对象 post_checked
+ *
+ * @author csg
+ * @date 2024-01-05
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel(value = "岗检表管理对象")
+@TableName("post_checked") // 数据库表名
+public class PostChecked extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    @ApiModelProperty("检查工作组ID")
+    @TableField(value = "check_workgroup_id")
+    @Excel(name = "检查工作组ID")
+    private Long checkWorkgroupId;
+
+    @ApiModelProperty("检查小组ID")
+    @TableField(value = "check_group_id")
+    @Excel(name = "检查小组ID")
+    private Long checkGroupId;
+
+    @ApiModelProperty("被检查部门ID")
+    @TableField(value = "checked_dept_id")
+    @Excel(name = "被检查部门ID")
+    private Long checkedDeptId;
+
+    @ApiModelProperty("被检查岗位ID")
+    @TableField(value = "checked_post_id")
+    @Excel(name = "被检查岗位ID")
+    private Long checkedPostId;
+
+    @ApiModelProperty("打印人ID")
+    @TableField(value = "print_user_id")
+    @Excel(name = "打印人ID")
+    private Long printUserId;
+
+    @ApiModelProperty("打印时间")
+    @TableField(value = "print_time")
+    @Excel(name = "打印时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date printTime;
+
+    @ApiModelProperty("上传：检查后的检查表照片或PDF，磁盘相对路径")
+    @TableField(value = "checked_img")
+    @Excel(name = "上传：检查后的检查表照片或PDF，磁盘相对路径")
+    private String checkedImg;
+
+    @ApiModelProperty("上传：检查人中文姓名")
+    @TableField(value = "checked_user_name")
+    @Excel(name = "上传：检查人中文姓名", readConverterExp = "上=传页面设置的值")
+    private String checkedUserName;
+
+    @ApiModelProperty("上传：检查时间")
+    @TableField(value = "checked_time")
+    @Excel(name = "上传：检查时间", readConverterExp = "上=传页面设置的值")
+    private Date checkedTime;
+
+    @ApiModelProperty("上传：检查表上传人ID")
+    @TableField(value = "upload_user_id")
+    @Excel(name = "上传：检查表上传人ID")
+    private Long uploadUserId;
+
+    @ApiModelProperty("上传：检查表上传时间")
+    @TableField(value = "upload_time")
+    @Excel(name = "上传：检查表上传时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date uploadTime;
+
+    @ApiModelProperty("创建者用户ID")
+    @TableField(value = "create_user_id")
+    @Excel(name = "创建者用户ID")
+    private Long createUserId;
+
+    @ApiModelProperty("检查表明细")
+    @TableField(exist = false)
+    private List<PostCheckedItems> children = new ArrayList<>();
+}

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

@@ -0,0 +1,65 @@
+package com.ruoyi.postCheck.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 岗检表管理明细对象 post_checked_items
+ *
+ * @author csg
+ * @date 2024-01-05
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel(value = "岗检表管理明细对象")
+@TableName("post_checked_items") // 数据库表名
+public class PostCheckedItems extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    @ApiModelProperty("岗位责任制检查表ID")
+    @TableField(value = "post_checked_id")
+    @Excel(name = "岗位责任制检查表ID")
+    private Long postCheckedId;
+
+    @ApiModelProperty("检查项目：参考post_list_info表；类型")
+    @TableField(value = "type")
+    @Excel(name = "检查项目：参考post_list_info表；类型", readConverterExp = "1=-业务职责；2-党建及党风廉政建设职责；3-安全环保职责；4-合规保密职；5-任职资格与能力素质要求")
+    private Integer type;
+
+    @ApiModelProperty("创建者用户ID")
+    @TableField(value = "create_user_id")
+    @Excel(name = "创建者用户ID")
+    private Long createUserId;
+
+    @ApiModelProperty("检查内容")
+    @TableField(value = "post_checked_content")
+    @Excel(name = "检查内容")
+    private String postCheckedContent;
+
+    @ApiModelProperty("检查标准")
+    @TableField(value = "post_checked_standard")
+    @Excel(name = "检查标准")
+    private String postCheckedStandard;
+
+    @ApiModelProperty("检查方法")
+    @TableField(value = "post_checked_method")
+    @Excel(name = "检查方法")
+    private String postCheckedMethod;
+
+    @ApiModelProperty("检查结果")
+    @TableField(value = "post_checked_result")
+    @Excel(name = "检查结果")
+    private String postCheckedResult;
+
+}

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

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

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

@@ -0,0 +1,37 @@
+package com.ruoyi.postCheck.domain.homePage;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@EqualsAndHashCode
+@Data
+@ApiModel(value = "首页-评比排名")
+public class AssessmentRatingView implements Serializable {
+
+
+    private static final long serialVersionUID = 1296736926345529777L;
+
+    @ApiModelProperty("排名")
+    private Integer rating;
+
+    @ApiModelProperty("部门ID")
+    private Long deptId;
+
+    @ApiModelProperty("部门名称")
+    private String deptName;
+
+    @ApiModelProperty("岗位ID")
+    private Long postId;
+
+    @ApiModelProperty("岗位名称")
+    private String postName;
+
+    @ApiModelProperty("得分")
+    private BigDecimal score;
+
+}

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

@@ -0,0 +1,33 @@
+package com.ruoyi.postCheck.domain.homePage;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@EqualsAndHashCode
+@Data
+@ApiModel(value = "首页-岗检部门整改率")
+public class DeptProblemRectificationView implements Serializable {
+
+
+    private static final long serialVersionUID = 1296736926345529777L;
+
+    @ApiModelProperty("部门ID")
+    private Long deptId;
+
+    @ApiModelProperty("部门名称")
+    private String deptName;
+
+    @ApiModelProperty("问题总数量")
+    private Integer problemTotal;
+
+    @ApiModelProperty("问题整改完成数量")
+    private Integer problemComplete;
+
+    @ApiModelProperty("问题整改率")
+    private BigDecimal problemRectificationRate;
+}

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

@@ -14,16 +14,18 @@ public class PostCheckedProblemView implements Serializable {
 
     private static final long serialVersionUID = -4567465960543504158L;
 
-    @ApiModelProperty("责任制清单数量")
-    private Integer listCount;
+    @ApiModelProperty("总数量")
+    private Integer problemTotal;
 
-    @ApiModelProperty("检查出的问题数量")
-    private Integer problemCount;
+    @ApiModelProperty("完整性数量")
+    private Integer problemComplete;
+
+    @ApiModelProperty("适宜性数量")
+    private Integer problemSuitable;
+
+    @ApiModelProperty("有效性数量")
+    private Integer problemEffective;
 
-    @ApiModelProperty("岗检数量-已查")
-    private Integer checkedPostCount;
 
-    @ApiModelProperty("岗检数量-未查")
-    private Integer uncheckedPostCount;
 
 }

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

@@ -0,0 +1,34 @@
+package com.ruoyi.postCheck.domain.homePage;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@EqualsAndHashCode
+@Data
+@ApiModel(value = "首页-岗检已查/岗检未查")
+public class PostCheckedUnCheckedView implements Serializable {
+
+
+    private static final long serialVersionUID = 1296736926345529777L;
+
+    @ApiModelProperty("部门ID")
+    private Long deptId;
+
+    @ApiModelProperty("部门名称")
+    private String deptName;
+
+    @ApiModelProperty("岗位ID")
+    private Long postId;
+
+    @ApiModelProperty("岗位名称")
+    private String postName;
+
+    @ApiModelProperty("岗位下人数")
+    private Integer userCount;
+
+}

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

@@ -0,0 +1,21 @@
+package com.ruoyi.postCheck.domain.tools;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "检查项目下拉框对象")
+@Data
+public class PostCheckListType {
+    @ApiModelProperty("key：检查项目 -> 业务职责、党建党风、安全环保……")
+    private Integer type;
+
+    @ApiModelProperty("value：检查项目 -> 业务职责、党建党风、安全环保……")
+    private String typeView;
+
+    public PostCheckListType(Integer type, String typeView) {
+        this.type = type;
+        this.typeView = typeView;
+    }
+}

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

@@ -0,0 +1,62 @@
+package com.ruoyi.postCheck.mapper;
+
+import java.util.List;
+import com.ruoyi.postCheck.domain.PostCheckedItems;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 岗检表管理明细Mapper接口
+ *
+ * @author csg
+ * @date 2024-01-05
+ */
+public interface PostCheckedItemsMapper extends BaseMapper<PostCheckedItems>
+{
+    /**
+     * 查询岗检表管理明细
+     *
+     * @param id 岗检表管理明细主键
+     * @return 岗检表管理明细
+     */
+    public PostCheckedItems selectPostCheckedItemsById(Long id);
+
+    /**
+     * 查询岗检表管理明细列表
+     *
+     * @param postCheckedItems 岗检表管理明细
+     * @return 岗检表管理明细集合
+     */
+    public List<PostCheckedItems> selectPostCheckedItemsList(PostCheckedItems postCheckedItems);
+
+    /**
+     * 新增岗检表管理明细
+     *
+     * @param postCheckedItems 岗检表管理明细
+     * @return 结果
+     */
+    public int insertPostCheckedItems(PostCheckedItems postCheckedItems);
+
+    /**
+     * 修改岗检表管理明细
+     *
+     * @param postCheckedItems 岗检表管理明细
+     * @return 结果
+     */
+    public int updatePostCheckedItems(PostCheckedItems postCheckedItems);
+
+    /**
+     * 删除岗检表管理明细
+     *
+     * @param id 岗检表管理明细主键
+     * @return 结果
+     */
+    public int deletePostCheckedItemsById(Long id);
+
+    /**
+     * 批量删除岗检表管理明细
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deletePostCheckedItemsByIds(Long[] ids);
+}

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

@@ -0,0 +1,62 @@
+package com.ruoyi.postCheck.mapper;
+
+import java.util.List;
+import com.ruoyi.postCheck.domain.PostChecked;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 岗检表管理Mapper接口
+ *
+ * @author csg
+ * @date 2024-01-05
+ */
+public interface PostCheckedMapper extends BaseMapper<PostChecked>
+{
+    /**
+     * 查询岗检表管理
+     *
+     * @param id 岗检表管理主键
+     * @return 岗检表管理
+     */
+    public PostChecked selectPostCheckedById(Long id);
+
+    /**
+     * 查询岗检表管理列表
+     *
+     * @param postChecked 岗检表管理
+     * @return 岗检表管理集合
+     */
+    public List<PostChecked> selectPostCheckedList(PostChecked postChecked);
+
+    /**
+     * 新增岗检表管理
+     *
+     * @param postChecked 岗检表管理
+     * @return 结果
+     */
+    public int insertPostChecked(PostChecked postChecked);
+
+    /**
+     * 修改岗检表管理
+     *
+     * @param postChecked 岗检表管理
+     * @return 结果
+     */
+    public int updatePostChecked(PostChecked postChecked);
+
+    /**
+     * 删除岗检表管理
+     *
+     * @param id 岗检表管理主键
+     * @return 结果
+     */
+    public int deletePostCheckedById(Long id);
+
+    /**
+     * 批量删除岗检表管理
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deletePostCheckedByIds(Long[] ids);
+}

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

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

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

@@ -0,0 +1,62 @@
+package com.ruoyi.postCheck.service;
+
+import java.util.List;
+import com.ruoyi.postCheck.domain.PostCheckedItems;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 岗检表管理明细Service接口
+ *
+ * @author csg
+ * @date 2024-01-05
+ */
+public interface IPostCheckedItemsService extends IService<PostCheckedItems>
+{
+    /**
+     * 查询岗检表管理明细
+     *
+     * @param id 岗检表管理明细主键
+     * @return 岗检表管理明细
+     */
+    public PostCheckedItems selectPostCheckedItemsById(Long id);
+
+    /**
+     * 查询岗检表管理明细列表
+     *
+     * @param postCheckedItems 岗检表管理明细
+     * @return 岗检表管理明细集合
+     */
+    public List<PostCheckedItems> selectPostCheckedItemsList(PostCheckedItems postCheckedItems);
+
+    /**
+     * 新增岗检表管理明细
+     *
+     * @param postCheckedItems 岗检表管理明细
+     * @return 结果
+     */
+    public int insertPostCheckedItems(PostCheckedItems postCheckedItems);
+
+    /**
+     * 修改岗检表管理明细
+     *
+     * @param postCheckedItems 岗检表管理明细
+     * @return 结果
+     */
+    public int updatePostCheckedItems(PostCheckedItems postCheckedItems);
+
+    /**
+     * 批量删除岗检表管理明细
+     *
+     * @param ids 需要删除的岗检表管理明细主键集合
+     * @return 结果
+     */
+    public int deletePostCheckedItemsByIds(Long[] ids);
+
+    /**
+     * 删除岗检表管理明细信息
+     *
+     * @param id 岗检表管理明细主键
+     * @return 结果
+     */
+    public int deletePostCheckedItemsById(Long id);
+}

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

@@ -0,0 +1,62 @@
+package com.ruoyi.postCheck.service;
+
+import java.util.List;
+
+import com.ruoyi.postCheck.domain.PostChecked;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 岗检表管理Service接口
+ *
+ * @author csg
+ * @date 2024-01-05
+ */
+public interface IPostCheckedService extends IService<PostChecked> {
+    /**
+     * 查询岗检表管理
+     *
+     * @param id 岗检表管理主键
+     * @return 岗检表管理
+     */
+    public PostChecked selectPostCheckedById(Long id);
+
+    /**
+     * 查询岗检表管理列表
+     *
+     * @param postChecked 岗检表管理
+     * @return 岗检表管理集合
+     */
+    public List<PostChecked> selectPostCheckedList(PostChecked postChecked);
+
+    /**
+     * 新增岗检表管理
+     *
+     * @param postChecked 岗检表管理
+     * @return 结果
+     */
+    public int insertPostChecked(PostChecked postChecked);
+
+    /**
+     * 修改岗检表管理
+     *
+     * @param postChecked 岗检表管理
+     * @return 结果
+     */
+    public int updatePostChecked(PostChecked postChecked);
+
+    /**
+     * 批量删除岗检表管理
+     *
+     * @param ids 需要删除的岗检表管理主键集合
+     * @return 结果
+     */
+    public int deletePostCheckedByIds(Long[] ids);
+
+    /**
+     * 删除岗检表管理信息
+     *
+     * @param id 岗检表管理主键
+     * @return 结果
+     */
+    public int deletePostCheckedById(Long id);
+}

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

@@ -1,6 +1,8 @@
 package com.ruoyi.postCheck.service;
 
 import java.util.List;
+
+import com.ruoyi.postCheck.domain.PostCheckedItems;
 import com.ruoyi.postCheck.domain.PostList;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -59,4 +61,13 @@ public interface IPostListService extends IService<PostList>
      * @return 结果
      */
     public int deletePostListById(Long id);
+
+    /**
+     *
+     * @param deptId 部门ID
+     * @param postId 岗位ID
+     * @param type 检查项目（业务职责、党建党风、安全环保……）
+     * @return
+     */
+    List<PostCheckedItems> contentListByType(Long deptId, Long postId, Integer type);
 }

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

@@ -0,0 +1,100 @@
+package com.ruoyi.postCheck.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.postCheck.mapper.PostCheckedItemsMapper;
+import com.ruoyi.postCheck.domain.PostCheckedItems;
+import com.ruoyi.postCheck.service.IPostCheckedItemsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+
+/**
+ * 岗检表管理明细Service业务层处理
+ *
+ * @author csg
+ * @date 2024-01-05
+ */
+@Service
+public class PostCheckedItemsServiceImpl extends ServiceImpl<PostCheckedItemsMapper, PostCheckedItems> implements IPostCheckedItemsService {
+    @Autowired
+    private PostCheckedItemsMapper postCheckedItemsMapper;
+
+    /**
+     * 查询岗检表管理明细
+     *
+     * @param id 岗检表管理明细主键
+     * @return 岗检表管理明细
+     */
+    @Override
+    public PostCheckedItems selectPostCheckedItemsById(Long id) {
+        return postCheckedItemsMapper.selectPostCheckedItemsById(id);
+    }
+
+    /**
+     * 查询岗检表管理明细列表
+     *
+     * @param postCheckedItems 岗检表管理明细
+     * @return 岗检表管理明细
+     */
+    @Override
+    public List<PostCheckedItems> selectPostCheckedItemsList(PostCheckedItems postCheckedItems) {
+        return postCheckedItemsMapper.selectPostCheckedItemsList(postCheckedItems);
+    }
+
+    /**
+     * 新增岗检表管理明细
+     *
+     * @param postCheckedItems 岗检表管理明细
+     * @return 结果
+     */
+    @Override
+    public int insertPostCheckedItems(PostCheckedItems postCheckedItems) {
+        //TODO 自增主键修改为-MyBatis-Plus雪花算法(截取5位解决VUE精度丢失BUG)-系统登录日志
+//        if (postCheckedItems.getId() == null)
+            postCheckedItems.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+        // postCheckedItems.setCreateTime(DateUtils.getNowDate());
+        postCheckedItems.setCreateDefault();
+//        postCheckedItems.setStatus(PostCheckedItemsEnum.STATUS_WAIT.getValue()); // 去创建自己的枚举类
+        postCheckedItems.setCreateUserId(SecurityUtils.getUserId());
+        return postCheckedItemsMapper.insertPostCheckedItems(postCheckedItems);
+    }
+
+    /**
+     * 修改岗检表管理明细
+     *
+     * @param postCheckedItems 岗检表管理明细
+     * @return 结果
+     */
+    @Override
+    public int updatePostCheckedItems(PostCheckedItems postCheckedItems) {
+        // postCheckedItems.setUpdateTime(DateUtils.getNowDate());
+        postCheckedItems.setUpdateDefault();
+        return postCheckedItemsMapper.updatePostCheckedItems(postCheckedItems);
+    }
+
+    /**
+     * 批量删除岗检表管理明细
+     *
+     * @param ids 需要删除的岗检表管理明细主键
+     * @return 结果
+     */
+    @Override
+    public int deletePostCheckedItemsByIds(Long[] ids) {
+        return postCheckedItemsMapper.deletePostCheckedItemsByIds(ids);
+    }
+
+    /**
+     * 删除岗检表管理明细信息
+     *
+     * @param id 岗检表管理明细主键
+     * @return 结果
+     */
+    @Override
+    public int deletePostCheckedItemsById(Long id) {
+        return postCheckedItemsMapper.deletePostCheckedItemsById(id);
+    }
+}

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

@@ -0,0 +1,191 @@
+package com.ruoyi.postCheck.service.impl;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.postCheck.domain.PostCheckedItems;
+import com.ruoyi.postCheck.service.IPostCheckedItemsService;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.postCheck.mapper.PostCheckedMapper;
+import com.ruoyi.postCheck.domain.PostChecked;
+import com.ruoyi.postCheck.service.IPostCheckedService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+/**
+ * 岗检表管理Service业务层处理
+ *
+ * @author csg
+ * @date 2024-01-05
+ */
+@Service
+@Slf4j
+public class PostCheckedServiceImpl extends ServiceImpl<PostCheckedMapper, PostChecked> implements IPostCheckedService {
+    @Autowired
+    private PostCheckedMapper postCheckedMapper;
+    @Autowired
+    private IPostCheckedItemsService postCheckedItemsService;
+
+    /**
+     * 查询岗检表管理
+     *
+     * @param id 岗检表管理主键
+     * @return 岗检表管理
+     */
+    @Override
+    public PostChecked selectPostCheckedById(Long id) {
+        PostChecked data = postCheckedMapper.selectPostCheckedById(id);
+        if (data != null) {
+//            Long id = data.getId();
+//            if (id != null) {
+
+            PostCheckedItems param = new PostCheckedItems();
+            param.setPostCheckedId(id);
+            List<PostCheckedItems> children = postCheckedItemsService.selectPostCheckedItemsList(param);
+            data.setChildren(children);
+//            }
+        }
+        return data;
+    }
+
+    /**
+     * 查询岗检表管理列表
+     *
+     * @param postChecked 岗检表管理
+     * @return 岗检表管理
+     */
+    @Override
+    public List<PostChecked> selectPostCheckedList(PostChecked postChecked) {
+        List<PostChecked> dataList = postCheckedMapper.selectPostCheckedList(postChecked);
+        if (!CollectionUtils.isEmpty(dataList)) {
+            for (PostChecked data : dataList) {
+                Long id = data.getId();
+                if (id != null) {
+
+                    PostCheckedItems param = new PostCheckedItems();
+                    param.setPostCheckedId(id);
+                    List<PostCheckedItems> children = postCheckedItemsService.selectPostCheckedItemsList(param);
+                    data.setChildren(children);
+                }
+            }
+        }
+        return dataList;
+    }
+
+    /**
+     * 新增岗检表管理
+     *
+     * @param postChecked 岗检表管理
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int insertPostChecked(PostChecked postChecked) {
+
+        List<PostCheckedItems> children = postChecked.getChildren();
+        if (CollectionUtils.isEmpty(children)) {
+            log.error("【岗检表】-add：未设置检查内容，请在页面选择需要检查的项目，再提交！");
+            throw new BaseException("未设置检查内容，请在页面选择需要检查的项目，再提交！");
+        }
+        //TODO 自增主键修改为-MyBatis-Plus雪花算法(截取5位解决VUE精度丢失BUG)-系统登录日志
+//        if (postChecked.getId() == null)
+        postChecked.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+        // postChecked.setCreateTime(DateUtils.getNowDate());
+        postChecked.setCreateDefault();
+//        postChecked.setStatus(PostCheckedEnum.STATUS_WAIT.getValue()); // 去创建自己的枚举类
+        postChecked.setCreateUserId(SecurityUtils.getUserId());
+        int row = postCheckedMapper.insertPostChecked(postChecked);
+        if (row > 0) {
+            for (PostCheckedItems child : children) {
+                child.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+                child.setCreateDefault();
+            }
+            postCheckedItemsService.saveBatch(children);
+        }
+        return row;
+    }
+
+    /**
+     * 修改岗检表管理
+     *
+     * @param postChecked 岗检表管理
+     * @return 结果
+     */
+    @Override
+    public int updatePostChecked(PostChecked postChecked) {
+        Long id = postChecked.getId();
+
+        if (id == null) {
+            log.error("【岗检表】-edit：未设置id，请联系管理员！");
+            throw new BaseException("未设置id，请联系管理员！");
+        }
+
+        List<PostCheckedItems> children = postChecked.getChildren();
+        if (CollectionUtils.isEmpty(children) || id == null) {
+            log.error("【岗检表】-edit：未设置检查内容，请在页面选择需要检查的项目，再提交！");
+            throw new BaseException("未设置检查内容，请在页面选择需要检查的项目，再提交！");
+        }
+
+
+        postChecked.setUpdateDefault();
+        int row = postCheckedMapper.updatePostChecked(postChecked);
+        if (row > 0) {
+            //删除明细
+            LambdaUpdateWrapper<PostCheckedItems> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.eq(PostCheckedItems::getPostCheckedId, id);
+            postCheckedItemsService.remove(updateWrapper);
+
+            //插入明细
+            for (PostCheckedItems child : children) {
+                child.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+                child.setCreateDefault();
+            }
+            postCheckedItemsService.saveBatch(children);
+        }
+
+        return row;
+    }
+
+    /**
+     * 批量删除岗检表管理
+     *
+     * @param ids 需要删除的岗检表管理主键
+     * @return 结果
+     */
+    @Override
+    public int deletePostCheckedByIds(Long[] ids) {
+        int row = postCheckedMapper.deletePostCheckedByIds(ids);
+
+        //删除明细
+        LambdaUpdateWrapper<PostCheckedItems> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.in(PostCheckedItems::getPostCheckedId, ids);
+        postCheckedItemsService.remove(updateWrapper);
+
+        return row;
+    }
+
+    /**
+     * 删除岗检表管理信息
+     *
+     * @param id 岗检表管理主键
+     * @return 结果
+     */
+    @Override
+    public int deletePostCheckedById(Long id) {
+        int row = postCheckedMapper.deletePostCheckedById(id);
+        //删除明细
+        LambdaUpdateWrapper<PostCheckedItems> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(PostCheckedItems::getPostCheckedId, id);
+        postCheckedItemsService.remove(updateWrapper);
+        return row;
+    }
+}

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

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.ruoyi.common.constant.PostListEnum;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.postCheck.domain.PostCheckedItems;
 import com.ruoyi.postCheck.service.IPostListInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -187,4 +188,17 @@ public class PostListServiceImpl extends ServiceImpl<PostListMapper, PostList> i
             }
         }
     }
+
+
+    /**
+     * @param deptId 部门ID
+     * @param postId 岗位ID
+     * @param type   检查项目（业务职责、党建党风、安全环保……）
+     * @return
+     */
+    @Override
+    public List<PostCheckedItems> contentListByType(Long deptId, Long postId, Integer type) {
+
+        return postListMapper.contentListByType(deptId,postId,type);
+    }
 }

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

@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.postCheck.mapper.PostCheckedItemsMapper">
+    
+    <resultMap type="PostCheckedItems" id="PostCheckedItemsResult">
+        <result property="id"    column="id"    />
+        <result property="postCheckedId"    column="post_checked_id"    />
+        <result property="type"    column="type"    />
+        <result property="remark"    column="remark"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="createUserId"    column="create_user_id"    />
+        <result property="postCheckedContent"    column="post_checked_content"    />
+        <result property="postCheckedStandard"    column="post_checked_standard"    />
+        <result property="postCheckedMethod"    column="post_checked_method"    />
+        <result property="postCheckedResult"    column="post_checked_result"    />
+    </resultMap>
+
+    <sql id="selectPostCheckedItemsVo">
+        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
+    </sql>
+
+    <select id="selectPostCheckedItemsList" parameterType="PostCheckedItems" resultMap="PostCheckedItemsResult">
+        <include refid="selectPostCheckedItemsVo"/>
+        <where>  
+            <if test="postCheckedId != null "> and post_checked_id = #{postCheckedId}</if>
+            <if test="type != null "> and type = #{type}</if>
+            <if test="createUserId != null "> and create_user_id = #{createUserId}</if>
+            <if test="postCheckedContent != null  and postCheckedContent != ''"> and post_checked_content = #{postCheckedContent}</if>
+            <if test="postCheckedStandard != null  and postCheckedStandard != ''"> and post_checked_standard = #{postCheckedStandard}</if>
+            <if test="postCheckedMethod != null  and postCheckedMethod != ''"> and post_checked_method = #{postCheckedMethod}</if>
+            <if test="postCheckedResult != null  and postCheckedResult != ''"> and post_checked_result = #{postCheckedResult}</if>
+        </where>
+    </select>
+    
+    <select id="selectPostCheckedItemsById" parameterType="Long" resultMap="PostCheckedItemsResult">
+        <include refid="selectPostCheckedItemsVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertPostCheckedItems" parameterType="PostCheckedItems">
+        insert into post_checked_items
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="postCheckedId != null">post_checked_id,</if>
+            <if test="type != null">type,</if>
+            <if test="remark != null">remark,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null and createBy != ''">create_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="updateBy != null and updateBy != ''">update_by,</if>
+            <if test="createUserId != null">create_user_id,</if>
+            <if test="postCheckedContent != null">post_checked_content,</if>
+            <if test="postCheckedStandard != null">post_checked_standard,</if>
+            <if test="postCheckedMethod != null">post_checked_method,</if>
+            <if test="postCheckedResult != null">post_checked_result,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="postCheckedId != null">#{postCheckedId},</if>
+            <if test="type != null">#{type},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null and createBy != ''">#{createBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
+            <if test="createUserId != null">#{createUserId},</if>
+            <if test="postCheckedContent != null">#{postCheckedContent},</if>
+            <if test="postCheckedStandard != null">#{postCheckedStandard},</if>
+            <if test="postCheckedMethod != null">#{postCheckedMethod},</if>
+            <if test="postCheckedResult != null">#{postCheckedResult},</if>
+         </trim>
+    </insert>
+
+    <update id="updatePostCheckedItems" parameterType="PostCheckedItems">
+        update post_checked_items
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="postCheckedId != null">post_checked_id = #{postCheckedId},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="createUserId != null">create_user_id = #{createUserId},</if>
+            <if test="postCheckedContent != null">post_checked_content = #{postCheckedContent},</if>
+            <if test="postCheckedStandard != null">post_checked_standard = #{postCheckedStandard},</if>
+            <if test="postCheckedMethod != null">post_checked_method = #{postCheckedMethod},</if>
+            <if test="postCheckedResult != null">post_checked_result = #{postCheckedResult},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deletePostCheckedItemsById" parameterType="Long">
+        delete from post_checked_items where id = #{id}
+    </delete>
+
+    <delete id="deletePostCheckedItemsByIds" parameterType="String">
+        delete from post_checked_items where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.postCheck.mapper.PostCheckedMapper">
+    
+    <resultMap type="PostChecked" id="PostCheckedResult">
+        <result property="id"    column="id"    />
+        <result property="checkWorkgroupId"    column="check_workgroup_id"    />
+        <result property="checkGroupId"    column="check_group_id"    />
+        <result property="checkedDeptId"    column="checked_dept_id"    />
+        <result property="checkedPostId"    column="checked_post_id"    />
+        <result property="printUserId"    column="print_user_id"    />
+        <result property="printTime"    column="print_time"    />
+        <result property="checkedImg"    column="checked_img"    />
+        <result property="checkedUserName"    column="checked_user_name"    />
+        <result property="checkedTime"    column="checked_time"    />
+        <result property="uploadUserId"    column="upload_user_id"    />
+        <result property="uploadTime"    column="upload_time"    />
+        <result property="remark"    column="remark"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="createUserId"    column="create_user_id"    />
+    </resultMap>
+
+    <sql id="selectPostCheckedVo">
+        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
+    </sql>
+
+    <select id="selectPostCheckedList" parameterType="PostChecked" resultMap="PostCheckedResult">
+        <include refid="selectPostCheckedVo"/>
+        <where>  
+            <if test="checkWorkgroupId != null "> and check_workgroup_id = #{checkWorkgroupId}</if>
+            <if test="checkGroupId != null "> and check_group_id = #{checkGroupId}</if>
+            <if test="checkedDeptId != null "> and checked_dept_id = #{checkedDeptId}</if>
+            <if test="checkedPostId != null "> and checked_post_id = #{checkedPostId}</if>
+            <if test="printUserId != null "> and print_user_id = #{printUserId}</if>
+            <if test="printTime != null "> and print_time = #{printTime}</if>
+            <if test="checkedImg != null  and checkedImg != ''"> and checked_img = #{checkedImg}</if>
+            <if test="checkedUserName != null  and checkedUserName != ''"> and checked_user_name like concat('%', #{checkedUserName}, '%')</if>
+            <if test="checkedTime != null "> and checked_time = #{checkedTime}</if>
+            <if test="uploadUserId != null "> and upload_user_id = #{uploadUserId}</if>
+            <if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
+            <if test="createUserId != null "> and create_user_id = #{createUserId}</if>
+        </where>
+    </select>
+    
+    <select id="selectPostCheckedById" parameterType="Long" resultMap="PostCheckedResult">
+        <include refid="selectPostCheckedVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertPostChecked" parameterType="PostChecked">
+        insert into post_checked
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="checkWorkgroupId != null">check_workgroup_id,</if>
+            <if test="checkGroupId != null">check_group_id,</if>
+            <if test="checkedDeptId != null">checked_dept_id,</if>
+            <if test="checkedPostId != null">checked_post_id,</if>
+            <if test="printUserId != null">print_user_id,</if>
+            <if test="printTime != null">print_time,</if>
+            <if test="checkedImg != null">checked_img,</if>
+            <if test="checkedUserName != null">checked_user_name,</if>
+            <if test="checkedTime != null">checked_time,</if>
+            <if test="uploadUserId != null">upload_user_id,</if>
+            <if test="uploadTime != null">upload_time,</if>
+            <if test="remark != null">remark,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null and createBy != ''">create_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="updateBy != null and updateBy != ''">update_by,</if>
+            <if test="createUserId != null">create_user_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="checkWorkgroupId != null">#{checkWorkgroupId},</if>
+            <if test="checkGroupId != null">#{checkGroupId},</if>
+            <if test="checkedDeptId != null">#{checkedDeptId},</if>
+            <if test="checkedPostId != null">#{checkedPostId},</if>
+            <if test="printUserId != null">#{printUserId},</if>
+            <if test="printTime != null">#{printTime},</if>
+            <if test="checkedImg != null">#{checkedImg},</if>
+            <if test="checkedUserName != null">#{checkedUserName},</if>
+            <if test="checkedTime != null">#{checkedTime},</if>
+            <if test="uploadUserId != null">#{uploadUserId},</if>
+            <if test="uploadTime != null">#{uploadTime},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null and createBy != ''">#{createBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
+            <if test="createUserId != null">#{createUserId},</if>
+         </trim>
+    </insert>
+
+    <update id="updatePostChecked" parameterType="PostChecked">
+        update post_checked
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="checkWorkgroupId != null">check_workgroup_id = #{checkWorkgroupId},</if>
+            <if test="checkGroupId != null">check_group_id = #{checkGroupId},</if>
+            <if test="checkedDeptId != null">checked_dept_id = #{checkedDeptId},</if>
+            <if test="checkedPostId != null">checked_post_id = #{checkedPostId},</if>
+            <if test="printUserId != null">print_user_id = #{printUserId},</if>
+            <if test="printTime != null">print_time = #{printTime},</if>
+            <if test="checkedImg != null">checked_img = #{checkedImg},</if>
+            <if test="checkedUserName != null">checked_user_name = #{checkedUserName},</if>
+            <if test="checkedTime != null">checked_time = #{checkedTime},</if>
+            <if test="uploadUserId != null">upload_user_id = #{uploadUserId},</if>
+            <if test="uploadTime != null">upload_time = #{uploadTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="createUserId != null">create_user_id = #{createUserId},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deletePostCheckedById" parameterType="Long">
+        delete from post_checked where id = #{id}
+    </delete>
+
+    <delete id="deletePostCheckedByIds" parameterType="String">
+        delete from post_checked where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -262,4 +262,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ( #{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})
         </foreach>
     </insert>
+
+    <select id="contentListByType" resultType="PostCheckedItems">
+        SELECT
+            t2.type,
+            t2.level_one  as levelOne,
+            t2.level_two as levelTwo,
+            t2.level_three as levelThre,
+            t2.level_four as levelFour,
+            t2.level_five as levelFive,
+            case
+                when t2.level_five IS NOT NULL AND CHAR_LENGTH(TRIM(t2.level_five)) > 0 then TRIM(t2.level_five)
+                when t2.level_four IS NOT NULL AND CHAR_LENGTH(TRIM(t2.level_four)) > 0  then TRIM(t2.level_four)
+                when t2.level_three IS NOT NULL AND CHAR_LENGTH(TRIM(t2.level_three)) > 0  then TRIM(t2.level_three)
+                when t2.level_two IS NOT NULL AND CHAR_LENGTH(TRIM(t2.level_two)) > 0  then TRIM(t2.level_two)
+                when t2.level_one IS NOT NULL AND CHAR_LENGTH(TRIM(t2.level_one)) > 0  then TRIM(t2.level_one)
+               <!--
+                when t2.level_five IS NOT NULL then t2.level_five
+                when t2.level_four IS NOT NULL then t2.level_four
+                when t2.level_three IS NOT NULL then t2.level_three
+                when t2.level_two IS NOT NULL then t2.level_two
+                when t2.level_one IS NOT NULL then t2.level_one
+               -->
+                else 'Other'
+            END AS postCheckedContent,
+            t2.work_standard as postCheckedStandard
+        FROM "post_list" t1
+        INNER JOIN "post_list_info" t2 ON t2."post_list_id" = t1."id"
+        WHERE t1."dept_id" = #{deptId}
+        AND t1."post_id" = #{postId}
+        AND t2."type" = #{type}
+    </select>
 </mapper>

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

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

sql/Database.sql

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

sql/Menu.sql

@@ -37,8 +37,24 @@ values('298192019214341', '岗检计划删除', '298192019214337', '4',  '#', ''
 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)
 values('298192019214342', '岗检计划导出', '298192019214337', '5',  '#', '', 1, 0, 'F', '0', '0', 'postCheck:postPlan:export',       '#', 'admin', CURRENT_TIMESTAMP, '', null, '');
 
+-- 菜单 SQL：岗检表管理
+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)
+values('201116134002689', '岗检表管理', '17355455216040', '1', 'postChecked', 'postCheck/postChecked/index', 1, 0, 'C', '0', '0', 'postCheck:postChecked:list', '#', 'admin', CURRENT_TIMESTAMP, '', null, '岗检表管理菜单');
+-- 按钮 SQL：岗检表管理
+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)
+values('201116134002690', '岗检表管理查询', '201116134002689', '1',  '#', '', 1, 0, 'F', '0', '0', 'postCheck:postChecked:query',        '#', 'admin', CURRENT_TIMESTAMP, '', null, '');
+
+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)
+values('201116134002691', '岗检表管理新增', '201116134002689', '2',  '#', '', 1, 0, 'F', '0', '0', 'postCheck:postChecked:add',          '#', 'admin', CURRENT_TIMESTAMP, '', null, '');
 
+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)
+values('201116134002692', '岗检表管理修改', '201116134002689', '3',  '#', '', 1, 0, 'F', '0', '0', 'postCheck:postChecked:edit',         '#', 'admin', CURRENT_TIMESTAMP, '', null, '');
+
+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)
+values('201116134002693', '岗检表管理删除', '201116134002689', '4',  '#', '', 1, 0, 'F', '0', '0', 'postCheck:postChecked:remove',       '#', 'admin', CURRENT_TIMESTAMP, '', null, '');
 
+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)
+values('201116134002694', '岗检表管理导出', '201116134002689', '5',  '#', '', 1, 0, 'F', '0', '0', 'postCheck:postChecked:export',       '#', 'admin', CURRENT_TIMESTAMP, '', null, '');
 
 
 -- 菜单 SQL：岗检记录上传

sql/UpdateTable.sql

@@ -356,7 +356,7 @@ ALTER TABLE "public"."post_checked_problem" MODIFY "speciality_department_review
 ALTER TABLE "public"."post_checked_problem" MODIFY "speciality_department_review_time" COMMENT '审核2：专业部门审核人审核时间';
 ALTER TABLE "public"."post_checked_problem" MODIFY "problem_level" COMMENT '问题等级（一般、重要）';
 ALTER TABLE "public"."post_checked_problem" MODIFY "problem_attribute" COMMENT '问题属性（完整问题、有效性问题、适宜性问题）';
-ALTER TABLE "public"."post_checked_problem" MODIFY "problem_category" COMMENT '问题类别（职责权限问题、工作内容问题、工作标准问题、考核奖励问题、考核奖励问题、任职资格问题、其他）';
+ALTER TABLE "public"."post_checked_problem" MODIFY "problem_category" COMMENT '问题类别（职责权限问题、工作内容问题、工作标准问题、考核奖励问题、任职资格问题、其他）';
 ALTER TABLE "public"."post_checked_problem" MODIFY "description" COMMENT '问题描述';
 ALTER TABLE "public"."post_checked_problem" MODIFY "problem_cause" COMMENT '问题原因';
 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
     ALTER TABLE "public"."post_assessment_rating_other" ADD COLUMN create_by varying(64 char) NULL COMMENT '创建者';
     ALTER TABLE "public"."post_assessment_rating_other" ADD COLUMN update_time DATETIME NULL COMMENT '更新时间';
     ALTER TABLE "public"."post_assessment_rating_other" ADD COLUMN update_by varying(64 char) NULL COMMENT '更新者';
+
+
+
+ALTER TABLE "public"."post_checked" RENAME COLUMN "checked_user_id" TO checked_user_name;
+ALTER TABLE "public"."post_checked" MODIFY COLUMN "checked_user_name" varchar(64);
+ALTER TABLE "public"."post_checked" MODIFY COLUMN "checked_user_name" varchar COMMENT '检查人中文姓名（上传页面设置的值）';
+ALTER TABLE "public"."post_checked" MODIFY COLUMN "checked_time" timestamp WITH time ZONE COMMENT '检查时间（上传页面设置的值）';
+ALTER TABLE "public"."post_checked" MODIFY COLUMN "upload_user_id" bigint COMMENT '检查表上传人ID';
+ALTER TABLE "public"."post_checked" MODIFY COLUMN "upload_time" timestamp WITH time ZONE COMMENT '检查表上传时间';
+
+ALTER TABLE "public"."post_checked_items" MODIFY COLUMN "type" integer COMMENT '检查项目：参考post_list_info表；类型（1-业务职责；2-党建及党风廉政建设职责；3-安全环保职责；4-合规保密职；5-任职资格与能力素质要求）';
+ALTER TABLE "public"."post_checked_items" ADD COLUMN post_checked_content varchar(1000) COMMENT '检查内容';
+ALTER TABLE "public"."post_checked_items" ADD COLUMN post_checked_standard varchar(1000) COMMENT '检查标准';
+ALTER TABLE "public"."post_checked_items" ADD COLUMN post_checked_method varchar(1000) COMMENT '检查方法';
+ALTER TABLE "public"."post_checked_items" ADD COLUMN post_checked_result varchar(1000) COMMENT '检查结果';