From 9155df2aeab5b0d95c89dd928dbaefbfbaeae9d1 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 05 九月 2024 17:10:35 +0800
Subject: [PATCH] zjh 2024-09-05
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjZhxmController.java | 58 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 15 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 b028682..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
@@ -41,6 +41,41 @@
@Resource
private ITjProjectService tjProjectService;
+ @GetMapping("/getZhList")
+ @ApiOperation(value = "鏌ヨ缁勫悎闆嗗悎")
+ public AjaxResult getZhList(@ApiParam(value = "浣撴缁勫悎鍚嶇О鎴栨嫾闊崇爜") @RequestParam(required = false) String zhmc) {
+ LambdaQueryWrapper<TjZhxm> wq2=new LambdaQueryWrapper<>();
+ if (zhmc != null) wq2.like(TjZhxm::getZhmc,zhmc).or().like(TjZhxm::getPym,zhmc);
+ List<TjZhxm> lists = zhxmService.list(wq2);
+ if (null != lists && lists.size()>0) {
+ for (TjZhxm zhxm : lists) {
+ LambdaQueryWrapper<TjZhxmglpro> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjZhxmglpro::getZhId, zhxm.getId());
+ List<TjZhxmglpro> list = tjZhxmglproService.list(wq);
+ StringBuilder allName = new StringBuilder();
+ if (null != list && list.size() > 0) {
+ 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(project);
+ allName.append(project.getProName()).append("锛�");
+ money=money.add(project.getProPrice());
+ }
+ }
+ zhxm.setPrice(money);
+ zhxm.setAllProName(allName.toString());
+ zhxm.setZhxmglpros(list);
+ zhxm.setTjProjectList(projectList);
+ }
+ }
+ return AjaxResult.success(lists);
+ }
+ return AjaxResult.success("鏆傛椂娌℃湁鏁版嵁");
+ }
+
+
@Log(title = "浣撴缁勫悎椤圭洰", businessType = BusinessType.INSERT)
@PostMapping
@ApiOperation(value = "鏂板浣撴缁勫悎")
@@ -110,26 +145,19 @@
// StringBuilder allSonName = new StringBuilder();
if (null != list && list.size() > 0) {
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(project);
+ 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);
+ zhxm.setTjProjectList(projectList);
return AjaxResult.success(zhxm);
}
--
Gitblit v1.8.0