分页拦名字优化

王富生
1 parent 70d74a2c
Showing 8 changed files with 40 additions and 8 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanInterceptMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanInterceptMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/planrate/PlanRateInterceptMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/road/RoadInterceptMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadServiceImpl.java
@@ -17,7 +17,7 @@ import org.apache.ibatis.annotations.Mapper;
 @ProcessBusinessLine
 @Mapper
 public interface InspectionPlanInterceptMapper extends BaseMapperX<InspectionPlanDO> {
-    default PageResult<InspectionPlanDO> selectPage(InspectionPlanPageReqVO reqVO) {
+    default PageResult<InspectionPlanDO> selectForPage(InspectionPlanPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<InspectionPlanDO>()
                 .eqIfPresent(InspectionPlanDO::getBatchNo, reqVO.getBatchNo())
                 .likeIfPresent(InspectionPlanDO::getPlanName, reqVO.getPlanName())
@@ -29,7 +29,6 @@ public interface InspectionPlanInterceptMapper extends BaseMapperX&lt;InspectionPla
                 .eqIfPresent(InspectionPlanDO::getFinishState, reqVO.getFinishState())
                 .eqIfPresent(InspectionPlanDO::getFinishState, reqVO.getFinishState())
                 .betweenIfPresent(InspectionPlanDO::getBeginTime, reqVO.getBeginTime())
-                .eq(InspectionPlanDO::getDeleted,0)
                 .betweenIfPresent(InspectionPlanDO::getEndTime, reqVO.getEndTime())
                 .orderByDesc(InspectionPlanDO::getId));
     }
@@ -18,7 +18,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface MaintainPlanInterceptMapper extends BaseMapperX<MaintainPlanDO> {
-    default PageResult<MaintainPlanDO> selectPage(MaintainPlanPageReqVO reqVO) {
+    default PageResult<MaintainPlanDO> selectForPage(MaintainPlanPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<MaintainPlanDO>()
                 .eqIfPresent(MaintainPlanDO::getBatchNo, reqVO.getBatchNo())
                 .likeIfPresent(MaintainPlanDO::getPlanName, reqVO.getPlanName())
+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<PlanRateDO> {
+
+    default PageResult<PlanRateDO> selectForPage(PlanRatePageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<PlanRateDO>()
+                .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
@@ -17,7 +17,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface RoadInterceptMapper extends BaseMapperX<RoadDO> {
-    default PageResult<RoadDO> selectPage(RoadPageReqVO reqVO) {
+    default PageResult<RoadDO> selectForPage(RoadPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<RoadDO>()
                 .likeIfPresent(RoadDO::getRoadName, reqVO.getRoadName())
                 .eqIfPresent(RoadDO::getStreetId, reqVO.getStreetId())
@@ -246,7 +246,7 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
     @Override
     public PageResult<InspectionPlanRespVO> getInspectionPlanPage(InspectionPlanPageReqVO pageReqVO) {
-        PageResult<InspectionPlanDO> pageResult = inspectionPlanInterceptMapper.selectPage(pageReqVO);
+        PageResult<InspectionPlanDO> pageResult = inspectionPlanInterceptMapper.selectForPage(pageReqVO);
         PageResult<InspectionPlanRespVO> result = BeanUtils.toBean(pageResult, InspectionPlanRespVO.class);
         addDataInspectionPlan(result.getList());
@@ -246,7 +246,7 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
     @Override
     public PageResult<MaintainPlanRespVO> getMaintainPlanPage(MaintainPlanPageReqVO pageReqVO) {
-        PageResult<MaintainPlanDO> pageResult = maintainPlanInterceptMapper.selectPage(pageReqVO);
+        PageResult<MaintainPlanDO> pageResult = maintainPlanInterceptMapper.selectForPage(pageReqVO);
         PageResult<MaintainPlanRespVO> result = BeanUtils.toBean(pageResult, MaintainPlanRespVO.class);
         addDataInspectionPlan(result.getList());
         return result;
@@ -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<PlanRateDO> getPlanRatePage(PlanRatePageReqVO pageReqVO) {
-        return planRateMapper.selectPage(pageReqVO);
+        return planRateInterceptMapper.selectForPage(pageReqVO);
     }
     @Override
@@ -114,7 +114,7 @@ public class RoadServiceImpl implements RoadService {
     @Override
     public PageResult<RoadRespVO> getRoadPage(RoadPageReqVO pageReqVO) {
-        PageResult<RoadDO> pageResult = roadInterceptMapper.selectPage(pageReqVO);
+        PageResult<RoadDO> pageResult = roadInterceptMapper.selectForPage(pageReqVO);
         PageResult<RoadRespVO> page = BeanUtils.toBean(pageResult, RoadRespVO.class);
         addDataInspectionPlan(page.getList());
         return page;