From 991d785c3401821a9c50c75dd6b33c70dd454151 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 06 二月 2024 17:15:26 +0800
Subject: [PATCH] zjh 2024/02/6--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 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 c4e4481..3a5f591 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
@@ -89,17 +89,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);
@@ -113,8 +113,21 @@
*/
@GetMapping("/getAllChildListById")
@ApiOperation(value = "鏌ヨ椤圭洰瀛愰」")
- public AjaxResult getAllChildListById(String proId) {
- List<TjProject> tjProjects = tjProjectService.getAllChildListById(proId);
+ public AjaxResult getAllChildListById(@RequestParam(required = false)String proId,
+ @RequestParam(required = false) String proName,
+ @RequestParam(required = false) String checkType) {
+ LambdaQueryWrapper<TjProject> wq=new LambdaQueryWrapper<>();
+ if (proId!=null){
+ wq.eq(TjProject::getProParentId,proId);
+ }
+ if (proName!=null){
+ wq.like(TjProject::getProName,proName);
+ }
+ if (checkType!=null){
+ wq.eq(TjProject::getProCheckType,checkType);
+ }
+ List<TjProject> tjProjects = tjProjectService.list(wq);
+// List<TjProject> tjProjects = tjProjectService.getAllChildListById(proId);
if (tjProjects != null) {
for (TjProject project : tjProjects) {
SysDept sysDept = deptService.selectDeptById(project.getDeptId());
@@ -471,7 +484,7 @@
*/
@GetMapping(value = "/getInfoByProId")
@ApiOperation(value = "鑾峰彇浣撴椤圭洰璇︾粏淇℃伅")
- public AjaxResult getInfoByProId(Long proId) {
+ public AjaxResult getInfoByProId(@RequestParam Long proId) {
TjProject tjProject = tjProjectService.getById(proId);
return AjaxResult.success(tjProject);
}
--
Gitblit v1.8.0