From 5e15f28db8bf83cc19697e1ce2bd0078cd9cdfb8 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 23 一月 2025 17:07:51 +0800
Subject: [PATCH] zjh20250123
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjZhxmController.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjZhxmController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjZhxmController.java
index 4d62ead..7ac71af 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjZhxmController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjZhxmController.java
@@ -54,12 +54,12 @@
List<TjZhxmglpro> list = tjZhxmglproService.list(wq);
StringBuilder allName = new StringBuilder();
if (null != list && list.size() > 0) {
-// List<TjProject> projectList = new ArrayList<>();
+ List<TjProject> projectList = new ArrayList<>();
BigDecimal money = new BigDecimal("0.00");
for (TjZhxmglpro zhxmglpro : list) {
TjProject project = tjProjectService.getById(zhxmglpro.getProId());
if (null != project) {
-// projectList.add(tjProjectService.getOne(wq1));
+ projectList.add(project);
allName.append(project.getProName()).append("锛�");
money=money.add(project.getProPrice());
}
@@ -67,6 +67,7 @@
zhxm.setPrice(money);
zhxm.setAllProName(allName.toString());
zhxm.setZhxmglpros(list);
+ zhxm.setTjProjectList(projectList);
}
}
return AjaxResult.success(lists);
@@ -89,7 +90,7 @@
zhxm.setPym(PinyinUtil.getFirstLetter(zhxm.getZhmc(), ""));
if (zhxmService.save(zhxm)) {
List<TjZhxmglpro> zhxmglpros = zhxm.getZhxmglpros();
- if (null != zhxmglpros && zhxmglpros.size() > 0) {
+ if (null != zhxmglpros && !zhxmglpros.isEmpty()) {
for (TjZhxmglpro zhxmglpro : zhxmglpros) {
TjZhxmglpro pro = new TjZhxmglpro();
pro.setZhId(zhxm.getId());
@@ -113,7 +114,7 @@
zhxm.setPym(PinyinUtil.getFirstLetter(zhxm.getZhmc(), ""));
if (zhxmService.updateById(zhxm)) {
List<TjZhxmglpro> zhxmglpros = zhxm.getZhxmglpros();
- if (null != zhxmglpros && zhxmglpros.size() > 0) {
+ if (null != zhxmglpros && !zhxmglpros.isEmpty()) {
LambdaQueryWrapper<TjZhxmglpro> wq = new LambdaQueryWrapper<>();
wq.eq(TjZhxmglpro::getZhId, zhxm.getId());
tjZhxmglproService.remove(wq);
@@ -142,13 +143,13 @@
List<TjZhxmglpro> list = tjZhxmglproService.list(wq);
StringBuilder allName = new StringBuilder();
// StringBuilder allSonName = new StringBuilder();
- if (null != list && list.size() > 0) {
-// List<TjProject> projectList = new ArrayList<>();
+ if (null != list && !list.isEmpty()) {
+ List<TjProject> projectList = new ArrayList<>();
BigDecimal money = new BigDecimal("0.00");
for (TjZhxmglpro zhxmglpro : list) {
TjProject project = tjProjectService.getById(zhxmglpro.getProId());
if (null != project) {
-// projectList.add(tjProjectService.getOne(wq1));
+ projectList.add(project);
allName.append(project.getProName()).append("锛�");
money=money.add(project.getProPrice());
}
@@ -156,6 +157,7 @@
zhxm.setAllProName(allName.toString());
zhxm.setPrice(money);
zhxm.setZhxmglpros(list);
+ zhxm.setTjProjectList(projectList);
return AjaxResult.success(zhxm);
}
--
Gitblit v1.8.0