分类列表添加筛选

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/ContingencyPlanController.java

@@ -92,14 +92,15 @@ public class ContingencyPlanController extends BaseController {
                                     @RequestParam(value = "implementationTimeLeft", required = false) Long implementationTimeLeftStamp,
                                     @RequestParam(value = "implementationTimeRight", required = false) Long implementationTimeRightStamp,
                                     @RequestParam(value = "size") int size,
-                                    @RequestParam(value = "equipmentId", required = false) String equipmentId) {
+                                    @RequestParam(value = "equipmentId", required = false) String equipmentId,
+                                    @RequestParam(value = "category") String category) {
         if (current < 1 || size < 1) {
             throw new YeeException("分页参数有误");
         }
         Date implementationTimeLeft = implementationTimeLeftStamp == null ? null : new Date(implementationTimeLeftStamp);
         Date implementationTimeRight = implementationTimeRightStamp == null ? null : new Date(implementationTimeRightStamp);
         Page page = new Page(current, size);
-        return CommonResponseUtil2.success(contingencyPlanService.pageFilter(page, planName, classifyId, planRange, editOrgName, implementationTimeLeft, implementationTimeRight, equipmentId));
+        return CommonResponseUtil2.success(contingencyPlanService.pageFilter(page, planName, classifyId, planRange, editOrgName, implementationTimeLeft, implementationTimeRight, equipmentId, category));
     }
 
     /**

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/PlanDetailMapper.java

@@ -38,13 +38,13 @@ public interface PlanDetailMapper {
      * 筛选预案获得总数
      * @return
      */
-    Integer filterCount(@Param("planName") String planName, @Param("classifyId") List<Long> classifyId, @Param("planRange") List<String> planRange, @Param("editOrgName") String editOrgName, @Param("implementationTimeLeft") Date implementationTimeLeft, @Param("implementationTimeRight") Date implementationTimeRight, @Param("equipmentId") String equipmentId);
+    Integer filterCount(@Param("planName") String planName, @Param("classifyId") List<Long> classifyId, @Param("planRange") List<String> planRange, @Param("editOrgName") String editOrgName, @Param("implementationTimeLeft") Date implementationTimeLeft, @Param("implementationTimeRight") Date implementationTimeRight, @Param("equipmentId") String equipmentId, @Param("category") String category);
 
     /**
      * 筛选预案获得分页记录
      * @return
      */
-    List<PlanDetailVo> filterList(@Param("planName") String planName, @Param("classifyId") List<Long> classifyId, @Param("planRange") List<String> planRange, @Param("editOrgName") String editOrgName, @Param("implementationTimeLeft") Date implementationTimeLeft, @Param("implementationTimeRight") Date implementationTimeRight, @Param("start") int start, @Param("size") int size, @Param("equipmentId") String equipmentId);
+    List<PlanDetailVo> filterList(@Param("planName") String planName, @Param("classifyId") List<Long> classifyId, @Param("planRange") List<String> planRange, @Param("editOrgName") String editOrgName, @Param("implementationTimeLeft") Date implementationTimeLeft, @Param("implementationTimeRight") Date implementationTimeRight, @Param("start") int start, @Param("size") int size, @Param("equipmentId") String equipmentId, @Param("category") String category);
 
     List<String> getRuleIdByEquipment(@Param("id")  Long id);
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyPlanServiceImpl.java

@@ -683,7 +683,7 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
     @Override
     public Page<PlanDetailVo> pageFilter(Page page, String planName, Long
             classifyId, List<String> planRange, String editOrgName, Date implementationTimeLeft, Date
-                                                 implementationTimeRight, String equipmentId) {
+                                                 implementationTimeRight, String equipmentId, String category) {
         List<Long> classifyIdList = new ArrayList<>();
         if (classifyId != null) {
             Collection<PlanClassifyTreeVo> classifyTreeList = planClassifyTreeService.getAllChildIncludeMe(classifyId);
@@ -692,7 +692,7 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
                 allChildren.forEach(e -> classifyIdList.add(e.getId()));
             }
         }
-        int total = planDetailMapper.filterCount(planName, classifyIdList, planRange, editOrgName, implementationTimeLeft, implementationTimeRight, equipmentId);
+        int total = planDetailMapper.filterCount(planName, classifyIdList, planRange, editOrgName, implementationTimeLeft, implementationTimeRight, equipmentId, category);
         page.setTotal(total);
         long start = (page.getCurrent() - 1) * page.getSize();
         if (total == 0) {
@@ -702,7 +702,7 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
                 page.setCurrent(1);
                 start = 0;
             }
-            List<PlanDetailVo> planList = planDetailMapper.filterList(planName, classifyIdList, planRange, editOrgName, implementationTimeLeft, implementationTimeRight, (int) start, (int) page.getSize(), equipmentId);
+            List<PlanDetailVo> planList = planDetailMapper.filterList(planName, classifyIdList, planRange, editOrgName, implementationTimeLeft, implementationTimeRight, (int) start, (int) page.getSize(), equipmentId, category);
             // 查询并插入绑定数据的信息
             fillBindingInfo(planList);
             page.setRecords(planList);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IContingencyPlanService.java

@@ -98,7 +98,7 @@ public interface IContingencyPlanService {
      * @param implementationTimeRight 实施时间右界限
      * @return Page
      */
-    Page<PlanDetailVo> pageFilter(Page page, String planName, Long classifyId, List<String> planRange, String editOrgName, Date implementationTimeLeft, Date implementationTimeRight, String equipmentId);
+    Page<PlanDetailVo> pageFilter(Page page, String planName, Long classifyId, List<String> planRange, String editOrgName, Date implementationTimeLeft, Date implementationTimeRight, String equipmentId, String category);
 
     /**
      * 查询预案使用的文档ID

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/PlanDetailMapper.xml

@@ -22,6 +22,7 @@
     FROM
       c_plan_detail cpd
     left join c_plan_equipment as cpe on cpd.id = cpe.plan_id and cpe.is_delete = 0
+    left join f_equipment c on c.id = cpe.fire_equipment_id
     <where>
       <if test="planName != null and planName.length > 0">
         AND cpd.plan_name LIKE concat('%', #{planName}, '%')
@@ -50,6 +51,9 @@
       <if test="equipmentId != null and equipmentId != ''">
         AND cpe.fire_equipment_id = #{equipmentId}
       </if>
+      <if test="category != null and category != ''">
+        AND c.category = #{category}
+      </if>
       AND cpd.is_delete = 0
     </where>
   </select>
@@ -59,21 +63,21 @@
     cpd.id AS id,
     cpd.id AS zid,
     cpd.create_date createDate
-    , plan_name planName
-    , code
-    , classify_id classifyId
-    , plan_range planRange
-    , edit_org_name editOrgName
-    , edition
-    , implementation_time implementationTime
+    , cpd.plan_name planName
+    , cpd.code
+    , cpd.classify_id classifyId
+    , cpd.plan_range planRange
+    , cpd.edit_org_name editOrgName
+    , cpd.edition
+    , cpd.implementation_time implementationTime
     , cpd.remark
-    , status
-    , creator
-    , reviser
-    , update_time updateTime
-    , org_code orgCode
+    , cpd.status
+    , cpd.creator
+    , cpd.reviser
+    , cpd.update_time updateTime
+    , cpd.org_code orgCode
     , cpd.is_delete isDelete
-    , input_time inputTime
+    , cpd.input_time inputTime
     , (SELECT classify_name FROM c_plan_classify_tree cpct WHERE id = cpd.classify_id) classifyName
     , (SELECT count(1) FROM c_plan_operation_record cpor WHERE plan_id = cpd.id) executionTimes
     ,fpp.picture
@@ -81,6 +85,7 @@
     c_plan_detail cpd
     left join c_plan_equipment as cpe on cpd.id = cpe.plan_id and cpe.is_delete = 0
     left join f_preplan_picture as fpp on fpp.equipment_id  = cpe.fire_equipment_id and fpp.`type` =5
+    left join f_equipment c on c.id = cpe.fire_equipment_id
     <where>
       <if test="planName != null and planName.length > 0">
         AND cpd.plan_name LIKE concat('%', #{planName}, '%')
@@ -109,6 +114,9 @@
       <if test="equipmentId != null and equipmentId != ''">
         AND cpe.fire_equipment_id = #{equipmentId}
       </if>
+      <if test="category != null and category != ''">
+        AND c.category = #{category}
+      </if>
       AND cpd.is_delete = 0
     </where>
     ORDER BY cpd.create_date DESC