From 5bb56d67edd8ba8d14e5fe79d7ba0c6c8df630e1 Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Tue, 21 Jan 2025 15:50:20 +0800
Subject: [PATCH] 1
---
.../tickets/service/impl/DlRepairTicketsServiceImpl.java | 7 +++----
.../resources/mapper/tickets/DlRepairTicketsMapper.xml | 2 +-
2 files changed, 4 insertions(+), 5 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 38ebc91a..a2e0e704 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
@@ -1159,9 +1159,9 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
//未结算
statusList = Arrays.asList("04","05","07","01");
}else if("zaichang".equals(repairTicketsReqVO.getTicketsStatus())){
- //在厂，就是没交车的
+ //在厂，就是没交车的,且不能是已作废和已完成的
repairTicketsReqVO.setIsHandover("0");
-// statusList = Arrays.asList("04","05","07","01","06","02");
+ statusList = Arrays.asList("04","05","07","01","06","02");
}else if("jinchang".equals(repairTicketsReqVO.getTicketsStatus())){
//进厂
statusList.add(TicketsStatusEnum.NO_WORK.getCode());
@@ -1171,7 +1171,6 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
}else if("yijiaoche".equals(repairTicketsReqVO.getTicketsStatus())){
//已交车
repairTicketsReqVO.setIsHandover("1");
-// statusList.add(TicketsStatusEnum.OVER.getCode());
}
if(!statusList.isEmpty()){
repairTicketsReqVO.setStatusList(statusList);
@@ -1728,7 +1727,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
workingIdList = repairTickets.stream().filter(item -> TicketsStatusEnum.WORKING.getCode().equals(item.getTicketsStatus())).map(DlRepairTickets::getId).collect(Collectors.toList());
workingNum = workingIdList.size();
//只要没交车都算在厂
- inCompanyIdList = repairTickets.stream().filter(item -> "0".equals(item.getIsHandover())).map(DlRepairTickets::getId).collect(Collectors.toList());
+ inCompanyIdList = repairTickets.stream().filter(item -> "0".equals(item.getIsHandover())).filter(item->!"03".equals(item.getTicketsStatus())).map(DlRepairTickets::getId).collect(Collectors.toList());
inCompanyNum = inCompanyIdList.size();
//只要没结算，都是未结算
List<String> noPayCodeList = Arrays.asList("04","05","07","01");
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 1d7f285a..97fcb593 100644
--- a/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTicketsMapper.xml
+++ b/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTicketsMapper.xml
@@ -372,7 +372,7 @@
</if>
left join dl_repair_titem drti
on drt.id = drti.ticket_id AND drti.deleted = '0' AND drti.item_type='01'
- where drt.deleted = '0'
+ where drt.deleted = '0' AND tickets_status!='03'
<if test="map.ticketNo != null and map.ticketNo != ''">
and (
drt.ticket_no like concat('%', #{map.ticketNo}, '%')