From 1976a2d297317067d7afe5f51df4615a6eba80af Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期一, 24 六月 2024 19:34:25 +0800
Subject: [PATCH] zjh 本地 2024/06/24 --1
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java | 7 -------
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java | 4 ++--
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 12 ++++++------
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java | 10 ++--------
4 files changed, 10 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 30aacc8..fe83d88 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
@@ -84,11 +84,11 @@
*/
@GetMapping("/getDxList")
@ApiOperation(value = "閫夋嫨浣撴椤圭洰閫夊崟椤规椂璋冪敤鐨勬帴鍙�")
- public AjaxResult getDxList(@RequestParam(required = false) String pname) {
- List<TjProject> tjProjects = tjProjectService.getDxTjProjectList(pname);
+ public AjaxResult getDxList() {
+ List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
String config = configService.selectConfigByKey("tj_dxsxtj");
if (null != config && config.equals("N")) {
- tjProjects = tjProjectService.getOpenDxTjProjectList(pname);
+ tjProjects = tjProjectService.getOpenDxTjProjectList();
}
if (tjProjects != null) {
for (TjProject project : tjProjects) {
@@ -545,11 +545,11 @@
*/
@GetMapping("/getProParentIdDxList")
@ApiOperation(value = "閫夋嫨浣撴椤圭洰(鎵�鏈夋湇椤圭洰)閫夊崟椤规椂璋冪敤鐨勬帴鍙�")
- public AjaxResult getProParentIdDxList(@RequestParam(required = false) String pname) {
- List<TjProject> tjProjects = tjProjectService.getDxTjProjectList(pname);
+ public AjaxResult getProParentIdDxList() {
+ List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
String config = configService.selectConfigByKey("tj_dxsxtj");
if (null != config && config.equals("N")) {
- tjProjects = tjProjectService.getOpenDxTjProjectList(pname);
+ tjProjects = tjProjectService.getOpenDxTjProjectList();
}
String key = configService.selectConfigByKey("is_open_sfxm");
Map<String, Object> map = new HashMap<>();
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
index 3a5f1df..72d335f 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
@@ -142,15 +142,8 @@
@Select("SELECT * FROM `tj_project` where pro_parent_id=0 and pro_status=0 and LOCATE( '浣撴',pro_name) ")
List<TjProject> getDxTjProjectList();
- @Select("SELECT * FROM `tj_project` where pro_parent_id=0 and pro_status=0 and LOCATE( '浣撴',pro_name) AND LOCATE(#{pname},pro_name) OR LOCATE(#{pname},pro_eng_name)")
- List<TjProject> getDxTjProjectList(String pname);
-
@Select("SELECT * FROM `tj_project` where pro_parent_id=0 and pro_status=0")
List<TjProject> getOpenDxTjProjectList();
-
-
- @Select("SELECT * FROM `tj_project` where pro_parent_id=0 and pro_status=0 AND LOCATE(#{pname},pro_name) OR LOCATE(#{pname},pro_eng_name)")
- List<TjProject> getOpenDxTjProjectList(String pname);
@Select("SELECT a.*,GROUP_CONCAT(b.pro_name ORDER BY b.pro_name) AS all_son_pro_name FROM\n" +
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java
index 7a31e40..94bc5bf 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java
@@ -108,9 +108,9 @@
List<TjProject> getAllChildListById(String proId);
List<TjProject> getTjProjectList();
- List<TjProject> getDxTjProjectList(String pname);
+ List<TjProject> getDxTjProjectList();
- List<TjProject> getOpenDxTjProjectList(String pname);
+ List<TjProject> getOpenDxTjProjectList();
List<TjProject> getPacTjProjectList();
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
index 8b6e81f..fdd92c5 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
@@ -207,18 +207,12 @@
}
@Override
- public List<TjProject> getDxTjProjectList(String pname) {
- if(null !=pname && !"".equals(pname)){
- return tjProjectMapper.getDxTjProjectList(pname);
- }
+ public List<TjProject> getDxTjProjectList() {
return tjProjectMapper.getDxTjProjectList();
}
@Override
- public List<TjProject> getOpenDxTjProjectList(String pname) {
- if(null !=pname && !"".equals(pname)){
- return tjProjectMapper.getOpenDxTjProjectList(pname);
- }
+ public List<TjProject> getOpenDxTjProjectList() {
return tjProjectMapper.getOpenDxTjProjectList();
}
--
Gitblit v1.8.0