From 407d6107d69a0e24bf8a55b87451aa594dae3957 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期三, 26 六月 2024 16:48:59 +0800
Subject: [PATCH] zjh 本地 2024/06/26 --2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjZhxmController.java | 39 ++++++++++++++++-----------------------
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjZhxm.java | 5 +++++
2 files changed, 21 insertions(+), 23 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 958762f..4d62ead 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,16 +54,17 @@
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) {
- LambdaQueryWrapper<TjProject> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjProject::getProId, zhxmglpro.getProId());
- wq1.eq(TjProject::getProParentId, 0);
- if (null != tjProjectService.getOne(wq1)) {
- projectList.add(tjProjectService.getOne(wq1));
- allName.append(tjProjectService.getOne(wq1).getProName()).append("锛�");
+ TjProject project = tjProjectService.getById(zhxmglpro.getProId());
+ if (null != project) {
+// projectList.add(tjProjectService.getOne(wq1));
+ allName.append(project.getProName()).append("锛�");
+ money=money.add(project.getProPrice());
}
}
+ zhxm.setPrice(money);
zhxm.setAllProName(allName.toString());
zhxm.setZhxmglpros(list);
}
@@ -142,26 +143,18 @@
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) {
- LambdaQueryWrapper<TjProject> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjProject::getProId, zhxmglpro.getProId());
- wq1.eq(TjProject::getProParentId, 0);
- if (null != tjProjectService.getOne(wq1)) {
- projectList.add(tjProjectService.getOne(wq1));
- allName.append(tjProjectService.getOne(wq1).getProName()).append("锛�");
+ TjProject project = tjProjectService.getById(zhxmglpro.getProId());
+ if (null != project) {
+// projectList.add(tjProjectService.getOne(wq1));
+ allName.append(project.getProName()).append("锛�");
+ money=money.add(project.getProPrice());
}
}
zhxm.setAllProName(allName.toString());
-// for (TjProject tjProject : projectList) {
-// LambdaQueryWrapper<TjProject> wq2 = new LambdaQueryWrapper<>();
-// wq2.eq(TjProject::getProParentId, tjProject.getProId());
-// tjProject.setTjProjectList(tjProjectService.list(wq2));
-// for (TjProject project : tjProjectService.list(wq2)) {
-// allSonName.append(project.getProName()).append("锛�");
-// }
-// tjProject.setAllSonProName(allSonName.toString());
-// }
+ zhxm.setPrice(money);
zhxm.setZhxmglpros(list);
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 c5e43db..6b4fce1 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
@@ -13,6 +13,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.List;
@Data
@@ -31,6 +32,10 @@
@ApiModelProperty(value = "搴忓彿")
private Integer xh;
+ @ApiModelProperty(value = "浠锋牸")
+ @TableField(exist = false)
+ private BigDecimal price;
+
@TableField(exist = false)
private List<TjZhxmglpro> zhxmglpros;
--
Gitblit v1.8.0