From edb81cb36ef2ff4560afdbe7918a747adbad998f Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期四, 29 二月 2024 10:58:26 +0800
Subject: [PATCH] zjh 本地 2024/02/29 -1

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java |    2 ++
 1 files changed, 2 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 ee8ed63..39a1433 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
@@ -725,6 +725,7 @@
         wq.ne(TjOrderDetail::getTjStatus, 0);
         wq.ne(TjOrderDetail::getProId,projectService.getHuaYanProId());
         wq.eq(TjOrderDetail::getProId,projectService.getNotCcCtXdtProId());
+        wq.notIn(TjOrderDetail::getProId,projectService.getNneedReprotProId());
         List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.list(wq);
 
         //閬嶅巻浣撴璁板綍 灏嗛」鐩殑鍏蜂綋淇℃伅
@@ -743,6 +744,7 @@
         wqq.eq(TjOrderRemark::getTjNumber, tjNumber);
         wqq.ne(TjOrderRemark::getDeptId,"241");
         wqq.in(TjOrderRemark::getDeptId,"269","270","253","254","255","257");
+        wqq.notIn(TjOrderRemark::getProId,projectService.getNneedReprotProId());
         List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);
 
         for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {

--
Gitblit v1.8.0