新增根据执法巡查id查询上报风险上报隐患列表

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EscalateHiddenDangerController.java

@@ -28,12 +28,14 @@ public class EscalateHiddenDangerController extends BaseController
     private IEscalateHiddenDangerService escalateHiddenDangerService;
 
     /**
-     * 查询上报隐患列表
+     * 根据巡检id查询上报隐患列表
+     *
+     * @param id 巡检执法id
      */
     @GetMapping("/list")
-    public String list()
+    public String list(int id)
     {
-        List<EscalateHiddenDanger> list = escalateHiddenDangerService.selectEscalateHiddenDangerList();
+        List<EscalateHiddenDanger> list = escalateHiddenDangerService.selectEscalateHiddenDangerList(id);
         return JSONObject.toJSONString(list);
     }
 

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/controller/EscalateRiskController.java

@@ -28,13 +28,14 @@ public class EscalateRiskController extends BaseController
 
     /**
      * 查询上报风险列表
+     *
+     * @param id 巡检执法id
      */
     @GetMapping("/list")
-    public String list()
+    public String list(int id)
     {
-        List<EscalateRisk> list = escalateRiskService.selectEscalateRiskList();
+        List<EscalateRisk> list = escalateRiskService.selectEscalateRiskList(id);
-        TableDataInfo tableDataInfo = getDataTable(list);
+        return JSONObject.toJSONString(list);
-        return JSONObject.toJSONString(tableDataInfo);
     }
 
     /**

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/EscalateHiddenDangerMapper.java

@@ -26,7 +26,7 @@ public interface EscalateHiddenDangerMapper
      *
      * @return 上报隐患集合
      */
-    List<EscalateHiddenDanger> selectEscalateHiddenDangerList();
+    List<EscalateHiddenDanger> selectEscalateHiddenDangerList(int id);
 
     /**
      * 新增上报隐患

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/mapper/EscalateRiskMapper.java

@@ -24,7 +24,7 @@ public interface EscalateRiskMapper
      *
      * @return 上报风险集合
      */
-    List<EscalateRisk> selectEscalateRiskList();
+    List<EscalateRisk> selectEscalateRiskList(int id);
 
     /**
      * 新增上报风险

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/EscalateHiddenDanger.java

@@ -2,8 +2,7 @@ package com.hbt.safety.supervision.pojo;
 
 import com.hbt.common.core.annotation.Excel;
 import com.hbt.common.core.web.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 上报隐患对象 escalate_hidden_danger
@@ -11,6 +10,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author 张雨
  * @date 2023-02-14
  */
+@Data
 public class EscalateHiddenDanger extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -26,40 +26,12 @@ public class EscalateHiddenDanger extends BaseEntity
     @Excel(name = "隐患表id")
     private int hiddenDangerId;
 
-    public void setId(int id)
+    /** 责任企业 */
-    {
+    private String enterprise;
-        this.id = id;
-    }
 
-    public int getId()
+    /** 责任人id */
-    {
+    private int personId;
-        return id;
-    }
-    public void setEnforcementId(int enforcementId)
-    {
-        this.enforcementId = enforcementId;
-    }
 
-    public int getEnforcementId()
+    /** 隐患名称 */
-    {
+    private String name;
-        return enforcementId;
-    }
-    public void setHiddenDangerId(int hiddenDangerId)
-    {
-        this.hiddenDangerId = hiddenDangerId;
-    }
-
-    public int getHiddenDangerId()
-    {
-        return hiddenDangerId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("enforcementId", getEnforcementId())
-            .append("hiddenDangerId", getHiddenDangerId())
-            .toString();
-    }
 }

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/EscalateRisk.java

@@ -2,8 +2,7 @@ package com.hbt.safety.supervision.pojo;
 
 import com.hbt.common.core.annotation.Excel;
 import com.hbt.common.core.web.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 上报风险对象 escalate_risk
@@ -11,6 +10,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author 张雨
  * @date 2023-02-14
  */
+@Data
 public class EscalateRisk extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -26,40 +26,13 @@ public class EscalateRisk extends BaseEntity
     @Excel(name = "风险表id")
     private int riskId;
 
-    public void setId(int id)
+    /** 责任企业 */
-    {
+    private String enterprise;
-        this.id = id;
-    }
 
-    public int getId()
+    /** 责任人id */
-    {
-        return id;
-    }
-    public void setEnforcementId(int enforcementId)
-    {
-        this.enforcementId = enforcementId;
-    }
 
-    public int getEnforcementId()
+    private int personId;
-    {
-        return enforcementId;
-    }
-    public void setRiskId(int riskId)
-    {
-        this.riskId = riskId;
-    }
 
-    public int getRiskId()
+    /** 风险名称 */
-    {
+    private String name;
-        return riskId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("enforcementId", getEnforcementId())
-            .append("riskId", getRiskId())
-            .toString();
-    }
 }

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IEscalateHiddenDangerService.java

@@ -26,7 +26,7 @@ public interface IEscalateHiddenDangerService
      *
      * @return 上报隐患集合
      */
-    List<EscalateHiddenDanger> selectEscalateHiddenDangerList();
+    List<EscalateHiddenDanger> selectEscalateHiddenDangerList(int id);
 
     /**
      * 新增上报隐患

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/IEscalateRiskService.java

@@ -23,10 +23,10 @@ public interface IEscalateRiskService
     /**
      * 查询上报风险列表
      * 
-     * @param escalateRisk 上报风险
+     * @param id 巡检执法id
      * @return 上报风险集合
      */
-    List<EscalateRisk> selectEscalateRiskList();
+    List<EscalateRisk> selectEscalateRiskList(int id);
 
     /**
      * 新增上报风险

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/EscalateHiddenDangerServiceImpl.java

@@ -39,9 +39,9 @@ public class EscalateHiddenDangerServiceImpl implements IEscalateHiddenDangerSer
      * @return 上报隐患
      */
     @Override
-    public List<EscalateHiddenDanger> selectEscalateHiddenDangerList()
+    public List<EscalateHiddenDanger> selectEscalateHiddenDangerList(int id)
     {
-        return escalateHiddenDangerMapper.selectEscalateHiddenDangerList();
+        return escalateHiddenDangerMapper.selectEscalateHiddenDangerList(id);
     }
 
     /**

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/EscalateRiskServiceImpl.java

@@ -38,9 +38,9 @@ public class EscalateRiskServiceImpl implements IEscalateRiskService
      * @return 上报风险
      */
     @Override
-    public List<EscalateRisk> selectEscalateRiskList()
+    public List<EscalateRisk> selectEscalateRiskList(int id)
     {
-        return escalateRiskMapper.selectEscalateRiskList();
+        return escalateRiskMapper.selectEscalateRiskList(id);
     }
 
     /**

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/EscalateHiddenDangerMapper.xml

@@ -11,12 +11,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectEscalateHiddenDangerVo">
-        select id, enforcement_id, hidden_danger_id from escalate_hidden_danger
+        select distinct(a.id) id, a.hidden_danger_id hiddenDangerId,  b.name name,
+                       c.name as enterprise,b.person_id personId
+        from escalate_hidden_danger  a
+        left join hidden_danger b on a.hidden_danger_id = b.id
+        left join enterprise_information as c on b.enterprise_id = c.id
     </sql>
 
-    <select id="selectEscalateHiddenDangerList" parameterType="com.hbt.safety.supervision.pojo.EscalateHiddenDanger" resultMap="EscalateHiddenDangerResult">
+    <select id="selectEscalateHiddenDangerList" parameterType="Integer" resultType="com.hbt.safety.supervision.pojo.EscalateHiddenDanger">
         <include refid="selectEscalateHiddenDangerVo"/>
         <where>
+            a.enforcement_id = #{id}
         </where>
     </select>
 

hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/EscalateRiskMapper.xml

@@ -11,12 +11,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectEscalateRiskVo">
-        select id, enforcement_id, risk_id from escalate_risk
+        select distinct(a.id) id, a.risk_id as riskId,  b.name name,
+                       c.name as enterprise,b.responsible_person_id personId
+        from escalate_risk  a
+                 left join risk b on a.risk_id = b.id
+                 left join enterprise_information as c on b.enterprise_id = c.id
     </sql>
 
-    <select id="selectEscalateRiskList" parameterType="com.hbt.safety.supervision.pojo.EscalateRisk" resultMap="EscalateRiskResult">
+    <select id="selectEscalateRiskList" parameterType="Integer" resultType="com.hbt.safety.supervision.pojo.EscalateRisk">
         <include refid="selectEscalateRiskVo"/>
         <where>
+            a.enforcement_id = #{id}
         </where>
     </select>