Merge remote-tracking branch 'origin/dev' into dev

wangqian
2 parents e45e4fb4 60304f37
Showing 4 changed files with 39 additions and 4 deletions
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/AppGardenWorkOrderPageReqVO.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/AppGardenWorkOrderReqVO.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoMapper.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java
@@ -3,6 +3,7 @@ package com.zteits.urbanops.module.workorder.controller.app.garden.vo;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
 import com.zteits.urbanops.module.workorder.controller.admin.maininfo.vo.MainInfoPageReqVO;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 /**
@@ -13,5 +14,12 @@ import lombok.Data;
  */
 @Schema(description = "管理后台 - 工单信息分页 Request VO")
 @Data
-public class AppGardenWorkOrderPageReqVO extends MainInfoPageReqVO {
+public class AppGardenWorkOrderPageReqVO extends PageParam {
+
+    @Schema(description = "搜索类型:1 位置 2 工单名称 3 情况描述 4 工单编号", example = "1")
+    private String type;
+
+    @Schema(description = "搜索输入内容", example = "祭旁")
+    private String searchContent;
+
 }
@@ -25,6 +25,9 @@ public class AppGardenWorkOrderReqVO {
     @NotNull(message = "道路ID不能为空")
     private Long roadId;
+    @Schema(description = "道路名称", example = "测试道路")
+    private String roadName;
+
     @Schema(description = "问题图片", example = "9184")
     private List<String> imgs;
@@ -52,7 +52,7 @@ public interface MainInfoMapper extends BaseMapperX&lt;MainInfoDO&gt; {
     default PageResult<MainInfoDO> selectPage(Long loginUserId,MainInfoPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<MainInfoDO>()
                 .eqIfPresent(MainInfoDO::getBusiLine, reqVO.getBusiLine())
-                .eqIfPresent(MainInfoDO::getOrderNo, reqVO.getOrderNo())
+                .likeIfPresent(MainInfoDO::getOrderNo, reqVO.getOrderNo())
                 .likeIfPresent(MainInfoDO::getOrderName, reqVO.getOrderName())
                 .eqIfPresent(MainInfoDO::getSourceId, reqVO.getSourceId())
                 .likeIfPresent(MainInfoDO::getSourceName, reqVO.getSourceName())
@@ -70,13 +70,13 @@ public interface MainInfoMapper extends BaseMapperX&lt;MainInfoDO&gt; {
                 .eqIfPresent(MainInfoDO::getLatLonType, reqVO.getLatLonType())
                 .eqIfPresent(MainInfoDO::getLat, reqVO.getLat())
                 .eqIfPresent(MainInfoDO::getLon, reqVO.getLon())
-                .eqIfPresent(MainInfoDO::getLonLatAddress, reqVO.getLonLatAddress())
+                .likeIfPresent(MainInfoDO::getLonLatAddress, reqVO.getLonLatAddress())
                 .eqIfPresent(MainInfoDO::getThirdWorkNo, reqVO.getThirdWorkNo())
                 .eqIfPresent(MainInfoDO::getThirdPushState, reqVO.getThirdPushState())
                 .eqIfPresent(MainInfoDO::getBuzStatus, reqVO.getBuzStatus())
                 .eqIfPresent(MainInfoDO::getStatus, reqVO.getStatus())
                 .eqIfPresent(MainInfoDO::getProcessInstanceId, reqVO.getProcessInstanceId())
-                .eqIfPresent(MainInfoDO::getRemark, reqVO.getRemark())
+                .likeIfPresent(MainInfoDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(MainInfoDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(MainInfoDO::getId));
     }
@@ -243,6 +243,30 @@ public class BpmGardenServiceImpl implements BpmGardenService{
     @Override
     public PageResult<BpmGardenWorkOrderDO> getGardenInspectionPage(Long loginUserId, AppGardenWorkOrderPageReqVO pageVO) {
         MainInfoPageReqVO mainInfoPageReqVo = BeanUtils.toBean(pageVO,MainInfoPageReqVO.class);
+        String type = pageVO.getType();
+        String content = pageVO.getSearchContent();
+        if(ObjectUtils.isNotAllEmpty(type)){
+            if("1".equals(type)){
+                if(ObjectUtils.isNotAllEmpty(content)){mainInfoPageReqVo.setLonLatAddress(content);}
+            } else
+            if("2".equals(type)){
+                if(ObjectUtils.isNotAllEmpty(content)){mainInfoPageReqVo.setOrderName(content);}
+            }else
+            if("3".equals(type)){
+                if(ObjectUtils.isNotAllEmpty(content)){mainInfoPageReqVo.setRemark(content);}
+            } else
+            if("4".equals(type)){
+                if(ObjectUtils.isNotAllEmpty(content)){mainInfoPageReqVo.setOrderNo(content);}
+            }else {
+                if (ObjectUtils.isNotAllEmpty(content)) {
+                    mainInfoPageReqVo.setOrderName(content);
+                }
+            }
+        }else {//默认是工单名称
+            if (ObjectUtils.isNotAllEmpty(content)) {
+                mainInfoPageReqVo.setOrderName(content);
+            }
+        }
         PageResult<MainInfoDO> pageList = workOrderMapper.selectPage(loginUserId, mainInfoPageReqVo);
         PageResult<BpmGardenWorkOrderDO>  targetList = BeanUtils.toBean(pageList,BpmGardenWorkOrderDO.class);
         return targetList;