From f42cce5f1b56371413f50676576b0ca195bec6b6 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期五, 02 二月 2024 20:06:35 +0800
Subject: [PATCH] zjh 本地 2024/02/2 -1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 78 +++++++++++++++++++++++++++-----------
1 files changed, 55 insertions(+), 23 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 8f87e6b..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,8 +11,11 @@
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.*;
+import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.treeUtil.TreeSelect;
import com.ltkj.system.service.ISysConfigService;
@@ -57,6 +60,22 @@
private DictProSfxmService dictProSfxmService;
@Autowired
private ITjRulesService tjRulesService;
+ @Resource
+ private TestMapper testMapper;
+ @Resource
+ private RedisCache redisCache;
+
+
+ @GetMapping("/getTjHyBgList")
+ @ApiOperation(value = "鏌ヨlis鏁版嵁搴撻」鐩俊鎭帴鍙�")
+ public AjaxResult getTjHyBgList(@RequestParam(required = false)String pacCode,
+ @RequestParam(required = false)String pacName,
+ @RequestParam(required = false)String pacRemark) {
+ List<Map<String, Object>> maps = testMapper.getTjHyBgList(pacCode,pacName,pacRemark);
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ return AjaxResult.success(maps);
+ }
+
/**
* 鏌ヨ浣撴椤圭洰鍒楄〃
@@ -66,38 +85,18 @@
public AjaxResult getlist(@RequestParam(required = false) @ApiParam(value = "椤圭洰鍚嶇О") String proName,
@RequestParam(required = false) @ApiParam(value = "妫�鏌ョ被鍒�") String checkType,
@RequestParam(required = false) @ApiParam(value = "閮ㄩ棬id") String deptId) {
-// LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>();
-// wq0.eq(TjProject::getProParentId, 0);
-// if(null !=proName){
-// wq0.like(TjProject::getProName,proName);
-// }
-// if(null !=checkType){
-// wq0.like(TjProject::getProCheckType,checkType);
-// }
-// if(null !=deptId){
-// wq0.like(TjProject::getDeptId,deptId);
-// }
-//
-// List<TjProject> tjProjects = tjProjectService.list(wq0);
-
//涓婇潰鐨勬崲sql
final List<TjProject> tjProjects = tjProjectService.getProBySqlAndName(proName, checkType, deptId);
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");
@@ -106,6 +105,35 @@
map.put("key",key);
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);
+
+ }
+
+
/**
* 鏌ヨ浣撴椤圭洰鍒楄〃
@@ -278,6 +306,7 @@
List<TjProject> list = tjProjectService.getTjProjectListBySoneId(String.valueOf(tjProject.getProId()));
if (null != list && list.size() > 0) {
for (TjProject project : list) {
+ project.setDeptId(tjProject.getDeptId());
project.setProType(tjProject.getProType());
project.setProCheckMethod(tjProject.getProCheckMethod());
project.setProStatus(tjProject.getProStatus());
@@ -302,6 +331,9 @@
}
}
TjProject byId1 = tjProjectService.selectTjProjectByProId(tjProject.getProParentId());
+ if(null !=byId1 && !tjProject.getDeptId().equals(byId1.getDeptId())){
+ return AjaxResult.error("涓嶅彲鏇存敼鐖堕」鐩瀹�!");
+ }
if(null !=byId1){
tjProject.setIsSampling(byId1.getIsSampling());
}
--
Gitblit v1.8.0