From fcc5d56c4fa7b269d96b8ef66a527fa6a7c90450 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期三, 28 二月 2024 19:10:18 +0800
Subject: [PATCH] zjh 本地 2024/02/28 -2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 2 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java | 4 ++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java | 2 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java | 5 +++++
4 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
index 32a9b70..ee8ed63 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -724,6 +724,7 @@
//20230323鍒ゆ柇椤圭洰宸叉
wq.ne(TjOrderDetail::getTjStatus, 0);
wq.ne(TjOrderDetail::getProId,projectService.getHuaYanProId());
+ wq.eq(TjOrderDetail::getProId,projectService.getNotCcCtXdtProId());
List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.list(wq);
//閬嶅巻浣撴璁板綍 灏嗛」鐩殑鍏蜂綋淇℃伅
@@ -741,6 +742,7 @@
LambdaQueryWrapper<TjOrderRemark> wqq = new LambdaQueryWrapper<>();
wqq.eq(TjOrderRemark::getTjNumber, tjNumber);
wqq.ne(TjOrderRemark::getDeptId,"241");
+ wqq.in(TjOrderRemark::getDeptId,"269","270","253","254","255","257");
List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);
for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
index 43956b1..8e003c0 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
@@ -158,4 +158,8 @@
List<Long> getHuaYanKsProId(String ksId);
+
+
+ @Select("SELECT a.pro_id FROM tj_project a JOIN sys_dept b ON a.dept_id=b.dept_id WHERE a.deleted=0 AND b.dept_id in(269,270,253,254,255,257) AND a.need_report='Y'")
+ List<Long> getNotCcCtXdtProId();
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java
index 2a39360..68763e3 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java
@@ -119,5 +119,7 @@
List<Long> getHuaYanKsProId(String ksId);
+ List<Long> getNotCcCtXdtProId();
+
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
index d36c51d..785e242 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
@@ -231,6 +231,11 @@
return tjProjectMapper.getHuaYanKsProId(ksId);
}
+ @Override
+ public List<Long> getNotCcCtXdtProId() {
+ return tjProjectMapper.getNotCcCtXdtProId();
+ }
+
/**
* 閫掑綊鍒楄〃
*/
--
Gitblit v1.8.0