完成检查计划的多表关联

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

@@ -9,6 +9,7 @@ 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.core.safetyCheck.vo.ruleItem.SafetyCheckRulePointVo;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.domain.SysRole;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -82,7 +83,7 @@ public class CoreSafecheckPlan extends BaseEntity {
      * 检查要点
      */
     @TableField(exist = false)
-    private List<SafetyCheckRulePointSelectVo> rulePointList;
+    private List<SafetyCheckRulePointVo> rulePointList;
     @TableField(exist = false)
     private List<Long> rulePointIds;
 

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

@@ -7,6 +7,7 @@ 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.core.safetyCheck.vo.ruleItem.SafetyCheckRulePointVo;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.SysOrg;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -117,9 +118,7 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
 
         //再处理角色关系
         if (coreSafecheckPlan.getRoleIds() != null) {
-//            if (coreSafecheckPlan.getId() != null) {
                 coreSafecheckPlanToRoleMapper.deleteCoreSafecheckPlanToRoleByPlanId(coreSafecheckPlan.getId());
-//            }
             for (Long id :
                     coreSafecheckPlan.getRoleIds()) {
                 coreSafecheckPlanToRoleMapper.insert(new CoreSafecheckPlanToRole(coreSafecheckPlan.getId(), id));
@@ -128,9 +127,7 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
         }
         //再处理检查机构关系
         if (coreSafecheckPlan.getExecOrgList() != null) {
-//            if (coreSafecheckPlan.getId() != null) {
                 coreSafecheckPlanToExecOrgMapper.deleteCoreSafecheckPlanToExecOrgByPlanId(coreSafecheckPlan.getId());
-//            }
             for (SysOrg org :
                     coreSafecheckPlan.getExecOrgList()) {
                 coreSafecheckPlanToExecOrgMapper.insert(new CoreSafecheckPlanToExecOrg(coreSafecheckPlan.getId(), org.getId()));
@@ -139,9 +136,7 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
         }
         //再处理受检机构关系
         if (coreSafecheckPlan.getCheckOrgList() != null) {
-//            if (coreSafecheckPlan.getId() != null) {
                 coreSafecheckPlanToCheckOrgMapper.deleteCoreSafecheckPlanToCheckOrgByPlanId(coreSafecheckPlan.getId());
-//            }
             for (SysOrg org :
                     coreSafecheckPlan.getCheckOrgList()) {
                 coreSafecheckPlanToCheckOrgMapper.insert(new CoreSafecheckPlanToCheckOrg(coreSafecheckPlan.getId(), org.getId()));
@@ -150,10 +145,8 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
         }
         //再处理检查要点关系
         if (coreSafecheckPlan.getRulePointList() != null) {
-//            if (coreSafecheckPlan.getId() != null) {
                 coreSafecheckPlanToPointMapper.deleteCoreSafecheckPlanToPointByPlanId(coreSafecheckPlan.getId());
-//            }
-            for (SafetyCheckRulePointSelectVo s :
+            for (SafetyCheckRulePointVo s :
                     coreSafecheckPlan.getRulePointList()) {
                 coreSafecheckPlanToPointMapper.insert(new CoreSafecheckPlanToPoint(coreSafecheckPlan.getId(), s.getId(),s.isPointScan()));
 

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

@@ -0,0 +1,41 @@
+package com.xunmei.core.safetyCheck.vo.ruleItem;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SafetyCheckRulePointVo {
+    /**
+     * 履职内容id
+     */
+    @JsonSerialize(using= ToStringSerializer.class)
+    private Long id;
+
+    @ApiModelProperty("规范id")
+    @JsonSerialize(using= ToStringSerializer.class)
+    private Long ruleId;
+
+    private  String ruleName;
+
+    @ApiModelProperty("检查项id")
+    @JsonSerialize(using= ToStringSerializer.class)
+    private Long itemId;
+
+    private String itemName;
+
+    @ApiModelProperty("履职内容")
+    private String pointName;
+
+    /**
+     * 区域id
+     */
+    @JsonSerialize(using= ToStringSerializer.class)
+    private  Long areaId;
+
+    private  String areaName;
+
+    private String businessType;
+    private boolean pointScan;
+}

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

@@ -50,7 +50,7 @@
             <result column="exec_org_name" property="name"/>
         </collection>
         <!-- 检查要点关系映射 -->
-        <collection property="rulePointList" ofType="com.xunmei.core.safetyCheck.vo.ruleItem.SafetyCheckRulePointSelectVo">
+        <collection property="rulePointList" ofType="com.xunmei.core.safetyCheck.vo.ruleItem.SafetyCheckRulePointVo">
             <result column="rule_point_id" property="id"/>
             <result column="rule_point_rule_id" property="ruleId"/>
             <result column="rule_point_rule_name" property="ruleName"/>