From 3845de0796e77f8182ef5748caa349d048255f3d Mon Sep 17 00:00:00 2001 From: lige <bestlige@outlook.com> Date: 星期五, 02 二月 2024 15:19:06 +0800 Subject: [PATCH] 1 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 44 +++++++++++++++++++++++++++++++++++--------- 1 files changed, 35 insertions(+), 9 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 6fc5f47..3ac2d21 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 @@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ltkj.common.core.domain.entity.SysDept; +import com.ltkj.common.core.redis.RedisCache; import com.ltkj.common.utils.bean.BeanUtils; import com.ltkj.framework.datasource.DynamicDataSourceContextHolder; import com.ltkj.hosp.domain.*; @@ -61,6 +62,8 @@ private ITjRulesService tjRulesService; @Resource private TestMapper testMapper; + @Resource + private RedisCache redisCache; @GetMapping("/getTjHyBgList") @@ -87,19 +90,13 @@ if (tjProjects != null) { for (TjProject project : tjProjects) { - LambdaQueryWrapper<TjProject> wq1 = new LambdaQueryWrapper<>(); - wq1.eq(TjProject::getProParentId, project.getProId()); - if(null !=proName) { - wq1.like(TjProject::getProName, proName); - } - List<TjProject> projectList = tjProjectService.list(wq1); - project.setTjProjectList(projectList); - - + 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"); @@ -109,6 +106,35 @@ return AjaxResult.success(map); } + + + + /** + * 鏌ヨ椤圭洰瀛愰」 + */ + @GetMapping("/getAllChildListById") + @ApiOperation(value = "鏌ヨ椤圭洰瀛愰」") + public AjaxResult getAllChildListById(String proId) { + List<TjProject> tjProjects = tjProjectService.getAllChildListById(proId); + if (tjProjects != null) { + for (TjProject project : tjProjects) { + 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); + + } + + + /** * 鏌ヨ浣撴椤圭洰鍒楄〃 */ -- Gitblit v1.8.0