From 2ae8b7c0aba4ceffb6dbb0ad48ece3fdb0ab5cea Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 28 五月 2024 11:39:32 +0800
Subject: [PATCH] 2024年05月28日 11:39:14
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 76 ++++++++++++++++++++++++--------------
1 files changed, 48 insertions(+), 28 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
index aeb73ef..74dbb7c 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
@@ -83,23 +83,15 @@
@GetMapping("/getDxList")
@ApiOperation(value = "閫夋嫨浣撴椤圭洰閫夊崟椤规椂璋冪敤鐨勬帴鍙�")
public AjaxResult getDxList() {
- LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>();
- wq0.eq(TjProject::getProParentId, 0);
-
- List<TjProject> tjProjects = tjProjectService.list(wq0);
-
- //涓婇潰鐨勬崲sql
-// final List<TjProject> tjProjects = tjProjectService.getProBySqlAndName(proName, checkType, deptId);
-
+ List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
+ String config = configService.selectConfigByKey("tj_dxsxtj");
+ if(null !=config && config.equals("N")){
+ tjProjects = tjProjectService.getOpenDxTjProjectList();
+ }
if (tjProjects != null) {
for (TjProject project : tjProjects) {
List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
project.setTjProjectList(projectList);
-
-// SysDept sysDept = deptService.selectDeptById(project.getDeptId());
-// if (sysDept!=null){
-// project.setDeptName(sysDept.getDeptName());
-// }
}
}
String key = configService.selectConfigByKey("is_open_sfxm");
@@ -181,21 +173,27 @@
}
+ @GetMapping("/getPacTjProjectList")
+ @ApiOperation(value = "缁存姢濂楅椤甸潰鏂板椤圭洰鏃惰皟鐢�")
+ public AjaxResult getPacTjProjectList() {
+ List<TjProject> tjProjects = tjProjectService.getPacTjProjectList();
+ return AjaxResult.success(tjProjects);
+ }
+
+
/**
* 鏌ヨ浣撴椤圭洰鍒楄〃
*/
@GetMapping("/list")
@ApiOperation(value = "鏌ヨ浣撴椤圭洰鍒楄〃")
public AjaxResult list() {
- LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
- wq.eq(TjProject::getProParentId, 0);
- wq.eq(TjProject::getProStatus, 0);
- List<TjProject> tjProjects = tjProjectService.list(wq);
+// LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
+// wq.eq(TjProject::getProParentId, 0);
+// wq.eq(TjProject::getProStatus, 0);
+ List<TjProject> tjProjects = tjProjectService.getTjProjectList();
if (tjProjects != null) {
for (TjProject project : tjProjects) {
- LambdaQueryWrapper<TjProject> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjProject::getProParentId, project.getProId());
- List<TjProject> projectList = tjProjectService.list(wq1);
+ List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
project.setTjProjectList(projectList);
}
return AjaxResult.success(tjProjects);
@@ -536,13 +534,35 @@
TjProject tjProject = tjProjectService.getById(proId);
return AjaxResult.success(tjProject);
}
-// /**
-// * 鑾峰彇閮ㄩ棬鏍戝垪琛�
-// */
-// @GetMapping("/deptTree")
-// @ApiOperation("鑾峰彇閮ㄩ棬鏍戝垪琛�")
-// public AjaxResult deptTree(SysDept dept) {
-// return success(deptService.selectDeptTreeList(dept));
-// }
+
+
+ /**
+ * 閫夋嫨浣撴椤圭洰閫夊崟椤规椂璋冪敤鐨勬帴鍙�
+ */
+ @GetMapping("/getProParentIdDxList")
+ @ApiOperation(value = "閫夋嫨浣撴椤圭洰(鎵�鏈夋湇椤圭洰)閫夊崟椤规椂璋冪敤鐨勬帴鍙�")
+ public AjaxResult getProParentIdDxList() {
+ List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
+ String config = configService.selectConfigByKey("tj_dxsxtj");
+ if(null !=config && config.equals("N")){
+ tjProjects = tjProjectService.getOpenDxTjProjectList();
+ }
+ String key = configService.selectConfigByKey("is_open_sfxm");
+ Map<String,Object> map=new HashMap<>();
+ map.put("list",tjProjects);
+ map.put("key",key);
+ return AjaxResult.success(map);
+ }
+
+ @GetMapping("/getProSonDxList")
+ @ApiOperation(value = "閫夋嫨浣撴椤圭洰(鏍规嵁鐖堕」id閫夋嫨瀛愰」)閫夊崟椤规椂璋冪敤鐨勬帴鍙�")
+ public AjaxResult getProSonDxList(@RequestParam String proId) {
+ List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(proId);
+ String key = configService.selectConfigByKey("is_open_sfxm");
+ Map<String,Object> map=new HashMap<>();
+ map.put("list",projectList);
+ map.put("key",key);
+ return AjaxResult.success(map);
+ }
}
--
Gitblit v1.8.0