From a4fad992983b01142244ec6ed99966e1ea6f3733 Mon Sep 17 00:00:00 2001 From: xiaofajia <1665375861@qq.com> Date: Wed, 27 Nov 2024 11:11:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=81=9A=E4=BA=86?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=BB=A5=E5=90=8E=EF=BC=8C=E6=8E=92=E5=88=97?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E9=83=BD=E8=A6=81=E5=88=B0=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E4=BD=8D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DlRepairSoServiceImpl.java | 16 ++++++++++++++++ .../service/DlRepairTicketsService.java | 9 +++++++++ .../impl/DlRepairTicketsServiceImpl.java | 19 +++++++++++++++++++ .../impl/DlRepairTitemServiceImpl.java | 7 +++++++ .../impl/DlTicketWaresServiceImpl.java | 19 +++++++++++++++++++ 5 files changed, 70 insertions(+) diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java index c4bdcc86..811a1336 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java @@ -379,6 +379,14 @@ public class DlRepairSoServiceImpl extends ServiceImpl { * @param id id **/ CustomerAndCarVO getCusAndCarById(String id); + + /** + * 用于刷新工单的更新时间 + * + * @author 小李 + * @date 10:31 2024/11/27 + * @param id 工单ID + **/ + void refreshUpdateTime(String id); } 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 44bf316f..8d1ca7da 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 @@ -443,6 +443,10 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl recordTypeList = dictDataApi.getDictDataList(DICT_REPAIR_RECORDS_TYPE); Map typeMap = recordTypeList.stream().collect(Collectors.toMap(DictDataRespDTO::getValue, DictDataRespDTO::getLabel)); result.setRecords(records.stream().peek(item -> item.setType(typeMap.get(item.getType()))).collect(Collectors.toList())); + + // 更新主表时间 + refreshUpdateTime(id); + return result; } @@ -1862,6 +1866,21 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl() + .set(DlRepairTickets::getUpdateTime, LocalDateTime.now()) + .eq(DlRepairTickets::getId, id) + ); + } } diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTitemServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTitemServiceImpl.java index a15315ac..e633dfcd 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTitemServiceImpl.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTitemServiceImpl.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.tickets.service.impl; +import cn.hutool.core.util.ObjectUtil; import cn.iocoder.yudao.module.tickets.entity.DlRepairTitem; import cn.iocoder.yudao.module.tickets.mapper.DlRepairTitemMapper; import cn.iocoder.yudao.module.tickets.service.DlRepairTicketsService; @@ -70,6 +71,10 @@ public class DlRepairTitemServiceImpl extends ServiceImpl getProjList(String ticketId,String isOpen) { + // 更新工单主表时间 + repairTicketsService.removeTicketById(ticketId); return dlRepairTitemMapper.selectProjList(ticketId,isOpen); } } diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlTicketWaresServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlTicketWaresServiceImpl.java index 7323477e..2418d9ac 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlTicketWaresServiceImpl.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlTicketWaresServiceImpl.java @@ -243,6 +243,11 @@ public class DlTicketWaresServiceImpl extends ServiceImpl repairWorkerService.sentMessage(id, "您有新的配件申请单需要审核")); } + + // 更新工单主表时间 + if (ObjectUtil.isNotEmpty(respVO.getTicketId())){ + repairTicketsService.refreshUpdateTime(respVO.getTicketId()); + } } /** @@ -255,6 +260,11 @@ public class DlTicketWaresServiceImpl extends ServiceImpl Date: Wed, 27 Nov 2024 14:56:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=81=9A=E4=BA=86?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=BB=A5=E5=90=8E=EF=BC=8C=E6=8E=92=E5=88=97?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E9=83=BD=E8=A6=81=E5=88=B0=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E4=BD=8D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DlRepairTicketsServiceImpl.java | 42 +++++++++++++++++-- .../impl/DlRepairTitemServiceImpl.java | 4 +- 2 files changed, 40 insertions(+), 6 deletions(-) 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 8d1ca7da..4c047ff9 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 @@ -510,6 +510,9 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl item.getValue().equals(worker.getWorkType())).findFirst().orElse(null); String message = String.format("您的爱车%s已由%s %s接单了", tickets.getCarNo(), (dictDataRespDTO != null ? dictDataRespDTO.getLabel() : "维修工"), worker.getUserName()); repairWorkerService.sentMessageToCus(id, message, false); + + // 更新工单主表时间 + refreshUpdateTime(id); } /** @@ -1075,6 +1085,9 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl() - .set(DlRepairTickets::getUpdateTime, LocalDateTime.now()) - .eq(DlRepairTickets::getId, id) - ); + if (ObjectUtil.isNotEmpty(id)){ + baseMapper.update(new LambdaUpdateWrapper() + .set(DlRepairTickets::getUpdateTime, LocalDateTime.now()) + .eq(DlRepairTickets::getId, id) + ); + } } } diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTitemServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTitemServiceImpl.java index e633dfcd..24f0f6b2 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTitemServiceImpl.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTitemServiceImpl.java @@ -57,7 +57,7 @@ public class DlRepairTitemServiceImpl extends ServiceImpl getProjectList(String ticketId){ - return baseMapper.selectList(new LambdaQueryWrapper().and(item -> { + return baseMapper.selectList(new LambdaQueryWrapper().and(item -> { item.eq(DlRepairTitem::getItemType, "01") .eq(DlRepairTitem::getTicketId, ticketId); })); @@ -162,7 +162,7 @@ public class DlRepairTitemServiceImpl extends ServiceImpl getProjList(String ticketId,String isOpen) { // 更新工单主表时间 - repairTicketsService.removeTicketById(ticketId); + repairTicketsService.refreshUpdateTime(ticketId); return dlRepairTitemMapper.selectProjList(ticketId,isOpen); } }