From 8f4e6f3cddbfbf8eac7ab7374cd661cb9ec33769 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 30 五月 2025 18:15:38 +0800
Subject: [PATCH] zjh20250530
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java | 4 ++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java | 3 +++
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 | 5 +++++
4 files changed, 22 insertions(+), 2 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 a8dc766..a5ca9fe 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
@@ -790,8 +790,16 @@
@ApiOperation(value = "鏌ヨ鐥呯瀵瑰簲椤圭洰")
public AjaxResult getProByBz(@ApiParam(value = "鐥呯ID")@RequestParam(required = false)String bz) {
try {
- List<TjBzPro> list = bzProService.list(new LambdaQueryWrapper<>(TjBzPro.class).eq(TjBzPro::getBzId, bz));
- return AjaxResult.success(list);
+ LambdaQueryWrapper<TjBzPro> tjBzProLambdaQueryWrapper = new LambdaQueryWrapper<>(TjBzPro.class);
+ if(StringUtil.isNotBlank(bz)){
+ tjBzProLambdaQueryWrapper.eq(TjBzPro::getBzId, bz);
+ List<TjBzPro> list = bzProService.list(tjBzProLambdaQueryWrapper);
+ return AjaxResult.success(list);
+ }else {
+ List<TjProject> list = tjProjectService.selectTjProjectListByBz();
+ return AjaxResult.success(list);
+ }
+
} catch (Exception e) {
throw new RuntimeException(e);
}
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 6720d5a..5efbc69 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
@@ -207,4 +207,8 @@
@Select("call getProListByBwwh(#{bw,mode=IN}) ")
List<TjProject> getProListByBwwh(String bw);
+
+ @Select("SELECT * FROM tj_project a WHERE a.deleted=0 AND a.pro_status=0 AND a.pro_parent_id=0 AND a.pro_id NOT IN (SELECT pro_id FROM tj_bz_pro )")
+ List<TjProject> selectTjProjectListByBz();
+
}
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 bde7d45..fc5f135 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
@@ -146,4 +146,7 @@
List<TjProject> getProListByBblx(String bblx);
List<TjProject> getProListByBwwh(String bw);
+
+ List<TjProject> selectTjProjectListByBz();
+
}
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 2660873..9c58453 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
@@ -357,4 +357,9 @@
return tjProjectMapper.getProListByBwwh(bw);
}
+ @Override
+ public List<TjProject> selectTjProjectListByBz() {
+ return tjProjectMapper.selectTjProjectListByBz();
+ }
+
}
--
Gitblit v1.8.0