Merge remote-tracking branch 'origin/master'

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

@@ -240,15 +240,28 @@ public class SysUserController extends BaseController {
     @ApiOperation("查询用户列表（分页）支持部门ID、岗位名称筛选")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "deptId", value = "部门ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "deptName", value = "部门名称", dataType = "String", dataTypeClass = String.class),
+
+            @ApiImplicitParam(name = "postId", value = "岗位ID", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "postName", value = "岗位名称", dataType = "String", dataTypeClass = String.class),
+
+            @ApiImplicitParam(name = "nickName", 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)
+//            @ApiImplicitParam(name = "orderBy", value = "排序字段", dataType = "String", dataTypeClass = String.class)
     })
     @GetMapping("/postUserList")
-    public TableDataInfo postUserList(Long deptId ,String postName) {
-        startPage();
-        List<SysUser> list = userService.postUserList(deptId,postName);
+//    public TableDataInfo postUserList(Long deptId ,String postName) {
+    public TableDataInfo postUserList(Long deptId, String deptName, Long postId, String postName, String nickName) {
+//        pageNum: 1
+//        pageSize: 10
+//        deptName: 部门名称
+//        postName: 岗位名称
+//        nickName: 人员名称
+//        startPage();
+        startPage("desc", "u.create_time");
+        List<SysUser> list = userService.postUserList(deptId, deptName, postId, postName, nickName);
 
 
         return getDataTable(list);

ruoyi-admin/src/test/java/com/post/Test01.java

@@ -14,8 +14,4 @@ public class Test01 {
             System.out.println("insert into post_tools (id, \"type\", \"type_view\") values(" + i + ", 1, " + (2020 + (i - 100)) + ");");
         }
     }
-
-    public void ss() {
-
-    }
 }

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

@@ -64,6 +64,12 @@ public class PostCheckedController extends BaseController {
     @PreAuthorize("@ss.hasPermi('postCheck:postChecked:list')")
     @GetMapping("/list")
     public TableDataInfo list(PostChecked postChecked) {
+//        pageNum: 1
+//        pageSize: 10
+//        checkWorkgroupName: 工作组
+//        checkGroupName: 检查小组
+//        checkedDeptName: 部门
+//        postCode: 编号 post_code
 //        startPage();
         startPage("desc", "t1.create_time");
         List<PostChecked> list = postCheckedService.selectPostCheckedList(postChecked);

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

@@ -49,7 +49,7 @@ public class PostCheckedProblemController extends BaseController {
             @ApiImplicitParam(name = "problemNo", value = "问题编号（需要甲方提供规则规则）", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "checkWorkgroupId", value = "检查工作组ID", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "checkGroupId", value = "检查小组ID", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "checkUserId", value = "检查人员ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "checkUserName", value = "检查人姓名", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "deptApproveUserId", value = "审核1：整改部门经理ID", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "deptApproveTime", value = "审核1：整改部门经理审核时间", dataType = "Date", dataTypeClass = Date.class),
             @ApiImplicitParam(name = "specialityDepartmentReviewerId", value = "审核2：专业部门的审核人ID（非必选，方案填写人选择）", dataType = "Long", dataTypeClass = Long.class),
@@ -117,7 +117,6 @@ public class PostCheckedProblemController extends BaseController {
             @ApiImplicitParam(name = "problemNo", value = "问题编号（需要甲方提供规则规则）", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "checkWorkgroupId", value = "检查工作组ID", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "checkGroupId", value = "检查小组ID", dataType = "Long", dataTypeClass = Long.class),
-//            @ApiImplicitParam(name = "checkUserId", value = "检查人员ID", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "checkUserName", value = "检查人姓名", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "deptApproveUserId", value = "审核1：整改部门经理ID", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "deptApproveTime", value = "审核1：整改部门经理审核时间", dataType = "Date", dataTypeClass = Date.class),
@@ -163,7 +162,6 @@ public class PostCheckedProblemController extends BaseController {
 //            @ApiImplicitParam(name = "problemNo", value = "问题编号（需要甲方提供规则规则）", dataType = "String", dataTypeClass = String.class),
 //            @ApiImplicitParam(name = "checkWorkgroupId", value = "检查工作组ID", dataType = "Long", dataTypeClass = Long.class),
 //            @ApiImplicitParam(name = "checkGroupId", value = "检查小组ID", dataType = "Long", dataTypeClass = Long.class),
-//            @ApiImplicitParam(name = "checkUserId", value = "检查人员ID", dataType = "Long", dataTypeClass = Long.class),
 //            @ApiImplicitParam(name = "deptApproveUserId", value = "审核1：整改部门经理ID", dataType = "Long", dataTypeClass = Long.class),
 //            @ApiImplicitParam(name = "deptApproveTime", value = "审核1：整改部门经理审核时间", dataType = "Date", dataTypeClass = Date.class),
 //            @ApiImplicitParam(name = "specialityDepartmentReviewerId", value = "审核2：专业部门的审核人ID（非必选，方案填写人选择）", dataType = "Long", dataTypeClass = Long.class),
@@ -210,7 +208,6 @@ public class PostCheckedProblemController extends BaseController {
 //            @ApiImplicitParam(name = "problemNo", value = "问题编号（需要甲方提供规则规则）", dataType = "String", dataTypeClass = String.class),
 //            @ApiImplicitParam(name = "checkWorkgroupId", value = "检查工作组ID", dataType = "Long", dataTypeClass = Long.class),
 //            @ApiImplicitParam(name = "checkGroupId", value = "检查小组ID", dataType = "Long", dataTypeClass = Long.class),
-//            @ApiImplicitParam(name = "checkUserId", value = "检查人员ID", dataType = "Long", dataTypeClass = Long.class),
 //            @ApiImplicitParam(name = "deptApproveUserId", value = "审核1：整改部门经理ID", dataType = "Long", dataTypeClass = Long.class),
 //            @ApiImplicitParam(name = "deptApproveTime", value = "审核1：整改部门经理审核时间", dataType = "Date", dataTypeClass = Date.class),
 //            @ApiImplicitParam(name = "specialityDepartmentReviewerId", value = "审核2：专业部门的审核人ID（非必选，方案填写人选择）", dataType = "Long", dataTypeClass = Long.class),

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

@@ -242,12 +242,12 @@ public class PostCheckedReportController extends BaseController
     })
     @Log(title = "岗检报告审核", businessType = BusinessType.UPDATE)
     @PutMapping("/statusApprove")
-    public AjaxResult statusApprove(Long id, Integer status, String statusReason) {
+    public AjaxResult statusApprove(Long id, Integer status, String reason) {
 
         // 判断审核的权限
         LoginUser loginUser = SecurityUtils.getLoginUser();
         if (SecurityUtils.isAdmin(loginUser.getUserId())) {
-            return toAjax(postCheckedReportService.statusApprove(id, status,  statusReason));
+            return toAjax(postCheckedReportService.statusApprove(id, status,  reason));
         }
 
         // 当前登录用户的部门id 查询岗位id是否在内
@@ -259,7 +259,7 @@ public class PostCheckedReportController extends BaseController
         if (!sysPostService.userHaveAuthority(sysDept.getDeptId())) {
             return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");
         }
-        return toAjax(postCheckedReportService.statusApprove(id, status,  statusReason));
+        return toAjax(postCheckedReportService.statusApprove(id, status,  reason));
     }
 
 }

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

@@ -269,7 +269,9 @@ public class PostListController extends BaseController {
         List<PostCheckedItems> itemsList = new ArrayList<>();
         if (type == 6) {
             PostCheckedItems item = new PostCheckedItems();
-            item.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+//            item.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+            item.setId(610l);
+            item.setChildrenTypeId(610l);
             item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
             item.setPostCheckedContent("完整性"); //检查内容 -> 一级事项、……、五级事项
             item.setPostCheckedStandard("1.是否有岗位基本信息、岗位职责、岗位权限、工作内容、工作标准的描述；\n" +
@@ -282,7 +284,9 @@ public class PostListController extends BaseController {
             itemsList.add(item);
 
             item = new PostCheckedItems();
-            item.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+//            item.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+            item.setId(620l);
+            item.setChildrenTypeId(620l);
             item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
             item.setPostCheckedContent("适宜性"); //检查内容 -> 一级事项、……、五级事项
             item.setPostCheckedStandard("1.职责与权限；工作内容与岗位职责、权限；工作标准与工作内容、实际工作是否匹配；\n" +
@@ -303,7 +307,9 @@ public class PostListController extends BaseController {
             return success(itemsList);
         } else if (type == 5) {
             PostCheckedItems item = new PostCheckedItems();
-            item.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+//            item.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+            item.setId(510l);
+            item.setChildrenTypeId(510l);
             item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
             item.setPostCheckedContent("政治要求"); //检查内容 -> 一级事项、……、五级事项
             item.setPostCheckedStandard("·中共党员。\n" +
@@ -312,7 +318,9 @@ public class PostListController extends BaseController {
             itemsList.add(item);
 
             item = new PostCheckedItems();
-            item.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+//            item.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+            item.setId(520l);
+            item.setChildrenTypeId(520l);
             item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
             item.setPostCheckedContent("最低学历要求"); //检查内容 -> 一级事项、……、五级事项
             item.setPostCheckedStandard("大学本科");  //检查标准 ->  工作标准（work_standard）  要求2（requirement）
@@ -320,7 +328,9 @@ public class PostListController extends BaseController {
             itemsList.add(item);
 
             item = new PostCheckedItems();
-            item.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+//            item.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+            item.setId(530l);
+            item.setChildrenTypeId(530l);
             item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
             item.setPostCheckedContent("最低学位要求"); //检查内容 -> 一级事项、……、五级事项
             item.setPostCheckedStandard("无");  //检查标准 ->  工作标准（work_standard）  要求2（requirement）
@@ -328,7 +338,9 @@ public class PostListController extends BaseController {
             itemsList.add(item);
 
             item = new PostCheckedItems();
-            item.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+//            item.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+            item.setId(540l);
+            item.setChildrenTypeId(540l);
             item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
             item.setPostCheckedContent("工作经验"); //检查内容 -> 一级事项、……、五级事项
             item.setPostCheckedStandard("具有累计7年以上企业工作经历。M8/T6级及以上，在副经理（或相当层级）岗位工作2年以上；未满2年的应当在副经理（或相当层级）和岗位经理/主管工程师（或相当层级）岗位工作累计5年以上，且在副经理（或相当层级）岗位工作至少满1年。");  //检查标准 ->  工作标准（work_standard）  要求2（requirement）
@@ -336,7 +348,9 @@ public class PostListController extends BaseController {
             itemsList.add(item);
 
             item = new PostCheckedItems();
-            item.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+//            item.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+            item.setId(550l);
+            item.setChildrenTypeId(550l);
             item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
             item.setPostCheckedContent("职称要求"); //检查内容 -> 一级事项、……、五级事项
             item.setPostCheckedStandard("高级职称");  //检查标准 ->  工作标准（work_standard）  要求2（requirement）
@@ -344,7 +358,9 @@ public class PostListController extends BaseController {
             itemsList.add(item);
 
             item = new PostCheckedItems();
-            item.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+//            item.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+            item.setId(560l);
+            item.setChildrenTypeId(560l);
             item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
             item.setPostCheckedContent("专业要求"); //检查内容 -> 一级事项、……、五级事项
             item.setPostCheckedStandard("石油主干专业、企业管理或相关专业。");  //检查标准 ->  工作标准（work_standard）  要求2（requirement）
@@ -352,7 +368,9 @@ public class PostListController extends BaseController {
             itemsList.add(item);
 
             item = new PostCheckedItems();
-            item.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+//            item.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+            item.setId(570l);
+            item.setChildrenTypeId(570l);
             item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
             item.setPostCheckedContent("能力要求"); //检查内容 -> 一级事项、……、五级事项
             item.setPostCheckedStandard("·具有出色的计划、控制、领导和团队管理能力\n" +
@@ -368,7 +386,9 @@ public class PostListController extends BaseController {
             itemsList.add(item);
 
             item = new PostCheckedItems();
-            item.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+//            item.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+            item.setId(580l);
+            item.setChildrenTypeId(580l);
             item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
             item.setPostCheckedContent("知识要求"); //检查内容 -> 一级事项、……、五级事项
             item.setPostCheckedStandard("·掌握相关的政策、法律和法规知识\n" +
@@ -379,7 +399,9 @@ public class PostListController extends BaseController {
             itemsList.add(item);
 
             item = new PostCheckedItems();
-            item.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+//            item.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+            item.setId(590l);
+            item.setChildrenTypeId(590l);
             item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
             item.setPostCheckedContent("在岗时应持有证书或必须参加的培训"); //检查内容 -> 一级事项、……、五级事项
             item.setPostCheckedStandard("无");  //检查标准 ->  工作标准（work_standard）  要求2（requirement）
@@ -387,7 +409,9 @@ public class PostListController extends BaseController {
             itemsList.add(item);
 
             item = new PostCheckedItems();
-            item.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+//            item.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+            item.setId(5100l);
+            item.setChildrenTypeId(5100l);
             item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
             item.setPostCheckedContent("其他要求"); //检查内容 -> 一级事项、……、五级事项
             item.setPostCheckedStandard("具有正常履职的身体条件，心理素质良好。");  //检查标准 ->  工作标准（work_standard）  要求2（requirement）
@@ -400,7 +424,9 @@ public class PostListController extends BaseController {
         itemsList = postListService.contentListByType(deptId, postId, type);
         if (type == 4) {
             PostCheckedItems item = new PostCheckedItems();
-            item.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+//            item.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+            item.setId(410l);
+            item.setChildrenTypeId(410l);
             item.setType(type); //检查项目 -> 业务职责、党建党风、安全环保……
             item.setPostCheckedContent("党委会、董事会管理"); //检查内容 -> 一级事项、……、五级事项
             item.setPostCheckedStandard("抓好三重一大管理，确保党委会、董事会合规运行");  //检查标准 ->  工作标准（work_standard）  要求2（requirement）
@@ -420,6 +446,10 @@ public class PostListController extends BaseController {
                 itemsList.add(0, item);
             }
         }
+        for (PostCheckedItems items : itemsList) {
+            Long id = items.getId();
+            items.setChildrenTypeId(id);
+        }
 
         //写死的假数据
         if (false) {

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

@@ -97,6 +97,12 @@ public class PostPlanController extends BaseController {
     @PreAuthorize("@ss.hasPermi('postCheck:postPlan:list')")
     @GetMapping("/list")
     public TableDataInfo list(PostPlan postPlan) {
+//        pageNum: 1
+//        pageSize: 10
+//        checkGroupName: 工作组
+//        checkTeamName: 小组
+//        params[beginTime]: 2024-1-01
+//        params[endTime]: 2024-1-31
 //        startPage();
         startPage("desc", "t1.create_time");
         List<PostPlan> list = postPlanService.selectPostPlanList(postPlan);

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

@@ -34,9 +34,7 @@ public class PostPlanJoinCheckedController extends BaseController {
     @Autowired
     private IPostPlanJoinCheckedService postPlanJoinCheckedService;
 
-    /**
-     * 查询岗检记录上传列表列表
-     */
+
     @ApiOperation("查询岗检记录上传列表列表")
     @ApiImplicitParams({
 //                    @ApiImplicitParam(name = "id", value = "id", dataType = "Long", dataTypeClass = Long.class),
@@ -48,66 +46,31 @@ public class PostPlanJoinCheckedController extends BaseController {
     @PreAuthorize("@ss.hasPermi('postCheck:postPlanJoinChecked:list')")
     @GetMapping("/list")
     public TableDataInfo list(PostPlanJoinChecked postPlanJoinChecked) {
+//        pageNum: 1
+//        pageSize: 10
+//        checkGroupName: 工作组
+//        checkedPostNames: 岗位
+//        checkedDeptName: 部门
+//        status: 2
         startPage();
+//        startPage("desc", "t1.create_time");
         List<PostPlanJoinChecked> list = postPlanJoinCheckedService.selectPostPlanJoinCheckedList(postPlanJoinChecked);
         return getDataTable(list);
     }
 
-    /**
-     * 导出岗检记录上传列表列表
-     @ApiOperation("导出岗检记录上传列表列表")
-     @PreAuthorize("@ss.hasPermi('postCheck:postPlanJoinChecked:export')")
-     @Log(title = "岗检记录上传列表", businessType = BusinessType.EXPORT)
-     @PostMapping("/export") public void export(HttpServletResponse response, PostPlanJoinChecked postPlanJoinChecked)
-     {
-     List<PostPlanJoinChecked> list = postPlanJoinCheckedService.selectPostPlanJoinCheckedList(postPlanJoinChecked);
-     ExcelUtil<PostPlanJoinChecked> util = new ExcelUtil<PostPlanJoinChecked>(PostPlanJoinChecked.class);
-     util.exportExcel(response, list, "岗检记录上传列表数据");
-     }
-     */
-
-    /**
-     * 获取岗检记录上传列表详细信息
-     @ApiOperation("获取岗检记录上传列表详细信息")
-     @PreAuthorize("@ss.hasPermi('postCheck:postPlanJoinChecked:query')")
-     @GetMapping(value = "/{id}")
-     public AjaxResult getInfo(@PathVariable("id") Long id)
-     {
-     return success(postPlanJoinCheckedService.selectPostPlanJoinCheckedById(id));
-     }
-     */
-
-    /**
-     * 新增岗检记录上传列表
-     *
-     * @ApiOperation("新增岗检记录上传列表")
-     * @ApiImplicitParams({
-     * @ApiImplicitParam(name = "id", value = "id", dataType = "Long", dataTypeClass = Long.class),
-     * @ApiImplicitParam(name = "name", value = "name", dataType = "Long", dataTypeClass = Long.class),
-     * })
-     * @PreAuthorize("@ss.hasPermi('postCheck:postPlanJoinChecked:add')")
-     * @Log(title = "岗检记录上传列表", businessType = BusinessType.INSERT)
-     * @PostMapping public AjaxResult add(@RequestBody PostPlanJoinChecked postPlanJoinChecked)
-     * {
-     * return toAjax(postPlanJoinCheckedService.insertPostPlanJoinChecked(postPlanJoinChecked));
-     * }
-     */
-
 
     @ApiOperation("岗检完成确认")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "planInfoId", value = "岗检计划明细ID", dataType = "Long", dataTypeClass = Long.class),
-            @ApiImplicitParam(name = "checkedUserId", value = "检查人ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "checkedUserName", value = "检查人姓名-与系统用户不关联", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "checkedTime", value = "检查时间(yyyy-MM-dd HH:mm:ss)", dataType = "Date", dataTypeClass = Date.class),
             @ApiImplicitParam(name = "checkedImg", value = "检查表照片(图片上传后的相对路径)", dataType = "String", dataTypeClass = String.class),
 
     })
-//    @PreAuthorize("@ss.hasPermi('postCheck:postPlanJoinChecked:edit')")
     @Log(title = "岗检完成确认", businessType = BusinessType.UPDATE)
-    @PutMapping("checked")
-    public AjaxResult checked(Long planInfoId, Long checkedUserId, Date checkedTime, String checkedImg) {
-
-        return toAjax(postPlanJoinCheckedService.checked(planInfoId, checkedUserId, checkedTime, checkedImg));
+    @PutMapping("/checked")
+    public AjaxResult checked(Long planInfoId,  String checkedUserName,Date checkedTime, String checkedImg) {
+        return toAjax(postPlanJoinCheckedService.checked(planInfoId, checkedUserName, checkedTime, checkedImg));
     }
 
     @ApiOperation("岗检完成确认后重新上传检查表照片")
@@ -116,22 +79,10 @@ public class PostPlanJoinCheckedController extends BaseController {
             @ApiImplicitParam(name = "checkedImg", value = "检查表照片(图片上传后的相对路径)", dataType = "String", dataTypeClass = String.class),
 
     })
-//    @PreAuthorize("@ss.hasPermi('postCheck:postPlanJoinChecked:edit')")
+
     @Log(title = "岗检完成确认后重新上传检查表照片", businessType = BusinessType.UPDATE)
     @PutMapping("imgReUpload")
     public AjaxResult imgReUpload(Long planInfoId, String checkedImg) {
         return toAjax(postPlanJoinCheckedService.imgReUpload(planInfoId, checkedImg));
     }
-
-    /**
-     * 删除岗检记录上传列表
-     @ApiOperation("删除岗检记录上传列表")
-     @ApiImplicitParam(name = "ids", value = "Long类型的主键数组", dataType = "Long[]", dataTypeClass = "Long[].class")
-     @PreAuthorize("@ss.hasPermi('postCheck:postPlanJoinChecked:remove')")
-     @Log(title = "岗检记录上传列表", businessType = BusinessType.DELETE)
-     @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids)
-     {
-     return toAjax(postPlanJoinCheckedService.deletePostPlanJoinCheckedByIds(ids));
-     }
-     */
 }

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

@@ -58,6 +58,7 @@ public class PostPlanJoinProblemController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(PostPlanJoinProblem postPlanJoinProblem) {
         startPage();
+//        startPage("desc", "t1.create_time");
         List<PostPlanJoinProblem> list = postPlanJoinProblemService.selectPostPlanJoinProblemList(postPlanJoinProblem);
         return getDataTable(list);
     }

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

@@ -32,6 +32,11 @@ public class PostChecked extends BaseEntity
 
     private Long id;
 
+    @ApiModelProperty("岗检编号")
+    @TableField(value = "post_code")
+    @Excel(name = "岗检编号")
+    private String postCode;
+
     @ApiModelProperty("检查工作组ID")
     @TableField(value = "check_workgroup_id")
     @Excel(name = "检查工作组ID")

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

@@ -37,6 +37,12 @@ public class PostCheckedItems extends BaseEntity
     @Excel(name = "检查项目：参考post_list_info表；类型", readConverterExp = "1=-业务职责；2-党建及党风廉政建设职责；3-安全环保职责；4-合规保密职；5-任职资格与能力素质要求")
     private Integer type;
 
+
+    //实际上是岗位责任制清单明细的id，但是type=6和5时是接口（/contentListByType）写死的初始的部分，接口中也是把id写死了。
+    @ApiModelProperty("检查内容ID")
+    @TableField(value = "children_type_id")
+    private Long childrenTypeId;
+
     @ApiModelProperty("创建者用户ID")
     @TableField(value = "create_user_id")
     @Excel(name = "创建者用户ID")

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

@@ -57,11 +57,6 @@ public class PostCheckedProblem extends BaseEntity {
     @Excel(name = "检查小组ID")
     private Long checkGroupId;
 
-//    @ApiModelProperty("检查人员ID")
-//    @TableField(value = "check_user_id")
-//    @Excel(name = "检查人员ID")
-//    private Long checkUserId;
-
     @ApiModelProperty("检查人员姓名")
     @TableField(value = "check_user_name")
     @Excel(name = "检查人员姓名")
@@ -200,6 +195,13 @@ public class PostCheckedProblem extends BaseEntity {
 
 
     //    ==================显示字段==============
+    @ApiModelProperty("岗检工作组")
+    @TableField(exist = false)
+    private String checkWorkgroupName;
+    @ApiModelProperty("岗检小组")
+    @TableField(exist = false)
+    private String checkGroupName;
+
     @ApiModelProperty("整改责任部门名称")
     @TableField(exist = false)
     private String checkedDeptName;

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

@@ -75,10 +75,10 @@ public class PostPlanInfo extends BaseEntity
     @Excel(name = "上传：检查后的检查表照片或PDF，磁盘相对路径")
     private String checkedImg;
 
-    @ApiModelProperty("上传：检查人ID")
-    @TableField(value = "checked_user_id")
-    @Excel(name = "上传：检查人ID")
-    private Long checkedUserId;
+    @ApiModelProperty("上传：检查人姓名-与系统用户不关联")
+    @TableField(value = "checked_user_name")
+    @Excel(name = "上传：检查人姓名-与系统用户不关联")
+    private String checkedUserName;
 
     @ApiModelProperty("上传：检查时间")
     @TableField(value = "checked_time")

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/join/PostPlanJoinChecked.java

@@ -37,6 +37,9 @@ public class PostPlanJoinChecked implements Serializable {
     @ApiModelProperty("检查小组名称")
     private String checkTeamName;
 
+    @ApiModelProperty("上传-岗检人")
+    private String checkedUserName;
+
     @ApiModelProperty("检查人员中文名称逗号拼接")
     private String checkedUserNames;
 

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

@@ -71,10 +71,10 @@ public interface IPostCheckedReportService extends IService<PostCheckedReport>
      * 岗检报告审核
      * @param id 主键
      * @param status 状态：3-通过；4-驳回；
-     * @param statusReason 未通过理由
+     * @param reason 未通过理由
      * @return
      */
-    int statusApprove(Long id, Integer status, String statusReason);
+    int statusApprove(Long id, Integer status, String reason);
 
     List<CheckStatisticsView>  checkStatistics();
 

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

@@ -33,12 +33,12 @@ public interface IPostPlanJoinCheckedService {
      * 岗检完成确认
      *
      * @param planInfoId 岗检计划明细ID
-     * @param checkedUserId 检查人ID
+     * @param checkedUserName 检查人ID
      * @param checkedTime 检查时间
      * @param checkedImg 检查表照片
      * @return 结果
      */
-    public int checked(Long planInfoId, Long checkedUserId, Date checkedTime, String checkedImg);
+    public int checked(Long planInfoId, String checkedUserName,Date checkedTime, String checkedImg);
 
     /**
      * 岗检完成确认后重新上传检查表照片

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

@@ -31,6 +31,7 @@ import com.ruoyi.postCheck.mapper.PostAssessmentRatingMapper;
 import com.ruoyi.postCheck.domain.PostAssessmentRating;
 import com.ruoyi.postCheck.service.IPostAssessmentRatingService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.util.CollectionUtils;
 
 /**
  * 考核评比Service业务层处理
@@ -110,7 +111,9 @@ public class PostAssessmentRatingServiceImpl extends ServiceImpl<PostAssessmentR
                     }
                 }
                 BigDecimal divide = new BigDecimal("0");
-                if (postTotal != null) {
+                //collect.size() = 0 时  / by zero 异常
+                if (postTotal != null && !CollectionUtils.isEmpty(collect)) {
+//                if (postTotal != null) {
                     divide = new BigDecimal(postCheckedProblems.size()).divide(postTotal.multiply(new BigDecimal(collect.size())), 4, RoundingMode.HALF_UP);
                 }
                 // 计算系数 1-问题总数/需要查的问题数

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

@@ -871,10 +871,10 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
                 }
             }
         Map<Integer, BigDecimal> map = new HashMap<>();
-        map.put(1, new BigDecimal(overproblemComplete).divide(new BigDecimal(problemComplete), 4, RoundingMode.HALF_UP));
-        map.put(2, new BigDecimal(overproblemSuitable).divide(new BigDecimal(problemSuitable), 4, RoundingMode.HALF_UP));
-        map.put(3, new BigDecimal(overproblemEffective).divide(new BigDecimal(problemEffective), 4, RoundingMode.HALF_UP));
-        map.put(4, new BigDecimal(overtotal).divide(new BigDecimal(total), 4, RoundingMode.HALF_UP));
+        map.put(1, problemComplete == 0 ? new BigDecimal(0) : new BigDecimal(overproblemComplete).divide(new BigDecimal(problemComplete), 4, RoundingMode.HALF_UP));
+        map.put(2, problemSuitable == 0 ? new BigDecimal(0) : new BigDecimal(overproblemSuitable).divide(new BigDecimal(problemSuitable), 4, RoundingMode.HALF_UP));
+        map.put(3, problemEffective == 0 ? new BigDecimal(0) : new BigDecimal(overproblemEffective).divide(new BigDecimal(problemEffective), 4, RoundingMode.HALF_UP));
+        map.put(4, total == 0 ? new BigDecimal(0) : new BigDecimal(overtotal).divide(new BigDecimal(total), 4, RoundingMode.HALF_UP));
         return map;
 
     }
@@ -1350,8 +1350,8 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
         // 查询职能问题数量
         LambdaQueryWrapper<PostCheckedProblem> postCheckedProblemLambdaQueryWrapper = Wrappers.<PostCheckedProblem>lambdaQuery();
         postCheckedProblemLambdaQueryWrapper.in(PostCheckedProblem::getCheckedDeptId, deptIds);
-        if (type.getParams()!=null&&type.getParams().get("beginTime")!=null&&type.getParams().get("beginTime")!=null)
-        postCheckedProblemLambdaQueryWrapper.between(PostCheckedProblem::getCreateTime,type.getParams().get("beginTime"),type.getParams().get("endTime"));
+        if (type.getParams() != null && type.getParams().get("beginTime") != null && type.getParams().get("beginTime") != null)
+            postCheckedProblemLambdaQueryWrapper.between(PostCheckedProblem::getCreateTime, type.getParams().get("beginTime"), type.getParams().get("endTime"));
         List<PostCheckedProblem> postCheckedProblems = postCheckedProblemMapper.selectList(postCheckedProblemLambdaQueryWrapper);
 
         List<CheckedProblemDeptDetaailView> list = new ArrayList<>();
@@ -1367,7 +1367,7 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
                 CheckedProblemDeptDetaailView data1 = new CheckedProblemDeptDetaailView();
                 data1.setDeptId(key); //部门ID
                 data1.setDeptName(postAssessmentRatingMapper.getSysDeptName(key));// 部门名称
-                if (type.getDeptName()!=null && !data1.getDeptName().contains(type.getDeptName())){
+                if (type.getDeptName() != null && !data1.getDeptName().contains(type.getDeptName())) {
                     continue;
                 }
                 int problemTotal = 0;
@@ -1379,20 +1379,20 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
                 Integer rate = 0;
                 for (PostCheckedProblem postCheckedProblem : value) {
                     problemTotal++;
-                    if (postCheckedProblem.getProblemLevel().equals("1")){
+                    if (postCheckedProblem.getProblemLevel().equals("1")) {
                         problemLeveOne++;
                     }
-                    if (postCheckedProblem.getProblemLevel().equals("2")){
+                    if (postCheckedProblem.getProblemLevel().equals("2")) {
                         problemLeveTwo++;
                     }
-                    if (postCheckedProblem.getIsRectificationCompleted()!=null && postCheckedProblem.getIsRectificationCompleted()==1){
+                    if (postCheckedProblem.getIsRectificationCompleted() != null && postCheckedProblem.getIsRectificationCompleted() == 1) {
                         rate++;
                     }
                 }
-                if (rate == 0 || problemTotal == 0){
+                if (rate == 0 || problemTotal == 0) {
                     data1.setRate(new BigDecimal("0"));
-                }else{
-                    data1.setRate(new BigDecimal(rate).divide(new BigDecimal(problemTotal),4,RoundingMode.HALF_UP));
+                } else {
+                    data1.setRate(new BigDecimal(rate).divide(new BigDecimal(problemTotal), 4, RoundingMode.HALF_UP));
                 }
                 data1.setStatisticsTime(new Date());
                 data1.setProblemTotal(problemTotal); //问题数量
@@ -1413,11 +1413,11 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
                     child1.setDutyType(duty);
                     List<PostCheckedProblem> postCheckedProblemList = integerListEntry.getValue();
 //                    @ApiModelProperty("已完成完整性数量")
-                     int problemCompleteChecked = 0;
+                    int problemCompleteChecked = 0;
 //                    @ApiModelProperty("已完成适宜性数量")
-                     int problemSuitableChecked = 0;
+                    int problemSuitableChecked = 0;
 //                    @ApiModelProperty("已完成有效性数量")
-                     int problemEffectiveChecked = 0;
+                    int problemEffectiveChecked = 0;
                     for (PostCheckedProblem postCheckedProblem : postCheckedProblemList) {
                         if (postCheckedProblem.getProblemAttribute() == 1) {
                             problemComplete++;
@@ -1428,7 +1428,7 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
                         if (postCheckedProblem.getProblemAttribute() == 3) {
                             problemSuitable++;
                         }
-                        if (postCheckedProblem.getIsRectificationCompleted()!=null&&postCheckedProblem.getIsRectificationCompleted()== 1){
+                        if (postCheckedProblem.getIsRectificationCompleted() != null && postCheckedProblem.getIsRectificationCompleted() == 1) {
                             if (postCheckedProblem.getProblemAttribute() == 1) {
                                 problemCompleteChecked++;
                             }

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

@@ -140,23 +140,25 @@ public class PostCheckedReportServiceImpl extends ServiceImpl<PostCheckedReportM
      *
      * @param id           主键
      * @param status       状态：3-通过；4-驳回；
-     * @param statusReason 未通过理由
+     * @param reason 未通过理由
      * @return
      */
     @Override
-    public int statusApprove(Long id, Integer status, String statusReason) {
+    public int statusApprove(Long id, Integer status, String reason) {
         if (id == null || status == null) {
-            return 0;
+//            return 0;
+            throw new BaseException("参数不全，请检查！");
         }
 
         //状态错误
         if (status != PostCheckedReportEnum.STATUS_PASS.getValue() && status != PostCheckedReportEnum.STATUS_BACK.getValue()) {
-            return 0;
+//            return 0;
+            throw new BaseException("状态错误，请检查！");
         }
 
         //驳回时必须填写原因
-        if (status == PostCheckedReportEnum.STATUS_BACK.getValue() && StringUtils.isBlank(statusReason)) {
-            return 0;
+        if (status == PostCheckedReportEnum.STATUS_BACK.getValue() && StringUtils.isBlank(reason)) {
+            throw new BaseException("请填写未通过理由！");
         }
         LoginUser loginUser = SecurityUtils.getLoginUser();
         SysUser sysUser = loginUser.getUser();
@@ -166,7 +168,7 @@ public class PostCheckedReportServiceImpl extends ServiceImpl<PostCheckedReportM
         data.setStatusByUserId(sysUser.getUserId());
         data.setStatusByUserName(sysUser.getUserName());
         data.setStatusApproveTime(new Date());
-        data.setStatusReason(statusReason);
+        data.setStatusReason(reason);
         return postCheckedReportMapper.updatePostCheckedReport(data);
     }
 

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

@@ -98,6 +98,7 @@ public class PostCheckedServiceImpl extends ServiceImpl<PostCheckedMapper, PostC
         //TODO 自增主键修改为-MyBatis-Plus雪花算法(截取5位解决VUE精度丢失BUG)-系统登录日志
 //        if (postChecked.getId() == null)
         postChecked.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+        postChecked.setPostCode("GJ-" + DateUtils.dateTimeNow());
         // postChecked.setCreateTime(DateUtils.getNowDate());
         postChecked.setCreateDefault();
 //        postChecked.setStatus(PostCheckedEnum.STATUS_WAIT.getValue()); // 去创建自己的枚举类
@@ -108,6 +109,8 @@ public class PostCheckedServiceImpl extends ServiceImpl<PostCheckedMapper, PostC
                 child.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
                 child.setPostCheckedId(postChecked.getId());
                 child.setCreateDefault();
+                Long childrenTypeId = child.getChildrenTypeId();
+                log.error("【岗检表】-新增：新增明细时参数缺少：childrenTypeId : {}", childrenTypeId);
             }
             postCheckedItemsService.saveBatch(children);
         }
@@ -121,6 +124,7 @@ public class PostCheckedServiceImpl extends ServiceImpl<PostCheckedMapper, PostC
      * @return 结果
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public int updatePostChecked(PostChecked postChecked) {
         Long id = postChecked.getId();
 
@@ -149,6 +153,8 @@ public class PostCheckedServiceImpl extends ServiceImpl<PostCheckedMapper, PostC
                 child.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
                 child.setPostCheckedId(postChecked.getId());
                 child.setCreateDefault();
+                Long childrenTypeId = child.getChildrenTypeId();
+                log.error("【岗检表】-新增：新增明细时参数缺少：childrenTypeId : {}", childrenTypeId);
             }
             postCheckedItemsService.saveBatch(children);
         }

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

@@ -14,6 +14,7 @@ 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.domain.PostCheckedProblem;
 import com.ruoyi.postCheck.mapper.PostListInfoMapper;
 import com.ruoyi.postCheck.service.IPostListInfoService;
 import com.ruoyi.system.service.ISysPostService;
@@ -231,6 +232,7 @@ public class PostListServiceImpl extends ServiceImpl<PostListMapper, PostList> i
                 //自动审核：任职资格与能力素质要求
                 if (type == PostListEnum.TYPE_FIVE.getValue()) {
                     postListInfo.setStatus(PostListEnum.STATUS_PASS.getValue());//状态，可能需要重新设计，五大部门按类型区分状态
+                    postListInfo.setStatusTime(new Date());
                     postListInfo.setStatusByUserId(SecurityUtils.getUserId());
                     postListInfo.setStatusByUserName(SecurityUtils.getLoginUser().getUser().getNickName());
                     postListInfo.setReason("Auto");
@@ -238,6 +240,10 @@ public class PostListServiceImpl extends ServiceImpl<PostListMapper, PostList> i
                 //其他都是待审核
                 else {
                     postListInfo.setStatus(PostListEnum.STATUS_WAIT.getValue());//状态，可能需要重新设计，五大部门按类型区分状态
+                    postListInfo.setStatusTime(null);
+                    postListInfo.setStatusByUserId(null);
+                    postListInfo.setStatusByUserName(null);
+                    postListInfo.setReason(null);
                 }
 
                 list.add(postListInfo);
@@ -330,27 +336,61 @@ public class PostListServiceImpl extends ServiceImpl<PostListMapper, PostList> i
         }
 
 
-        //2、判断人力资源最后审核
+        //2、判断人力资源最后审核 & 全部是驳回时设置为驳回状态，都则审核中
         if (type == PostListEnum.TYPE_ONE.getValue()) {
-            //查询其他类型待审核的记录
-            LambdaQueryWrapper<PostListInfo> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(PostListInfo::getPostListId, id);
-            queryWrapper.ne(PostListInfo::getType, PostListEnum.TYPE_ONE.getValue());//类型（1-业务职责；2-党建及党风廉政建设职责；3-安全环保职责；4-合规保密职；5-任职资格与能力素质要求）
-            queryWrapper.ne(PostListInfo::getStatus, PostListEnum.STATUS_WAIT.getValue());//分区域审核-状态：1-待审核；3-通过；4-驳回；
-
-            List<PostListInfo> postListInfoList = postListInfoMapper.selectList(queryWrapper);
-            if (!CollectionUtils.isEmpty(postListInfoList)) {
-                Set<Integer> typeSet = postListInfoList.stream().map(t -> t.getType()).collect(Collectors.toSet());
-                String typeView = "";
-                for (Integer typeIng : typeSet) {
-                    typeView += PostListEnum.getTypeView(typeIng) + "；";
+            boolean allStatusBack = false;
+            //通过
+            if (status == PostListEnum.STATUS_PASS.getValue()) {
+                //查询其他类型 待审核 & 驳回 的记录
+                LambdaQueryWrapper<PostListInfo> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(PostListInfo::getPostListId, id);
+                queryWrapper.in(PostListInfo::getType, PostListEnum.TYPE_TWO.getValue(), PostListEnum.TYPE_THREE.getValue(), PostListEnum.TYPE_FOUR.getValue());//类型（1-业务职责；2-党建及党风廉政建设职责；3-安全环保职责；4-合规保密职；5-任职资格与能力素质要求）
+                queryWrapper.in(PostListInfo::getStatus, PostListEnum.STATUS_WAIT.getValue(), PostListEnum.STATUS_BACK.getValue());//分区域审核-状态：1-待审核；3-通过；4-驳回；
+                queryWrapper.groupBy(PostListInfo::getType);
+                List<PostListInfo> postListInfoList = postListInfoMapper.selectList(queryWrapper);
+                if (!CollectionUtils.isEmpty(postListInfoList)) {
+                    Set<Integer> typeSet = postListInfoList.stream().map(t -> t.getType()).collect(Collectors.toSet());
+                    String typeView = "";
+                    for (Integer typeIng : typeSet) {
+                        typeView += PostListEnum.getTypeView(typeIng) + "；";
+                    }
+                    throw new BaseException("以下部门还未审核，请检查！" + typeView);
+                }
+            }
+            //驳回
+            else {
+//                boolean allStatusBack = true;
+                //查询其他类型 待审核 & 通过 的记录
+                LambdaQueryWrapper<PostListInfo> queryWrapperV2 = new LambdaQueryWrapper<>();
+                queryWrapperV2.eq(PostListInfo::getPostListId, id);
+                queryWrapperV2.in(PostListInfo::getType, PostListEnum.TYPE_TWO.getValue(), PostListEnum.TYPE_THREE.getValue(), PostListEnum.TYPE_FOUR.getValue());//类型（1-业务职责；2-党建及党风廉政建设职责；3-安全环保职责；4-合规保密职；5-任职资格与能力素质要求）
+                queryWrapperV2.in(PostListInfo::getStatus, PostListEnum.STATUS_WAIT.getValue(), PostListEnum.STATUS_PASS.getValue());//分区域审核-状态：1-待审核；3-通过；4-驳回；
+                queryWrapperV2.groupBy(PostListInfo::getType);
+                List<PostListInfo> postListInfoListV2 = postListInfoMapper.selectList(queryWrapperV2);
+                //全部驳回
+                if (CollectionUtils.isEmpty(postListInfoListV2)) {
+                    allStatusBack = true;
+                }
+                //部分驳回
+                else {
+                    allStatusBack = false;
                 }
-                throw new BaseException("以下部门还未审核，请检查！" + typeView);
             }
 
+            //人力资源审核通过 其他部门都审核通过时 将主单据修改为 审核通过
+            //人力资源审核驳回 其他部门部分审核通过、部分驳回时 将主单据修改为 审核中
+            //人力资源审核驳回 其他部门都驳回时 将主单据修改为 驳回
             LambdaUpdateWrapper<PostList> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
             lambdaUpdateWrapper.eq(PostList::getId, id);
-            lambdaUpdateWrapper.set(PostList::getStatus, PostListEnum.STATUS_PASS.getValue());
+            if (status == PostListEnum.STATUS_PASS.getValue()) {
+                lambdaUpdateWrapper.set(PostList::getStatus, PostListEnum.STATUS_PASS.getValue());
+            } else {
+                if (allStatusBack) {
+                    lambdaUpdateWrapper.set(PostList::getStatus, PostListEnum.STATUS_BACK.getValue());
+                } else {
+                    lambdaUpdateWrapper.set(PostList::getStatus, PostListEnum.STATUS_WAIT.getValue());
+                }
+            }
             postListMapper.update(null, lambdaUpdateWrapper);
         }
         //非人力资源审核，将外层状态设置为审核中
@@ -372,16 +412,19 @@ public class PostListServiceImpl extends ServiceImpl<PostListMapper, PostList> i
         infoLambdaUpdateWrapper.set(PostListInfo::getStatus, status);
         infoLambdaUpdateWrapper.set(PostListInfo::getStatusTime, new Date());
 
+        infoLambdaUpdateWrapper.set(PostListInfo::getStatusByUserId, SecurityUtils.getUserId());
+        infoLambdaUpdateWrapper.set(PostListInfo::getStatusByUserName, SecurityUtils.getLoginUser().getUser().getNickName());
+
         //通过-参数
         if (status == PostListEnum.STATUS_PASS.getValue()) {
-            infoLambdaUpdateWrapper.set(PostListInfo::getStatusByUserId, SecurityUtils.getUserId());
-            infoLambdaUpdateWrapper.set(PostListInfo::getStatusByUserName, SecurityUtils.getLoginUser().getUser().getNickName());
+//            infoLambdaUpdateWrapper.set(PostListInfo::getStatusByUserId, SecurityUtils.getUserId());
+//            infoLambdaUpdateWrapper.set(PostListInfo::getStatusByUserName, SecurityUtils.getLoginUser().getUser().getNickName());
             infoLambdaUpdateWrapper.set(PostListInfo::getReason, null);
         }
         //驳回-参数
         else if (status == PostListEnum.STATUS_BACK.getValue()) {
-            infoLambdaUpdateWrapper.set(PostListInfo::getStatusByUserId, null);
-            infoLambdaUpdateWrapper.set(PostListInfo::getStatusByUserName, null);
+//            infoLambdaUpdateWrapper.set(PostListInfo::getStatusByUserId, null);
+//            infoLambdaUpdateWrapper.set(PostListInfo::getStatusByUserName, null);
             infoLambdaUpdateWrapper.set(PostListInfo::getReason, reason);
         }
         int updateCount = postListInfoMapper.update(null, infoLambdaUpdateWrapper);

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

@@ -56,21 +56,13 @@ public class PostPlanInfoServiceImpl extends ServiceImpl<PostPlanInfoMapper, Pos
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int insertPostPlanInfo(PostPlanInfo postPlanInfo) {
-
-        //            checkedDeptId
-//            checkedPostId
         if (postPlanInfo.getCheckedDeptId() == null || postPlanInfo.getCheckedPostId() == null) {
             throw new BaseException("涉及部门和涉及岗位的值为空，请重新选择！");
         }
-
-
-        //TODO 自增主键修改为-MyBatis-Plus雪花算法(截取5位解决VUE精度丢失BUG)-系统登录日志
-        if (postPlanInfo.getId() == null)
-            postPlanInfo.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+        postPlanInfo.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
         postPlanInfo.setCreateDefault();
         postPlanInfo.setStatus(PostPlanEnum.INFO_STATUS_NO.getValue());
         postPlanInfo.setCreateUserId(SecurityUtils.getUserId());
-
         return postPlanInfoMapper.insertPostPlanInfo(postPlanInfo);
     }
 

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

@@ -3,6 +3,7 @@ package com.ruoyi.postCheck.service.impl;
 import java.util.Date;
 import java.util.List;
 
+import com.ruoyi.common.constant.PostPlanEnum;
 import com.ruoyi.postCheck.domain.PostPlanInfo;
 import com.ruoyi.postCheck.mapper.PostPlanInfoMapper;
 import com.ruoyi.postCheck.mapper.PostPlanMapper;
@@ -54,23 +55,24 @@ public class PostPlanJoinCheckedServiceImpl implements IPostPlanJoinCheckedServi
      * 岗检完成确认
      *
      * @param planInfoId    岗检计划明细ID
-     * @param checkedUserId 检查人ID
+     * @param checkedUserName 检查人ID
      * @param checkedTime   检查时间
      * @param checkedImg    检查表照片
      * @return 结果
      */
     @Override
-    public int checked(Long planInfoId, Long checkedUserId, Date checkedTime, String checkedImg) {
+    public int checked(Long planInfoId, String checkedUserName, Date checkedTime, String checkedImg) {
 
-        if (planInfoId == null || checkedUserId == null || checkedTime == null) {
+        if (planInfoId == null || checkedUserName == null || checkedTime == null) {
             return 0;
         }
 
         PostPlanInfo postPlanInfo = new PostPlanInfo();
         postPlanInfo.setId(planInfoId);
-        postPlanInfo.setCheckedUserId(checkedUserId);
+        postPlanInfo.setCheckedUserName(checkedUserName);
         postPlanInfo.setCheckedTime(checkedTime);
         postPlanInfo.setCheckedImg(checkedImg);
+        postPlanInfo.setStatus(PostPlanEnum.INFO_STATUS_YES.getValue());
 
         return postPlanInfoMapper.updatePostPlanInfo(postPlanInfo);
     }

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

@@ -60,7 +60,7 @@ public class PostProgrammeServiceImpl extends ServiceImpl<PostProgrammeMapper, P
     @Override
     public int insertPostProgramme(PostProgramme postProgramme) {
         //TODO 自增主键修改为-MyBatis-Plus雪花算法(截取5位解决VUE精度丢失BUG)-系统登录日志
-        if (postProgramme.getId() == null)
+//        if (postProgramme.getId() == null)
             postProgramme.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
         postProgramme.setCreateDefault();
 

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

@@ -3,7 +3,7 @@
 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"    />
@@ -19,17 +19,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="postCheckedStandard"    column="post_checked_standard"    />
         <result property="postCheckedMethod"    column="post_checked_method"    />
         <result property="postCheckedResult"    column="post_checked_result"    />
+        <result property="childrenTypeId"    column="children_type_id"    />
     </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
+        select id, post_checked_id, type, children_type_id, 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>  
+        <where>
             <if test="postCheckedId != null "> and post_checked_id = #{postCheckedId}</if>
             <if test="type != null "> and type = #{type}</if>
+            <if test="childrenTypeId != null "> and children_type_id = #{childrenTypeId}</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>
@@ -37,18 +39,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="childrenTypeId != null">children_type_id,</if>
             <if test="remark != null">remark,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="createTime != null">create_time,</if>
@@ -65,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="id != null">#{id},</if>
             <if test="postCheckedId != null">#{postCheckedId},</if>
             <if test="type != null">#{type},</if>
+            <if test="childrenTypeId != null">#{childrenTypeId},</if>
             <if test="remark != null">#{remark},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -84,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="postCheckedId != null">post_checked_id = #{postCheckedId},</if>
             <if test="type != null">type = #{type},</if>
+            <if test="childrenTypeId != null">children_type_id = #{childrenTypeId},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
@@ -104,9 +109,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deletePostCheckedItemsByIds" parameterType="String">
-        delete from post_checked_items where id in 
+        delete from post_checked_items where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-</mapper>
+</mapper>

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

@@ -5,7 +5,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.postCheck.mapper.PostCheckedMapper">
 
     <resultMap type="PostChecked" id="PostCheckedResult">
-        <result property="id"    column="id"    />
+        <result property="id"    column="id"/>
+        <result property="postCode"    column="post_code"/>
         <result property="checkWorkgroupId"    column="check_workgroup_id"    />
         <result property="checkGroupId"    column="check_group_id"    />
         <result property="checkedDeptId"    column="checked_dept_id"    />
@@ -29,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectPostCheckedVo">
         SELECT
             t1.id,
+            t1.post_code,
             t1.check_workgroup_id,
             t1.check_group_id,
             t1.checked_dept_id,
@@ -79,6 +81,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
+
+            <if test="postCode != null  and postCode != ''"> and t1.post_code like concat('%', #{postCode}, '%')</if>
+            <if test="checkedDeptName != null  and checkedDeptName != ''"> and sd."dept_name" like concat('%', #{checkedDeptName}, '%')</if>
+            <if test="checkWorkgroupName != null  and checkWorkgroupName != ''"> and pt1."name" like concat('%', #{checkWorkgroupName}, '%')</if>
+            <if test="checkGroupName != null  and checkGroupName != ''"> and pt2."name" like concat('%', #{checkGroupName}, '%')</if>
         </where>
     </select>
 
@@ -91,6 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into post_checked
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
+            post_code,
             <if test="checkWorkgroupId != null">check_workgroup_id,</if>
             <if test="checkGroupId != null">check_group_id,</if>
             <if test="checkedDeptId != null">checked_dept_id,</if>
@@ -112,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
+            #{postCode},
             <if test="checkWorkgroupId != null">#{checkWorkgroupId},</if>
             <if test="checkGroupId != null">#{checkGroupId},</if>
             <if test="checkedDeptId != null">#{checkedDeptId},</if>

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

@@ -10,7 +10,6 @@
         <result property="problemNo"    column="problem_no"    />
         <result property="checkWorkgroupId"    column="check_workgroup_id"    />
         <result property="checkGroupId"    column="check_group_id"    />
-        <!--<result property="checkUserId"    column="check_user_id"    />-->
         <result property="checkUserName"    column="check_user_name"    />
         <result property="deptApproveUserId"    column="dept_approve_user_id"    />
         <result property="deptApproveTime"    column="dept_approve_time"    />
@@ -58,8 +57,6 @@
             t1.problem_no,
             t1.check_workgroup_id,
             t1.check_group_id,
-            t1.check_user_id,
-            t1.check_user_name,
             t1.dept_approve_user_id,
             t1.dept_approve_time,
             t1.speciality_department_reviewer_id,
@@ -89,12 +86,18 @@
             t1.update_by,
             t1.create_user_id,
             t1.check_time,
+            t1.check_user_name,
             t1.duty_type,
 
+            pt1.name AS checkWorkgroupName,
+            pt2.name AS checkGroupName,
+
             t2."dept_name" as checkedDeptName,
             t3."post_name" as checkedPostName,
             t4."nick_name" AS rectificationResponsibleUserName
         from post_checked_problem t1
+        LEFT JOIN post_team pt1 ON pt1.id = t1.check_workgroup_id
+        LEFT JOIN post_team pt2 ON pt2.id = t1.check_group_id
         LEFT JOIN "sys_dept" t2 ON t2."dept_id" = t1."checked_dept_id"
         LEFT JOIN "sys_post" t3 ON t3."post_id" = t1."checked_post_id"
         LEFT JOIN "public"."sys_users" t4 ON  t4."user_id" = t1."rectification_responsible_user_id"
@@ -103,40 +106,44 @@
     <select id="selectPostCheckedProblemList" parameterType="PostCheckedProblem" resultMap="PostCheckedProblemResult">
         <include refid="selectPostCheckedProblemVo"/>
         <where>
-            <if test="status != null "> and status = #{status}</if>
-            <if test="problemNo != null  and problemNo != ''"> and problem_no = #{problemNo}</if>
-            <if test="checkWorkgroupId != null "> and check_workgroup_id = #{checkWorkgroupId}</if>
-            <if test="checkGroupId != null "> and check_group_id = #{checkGroupId}</if>
-            <!--<if test="checkUserId != null "> and check_user_id = #{checkUserId}</if>-->
-            <if test="checkUserName != null and checkUserName != ''"> and check_user_name = #{checkUserName}</if>
-            <if test="deptApproveUserId != null "> and dept_approve_user_id = #{deptApproveUserId}</if>
-            <if test="deptApproveTime != null "> and dept_approve_time = #{deptApproveTime}</if>
-            <if test="specialityDepartmentReviewerId != null "> and speciality_department_reviewer_id = #{specialityDepartmentReviewerId}</if>
-            <if test="specialityDepartmentReviewTime != null "> and speciality_department_review_time = #{specialityDepartmentReviewTime}</if>
-            <if test="problemLevel != null  and problemLevel != ''"> and problem_level = #{problemLevel}</if>
-            <if test="problemAttribute != null"> and problem_attribute = #{problemAttribute}</if>
-            <if test="problemCategory != null"> and problem_category = #{problemCategory}</if>
-            <if test="description != null  and description != ''"> and description = #{description}</if>
-            <if test="problemCause != null  and problemCause != ''"> and problem_cause = #{problemCause}</if>
-            <if test="isImmediatelyCorrected != null "> and is_immediately_corrected = #{isImmediatelyCorrected}</if>
+            <if test="checkWorkgroupName != null  and checkWorkgroupName != ''"> and pt1."name" like concat('%', #{checkWorkgroupName}, '%')</if>
+            <if test="checkGroupName != null  and checkGroupName != ''"> and pt2."name" like concat('%', #{checkGroupName}, '%')</if>
+            <if test="checkedDeptName != null  and checkedDeptName != ''"> and t2."dept_name" like concat('%', #{checkedDeptName}, '%')</if>
+            <if test="checkedPostName != null  and checkedPostName != ''"> and t3."post_name" like concat('%', #{checkedPostName}, '%')</if>
+
+            <if test="status != null "> and t1.status = #{status}</if>
+            <if test="problemNo != null  and problemNo != ''"> and t1.problem_no = #{problemNo}</if>
+            <if test="checkWorkgroupId != null "> and t1.check_workgroup_id = #{checkWorkgroupId}</if>
+            <if test="checkGroupId != null "> and t1.check_group_id = #{checkGroupId}</if>
+            <if test="checkUserName != null and checkUserName != ''"> and t1.check_user_name = #{checkUserName}</if>
+            <if test="deptApproveUserId != null "> and t1.dept_approve_user_id = #{deptApproveUserId}</if>
+            <if test="deptApproveTime != null "> and t1.dept_approve_time = #{deptApproveTime}</if>
+            <if test="specialityDepartmentReviewerId != null "> and t1.speciality_department_reviewer_id = #{specialityDepartmentReviewerId}</if>
+            <if test="specialityDepartmentReviewTime != null "> and t1.speciality_department_review_time = #{specialityDepartmentReviewTime}</if>
+            <if test="problemLevel != null  and problemLevel != ''"> and t1.problem_level = #{problemLevel}</if>
+            <if test="problemAttribute != null"> and t1.problem_attribute = #{problemAttribute}</if>
+            <if test="problemCategory != null"> and t1.problem_category = #{problemCategory}</if>
+            <if test="description != null  and description != ''"> and t1.description = #{description}</if>
+            <if test="problemCause != null  and problemCause != ''"> and t1.problem_cause = #{problemCause}</if>
+            <if test="isImmediatelyCorrected != null "> and t1.is_immediately_corrected = #{isImmediatelyCorrected}</if>
             <if test="rectificationMeasure != null  and rectificationMeasure != ''"> and rectification_measure = #{rectificationMeasure}</if>
-            <if test="checkedDeptId != null "> and checked_dept_id = #{checkedDeptId}</if>
-            <if test="checkedPostId != null "> and checked_post_id = #{checkedPostId}</if>
-            <if test="rectificationResponsibleUserId != null "> and rectification_responsible_user_id = #{rectificationResponsibleUserId}</if>
-            <if test="rectificationPeriod != null "> and rectification_period = #{rectificationPeriod}</if>
-            <if test="isRectificationCompleted != null "> and is_rectification_completed = #{isRectificationCompleted}</if>
-            <if test="rectificationCompletionTime != null "> and rectification_completion_time = #{rectificationCompletionTime}</if>
-            <if test="rectificationCompletionImg != null  and rectificationCompletionImg != ''"> and rectification_completion_img = #{rectificationCompletionImg}</if>
-            <if test="reviewDepartmentReviewerId != null "> and review_department_reviewer_id = #{reviewDepartmentReviewerId}</if>
-            <if test="reviewDepartmentReviewerTime != null "> and review_department_reviewer_time = #{reviewDepartmentReviewerTime}</if>
-            <if test="reviewConclusion != null  and reviewConclusion != ''"> and review_conclusion = #{reviewConclusion}</if>
-            <if test="reason != null  and reason != ''"> and reason = #{reason}</if>
-            <if test="createUserId != null "> and create_user_id = #{createUserId}</if>
+            <if test="checkedDeptId != null "> and t1.checked_dept_id = #{checkedDeptId}</if>
+            <if test="checkedPostId != null "> and t1.checked_post_id = #{checkedPostId}</if>
+            <if test="rectificationResponsibleUserId != null "> and t1.rectification_responsible_user_id = #{rectificationResponsibleUserId}</if>
+            <if test="rectificationPeriod != null "> and t1.rectification_period = #{rectificationPeriod}</if>
+            <if test="isRectificationCompleted != null "> and t1.is_rectification_completed = #{isRectificationCompleted}</if>
+            <if test="rectificationCompletionTime != null "> and t1.rectification_completion_time = #{rectificationCompletionTime}</if>
+            <if test="rectificationCompletionImg != null  and rectificationCompletionImg != ''"> and t1.rectification_completion_img = #{rectificationCompletionImg}</if>
+            <if test="reviewDepartmentReviewerId != null "> and t1.review_department_reviewer_id = #{reviewDepartmentReviewerId}</if>
+            <if test="reviewDepartmentReviewerTime != null "> and t1.review_department_reviewer_time = #{reviewDepartmentReviewerTime}</if>
+            <if test="reviewConclusion != null  and reviewConclusion != ''"> and t1.review_conclusion = #{reviewConclusion}</if>
+            <if test="reason != null  and reason != ''"> and t1.reason = #{reason}</if>
+            <if test="createUserId != null "> and t1.create_user_id = #{createUserId}</if>
 
             <!--<if test="checkTime != null "> and check_time = #{checkTime}</if>-->
             <if test="checkTime != null "> and TO_DATE(t1.check_time, 'yyyy-mm-dd') &gt;= TO_DATE(#{checkTime}, 'yyyy-mm-dd')</if>
 
-            <if test="dutyType != null "> and duty_type = #{dutyType}</if>
+            <if test="dutyType != null "> and t1.duty_type = #{dutyType}</if>
 
             <!-- 开始时间检索 -->
             <if test="params.beginTime != null and params.beginTime != ''">
@@ -162,7 +169,6 @@
             <if test="problemNo != null and problemNo != ''">problem_no,</if>
             <if test="checkWorkgroupId != null">check_workgroup_id,</if>
             <if test="checkGroupId != null">check_group_id,</if>
-            <!--<if test="checkUserId != null">check_user_id,</if>-->
             <if test="checkUserName != null and checkUserName != ''">check_user_name,</if>
             <if test="deptApproveUserId != null">dept_approve_user_id,</if>
             <if test="deptApproveTime != null">dept_approve_time,</if>
@@ -202,7 +208,6 @@
             <if test="problemNo != null and problemNo != ''">#{problemNo},</if>
             <if test="checkWorkgroupId != null">#{checkWorkgroupId},</if>
             <if test="checkGroupId != null">#{checkGroupId},</if>
-            <!--<if test="checkUserId != null">#{checkUserId},</if>-->
             <if test="checkUserName != null and checkUserName != ''">#{checkUserName},</if>
             <if test="deptApproveUserId != null">#{deptApproveUserId},</if>
             <if test="deptApproveTime != null">#{deptApproveTime},</if>
@@ -245,7 +250,6 @@
             <if test="problemNo != null and problemNo != ''">problem_no = #{problemNo},</if>
             <if test="checkWorkgroupId != null">check_workgroup_id = #{checkWorkgroupId},</if>
             <if test="checkGroupId != null">check_group_id = #{checkGroupId},</if>
-            <!--<if test="checkUserId != null">check_user_id = #{checkUserId},</if>-->
             <if test="checkUserName != null and checkUserName != ''">check_user_name = #{checkUserName},</if>
             <if test="deptApproveUserId != null">dept_approve_user_id = #{deptApproveUserId},</if>
             <if test="deptApproveTime != null">dept_approve_time = #{deptApproveTime},</if>

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

@@ -19,11 +19,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="checkedImg"    column="checked_img"    />
         <result property="createUserId"    column="create_user_id"    />
         <result property="checkedTime"    column="checked_time"    />
+        <result property="checkedUserName"    column="checked_user_name"    />
+        <result property="status"    column="status"    />
+
+        <result property="printUserId"    column="print_user_id"    />
+        <result property="printTime"    column="print_time"    />
     </resultMap>
 
+
+
     <sql id="selectPostPlanInfoVo">
         select
-            id, post_plan_id, checked_dept_id, check_time, checked_post_id, remark, del_flag, create_time, create_by, update_time, update_by, create_user_id
+            id, post_plan_id, checked_dept_id, check_time, checked_post_id, remark, del_flag, create_time, create_by, update_time, update_by, create_user_id,
+            print_user_id,
+            print_time,
+            checked_user_name,
+            checked_img,
+            checked_time,
+            status
         from post_plan_info
     </sql>
 
@@ -35,6 +48,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="checkTime != null "> and check_time = #{checkTime}</if>
             <if test="checkedPostId != null "> and checked_post_id = #{checkedPostId}</if>
             <if test="createUserId != null "> and create_user_id = #{createUserId}</if>
+            <if test="checkedUserName != null  and checkedUserName != ''"> and checked_user_name like concat('%', #{checkedUserName}, '%')</if>
+            <if test="status != null "> and status = #{status}</if>
         </where>
     </select>
 
@@ -58,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="status != null">status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -72,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
             <if test="createUserId != null">#{createUserId},</if>
+            <if test="status != null">#{status},</if>
          </trim>
     </insert>
 
@@ -89,12 +106,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="checkedImg != null">checked_img = #{checkedImg},</if>
-            <if test="createUserId != null">create_user_id = #{createUserId},</if>
+            <if test="checkedUserName != null">checked_user_name = #{checkedUserName},</if>
             <if test="checkedTime != null">checked_time = #{checkedTime},</if>
+            <if test="printUserId != null">print_user_id = #{printUserId},</if>
+            <if test="printTime != null">print_time = #{printTime},</if>
+            <if test="status != null">status = #{status},</if>
+
         </trim>
         where id = #{id}
     </update>
 
+
+
     <delete id="deletePostPlanInfoById" parameterType="Long">
         delete from post_plan_info where id = #{id}
     </delete>

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

@@ -97,6 +97,8 @@
             <if test="params.endTime != null and params.endTime != ''">
                 AND TO_DATE(t1.start_time, 'yyyy-mm-dd') &lt;= TO_DATE(#{params.endTime}, 'yyyy-mm-dd')
             </if>
+            <if test="checkGroupName != null  and checkGroupName != ''"> and pt1."name" like concat('%', #{checkGroupName}, '%')</if>
+            <if test="checkTeamName != null  and checkTeamName != ''"> and pt2."name" like concat('%', #{checkTeamName}, '%')</if>
         </where>
         GROUP BY t1.id
     </select>
@@ -211,25 +213,11 @@
 
     <!--从岗检计划中查询，岗检记录上传的列表-->
     <select id="selectPostPlanJoinCheckedList" parameterType="PostPlanJoinChecked" resultType="PostPlanJoinChecked">
-       <!--
         SELECT
             t1.check_group_id AS checkGroupId,
             t1.check_team_id AS checkTeamId,
             t2.id AS planInfoId,
-            t2.checked_user_id AS checkedUserId,
-            t2.checked_dept_id AS checkedDeptId,
-            t2.checked_post_id AS checkedPostId,
-            t2.status AS status
-        FROM post_plan t1
-        INNER JOIN post_plan_info t2 ON t2."post_plan_id"  = t1.id
-        GROUP BY t2.checked_dept_id
-        ORDER BY t1.start_time, t1.create_time, t2.create_time, t2.id
-        -->
-        SELECT
-            t1.check_group_id AS checkGroupId,
-            t1.check_team_id AS checkTeamId,
-            t2.id AS planInfoId,
-            t2.checked_user_id AS checkedUserId,
+            t2.checked_user_name AS checkedUserName,
             t2.checked_dept_id AS checkedDeptId,
             t2.checked_post_id AS checkedPostId,
             t2.check_time AS checkTime,
@@ -252,6 +240,14 @@
         LEFT JOIN post_team pt2 ON pt2.id = t1.check_team_id
         LEFT JOIN sys_dept sd ON sd.dept_id = t2.checked_dept_id
         LEFT JOIN sys_post sp ON sp.post_id = t2.checked_post_id
+        <where>
+            <if test="status != null  and status != 0"> and t2."status" = #{status}</if>
+
+            <if test="checkGroupName != null  and checkGroupName != ''"> and pt1."name" like concat('%', #{checkGroupName}, '%')</if>
+            <if test="checkTeamName != null  and checkTeamName != ''"> and pt2."name" like concat('%', #{checkTeamName}, '%')</if>
+            <if test="checkedPostNames != null  and checkedPostNames != ''"> and sp."post_name" like concat('%', #{checkedPostNames}, '%')</if>
+            <if test="checkedDeptName != null  and checkedDeptName != ''"> and sd."dept_name" like concat('%', #{checkedDeptName}, '%')</if>
+        </where>
         GROUP BY t2.checked_dept_id
         ORDER BY t1.start_time, t1.create_time, t2.create_time, t2.id
     </select>
@@ -290,6 +286,13 @@
             <if test="planInfoId != null">
                 and t2.id = #{planInfoId}
             </if>
+            <if test="status != null  and status != 0"> and t2."status" = #{status}</if>
+
+            <if test="checkGroupName != null  and checkGroupName != ''"> and pt1."name" like concat('%', #{checkGroupName}, '%')</if>
+            <if test="checkTeamName != null  and checkTeamName != ''"> and pt2."name" like concat('%', #{checkTeamName}, '%')</if>
+            <if test="checkedPostNames != null  and checkedPostNames != ''"> and sp."post_name" like concat('%', #{checkedPostNames}, '%')</if>
+            <if test="checkedDeptName != null  and checkedDeptName != ''"> and sd."dept_name" like concat('%', #{checkedDeptName}, '%')</if>
+
         </where>
         GROUP BY t1.id, t2.checked_dept_id
         ORDER BY t1.start_time, t1.create_time, t2.create_time, t2.id

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -1,6 +1,7 @@
 package com.ruoyi.system.mapper;
 
 import java.util.List;
+
 import org.apache.ibatis.annotations.Param;
 import com.ruoyi.common.core.domain.entity.SysUser;
 
@@ -9,8 +10,7 @@ import com.ruoyi.common.core.domain.entity.SysUser;
  *
  * @author ruoyi
  */
-public interface SysUserMapper
-{
+public interface SysUserMapper {
     /**
      * 根据条件分页查询用户列表
      *
@@ -71,7 +71,7 @@ public interface SysUserMapper
      * 修改用户头像
      *
      * @param userName 用户名
-     * @param avatar 头像地址
+     * @param avatar   头像地址
      * @return 结果
      */
     public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar);
@@ -129,8 +129,13 @@ public interface SysUserMapper
      * 查询用户列表（分页）支持部门ID、岗位名称筛选
      *
      * @param deptId   部门ID
+     * @param deptName 部门名称
+     * @param postId   岗位ID
      * @param postName 岗位名称
+     * @param nickName 人员姓名
      * @return
      */
-    List<SysUser> postUserList(@Param("deptId") Long deptId,@Param("postName") String postName);
+    List<SysUser> postUserList(@Param("deptId") Long deptId, @Param("deptName") String deptName,
+                               @Param("postId") Long postId, @Param("postName") String postName,
+                               @Param("nickName") String nickName);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -204,11 +204,17 @@ public interface ISysUserService
      */
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
 
+
     /**
      *查询用户列表（分页）支持部门ID、岗位名称筛选
      * @param deptId 部门ID
+     * @param deptName 部门名称
+     *
+     * @param postId 岗位ID
      * @param postName 岗位名称
+     *
+     * @param nickName 人员姓名
      * @return
      */
-    List<SysUser> postUserList(Long deptId, String postName);
+    List<SysUser> postUserList(Long deptId, String deptName, Long postId, String postName, String nickName);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -437,14 +437,7 @@ public class SysUserServiceImpl implements ISysUserService {
         return userMapper.deleteUserByIds(userIds);
     }
 
-    /**
-     * 导入用户数据
-     *
-     * @param userList        用户数据列表
-     * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
-     * @param operName        操作用户
-     * @return 结果
-     */
+
     @Override
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName) {
         if (StringUtils.isNull(userList) || userList.size() == 0) {
@@ -500,12 +493,15 @@ public class SysUserServiceImpl implements ISysUserService {
      * 查询用户列表（分页）支持部门ID、岗位名称筛选
      *
      * @param deptId   部门ID
+     * @param deptName 部门名称
+     * @param postId   岗位ID
      * @param postName 岗位名称
+     * @param nickName 人员姓名
      * @return
      */
     @Override
-    public List<SysUser> postUserList(Long deptId, String postName) {
+    public List<SysUser> postUserList(Long deptId, String deptName, Long postId, String postName, String nickName) {
 
-        return userMapper.postUserList(deptId, postName);
+        return userMapper.postUserList(deptId, deptName, deptId, postName, nickName);
     }
 }

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

@@ -256,10 +256,11 @@ 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="postName != null and postName != ''">
-			AND sp.post_name like concat('%', #{postName}, '%')
-		</if>
+		<if test="nickName != null and nickName != ''">AND u."nick_name" LIKE concat('%', #{nickName}, '%')</if>
+		<if test="deptId != null">AND u.dept_id = #{deptId}</if>
+		<if test="deptName != null and deptName != ''">AND d."dept_name" LIKE concat('%', #{deptName}, '%')</if>
+		<if test="postId != null">AND sp."post_id" = #{postId}</if>
+		<if test="postName != null and postName != ''">AND sp.post_name like concat('%', #{postName}, '%')</if>
 	</select>
 
 </mapper>