1、修改固有风险台账筛选、导出

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

@@ -177,9 +177,9 @@ public class RiskPlanController extends BaseController
      * 导出项目风险清单表
      */
     @PostMapping("/exportExcel/InherentList")
-    public void export(RiskPlanInherentList riskPlanInherentList, HttpServletResponse response) {
+    public void export(RiskInherentListExportDto riskInherentListExportDto, HttpServletResponse response) {
         try {
-            List<RiskInherentListExportDto> dtos = riskPlanInherentListService.getPlanInherentList(riskPlanInherentList);
+            List<RiskInherentListExportDto> dtos = riskPlanInherentListService.getPlanInherentList(riskInherentListExportDto);
             for (RiskInherentListExportDto dto : dtos) {
                 if ("1".equals(dto.getMajorHazardSource())){
                     dto.setMajorHazardSource("是");
@@ -199,10 +199,10 @@ public class RiskPlanController extends BaseController
      * 查询固有风险信息列表
      */
     @GetMapping("/inherentList")
-    public TableDataInfo list(RiskPlanInherentList riskPlanInherentList)
+    public TableDataInfo list(RiskInherentListExportDto riskInherentListExportDto)
     {
         startPage();
-        List<RiskInherentListExportDto> dtos = riskPlanInherentListService.getPlanInherentList(riskPlanInherentList);
+        List<RiskInherentListExportDto> dtos = riskPlanInherentListService.getPlanInherentList(riskInherentListExportDto);
         for (RiskInherentListExportDto dto : dtos) {
             if ("1".equals(dto.getMajorHazardSource())){
                 dto.setMajorHazardSource("是");

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskInherentListExportDto.java

@@ -120,4 +120,9 @@ public class RiskInherentListExportDto {
      * 判定依据
      */
     private String referenceBasis;
+
+    /**
+     * 任务id
+     */
+    private Long planId;
 }

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

@@ -73,5 +73,5 @@ public interface RiskPlanInherentListMapper extends  MPJBaseMapper<RiskPlanInher
 
     RiskNotificationExportWordDto getRiskNotificationExportWordDto(@Param("inherentId") Long inherentId);
 
-    List<RiskInherentListExportDto> getPlanInherentList(RiskPlanInherentList riskPlanInherentList);
+    List<RiskInherentListExportDto> getPlanInherentList(RiskInherentListExportDto riskInherentListExportDto);
 }

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

@@ -77,5 +77,5 @@ public interface IRiskPlanInherentListService extends MPJBaseService<RiskPlanInh
 
     void exportPlanInherentList(HttpServletResponse response,List<RiskInherentListExportDto> dtos) throws IOException;
 
-    List<RiskInherentListExportDto> getPlanInherentList(RiskPlanInherentList riskPlanInherentList);
+    List<RiskInherentListExportDto> getPlanInherentList(RiskInherentListExportDto riskInherentListExportDto);
 }

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

@@ -400,8 +400,8 @@ public class RiskPlanInherentListServiceImpl
     }
 
     @Override
-    public List<RiskInherentListExportDto> getPlanInherentList(RiskPlanInherentList riskPlanInherentList) {
-        return riskPlanInherentListMapper.getPlanInherentList(riskPlanInherentList);
+    public List<RiskInherentListExportDto> getPlanInherentList(RiskInherentListExportDto riskInherentListExportDto) {
+        return riskPlanInherentListMapper.getPlanInherentList(riskInherentListExportDto);
     }
 
 

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

@@ -449,7 +449,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN risk_plan_existing_list rpel ON rpel.inherent_id = rpil.id
         WHERE
             rpil.id IS NOT NULL
-            <if test="name != null">and risk_plan_inherent_list.name like concat('%',#{name},'%')</if>
+            <if test="deptName != null and deptName != ''">and sd.dept_name like concat('%',#{deptName},'%')</if>
+            <if test="projectName != null and projectName != ''">and lp.name like concat('%',#{projectName},'%')</if>
+            <if test="city != null and city != ''">and lp.city like concat('%',#{city},'%')</if>
+            <if test="businessFormat != null and businessFormat != ''">and lp.business like concat('%',#{businessFormat},'%')</if>
+            <if test="inherentName != null and inherentName != ''">and rpil.`name` like concat('%',#{inherentName},'%')</if>
+            <if test="inherentLevel != null and inherentLevel != ''">and rpil.`level` like concat('%',#{inherentLevel},'%')</if>
+            <if test="existingName != null and existingName != ''">and rpel.`name` like concat('%',#{existingName},'%')</if>
+            <if test="existingLevel != null and existingLevel != ''">and rpel.`level` like concat('%',#{existingLevel},'%')</if>
+            <if test="presenceLocation != null and presenceLocation != ''">and rpil.presence_location like concat('%',#{presenceLocation},'%')</if>
+            <if test="listType != null and listType != ''">and rpil.type like concat('%',#{listType},'%')</if>
             <if test="planId != null">and rp.id = #{name}</if>
             GROUP BY rpil.id
     </select>