养护计划优化提交

王富生
1 parent 20e63a6f
Showing 7 changed files with 11 additions and 11 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanCommitRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanDetailMapper.java
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/MaintainPlanDetailMapper.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/road/RoadInterceptMapper.java
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml
@@ -60,7 +60,7 @@ public class InspectionPlanCommitRespVO {
     @Schema(description = "巡检照片")
     @ExcelProperty("巡检照片")
     @TableField(typeHandler = StringListTypeHandler.class)
-    private List<String> img;
+    private List<String> imgList;
     @Schema(description = "巡检结果: 1:正常;2:异常")
     @ExcelProperty("巡检结果: 1:正常;2:异常")
@@ -31,8 +31,8 @@ public interface InspectionPlanDetailMapper extends BaseMapperX&lt;InspectionPlanDe
             endTime = reqVO.getEndTime().atTime(23, 59, 59);
         }
         return selectPage(reqVO, new LambdaQueryWrapperX<InspectionPlanDetailDO>()
-                .eqIfPresent(InspectionPlanDetailDO::getBatchNo, reqVO.getBatchNo())
-                .eqIfPresent(InspectionPlanDetailDO::getPlanNo, reqVO.getPlanNo())
+                .likeIfPresent(InspectionPlanDetailDO::getBatchNo, reqVO.getBatchNo())
+                .likeIfPresent(InspectionPlanDetailDO::getPlanNo, reqVO.getPlanNo())
                 .eqIfPresent(InspectionPlanDetailDO::getBusiLine, reqVO.getBusiLine())
                 .eqIfPresent(InspectionPlanDetailDO::getCompanyId, reqVO.getCompanyId())
                 .eqIfPresent(InspectionPlanDetailDO::getDeptId, reqVO.getDeptId())
@@ -19,7 +19,7 @@ import org.apache.ibatis.annotations.Mapper;
 public interface InspectionPlanInterceptMapper extends BaseMapperX<InspectionPlanDO> {
     default PageResult<InspectionPlanDO> selectForPage(InspectionPlanPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<InspectionPlanDO>()
-                .eqIfPresent(InspectionPlanDO::getBatchNo, reqVO.getBatchNo())
+                .likeIfPresent(InspectionPlanDO::getBatchNo, reqVO.getBatchNo())
                 .likeIfPresent(InspectionPlanDO::getPlanName, reqVO.getPlanName())
                 .eqIfPresent(InspectionPlanDO::getPlanAttr, reqVO.getPlanAttr())
                 .eqIfPresent(InspectionPlanDO::getPlanTypeId, reqVO.getPlanTypeId())
@@ -26,8 +26,8 @@ public interface MaintainPlanDetailMapper extends BaseMapperX&lt;MaintainPlanDetail
     default PageResult<MaintainPlanDetailDO> selectPage(MaintainPlanDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<MaintainPlanDetailDO>()
-                .eqIfPresent(MaintainPlanDetailDO::getBatchNo, reqVO.getBatchNo())
-                .eqIfPresent(MaintainPlanDetailDO::getPlanNo, reqVO.getPlanNo())
+                .likeIfPresent(MaintainPlanDetailDO::getBatchNo, reqVO.getBatchNo())
+                .likeIfPresent(MaintainPlanDetailDO::getPlanNo, reqVO.getPlanNo())
                 .eqIfPresent(MaintainPlanDetailDO::getBusiLine, reqVO.getBusiLine())
                 .eqIfPresent(MaintainPlanDetailDO::getCompanyId, reqVO.getCompanyId())
                 .eqIfPresent(MaintainPlanDetailDO::getDeptId, reqVO.getDeptId())
@@ -39,7 +39,7 @@ public interface MaintainPlanDetailMapper extends BaseMapperX&lt;MaintainPlanDetail
                 .eqIfPresent(MaintainPlanDetailDO::getFinishState, reqVO.getFinishState())
                 .likeIfPresent(MaintainPlanDetailDO::getCreatorName, reqVO.getCreatorName())
                 .betweenIfPresent(MaintainPlanDetailDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(MaintainPlanDetailDO::getId));
+                .orderByAsc(MaintainPlanDetailDO::getId));
     }
     int deleteByBatchNo(@Param("batchNo") String batchNo);
@@ -20,7 +20,7 @@ public interface MaintainPlanInterceptMapper extends BaseMapperX&lt;MaintainPlanDO&gt;
     default PageResult<MaintainPlanDO> selectForPage(MaintainPlanPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<MaintainPlanDO>()
-                .eqIfPresent(MaintainPlanDO::getBatchNo, reqVO.getBatchNo())
+                .likeIfPresent(MaintainPlanDO::getBatchNo, reqVO.getBatchNo())
                 .likeIfPresent(MaintainPlanDO::getPlanName, reqVO.getPlanName())
                 .eqIfPresent(MaintainPlanDO::getPlanAttr, reqVO.getPlanAttr())
                 .eqIfPresent(MaintainPlanDO::getPlanTypeId, reqVO.getPlanTypeId())
@@ -32,10 +32,10 @@ public interface RoadInterceptMapper extends BaseMapperX&lt;RoadDO&gt; {
                 .eqIfPresent(RoadDO::getTreeArea, reqVO.getTreeArea())
                 .eqIfPresent(RoadDO::getStartingLatitude, reqVO.getStartingLatitude())
                 .eqIfPresent(RoadDO::getStartingLongitude, reqVO.getStartingLongitude())
-                .eqIfPresent(RoadDO::getStartingRemark, reqVO.getStartingRemark())
+                .likeIfPresent(RoadDO::getStartingRemark, reqVO.getStartingRemark())
                 .eqIfPresent(RoadDO::getEndLatitude, reqVO.getEndLatitude())
                 .eqIfPresent(RoadDO::getEndLongitude, reqVO.getEndLongitude())
-                .eqIfPresent(RoadDO::getEndRemark, reqVO.getEndRemark())
+                .likeIfPresent(RoadDO::getEndRemark, reqVO.getEndRemark())
                 .eqIfPresent(RoadDO::getRemark, reqVO.getRemark())
                 .eqIfPresent(RoadDO::getCompanyId, reqVO.getCompanyId())
                 .eqIfPresent(RoadDO::getDeptId, reqVO.getDeptId())
@@ -4,7 +4,7 @@
     <resultMap id="BaseResultMap" type="com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanCommitRespVO">
-            <result property="img" column="img" typeHandler="com.zteits.urbanops.framework.mybatis.core.type.StringArrayToListTypeHandler"/>
+            <result property="imgList" column="img" typeHandler="com.zteits.urbanops.framework.mybatis.core.type.StringArrayToListTypeHandler"/>
     </resultMap>
     <!--
         一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。