岗检清单调整;岗检表模块

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

@@ -0,0 +1,16 @@
+package com.post;
+
+import com.ruoyi.common.utils.Arith;
+
+import java.math.BigDecimal;
+
+public class Test01 {
+    public static void main(String[] args) {
+        double round = Arith.round(new BigDecimal(99.98).doubleValue(), 2);
+        System.out.println(round);
+        System.out.println(new BigDecimal(round).doubleValue());
+    }
+    public void ss(){
+
+    }
+}

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

@@ -148,29 +148,31 @@ public class PostCheckedController extends BaseController {
 
     /**
      * 修改岗检表管理
-     @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("修改岗检表管理")
+    @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:edit')")
+    @Log(title = "岗检表管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody PostChecked postChecked) {
+        return toAjax(postCheckedService.updatePostChecked(postChecked));
+    }
 
     /**
      * 删除岗检表管理

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

@@ -181,8 +181,8 @@ public class PostListController extends BaseController {
     @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 = "deptId", value = "参数->部门ID", dataType = "Long", dataTypeClass = Long.class),
+            @ApiImplicitParam(name = "postId", value = "参数->岗位ID", dataType = "Long", dataTypeClass = Long.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),
@@ -266,7 +266,6 @@ public class PostListController extends BaseController {
                 item.setPostCheckedStandard("按照要求做好保密教育、不发生重大泄密事件；不发生大规模群访闹访事件，限时办结信访事项->伪代码返回-检查标准");  //检查标准 ->  工作标准（work_standard）  要求2（requirement）
                 itemsList.add(item);
 
-
             }
 
             // 按类型

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

@@ -199,11 +199,14 @@ public class PostCheckedProblem extends BaseEntity {
     private Date checkTime;
 
 
-//    ==================显示字段==============
+    //    ==================显示字段==============
     @ApiModelProperty("整改责任部门名称")
     @TableField(exist = false)
     private String checkedDeptName;
     @ApiModelProperty("整改责任岗位名称")
     @TableField(exist = false)
     private String checkedPostName;
+    @ApiModelProperty("整改责任人名称")
+    @TableField(exist = false)
+    private String rectificationResponsibleUserName;
 }

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

@@ -23,12 +23,20 @@ public class PostPlanJoinChecked implements Serializable {
 //    @TableField(value = "check_group_id")
     @Excel(name = "检查工作组ID")
     private Long checkGroupId;
+    @ApiModelProperty("检查工作组名称")
+    private String checkGroupName;
 
     @ApiModelProperty("检查小组")
 //    @TableField(value = "check_team_id")
     @Excel(name = "检查小组")
     private Long checkTeamId;
 
+    @ApiModelProperty("检查小组名称")
+    private String checkTeamName;
+
+    @ApiModelProperty("检查人员中文名称逗号拼接")
+    private String checkedUserNames;
+
     @ApiModelProperty("上传：检查人ID")
 //    @TableField(value = "checked_user_id")
     @Excel(name = "检查人ID")
@@ -38,12 +46,17 @@ public class PostPlanJoinChecked implements Serializable {
 //    @TableField(value = "checked_dept_id")
     @Excel(name = "被检查部门ID")
     private Long checkedDeptId;
+    @ApiModelProperty("被检查部门名称")
+    private String checkedDeptName;
 
     @ApiModelProperty("被检查岗位ID")
 //    @TableField(value = "checked_post_id")
     @Excel(name = "被检查岗位ID")
     private Long checkedPostId;
 
+    @ApiModelProperty("被检查岗位名称（多个拼接）")
+    private String checkedPostNames;
+
     @ApiModelProperty("岗检状态：1-未检；2-已检；")
 //    @TableField(value = "status")
     @Excel(name = "岗检状态")

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

@@ -34,12 +34,12 @@ public class PostPlanJoinProblem implements Serializable {
     @Excel(name = "检查小组")
     private Long checkTeamId;
 
-    @ApiModelProperty("检查人员中文名称逗号拼接")
-    private String checkedUserNames;
-
     @ApiModelProperty("检查小组名称")
     private String checkTeamName;
 
+    @ApiModelProperty("检查人员中文名称逗号拼接")
+    private String checkedUserNames;
+
     @ApiModelProperty("被检查部门ID")
 //    @TableField(value = "checked_dept_id")
     @Excel(name = "被检查部门ID")

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

@@ -107,6 +107,7 @@ public class PostCheckedServiceImpl extends ServiceImpl<PostCheckedMapper, PostC
         if (row > 0) {
             for (PostCheckedItems child : children) {
                 child.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+                child.setPostCheckedId(postChecked.getId());
                 child.setCreateDefault();
             }
             postCheckedItemsService.saveBatch(children);
@@ -147,6 +148,7 @@ public class PostCheckedServiceImpl extends ServiceImpl<PostCheckedMapper, PostC
             //插入明细
             for (PostCheckedItems child : children) {
                 child.setId(Long.parseLong(IdWorker.getIdStr().substring(4)));
+                child.setPostCheckedId(postChecked.getId());
                 child.setCreateDefault();
             }
             postCheckedItemsService.saveBatch(children);

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

@@ -265,6 +265,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="contentListByType" resultType="PostCheckedItems">
         SELECT
+            t2.id,
             t2.type,
             t2.level_one  as levelOne,
             t2.level_two as levelTwo,

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

@@ -199,6 +199,7 @@
 
     <!--从岗检计划中查询，岗检记录上传的列表-->
     <select id="selectPostPlanJoinCheckedList" parameterType="PostPlanJoinChecked" resultType="PostPlanJoinChecked">
+       <!--
         SELECT
             t1.check_group_id AS checkGroupId,
             t1.check_team_id AS checkTeamId,
@@ -211,6 +212,30 @@
         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_dept_id AS checkedDeptId,
+            t2.checked_post_id AS checkedPostId,
+            t2.status AS status,
+            pt1.name AS checkGroupName,
+            pt2.name AS checkTeamName,
+            sd.dept_name AS checkedDeptName,
+            GROUP_CONCAT (DISTINCT sp.post_name) AS checkedPostNames,
+            GROUP_CONCAT (DISTINCT su."nick_name") AS checkedUserNames
+        FROM post_plan t1
+        INNER JOIN post_plan_info t2 ON t2."post_plan_id"  = t1.id
+        LEFT JOIN post_plan_check_user t3 ON t3.post_plan_id  = t1.id
+        LEFT JOIN "public"."sys_users" su ON su."user_id" = t3."checked_user_id"
+        LEFT JOIN post_team pt1 ON pt1.id = t1.check_group_id
+        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
+        GROUP BY t2.checked_dept_id
+        ORDER BY t1.start_time, t1.create_time, t2.create_time, t2.id
     </select>
 
     <!--从岗检计划中查询，岗检问题录入的列表-->

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

@@ -32,7 +32,32 @@
     </resultMap>
 
     <sql id="selectPostProgrammeVo">
-        select id, name, submit_date, status_hr, date_hr, reason_hr, status_icfa, date_icfa, reason_icfa, remark, del_flag, create_time, create_by, update_time, update_by, create_user_id, disk_path, dept_id, dept_name, status, status_time, status_user_id, status_icfa_user_id, status_hr_user_id from post_programme
+        select
+            t1.id,
+            t1.name,
+            t1.submit_date,
+            t1.status_hr,
+            t1.date_hr,
+            t1.reason_hr,
+            t1.status_icfa,
+            t1.date_icfa,
+            t1.reason_icfa,
+            t1.remark,
+            t1.del_flag,
+            t1.create_time,
+            t1.create_by,
+            t1.update_time,
+            t1.update_by,
+            t1.create_user_id,
+            t1.disk_path,
+            t1.dept_id,
+            t1.dept_name,
+            t1.status,
+            t1.status_time,
+            t1.status_user_id,
+            t1.status_icfa_user_id,
+            t1.status_hr_user_id
+        from post_programme t1
     </sql>
 
     <select id="selectPostProgrammeList" parameterType="PostProgramme" resultMap="PostProgrammeResult">