From cc97e7b40cc53a78b07d460c956b962ea56339ce Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期一, 17 六月 2024 19:59:49 +0800
Subject: [PATCH] zjh 本地 2024/06/17 --1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
index db53294..dec7927 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -144,7 +144,7 @@
if (null != detailList && detailList.size() > 0) {
LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
- wq.groupBy(TjProject::getHisXmbm);
+// wq.groupBy(TjProject::getHisXmbm);
wq.in(TjProject::getDeptId, "241","317");
List<TjProject> projects = projectService.list(wq);
if (null != projects && projects.size() > 0) {
@@ -237,7 +237,7 @@
if (null != detailLists && detailLists.size() > 0) {
LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
wq.in(TjProject::getProId, detailLists.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
- wq.groupBy(TjProject::getHisXmbm);
+// wq.groupBy(TjProject::getHisXmbm);
wq.in(TjProject::getDeptId, "247", "248", "249", "250", "251", "252", "271", "273", "274", "275","298");
List<TjProject> projects = projectService.list(wq);
if (null != projects && projects.size() > 0) {
@@ -333,7 +333,7 @@
if (null != details && details.size() > 0) {
LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
wq.in(TjProject::getProId, details.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
- wq.groupBy(TjProject::getHisXmbm);
+// wq.groupBy(TjProject::getHisXmbm);
wq.in(TjProject::getDeptId, "100", "240", "253", "254", "255", "257", "258", "259", "269", "270");
// wq.isNull(TjProject::getDeptId);
List<TjProject> projects = projectService.list(wq);
--
Gitblit v1.8.0