From da9cb628948b381015faf188283a90a3aa15ce62 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 10 十二月 2024 19:52:55 +0800
Subject: [PATCH] zjh202412010
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
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 d83d19a..67163a4 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
@@ -346,7 +346,7 @@
LambdaQueryWrapper<TjPackageProject> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjPackageProject::getProId, tjProject.getProId());
List<TjPackageProject> list1 = ppservice.list(wq1);
- if (null != list1 && list1.size() > 0) {
+ if (null != list1 && !list1.isEmpty()) {
return AjaxResult.error("璇ラ」鐩鍦ㄥ椁愪腑浣跨敤,鏆傛椂涓嶈兘鍋滅敤");
}
}
@@ -374,7 +374,7 @@
}
}
List<TjProject> list = tjProjectService.getTjProjectListBySoneId(String.valueOf(tjProject.getProId()));
- if (null != list && list.size() > 0) {
+ if (null != list && !list.isEmpty()) {
for (TjProject project : list) {
project.setDeptId(tjProject.getDeptId());
project.setProType(tjProject.getProType());
@@ -385,7 +385,7 @@
}
}
List<TjConsumables> consumablesList = tjProject.getConsumablesList();
- if (null != consumablesList && consumablesList.size() > 0) {
+ if (null != consumablesList && !consumablesList.isEmpty()) {
LambdaQueryWrapper<TjProConsumables> wq = new LambdaQueryWrapper<>();
wq.eq(TjProConsumables::getProId, tjProject.getProId());
proConsumablesService.remove(wq);
@@ -426,7 +426,7 @@
}
}
List<TjStandard> tjStandardList = tjProject.getTjStandardList();
- if (null != tjStandardList && tjStandardList.size() > 0) {
+ if (null != tjStandardList && !tjStandardList.isEmpty()) {
for (TjStandard tjStandard : tjStandardList) {
if (null == tjStandard.getTjSex()) {
tjStandard.setTjSex(null);
@@ -442,8 +442,10 @@
if (null != proParentId) {
LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
wq.eq(TjProject::getProParentId, proParentId);
- List<TjProject> projectList = tjProjectService.list(wq);
- if (null != projectList && projectList.size() > 0) {
+ wq.eq(TjProject::getProStatus,0);
+// List<TjProject> projectList = tjProjectService.list(wq);
+ List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(String.valueOf(proParentId));
+ if (null != projectList && !projectList.isEmpty()) {
BigDecimal bigDecimal = new BigDecimal("0.00");
for (TjProject project : projectList) {
bigDecimal = bigDecimal.add(project.getProPrice());
--
Gitblit v1.8.0