From 33de5e90c14e44e1639c961a48e338c1da3d5624 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期三, 26 六月 2024 16:51:56 +0800
Subject: [PATCH] zjh 本地 2024/06/26 --2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjZhxmController.java | 20 +++++++++++---------
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjZhxm.java | 4 ++++
2 files changed, 15 insertions(+), 9 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..57fac02 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,19 +54,20 @@
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));
- allName.append(project.getProName()).append("锛�");
+ projectList.add(project);
+// allName.append(project.getProName()).append("锛�");
money=money.add(project.getProPrice());
}
}
zhxm.setPrice(money);
- zhxm.setAllProName(allName.toString());
+// zhxm.setAllProName(allName.toString());
zhxm.setZhxmglpros(list);
+ zhxm.setTjProjectList(projectList);
}
}
return AjaxResult.success(lists);
@@ -140,22 +141,23 @@
LambdaQueryWrapper<TjZhxmglpro> wq = new LambdaQueryWrapper<>();
wq.eq(TjZhxmglpro::getZhId, zhxm.getId());
List<TjZhxmglpro> list = tjZhxmglproService.list(wq);
- StringBuilder allName = new StringBuilder();
+// 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));
- allName.append(project.getProName()).append("锛�");
+ projectList.add(project);
+// allName.append(project.getProName()).append("锛�");
money=money.add(project.getProPrice());
}
}
- zhxm.setAllProName(allName.toString());
+// zhxm.setAllProName(allName.toString());
zhxm.setPrice(money);
zhxm.setZhxmglpros(list);
+ zhxm.setTjProjectList(projectList);
return AjaxResult.success(zhxm);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjZhxm.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjZhxm.java
index 6b4fce1..e4ee10d 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjZhxm.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjZhxm.java
@@ -46,4 +46,8 @@
@ApiModelProperty(value = "鐖堕」鐩悕绉板瓧绗︿覆")
@TableField(exist = false)
private String allProName;
+
+ @ApiModelProperty(value = "缁勫悎涓殑椤圭洰闆嗗悎")
+ @TableField(exist = false)
+ private List<TjProject> tjProjectList;
}
--
Gitblit v1.8.0