From 9155df2aeab5b0d95c89dd928dbaefbfbaeae9d1 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 05 九月 2024 17:10:35 +0800
Subject: [PATCH] zjh 2024-09-05
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/GroupInspectionController.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/GroupInspectionController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/GroupInspectionController.java
index 1695b6f..53b9554 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/GroupInspectionController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/GroupInspectionController.java
@@ -54,6 +54,9 @@
@Autowired
private ITjProjectService tjProjectService;
+ @Autowired
+ private IDictCompService dictCompService;
+
@GetMapping("/getDeptAndDwDeptByComp")
@ApiOperation(value = "鏍规嵁鍗曚綅鏌ヨ閮ㄩ棬鍜屽崟浣嶉儴闂ㄤ俊鎭�")
@@ -114,7 +117,9 @@
vo.setSex(record.getSex());
vo.setDepartment(record.getDepartment());
vo.setAge(record.getAge());
- vo.setCompany(record.getCompany());
+ if (record.getCompanyId()!=null){
+ vo.setCompany(dictCompService.getById(record.getCompanyId()).getCnName());
+ }
reservationPage.add(vo);
}
}
@@ -250,12 +255,39 @@
wq1.in(TjOrderDetail::getOrderId,orderIds);
wq1.eq(TjOrderDetail::getExceptionDesc,0);
final List<TjOrderDetail> list1 = tjOrderDetailService.list(wq1);
+ if (list1!=null){
+ for (TjOrderDetail tjOrderDetail : list1) {
+ final TjOrder byId = orderService.getById(tjOrderDetail.getOrderId());
+ if (byId!=null){
+ tjOrderDetail.setTjNumber(byId.getTjNumber());
+ final TjCustomer byId1 = customerService.getById(byId.getUserId());
+ tjOrderDetail.setCusName(byId1.getCusName());
+ }else {
+ tjOrderDetail.setTjNumber("鏈煡");
+ tjOrderDetail.setCusName("鏈煡");
+ }
+ }
+ }
LambdaQueryWrapper<TjOrderDetail> wq2=new LambdaQueryWrapper<>();
wq2.eq(TjOrderDetail::getProId,proId);
wq2.in(TjOrderDetail::getOrderId,orderIds);
wq2.eq(TjOrderDetail::getExceptionDesc,1);
final List<TjOrderDetail> list2 = tjOrderDetailService.list(wq2);
+ if(list2!=null){
+ for (TjOrderDetail tjOrderDetail : list2) {
+ final TjOrder byId = orderService.getById(tjOrderDetail.getOrderId());
+ if (byId!=null){
+ tjOrderDetail.setTjNumber(byId.getTjNumber());
+ final TjCustomer byId1 = customerService.getById(byId.getUserId());
+ tjOrderDetail.setCusName(byId1.getCusName());
+ }else {
+ tjOrderDetail.setTjNumber("鏈煡");
+ tjOrderDetail.setCusName("鏈煡");
+ }
+
+ }
+ }
map.put("project",tjProjectService.getById(proId));
map.put("zhengchang",list1);
--
Gitblit v1.8.0