From ca356d5f7fc46cf1eaf72895481a973769a79c4e Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期五, 09 八月 2024 17:37:17 +0800 Subject: [PATCH] sql字段调整 --- ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 8 ++++++-- ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java | 6 +++++- ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 5 ----- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java index 40b2af9..c33a62c 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java @@ -42,7 +42,11 @@ */ private String serialNumber; - private String pointTag; + private Boolean provinceTag; + + private Boolean importantTag; + + private Boolean importantCommandImageTag; /** * 鏄惁閲嶇偣鐐逛綅 diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java index b9a473e..a6c611b 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java @@ -343,11 +343,6 @@ public Result distributePage(DistributeWorkOrderQuery query) { IPage<WorkOrderVO> page = PageUtil.getPage(query, WorkOrderVO.class); baseMapper.distributePage(page, query); - page.getRecords().stream().forEach(workOrder -> { - if (StringUtils.hasText(workOrder.getPointTag()) && workOrder.getPointTag().contains(IMPORTANT)) { - workOrder.setImportant(Boolean.TRUE); - } - }); return Result.ok().data(page).total(page.getTotal()); } diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml index 2576775..667eded 100644 --- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml +++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml @@ -47,7 +47,9 @@ wo.*, u.unit_name, p.yw_person_name, - yp.point_tag, + yp.province_tag, + yp.important_tag, + yp.important_command_image_tag, odr.create_time as distributeTime, su.nick_name as realName FROM @@ -72,7 +74,9 @@ SELECT wo.id, wod.create_time, - yp.point_tag + yp.province_tag, + yp.important_tag, + yp.important_command_image_tag FROM t_work_order wo INNER JOIN t_yw_point yp ON yp.serial_number = wo.serial_number AND yp.deleted = 0 -- Gitblit v1.8.0