diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanInterceptMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanInterceptMapper.java index 7ef62b6..792cd7e 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanInterceptMapper.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanInterceptMapper.java @@ -17,7 +17,7 @@ import org.apache.ibatis.annotations.Mapper; @ProcessBusinessLine @Mapper public interface InspectionPlanInterceptMapper extends BaseMapperX { - default PageResult selectPage(InspectionPlanPageReqVO reqVO) { + default PageResult selectForPage(InspectionPlanPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(InspectionPlanDO::getBatchNo, reqVO.getBatchNo()) .likeIfPresent(InspectionPlanDO::getPlanName, reqVO.getPlanName()) @@ -29,7 +29,6 @@ public interface InspectionPlanInterceptMapper extends BaseMapperX { - default PageResult selectPage(MaintainPlanPageReqVO reqVO) { + default PageResult selectForPage(MaintainPlanPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(MaintainPlanDO::getBatchNo, reqVO.getBatchNo()) .likeIfPresent(MaintainPlanDO::getPlanName, reqVO.getPlanName()) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/planrate/PlanRateInterceptMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/planrate/PlanRateInterceptMapper.java new file mode 100644 index 0000000..73f6040 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/planrate/PlanRateInterceptMapper.java @@ -0,0 +1,29 @@ +package com.zteits.urbanops.module.garden.dal.mysql.planrate; + +import com.zteits.urbanops.framework.annotation.ProcessBusinessLine; +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX; +import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.zteits.urbanops.module.garden.controller.admin.planrate.vo.PlanRatePageReqVO; +import com.zteits.urbanops.module.garden.dal.dataobject.planrate.PlanRateDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 计划频次 Mapper + * + * @author 超级管理员 + */ +@ProcessBusinessLine +@Mapper +public interface PlanRateInterceptMapper extends BaseMapperX { + + default PageResult selectForPage(PlanRatePageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(PlanRateDO::getRateNo, reqVO.getRateNo()) + .eqIfPresent(PlanRateDO::getBusiLine, reqVO.getBusiLine()) + .eqIfPresent(PlanRateDO::getPlanTypeId, reqVO.getPlanTypeId()) + .eqIfPresent(PlanRateDO::getStdPlan, reqVO.getStdPlan()) + .eq(PlanRateDO::getType, reqVO.getType()) + .orderByDesc(PlanRateDO::getId)); + } +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/road/RoadInterceptMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/road/RoadInterceptMapper.java index 714d317..5887602 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/road/RoadInterceptMapper.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/road/RoadInterceptMapper.java @@ -17,7 +17,7 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface RoadInterceptMapper extends BaseMapperX { - default PageResult selectPage(RoadPageReqVO reqVO) { + default PageResult selectForPage(RoadPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .likeIfPresent(RoadDO::getRoadName, reqVO.getRoadName()) .eqIfPresent(RoadDO::getStreetId, reqVO.getStreetId()) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java index 477c06f..17839b5 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java @@ -246,7 +246,7 @@ public class InspectionPlanServiceImpl implements InspectionPlanService { @Override public PageResult getInspectionPlanPage(InspectionPlanPageReqVO pageReqVO) { - PageResult pageResult = inspectionPlanInterceptMapper.selectPage(pageReqVO); + PageResult pageResult = inspectionPlanInterceptMapper.selectForPage(pageReqVO); PageResult result = BeanUtils.toBean(pageResult, InspectionPlanRespVO.class); addDataInspectionPlan(result.getList()); diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java index 121fa6e..579a4fa 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java @@ -246,7 +246,7 @@ public class MaintainPlanServiceImpl implements MaintainPlanService { @Override public PageResult getMaintainPlanPage(MaintainPlanPageReqVO pageReqVO) { - PageResult pageResult = maintainPlanInterceptMapper.selectPage(pageReqVO); + PageResult pageResult = maintainPlanInterceptMapper.selectForPage(pageReqVO); PageResult result = BeanUtils.toBean(pageResult, MaintainPlanRespVO.class); addDataInspectionPlan(result.getList()); return result; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateServiceImpl.java index 65def1d..2cb2e9c 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateServiceImpl.java @@ -11,6 +11,7 @@ import com.zteits.urbanops.framework.common.util.object.BeanUtils; import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils; import com.zteits.urbanops.module.garden.dal.dataobject.planrate.PlanRateDetailDO; import com.zteits.urbanops.module.garden.dal.mysql.planrate.PlanRateDetailMapper; +import com.zteits.urbanops.module.garden.dal.mysql.planrate.PlanRateInterceptMapper; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -42,6 +43,9 @@ public class PlanRateServiceImpl implements PlanRateService { private PlanRateMapper planRateMapper; @Resource + private PlanRateInterceptMapper planRateInterceptMapper; + + @Resource private PlanRateDetailMapper planRateDetailMapper; @Resource @@ -178,7 +182,7 @@ public class PlanRateServiceImpl implements PlanRateService { @Override public PageResult getPlanRatePage(PlanRatePageReqVO pageReqVO) { - return planRateMapper.selectPage(pageReqVO); + return planRateInterceptMapper.selectForPage(pageReqVO); } @Override diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadServiceImpl.java index 1318e4f..1a97bf3 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadServiceImpl.java @@ -114,7 +114,7 @@ public class RoadServiceImpl implements RoadService { @Override public PageResult getRoadPage(RoadPageReqVO pageReqVO) { - PageResult pageResult = roadInterceptMapper.selectPage(pageReqVO); + PageResult pageResult = roadInterceptMapper.selectForPage(pageReqVO); PageResult page = BeanUtils.toBean(pageResult, RoadRespVO.class); addDataInspectionPlan(page.getList()); return page;