From c42f62b32bac302a7ac9fcde7489f7c5fc6e11aa Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 06 十二月 2024 15:35:17 +0800
Subject: [PATCH] zjh20241205-3
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjZhxmController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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..c46b535 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);
@@ -143,12 +144,12 @@
StringBuilder allName = new StringBuilder();
// StringBuilder allSonName = 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());
}
@@ -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