From 16bf2151e55c07717bb18a1eb3340aeff18ecf67 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期日, 18 二月 2024 18:04:29 +0800
Subject: [PATCH] zjh 2024/02/18--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 70 +++++++++++++++++++++++++++++-----
1 files changed, 59 insertions(+), 11 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 9e18417..aeb73ef 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.list(wq0);
+
+ //涓婇潰鐨勬崲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);
+ }
+
+
+
+
/**
* 鏌ヨ浣撴椤圭洰鍒楄〃
@@ -89,17 +124,17 @@
//涓婇潰鐨勬崲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());
- }
-
- }
- }
+// 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);
@@ -168,6 +203,19 @@
return AjaxResult.success(null);
}
+
+ @GetMapping("/getPacProList")
+ @ApiOperation(value = "鏌ヨ浣撴椤圭洰鍒楄〃")
+ public AjaxResult getPacProList() {
+ LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjProject::getProParentId, 0);
+ wq.eq(TjProject::getProStatus, 0);
+ List<TjProject> tjProjects = tjProjectService.list(wq);
+ return AjaxResult.success(tjProjects);
+ }
+
+
+
/**
* 瀵煎嚭浣撴椤圭洰鍒楄〃
*/
--
Gitblit v1.8.0