From 22c17adc3ec2a25e6656cd69961f49a888d433b3 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期三, 28 二月 2024 17:06:19 +0800
Subject: [PATCH] zjh 本地 2024/02/28 -1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 7 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 f2b8d65..a1ca1bb 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
@@ -77,6 +77,41 @@
return AjaxResult.success(maps);
}
+ /**
+ * 閫夋嫨浣撴椤圭洰閫夊崟椤规椂璋冪敤鐨勬帴鍙�
+ */
+ @GetMapping("/getDxList")
+ @ApiOperation(value = "閫夋嫨浣撴椤圭洰閫夊崟椤规椂璋冪敤鐨勬帴鍙�")
+ public AjaxResult getDxList() {
+// LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>();
+// wq0.eq(TjProject::getProParentId, 0);
+
+ List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
+
+ //涓婇潰鐨勬崲sql
+// final List<TjProject> tjProjects = tjProjectService.getProBySqlAndName(proName, checkType, deptId);
+
+ 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");
+ Map<String,Object> map=new HashMap<>();
+ map.put("list",tjProjects);
+ map.put("key",key);
+ return AjaxResult.success(map);
+ }
+
+
+
+
/**
* 鏌ヨ浣撴椤圭洰鍒楄〃
@@ -146,21 +181,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);
--
Gitblit v1.8.0