From 3c98fad235c8b253d29b1864b8b551597d0378f3 Mon Sep 17 00:00:00 2001 From: xuyuncong <3422692813@qq.com> Date: Mon, 1 Dec 2025 17:16:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/base/entity/RepairRecords.java | 3 ++ .../base/service/RepairRecordsService.java | 2 +- .../impl/RepairRecordsServiceImpl.java | 2 +- .../admin/DlRepairTicketsController.java | 5 +- .../service/DlRepairTicketsService.java | 2 +- .../impl/DlRepairTicketsServiceImpl.java | 51 ++++++++++--------- .../tickets/vo/DlRepairTicketsRespVO.java | 2 + .../mapper/base/RepairRecordsMapper.xml | 1 + .../mapper/tickets/DlRepairTicketsMapper.xml | 2 +- 9 files changed, 39 insertions(+), 31 deletions(-) diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/entity/RepairRecords.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/entity/RepairRecords.java index 0ac425f0..1fb3f4ea 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/entity/RepairRecords.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/entity/RepairRecords.java @@ -55,4 +55,7 @@ public class RepairRecords extends TenantBaseDO { */ private String otherData; + /** 输入备注 */ + private String inputRemark; + } diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/RepairRecordsService.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/RepairRecordsService.java index 5c9e2899..8d05022f 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/RepairRecordsService.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/RepairRecordsService.java @@ -36,7 +36,7 @@ public interface RepairRecordsService extends IService { * @return void **/ - void saveRepairRecord(String ticketId, String repairItemId, String type, String remark, String images, String otherData); + void saveRepairRecord(String ticketId, String repairItemId, String type, String remark, String inputRemark, String images, String otherData); /** * 根据条件查询维修记录 diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairRecordsServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairRecordsServiceImpl.java index d36fbab5..f8047723 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairRecordsServiceImpl.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairRecordsServiceImpl.java @@ -85,7 +85,7 @@ public class RepairRecordsServiceImpl extends ServiceImpl pickCar(@RequestParam("id") String id, @RequestParam(value = "image", required = false) String image, - @RequestParam(value = "remark", required = false) String remark) { - dlRepairTicketsService.pickCar(id, image, remark); + @RequestParam(value = "remark", required = false) String remark, + @RequestParam(value = "inputRemark", required = false) String inputRemark) { + dlRepairTicketsService.pickCar(id, image, remark,inputRemark); return CommonResult.ok(); } diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTicketsService.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTicketsService.java index fd337499..093f9365 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTicketsService.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTicketsService.java @@ -288,7 +288,7 @@ public interface DlRepairTicketsService extends IService { * @return void **/ - void pickCar(String id, String image, String remark); + void pickCar(String id, String image, String remark, String inputRemark); /** * @Author 许 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 d8d09b56..c23abd9a 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 @@ -224,7 +224,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl { @@ -313,7 +313,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl itemList = ticketsRespVO.getItemList(); List collect = itemList.stream().filter(item -> item.getItemType().equals("02")).collect(Collectors.toList()); ticketsRespVO.setPartStatus(CollectionUtil.isEmpty(collect) ? "01" : "02"); - if(RepairConstants.REPAIR_TYPE_A.equals(ticketsRespVO.getTicketType())) { + if (RepairConstants.REPAIR_TYPE_A.equals(ticketsRespVO.getTicketType())) { // 工单进行状态 默认是等待接单 ticketsRespVO.setTicketsWorkStatus(TicketsWorkStatusEnum.WAITING_RECEIVING.getCode()); // 工单状态 默认是待派工 @@ -342,7 +342,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl BItems = new ArrayList<>(); - if (CollectionUtil.isNotEmpty(bIds)){ - List BItemList = titemService.list(new LambdaQueryWrapper().in(DlRepairTitem::getTicketId, bIds)); - BItems = BItemList.stream().map(item -> BeanUtil.toBean(item, DlRepairTitemReqVO.class)).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(bIds)) { + List BItemList = titemService.list(new LambdaQueryWrapper().in(DlRepairTitem::getTicketId, bIds)); + BItems = BItemList.stream().map(item -> BeanUtil.toBean(item, DlRepairTitemReqVO.class)).collect(Collectors.toList()); - //处理项目 取项目 - List BProject = BItems.stream().filter(item -> item.getItemType().equals("01")).collect(Collectors.toList()); - if (CollectionUtil.isNotEmpty(BProject)) { - Set ids = BProject.stream().map(DlRepairTitemReqVO::getProjectId).collect(Collectors.toSet()); - List repairProjects = projectService.listByIds(ids); - BItems.forEach(item -> repairProjects.stream().filter(i -> i.getId().equals(item.getProjectId())).findFirst().ifPresent(item::setProject)); + //处理项目 取项目 + List BProject = BItems.stream().filter(item -> item.getItemType().equals("01")).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(BProject)) { + Set ids = BProject.stream().map(DlRepairTitemReqVO::getProjectId).collect(Collectors.toSet()); + List repairProjects = projectService.listByIds(ids); + BItems.forEach(item -> repairProjects.stream().filter(i -> i.getId().equals(item.getProjectId())).findFirst().ifPresent(item::setProject)); + } + result.setBProjects(BProject); } - result.setBProjects(BProject);} if (ifApp) { //app新增逻辑 if (CollectionUtil.isNotEmpty(projects)) { @@ -927,7 +928,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpllambdaUpdate() @@ -970,7 +971,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpllambdaUpdate() @@ -1094,7 +1095,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl progressMap, - Map> teamItemsMap, - String ticketId, boolean zjFinished, boolean skFinished, - boolean jsgdFinished, boolean jcFinished, boolean jssqFinished) { + Map> teamItemsMap, + String ticketId, boolean zjFinished, boolean skFinished, + boolean jsgdFinished, boolean jcFinished, boolean jssqFinished) { // 处理总检班组 String zjWorkType = "zj"; // 总检班组编码 String zjWorkTypeName = "总检"; // 总检班组名称 @@ -3537,14 +3538,14 @@ public class DlRepairTicketsServiceImpl extends ServiceImpllambdaUpdate() .eq(DlRepairTickets::getId, id) .set(DlRepairTickets::getIsPickCar, 1)); /* 2.步骤表里添加接车*/ - repairRecordsService.saveRepairRecord(id, null, RecordTypeEnum.PICKCAR.getCode(), "接车", image); + repairRecordsService.saveRepairRecord(id, null, RecordTypeEnum.PICKCAR.getCode(), "接车", inputRemark, image, null); } /** diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTicketsRespVO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTicketsRespVO.java index fc59c7a1..e9bb6b1f 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTicketsRespVO.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTicketsRespVO.java @@ -117,4 +117,6 @@ public class DlRepairTicketsRespVO extends DlRepairTickets { private String billedRemark; private Integer hasChildTickets; private List bTickets; + /** 备注 */ + private String inputRemark; } diff --git a/dl-module-repair/src/main/resources/mapper/base/RepairRecordsMapper.xml b/dl-module-repair/src/main/resources/mapper/base/RepairRecordsMapper.xml index e6f9a4c7..5d0ed037 100644 --- a/dl-module-repair/src/main/resources/mapper/base/RepairRecordsMapper.xml +++ b/dl-module-repair/src/main/resources/mapper/base/RepairRecordsMapper.xml @@ -18,6 +18,7 @@ + diff --git a/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTicketsMapper.xml b/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTicketsMapper.xml index d533ea4b..13586dee 100644 --- a/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTicketsMapper.xml +++ b/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTicketsMapper.xml @@ -871,7 +871,7 @@ SELECT ${ew.sqlSelect} FROM dl_repair_tickets drt LEFT JOIN dl_repair_records drr ON drt.id = drr.ticket_id - where 1=1 + where 1=1 and drt.deleted = '0' AND ${ew.sqlSegment}