From ff7f47b70d93eace91e7ceda07d590cf26234628 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 13 一月 2026 09:54:38 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/intelligent_manufacture_wuhu
---
serverWuhu/src/main/java/com/doumee/service/business/impl/DeclaresServiceImpl.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/serverWuhu/src/main/java/com/doumee/service/business/impl/DeclaresServiceImpl.java b/serverWuhu/src/main/java/com/doumee/service/business/impl/DeclaresServiceImpl.java
index 4c4bc9b..07d2a38 100644
--- a/serverWuhu/src/main/java/com/doumee/service/business/impl/DeclaresServiceImpl.java
+++ b/serverWuhu/src/main/java/com/doumee/service/business/impl/DeclaresServiceImpl.java
@@ -1072,6 +1072,7 @@
queryWrapper.leftJoin(Company.class, Company::getId, Declares::getCompanyId);
queryWrapper.leftJoin(ProjectLabel.class, ProjectLabel::getId, Declares::getDiagnoseTypeId);
queryWrapper.eq(Declares::getIsdeleted, Constants.ZERO);
+ queryWrapper.ne(Declares::getStatus, Constants.ZERO);
queryWrapper.eq(Declares::getProjectId, param.getProjectId());
queryWrapper.apply(param.getAreaId()!=null,"t2.area_id =" +param.getAreaId());
queryWrapper.groupBy(Declares::getDiagnoseTypeId);
@@ -1237,6 +1238,7 @@
queryWrapper.leftJoin(Company.class, Company::getId, Declares::getCompanyId);
queryWrapper.leftJoin(Areas.class, Areas::getId, Company::getAreaId);
queryWrapper.eq(Declares::getIsdeleted, Constants.ZERO);
+ queryWrapper.ne(Declares::getStatus, Constants.ZERO);
queryWrapper.eq(Declares::getProjectId, param.getProjectId());
queryWrapper.eq(param.getDiagnoseType()!=null,Declares::getDiagnoseTypeId, param.getDiagnoseTypeId());
queryWrapper.apply(param.getAreaId()!=null,"t1.area_id =" +param.getAreaId());
@@ -1292,6 +1294,7 @@
queryWrapper.selectAll(Declares.class);
queryWrapper.leftJoin(Company.class, Company::getId, Declares::getCompanyId);
queryWrapper.eq(Declares::getIsdeleted, Constants.ZERO);
+ queryWrapper.ne(Declares::getStatus, Constants.ZERO);
queryWrapper.eq(Declares::getProjectId, param.getProjectId());
queryWrapper.eq(param.getSoId()!=null,Declares::getSoId, param.getSoId());
@@ -2590,6 +2593,7 @@
.leftJoin(DeclareService.class,DeclareService::getDeclareId,Declares::getId)
.eq(Declares::getSoId,soId)
.eq(DeclareService::getIsdeleted,Constants.ZERO)
+ .ne(DeclareService::getStatus,Constants.ZERO)
.groupBy(DeclareService::getDeclareId);
List<Map<String, Object>> maps =
declareServiceMapper.selectMaps(declareServiceQuery);
--
Gitblit v1.9.3