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())){ // 更新工单子表