隐患排查加计划id筛选条件

src/main/java/com/hotwj/platform/securityManagement/hiddenDangerInspection/controller/HotHiddenDangerInspectionController.java

@@ -135,7 +135,8 @@ public class HotHiddenDangerInspectionController extends BaseController {
     )
     public TableDataInfo<HotHiddenDangerInspectionVo> hiddenDangerPlanPage(
             @RequestParam(value = "keyword", required = false) String keyword,
+            @RequestParam(value = "planId", required = false) Long planId,
             PageQuery pageQuery) {
-        return hotHiddenDangerInspectionService.queryMobilePlanPage(keyword, pageQuery);
+        return hotHiddenDangerInspectionService.queryMobilePlanPage(keyword, planId, pageQuery);
     }
 }

src/main/java/com/hotwj/platform/securityManagement/hiddenDangerInspection/mapper/HotHiddenDangerInspectionMapper.java

@@ -23,6 +23,7 @@ public interface HotHiddenDangerInspectionMapper extends BaseMapperPlus<HotHidde
                                                            @Param("isAdmin") Boolean isAdmin,
                                                            @Param("driverId") String driverId,
                                                            @Param("vehicleId") String vehicleId,
+                                                           @Param("planId") Long planId,
                                                            @Param("keyword") String keyword,
                                                            @Param("currentMonth") String currentMonth);
 }

src/main/java/com/hotwj/platform/securityManagement/hiddenDangerInspection/service/IHotHiddenDangerInspectionService.java

@@ -33,7 +33,7 @@ public interface IHotHiddenDangerInspectionService {
      */
     TableDataInfo<HotHiddenDangerInspectionVo> queryPageList(HotHiddenDangerInspectionBo bo, PageQuery pageQuery);
 
-    TableDataInfo<HotHiddenDangerInspectionVo> queryMobilePlanPage(String keyword, PageQuery pageQuery);
+    TableDataInfo<HotHiddenDangerInspectionVo> queryMobilePlanPage(String keyword, Long planId, PageQuery pageQuery);
 
     /**
      * 查询符合条件的隐患排查-排查项目列表

src/main/java/com/hotwj/platform/securityManagement/hiddenDangerInspection/service/impl/HotHiddenDangerInspectionServiceImpl.java

@@ -88,7 +88,7 @@ public class HotHiddenDangerInspectionServiceImpl implements IHotHiddenDangerIns
     }
 
     @Override
-    public TableDataInfo<HotHiddenDangerInspectionVo> queryMobilePlanPage(String keyword, PageQuery pageQuery) {
+    public TableDataInfo<HotHiddenDangerInspectionVo> queryMobilePlanPage(String keyword, Long planId, PageQuery pageQuery) {
         Long companyId = LoginHelper.getCompanyId();
         if (companyId == null) {
             throw new ServiceException("当前登录用户无公司信息");
@@ -109,6 +109,7 @@ public class HotHiddenDangerInspectionServiceImpl implements IHotHiddenDangerIns
                 !isDriver,
                 driverId,
                 vehicleId,
+                planId,
                 StringUtils.trimToNull(keyword),
                 currentMonth
         );

src/main/resources/mapper/securityManagement/HotHiddenDangerInspectionMapper.xml

@@ -28,6 +28,9 @@
         WHERE i.is_deleted = 0
         AND i.company_id = #{companyId}
         AND DATE_FORMAT(COALESCE(p.start_date, i.create_time), '%Y-%m') = #{currentMonth}
+        <if test="planId != null">
+            AND i.plan_id = #{planId}
+        </if>
         <if test="isAdmin == false">
             AND (
             (i.project_type = 3 AND i.project_id = #{driverId})
@@ -57,6 +60,9 @@
         AND i.company_id = #{companyId}
         AND DATE_FORMAT(COALESCE(p.start_date, i.create_time), '%Y-%m') != #{currentMonth}
         AND (i.status IS NULL OR i.status = 1 OR i.status = 2)
+        <if test="planId != null">
+            AND i.plan_id = #{planId}
+        </if>
         <if test="isAdmin == false">
             AND (
             (i.project_type = 3 AND i.project_id = #{driverId})