现状风险用户巡查明细列表

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/CurrentRiskUserPatrolDetailController.java

@@ -2,6 +2,8 @@ package com.censoft.censoftrongtong.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.censoft.censoftrongtong.domain.RiskExistingListPatrolVO;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -28,7 +30,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @date 2023-12-05
  */
 @RestController
-@RequestMapping("/risk/currentRiskPatrolDetail")
+@RequestMapping(value = {"/risk/currentRiskPatrolDetail","/app-api/risk/currentRiskPatrolDetail"})
 public class CurrentRiskUserPatrolDetailController extends BaseController
 {
     @Autowired
@@ -46,6 +48,19 @@ public class CurrentRiskUserPatrolDetailController extends BaseController
         return getDataTable(list);
     }
 
+
+    /**
+     * 查询现状风险用户巡查明细列表
+     */
+    @GetMapping("/detailList")
+    public TableDataInfo detailList(CurrentRiskUserPatrolDetail currentRiskUserPatrolDetail)
+    {
+        startPage();
+        String patrolId = String.valueOf(currentRiskUserPatrolDetail.getPatrolId());
+        List<RiskExistingListPatrolVO> list = currentRiskUserPatrolDetailService.riskExistingLists(patrolId);
+        return getDataTable(list);
+    }
+
     /**
      * 导出现状风险用户巡查明细列表
      */

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/RiskExistingListPatrolVO.java

+package com.censoft.censoftrongtong.domain;
+
+import lombok.Data;
+
+@Data
+public class RiskExistingListPatrolVO extends RiskExistingList{
+
+    private String patrolDetailId;
+
+    private String patrolId;
+
+    private String patrolStatus;
+}

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/CurrentRiskUserPatrolDetailMapper.java

@@ -2,7 +2,9 @@ package com.censoft.censoftrongtong.mapper;
 
 import java.util.List;
 import com.censoft.censoftrongtong.domain.CurrentRiskUserPatrolDetail;
+import com.censoft.censoftrongtong.domain.RiskExistingListPatrolVO;
 import com.github.yulichang.base.MPJBaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 现状风险用户巡查明细Mapper接口
@@ -59,4 +61,6 @@ public interface CurrentRiskUserPatrolDetailMapper  extends MPJBaseMapper<Curren
      * @return 结果
      */
     public int deleteCurrentRiskUserPatrolDetailByIds(Long[] ids);
+
+    List<RiskExistingListPatrolVO> riskExistingLists(@Param("patrolId") String patrolId);
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/ICurrentRiskUserPatrolDetailService.java

@@ -2,6 +2,7 @@ package com.censoft.censoftrongtong.service;
 
 import java.util.List;
 import com.censoft.censoftrongtong.domain.CurrentRiskUserPatrolDetail;
+import com.censoft.censoftrongtong.domain.RiskExistingListPatrolVO;
 import com.github.yulichang.base.MPJBaseService;
 /**
  * 现状风险用户巡查明细Service接口
@@ -58,4 +59,6 @@ public interface ICurrentRiskUserPatrolDetailService  extends MPJBaseService<Cur
      * @return 结果
      */
     public int deleteCurrentRiskUserPatrolDetailById(Long id);
+
+    List<RiskExistingListPatrolVO> riskExistingLists(String patrolId);
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/CurrentRiskUserPatrolDetailServiceImpl.java

 package com.censoft.censoftrongtong.service.impl;
 
 import java.util.List;
+
+import com.censoft.censoftrongtong.domain.RiskExistingListPatrolVO;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -93,4 +95,9 @@ public class CurrentRiskUserPatrolDetailServiceImpl extends MPJBaseServiceImpl<C
     {
         return currentRiskUserPatrolDetailMapper.deleteCurrentRiskUserPatrolDetailById(id);
     }
+
+    @Override
+    public List<RiskExistingListPatrolVO> riskExistingLists(String patrolId) {
+        return currentRiskUserPatrolDetailMapper.riskExistingLists(patrolId);
+    }
 }

censoft-rongtong/src/main/resources/mapper/system/CurrentRiskUserPatrolDetailMapper.xml

@@ -111,4 +111,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <resultMap type="com.censoft.censoftrongtong.domain.RiskExistingListPatrolVO" id="RiskExistingListResult">
+        <result property="id"    column="id"    />
+        <result property="inherentId"    column="inherent_id"    />
+        <result property="code"    column="code"    />
+        <result property="name"    column="name"    />
+        <result property="type"    column="type"    />
+        <result property="describe"    column="describe"    />
+        <result property="evaluationModel"    column="evaluation_model"    />
+        <result property="evaluationRange"    column="evaluation_range"    />
+        <result property="level"    column="level"    />
+        <result property="factor"    column="factor"    />
+        <result property="measuresProject"    column="measures_project"    />
+        <result property="measuresProjectFileIds"    column="measures_project_file_ids"    />
+        <result property="measuresAdministration"    column="measures_administration"    />
+        <result property="measuresAdministrationFileIds"    column="measures_administration_file_ids"    />
+        <result property="measuresEmergency"    column="measures_emergency"    />
+        <result property="measuresEmergencyFileIds"    column="measures_emergency_file_ids"    />
+        <result property="referenceBasis"    column="reference_basis"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="patrolDetailId"    column="patrolDetailId"    />
+        <result property="patrolId"    column="patrol_id"    />
+        <result property="patrolStatus"    column="patrolStatus"    />
+    </resultMap>
+    <select id="riskExistingLists" resultMap="RiskExistingListResult" parameterType="java.lang.String">
+        select b.id, b.inherent_id, b.code, b.name, b.type, b.describe, b.evaluation_model, b.evaluation_range, b.level, b.factor, b.measures_project,
+            b.measures_project_file_ids, b.measures_administration,b. measures_administration_file_ids, b.measures_emergency,
+            b.measures_emergency_file_ids, b.reference_basis, b.del_flag, b.create_by, b.create_time, b.update_by, b.update_time,
+            a.id patrolDetailId,a.patrol_id patrolId,a.STATUS patrolStatus
+        from current_risk_user_patrol_detail a
+        INNER JOIN risk_existing_list b ON a.current_risk_id = b.id
+        where a.patrol_id = #{patrolId}
+    </select>
 </mapper>
\ No newline at end of file