dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dianliang:2114d2a0cfefab9153d148ea60bf6871239115f0
Branches Tags
dianliang:master
dianliang:repair
dianliang:dev
...
compare: dianliang:345aaa77af2ce4c23d8da6e57e78cd4ca8784b88
Branches Tags
dianliang:repair
dianliang:dev
dianliang:master

2 Commits
2114d2a0cf ... 345aaa77af

Author SHA1 Message Date
PQZ
345aaa77af Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev 2024-10-18 23:48:07 +08:00
PQZ
8fcdb5ef18 111 2024-10-18 23:48:04 +08:00
2 changed files with 5 additions and 0 deletions
Show Stats Expand all files Collapse all files

2
dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
View File

@ -274,6 +274,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
List<RepairProject> repairProjects = projectService.listByIds(ids); List<RepairProject> repairProjects = projectService.listByIds(ids);
items.forEach(item -> repairProjects.stream().filter(i -> i.getId().equals(item.getProjectId())).findFirst().ifPresent(item::setProject)); items.forEach(item -> repairProjects.stream().filter(i -> i.getId().equals(item.getProjectId())).findFirst().ifPresent(item::setProject));
} }
result.setProjects(projects);
// 取配件 // 取配件
List<DlRepairTitemReqVO> wares = items.stream().filter(item -> item.getItemType().equals("02")).collect(Collectors.toList()); List<DlRepairTitemReqVO> wares = items.stream().filter(item -> item.getItemType().equals("02")).collect(Collectors.toList());
@ -282,6 +283,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
List<RepairWares> repairWares = waresService.listByIds(ids); List<RepairWares> repairWares = waresService.listByIds(ids);
items.forEach(item -> repairWares.stream().filter(i -> i.getId().equals(item.getPartId())).findFirst().ifPresent(item::setWare)); items.forEach(item -> repairWares.stream().filter(i -> i.getId().equals(item.getPartId())).findFirst().ifPresent(item::setWare));
} }
result.setWares(wares);
// 取附加 // 取附加
List<DlRepairTitemReqVO> others = items.stream().filter(item -> item.getItemType().equals("03")).collect(Collectors.toList()); List<DlRepairTitemReqVO> others = items.stream().filter(item -> item.getItemType().equals("03")).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(others)) { if (CollectionUtil.isNotEmpty(others)) {

3
dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTicketsRespVO.java
View File

@ -45,4 +45,7 @@ public class DlRepairTicketsRespVO extends DlRepairTickets {
private CustomerMain customerInfo; private CustomerMain customerInfo;
/** 车辆信息 */ /** 车辆信息 */
private CarMainRespVO carInfo; private CarMainRespVO carInfo;
List<DlRepairTitemReqVO> wares;
List<DlRepairTitemReqVO> projects;
} }