From 9597821e57d4bad1ea4e984241f363be956dda8c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 03 七月 2025 18:21:33 +0800
Subject: [PATCH] zjh20250703
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java
index 04f9c4c..90cb9dd 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java
@@ -275,14 +275,44 @@
*/
@GetMapping("/getTjParentProjectList")
@ApiOperation(value = "鑾峰彇浣撴鍗曢」椤圭洰淇℃伅")
- public AjaxResult getTjParentProjectList(@RequestParam(required = false) @ApiParam(value = "鍗曢」鍚�") String proName) {
+ public AjaxResult getTjParentProjectList(@RequestParam(required = false) @ApiParam(value = "鍗曢」鍚�") String proName,
+ @RequestParam(required = false) @ApiParam(value = "鎷奸煶鐮�") String pym) {
LambdaQueryWrapper<TjProject> wq =new LambdaQueryWrapper<>();
wq.eq(TjProject::getProParentId,0);
wq.eq(TjProject::getProStatus,0);
if(null !=proName && !proName.isEmpty()){
wq.like(TjProject::getProName,proName);
}
- List<TjProject> tjProjectList = projectService.list(wq);
+ if(null !=pym && !pym.isEmpty()){
+ wq.apply("LOWER(pro_eng_name) LIKE {0}", "%" + pym.toLowerCase() + "%");
+ }
+
+ List<TjProject> tjProjectList = projectService.list(wq);
return success(tjProjectList);
}
+
+
+ @GetMapping("/huoqutuantitaocanxiangmuList")
+ @ApiOperation(value = "鑾峰彇鎵�鏈夊崟浣嶅洟浣撳椁愰」鐩�")
+ public AjaxResult huoqutuantitaocanxiangmuList(@RequestParam(required = false) String dwId) {
+ List<TjPackage> list= tjDwGroupingService.huoqutuantitaocanxiangmuhuoqutuantitaocanxiangmuList(dwId);
+ if (null !=list && !list.isEmpty()){
+ for (TjPackage tjPackage : list) {
+ List<TjProject> res=new ArrayList<>();
+ LambdaQueryWrapper<TjGroupingPro> wqq=new LambdaQueryWrapper<>();
+ wqq.eq(TjGroupingPro::getGroupingId,tjPackage.getPacId());
+ final List<TjGroupingPro> groupingProList = groupingProService.list(wqq);
+ if (null !=groupingProList && !groupingProList.isEmpty()){
+ for (TjGroupingPro pro : groupingProList) {
+ final TjProject byId = projectService.getById(pro.getProId());
+ if(null !=byId){
+ res.add(byId);
+ }
+ }
+ tjPackage.setTjProjectList(res);
+ }
+ }
+ }
+ return AjaxResult.success(list);
+ }
}
--
Gitblit v1.8.0