BJ_FS / urbanops

Commit d5f081fec22ce3b7f3482b1f56e60d8bb7f44f47

Authored by wangqian
2 parents e45e4fb4 60304f37

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

Inline Side-by-side
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
  View file @d5f081f
... ... @@ -3,6 +3,7 @@ package com.zteits.urbanops.module.workorder.controller.app.garden.vo;
3 3 import com.zteits.urbanops.framework.common.pojo.PageParam;
4 4 import com.zteits.urbanops.module.workorder.controller.admin.maininfo.vo.MainInfoPageReqVO;
5 5 import io.swagger.v3.oas.annotations.media.Schema;
  6 +import jakarta.validation.constraints.NotNull;
6 7 import lombok.Data;
7 8  
8 9 /**
... ... @@ -13,5 +14,12 @@ import lombok.Data;
13 14 */
14 15 @Schema(description = "管理后台 - 工单信息分页 Request VO")
15 16 @Data
16   -public class AppGardenWorkOrderPageReqVO extends MainInfoPageReqVO {
  17 +public class AppGardenWorkOrderPageReqVO extends PageParam {
  18 +
  19 + @Schema(description = "搜索类型:1 位置 2 工单名称 3 情况描述 4 工单编号", example = "1")
  20 + private String type;
  21 +
  22 + @Schema(description = "搜索输入内容", example = "祭旁")
  23 + private String searchContent;
  24 +
17 25 }
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/AppGardenWorkOrderReqVO.java
  View file @d5f081f
... ... @@ -25,6 +25,9 @@ public class AppGardenWorkOrderReqVO {
25 25 @NotNull(message = "道路ID不能为空")
26 26 private Long roadId;
27 27  
  28 + @Schema(description = "道路名称", example = "测试道路")
  29 + private String roadName;
  30 +
28 31 @Schema(description = "问题图片", example = "9184")
29 32 private List<String> imgs;
30 33  
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoMapper.java
  View file @d5f081f
... ... @@ -52,7 +52,7 @@ public interface MainInfoMapper extends BaseMapperX&lt;MainInfoDO&gt; {
52 52 default PageResult<MainInfoDO> selectPage(Long loginUserId,MainInfoPageReqVO reqVO) {
53 53 return selectPage(reqVO, new LambdaQueryWrapperX<MainInfoDO>()
54 54 .eqIfPresent(MainInfoDO::getBusiLine, reqVO.getBusiLine())
55   - .eqIfPresent(MainInfoDO::getOrderNo, reqVO.getOrderNo())
  55 + .likeIfPresent(MainInfoDO::getOrderNo, reqVO.getOrderNo())
56 56 .likeIfPresent(MainInfoDO::getOrderName, reqVO.getOrderName())
57 57 .eqIfPresent(MainInfoDO::getSourceId, reqVO.getSourceId())
58 58 .likeIfPresent(MainInfoDO::getSourceName, reqVO.getSourceName())
... ... @@ -70,13 +70,13 @@ public interface MainInfoMapper extends BaseMapperX&lt;MainInfoDO&gt; {
70 70 .eqIfPresent(MainInfoDO::getLatLonType, reqVO.getLatLonType())
71 71 .eqIfPresent(MainInfoDO::getLat, reqVO.getLat())
72 72 .eqIfPresent(MainInfoDO::getLon, reqVO.getLon())
73   - .eqIfPresent(MainInfoDO::getLonLatAddress, reqVO.getLonLatAddress())
  73 + .likeIfPresent(MainInfoDO::getLonLatAddress, reqVO.getLonLatAddress())
74 74 .eqIfPresent(MainInfoDO::getThirdWorkNo, reqVO.getThirdWorkNo())
75 75 .eqIfPresent(MainInfoDO::getThirdPushState, reqVO.getThirdPushState())
76 76 .eqIfPresent(MainInfoDO::getBuzStatus, reqVO.getBuzStatus())
77 77 .eqIfPresent(MainInfoDO::getStatus, reqVO.getStatus())
78 78 .eqIfPresent(MainInfoDO::getProcessInstanceId, reqVO.getProcessInstanceId())
79   - .eqIfPresent(MainInfoDO::getRemark, reqVO.getRemark())
  79 + .likeIfPresent(MainInfoDO::getRemark, reqVO.getRemark())
80 80 .betweenIfPresent(MainInfoDO::getCreateTime, reqVO.getCreateTime())
81 81 .orderByDesc(MainInfoDO::getId));
82 82 }
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java
  View file @d5f081f
... ... @@ -243,6 +243,30 @@ public class BpmGardenServiceImpl implements BpmGardenService{
243 243 @Override
244 244 public PageResult<BpmGardenWorkOrderDO> getGardenInspectionPage(Long loginUserId, AppGardenWorkOrderPageReqVO pageVO) {
245 245 MainInfoPageReqVO mainInfoPageReqVo = BeanUtils.toBean(pageVO,MainInfoPageReqVO.class);
  246 + String type = pageVO.getType();
  247 + String content = pageVO.getSearchContent();
  248 + if(ObjectUtils.isNotAllEmpty(type)){
  249 + if("1".equals(type)){
  250 + if(ObjectUtils.isNotAllEmpty(content)){mainInfoPageReqVo.setLonLatAddress(content);}
  251 + } else
  252 + if("2".equals(type)){
  253 + if(ObjectUtils.isNotAllEmpty(content)){mainInfoPageReqVo.setOrderName(content);}
  254 + }else
  255 + if("3".equals(type)){
  256 + if(ObjectUtils.isNotAllEmpty(content)){mainInfoPageReqVo.setRemark(content);}
  257 + } else
  258 + if("4".equals(type)){
  259 + if(ObjectUtils.isNotAllEmpty(content)){mainInfoPageReqVo.setOrderNo(content);}
  260 + }else {
  261 + if (ObjectUtils.isNotAllEmpty(content)) {
  262 + mainInfoPageReqVo.setOrderName(content);
  263 + }
  264 + }
  265 + }else {//默认是工单名称
  266 + if (ObjectUtils.isNotAllEmpty(content)) {
  267 + mainInfoPageReqVo.setOrderName(content);
  268 + }
  269 + }
246 270 PageResult<MainInfoDO> pageList = workOrderMapper.selectPage(loginUserId, mainInfoPageReqVo);
247 271 PageResult<BpmGardenWorkOrderDO> targetList = BeanUtils.toBean(pageList,BpmGardenWorkOrderDO.class);
248 272 return targetList;
... ...