From 62a3b99ee38ac963fd7d0d8e411bf9c3827e2946 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期五, 26 一月 2024 18:01:53 +0800
Subject: [PATCH] 团队统计
---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java | 8 ++++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 14 --------------
ltkj-admin/src/main/java/com/ltkj/web/controller/system/GroupInspectionController.java | 34 +++++++++++++++++++++++++++++++++-
3 files changed, 41 insertions(+), 15 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);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
index 2661014..2402a43 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
@@ -82,20 +82,6 @@
public AjaxResult getlist(@RequestParam(required = false) @ApiParam(value = "椤圭洰鍚嶇О") String proName,
@RequestParam(required = false) @ApiParam(value = "妫�鏌ョ被鍒�") String checkType,
@RequestParam(required = false) @ApiParam(value = "閮ㄩ棬id") String deptId) {
-// LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>();
-// wq0.eq(TjProject::getProParentId, 0);
-// if(null !=proName){
-// wq0.like(TjProject::getProName,proName);
-// }
-// if(null !=checkType){
-// wq0.like(TjProject::getProCheckType,checkType);
-// }
-// if(null !=deptId){
-// wq0.like(TjProject::getDeptId,deptId);
-// }
-//
-// List<TjProject> tjProjects = tjProjectService.list(wq0);
-
//涓婇潰鐨勬崲sql
final List<TjProject> tjProjects = tjProjectService.getProBySqlAndName(proName, checkType, deptId);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java
index 7a20d1c..27573d3 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java
@@ -202,6 +202,14 @@
@JsonSerialize(using = ToStringSerializer.class)
private Long isPositive;
+
+
+ @TableField(exist = false)
+ private String tjNumber;
+
+ @TableField(exist = false)
+ private String cusName;
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
--
Gitblit v1.8.0