diff --git a/src/main/java/com/hotwj/platform/securityManagement/hiddenDangerInspection/controller/HotHiddenDangerInspectionController.java b/src/main/java/com/hotwj/platform/securityManagement/hiddenDangerInspection/controller/HotHiddenDangerInspectionController.java index 5348923..2185da6 100644 --- a/src/main/java/com/hotwj/platform/securityManagement/hiddenDangerInspection/controller/HotHiddenDangerInspectionController.java +++ b/src/main/java/com/hotwj/platform/securityManagement/hiddenDangerInspection/controller/HotHiddenDangerInspectionController.java @@ -135,7 +135,8 @@ public class HotHiddenDangerInspectionController extends BaseController { ) public TableDataInfo 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); } } diff --git a/src/main/java/com/hotwj/platform/securityManagement/hiddenDangerInspection/mapper/HotHiddenDangerInspectionMapper.java b/src/main/java/com/hotwj/platform/securityManagement/hiddenDangerInspection/mapper/HotHiddenDangerInspectionMapper.java index f7836e0..106a9e6 100644 --- a/src/main/java/com/hotwj/platform/securityManagement/hiddenDangerInspection/mapper/HotHiddenDangerInspectionMapper.java +++ b/src/main/java/com/hotwj/platform/securityManagement/hiddenDangerInspection/mapper/HotHiddenDangerInspectionMapper.java @@ -23,6 +23,7 @@ public interface HotHiddenDangerInspectionMapper extends BaseMapperPlus queryPageList(HotHiddenDangerInspectionBo bo, PageQuery pageQuery); - TableDataInfo queryMobilePlanPage(String keyword, PageQuery pageQuery); + TableDataInfo queryMobilePlanPage(String keyword, Long planId, PageQuery pageQuery); /** * 查询符合条件的隐患排查-排查项目列表 diff --git a/src/main/java/com/hotwj/platform/securityManagement/hiddenDangerInspection/service/impl/HotHiddenDangerInspectionServiceImpl.java b/src/main/java/com/hotwj/platform/securityManagement/hiddenDangerInspection/service/impl/HotHiddenDangerInspectionServiceImpl.java index 8d31c76..9f296db 100644 --- a/src/main/java/com/hotwj/platform/securityManagement/hiddenDangerInspection/service/impl/HotHiddenDangerInspectionServiceImpl.java +++ b/src/main/java/com/hotwj/platform/securityManagement/hiddenDangerInspection/service/impl/HotHiddenDangerInspectionServiceImpl.java @@ -88,7 +88,7 @@ public class HotHiddenDangerInspectionServiceImpl implements IHotHiddenDangerIns } @Override - public TableDataInfo queryMobilePlanPage(String keyword, PageQuery pageQuery) { + public TableDataInfo 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 ); diff --git a/src/main/resources/mapper/securityManagement/HotHiddenDangerInspectionMapper.xml b/src/main/resources/mapper/securityManagement/HotHiddenDangerInspectionMapper.xml index 66168d6..b9683c0 100644 --- a/src/main/resources/mapper/securityManagement/HotHiddenDangerInspectionMapper.xml +++ b/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} + + AND i.plan_id = #{planId} + 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) + + AND i.plan_id = #{planId} + AND ( (i.project_type = 3 AND i.project_id = #{driverId})