完成检查计划的多表关联

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/domain/CoreSafecheckPlan.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.xunmei.core.safetyCheck.vo.ruleItem.SafetyCheckRulePointSelectVo;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.domain.SysRole;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -81,7 +82,7 @@ public class CoreSafecheckPlan extends BaseEntity {
      * 检查要点
      */
     @TableField(exist = false)
-    private List<SafetyCheckRulePoint> rulePointList;
+    private List<SafetyCheckRulePointSelectVo> rulePointList;
     @TableField(exist = false)
     private List<Long> rulePointIds;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/domain/CoreSafecheckPlanToPoint.java

@@ -26,7 +26,7 @@ import com.xunmei.common.core.web.domain.BaseEntity;
 public class CoreSafecheckPlanToPoint extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    public CoreSafecheckPlanToPoint(Long planId, Long pointId, Integer pointScan) {
+    public CoreSafecheckPlanToPoint(Long planId, Long pointId, boolean pointScan) {
         this.planId = planId;
         this.pointId = pointId;
         this.pointScan = pointScan;
@@ -48,7 +48,7 @@ public class CoreSafecheckPlanToPoint extends BaseEntity {
      * 是否扫描NFC 1扫描，0不扫描
      */
     @ApiModelProperty(value = "是否扫描NFC 1扫描，0不扫描")
-    private Integer pointScan;
+    private boolean pointScan;
 
     public CoreSafecheckPlanToPoint() {
     }
@@ -64,7 +64,7 @@ public class CoreSafecheckPlanToPoint extends BaseEntity {
                 .append("pointId", getPointId())
 
 
-                .append("pointScan", getPointScan())
+                .append("pointScan", isPointScan())
 
 
                 .append("createTime", getCreateTime())

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/domain/SafetyCheckRulePoint.java

@@ -59,5 +59,5 @@ public class SafetyCheckRulePoint extends BaseEntity {
 
     @ApiModelProperty(value = "是否扫描NFC 1扫描，0不扫描")
     @TableField(exist = false)
-    private Integer pointScan;
+    private boolean pointScan;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/CoreSafecheckPlanServiceImpl.java

@@ -6,6 +6,7 @@ import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.core.safetyCheck.domain.*;
 import com.xunmei.core.safetyCheck.mapper.*;
 import com.xunmei.core.safetyCheck.service.ICoreSafecheckPlanService;
+import com.xunmei.core.safetyCheck.vo.ruleItem.SafetyCheckRulePointSelectVo;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.SysOrg;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -152,9 +153,9 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
 //            if (coreSafecheckPlan.getId() != null) {
                 coreSafecheckPlanToPointMapper.deleteCoreSafecheckPlanToPointByPlanId(coreSafecheckPlan.getId());
 //            }
-            for (SafetyCheckRulePoint s :
+            for (SafetyCheckRulePointSelectVo s :
                     coreSafecheckPlan.getRulePointList()) {
-                coreSafecheckPlanToPointMapper.insert(new CoreSafecheckPlanToPoint(coreSafecheckPlan.getId(), s.getId(),s.getPointScan()));
+                coreSafecheckPlanToPointMapper.insert(new CoreSafecheckPlanToPoint(coreSafecheckPlan.getId(), s.getId(),s.isPointScan()));
 
             }
         }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/vo/ruleItem/SafetyCheckRulePointSelectVo.java

@@ -40,4 +40,6 @@ public class SafetyCheckRulePointSelectVo {
     private  Long areaId;
 
     private  String areaName;
+
+    private boolean pointScan;
 }

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafecheckPlanMapper.xml

@@ -50,12 +50,15 @@
             <result column="exec_org_name" property="name"/>
         </collection>
         <!-- 检查要点关系映射 -->
-        <collection property="rulePointList" ofType="com.xunmei.core.safetyCheck.domain.SafetyCheckRulePoint">
+        <collection property="rulePointList" ofType="com.xunmei.core.safetyCheck.vo.ruleItem.SafetyCheckRulePointSelectVo">
             <result column="rule_point_id" property="id"/>
             <result column="rule_point_rule_id" property="ruleId"/>
+            <result column="rule_point_rule_name" property="ruleName"/>
             <result column="rule_point_item_id" property="itemId"/>
-            <result column="rule_point_name" property="name"/>
+            <result column="rule_point_item_name" property="itemName"/>
+            <result column="rule_point_point_name" property="pointName"/>
             <result column="rule_point_area_id" property="areaId"/>
+            <result column="rule_point_area_name" property="areaName"/>
         </collection>
 
     </resultMap>
@@ -122,35 +125,44 @@
 
     <select id="selectCoreSafecheckPlanById" parameterType="Long"
             resultMap="CoreSafecheckPlanResult">
-        SELECT c.*,
-               o1.NAME             AS plan_create_org_name,
-               o2.NAME             AS plan_of_org_name,
-               r.role_name,
-               r.id                AS role_id,
-               eo.plan_id          AS exec_org_plan_id,
-               eo.org_id           AS exec_org_org_id,
-               co.plan_id          AS check_org_plan_id,
-               co.org_id           AS check_org_org_id,
-               rp.id               as rule_point_id,
-               rp.rule_id          as rule_point_rule_id,
-               rp.item_id          as rule_point_item_id,
-               rp.name             as rule_point_name,
-               rp.area_id          as rule_point_area_id,
-               o3.id               as exec_org_id,
-               o3.name             as exec_org_name,
-               o4.id               as check_org_id,
-               o4.name             as check_org_name
-        FROM core_safecheck_plan c
-                 LEFT JOIN sys_org o1 ON c.plan_create_org_id = o1.id
-                 LEFT JOIN sys_org o2 ON c.plan_of_org_id = o2.id
-                 LEFT JOIN core_safecheck_plan_to_role pr ON c.id = pr.plan_id
-                 LEFT JOIN sys_role r ON r.id = pr.role_id
-                 LEFT JOIN core_safecheck_plan_to_exec_org eo ON eo.plan_id = c.id
-                 LEFT JOIN sys_org o3 ON eo.org_id = o3.id
-                 LEFT JOIN core_safecheck_plan_to_check_org co ON co.plan_id = c.id
-                 LEFT JOIN sys_org o4 ON co.org_id = o4.id
-                 LEFT JOIN core_safecheck_plan_to_point pp ON pp.plan_id = c.id
-                 LEFT JOIN core_safetycheck_rule_point rp ON rp.id = pp.point_id
+        SELECT
+            cr.NAME AS rule_point_rule_name,
+            ri.NAME AS rule_point_item_name,
+            rp.NAME AS rule_point_point_name,
+            are.NAME AS rule_point_area_name,
+            are.id AS rule_point_area_id,
+            rp.id AS rule_point_id,
+            rp.rule_id AS rule_point_rule_id,
+            rp.item_id AS rule_point_item_id,
+            rp.area_id AS rule_point_area_id,
+            c.*,
+            o1.NAME AS plan_create_org_name,
+            o2.NAME AS plan_of_org_name,
+            r.role_name,
+            r.id AS role_id,
+            eo.plan_id AS exec_org_plan_id,
+            eo.org_id AS exec_org_org_id,
+            co.plan_id AS check_org_plan_id,
+            co.org_id AS check_org_org_id,
+            o3.id AS exec_org_id,
+            o3.NAME AS exec_org_name,
+            o4.id AS check_org_id,
+            o4.NAME AS check_org_name
+        FROM
+            core_safecheck_plan c
+                LEFT JOIN sys_org o1 ON c.plan_create_org_id = o1.id
+                LEFT JOIN sys_org o2 ON c.plan_of_org_id = o2.id
+                LEFT JOIN core_safecheck_plan_to_role pr ON c.id = pr.plan_id
+                LEFT JOIN sys_role r ON r.id = pr.role_id
+                LEFT JOIN core_safecheck_plan_to_exec_org eo ON eo.plan_id = c.id
+                LEFT JOIN sys_org o3 ON eo.org_id = o3.id
+                LEFT JOIN core_safecheck_plan_to_check_org co ON co.plan_id = c.id
+                LEFT JOIN sys_org o4 ON co.org_id = o4.id
+                LEFT JOIN core_safecheck_plan_to_point pp ON pp.plan_id = c.id
+                LEFT JOIN core_safetycheck_rule_point rp ON rp.id = pp.point_id
+                LEFT JOIN core_safetycheck_rule_item ri ON ri.id = rp.item_id
+                LEFT JOIN core_safetycheck_rule cr ON cr.id = ri.rule_id
+                LEFT JOIN sys_area are ON are.id = rp.area_id
         where c.id = #{id}
 
     </select>