From 4ad6d6835b975d31230fdb0e7b19ddbbf041ca9d Mon Sep 17 00:00:00 2001 From: xiaofajia <1665375861@qq.com> Date: Sat, 19 Oct 2024 11:06:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=96=BD=E5=B7=A5-=E6=96=BD?= =?UTF-8?q?=E5=B7=A5=E4=B8=AD-=E6=96=BD=E5=B7=A5=E5=AE=8C=E6=88=90=20100%?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iocoder/yudao/common/TicketsWorkStatusEnum.java | 5 ++++- .../service/impl/DlRepairTicketsServiceImpl.java | 11 +++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/common/TicketsWorkStatusEnum.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/common/TicketsWorkStatusEnum.java index 685fd387..4f69339c 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/common/TicketsWorkStatusEnum.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/common/TicketsWorkStatusEnum.java @@ -26,7 +26,10 @@ public enum TicketsWorkStatusEnum { /** * 已完成 */ - END("03","已完成"); + END("03","已完成"), + + /** 待终检 */ + END_CHECK("05", "待终检"); /** * 角色code diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java index bc4ca37e..59b2691c 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java @@ -557,10 +557,13 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl() - .set(DlRepairTickets::getTicketsWorkStatus, respVO.getTicketsWorkStatus()) - .eq(DlRepairTickets::getId, respVO.getId()) - ); + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(DlRepairTickets::getId, respVO.getId()); + wrapper.set(DlRepairTickets::getTicketsWorkStatus, respVO.getTicketsWorkStatus()); + if (ObjectUtil.isNotEmpty(respVO.getIsFinish())){ + wrapper.set(DlRepairTickets::getIsFinish, respVO.getIsFinish()); + } + baseMapper.update(wrapper); } if(null!=respVO.getItem() && StringUtils.isNotEmpty(respVO.getItem().getItemStatus())){ // 更新工单子表