From 79acd735ffe1a51d34d056840a1dd8269032313a Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 05 六月 2025 17:16:35 +0800
Subject: [PATCH] zjh20250605
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwGroupingMapper.java | 3 ++-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwDeptController.java | 3 +++
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwDeptController.java
index 6556209..9b09082 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwDeptController.java
@@ -117,6 +117,9 @@
@DeleteMapping("/{ids}")
@ApiOperation(value = "鍒犻櫎鍗曚綅閮ㄩ棬淇℃伅")
public AjaxResult remove(@PathVariable String[] ids) {
+ if (!dwGroupingService.list(new LambdaQueryWrapper<TjDwGrouping>().in(TjDwGrouping::getDwDeptId,Arrays.asList(ids))).isEmpty()){
+ return AjaxResult.error("璇ラ儴闂ㄤ笅鏈夊垎缁勪俊鎭紝璇峰厛鍒犻櫎鍒嗙粍淇℃伅!");
+ }
return toAjax(dwDeptService.removeByIds(Arrays.asList(ids)));
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwGroupingMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwGroupingMapper.java
index f4ab2ee..ffda0fd 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwGroupingMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwGroupingMapper.java
@@ -107,7 +107,8 @@
- @Select("SELECT a.id pac_id,grouping_name pac_name,a.ys_price price , GROUP_CONCAT(b.pro_name ORDER BY b.pro_name) allProName FROM tj_dw_grouping a JOIN tj_grouping_pro b ON b.grouping_id=a.id \n" +
+ @Select("SELECT a.id pac_id,grouping_name pac_name,a.ys_price price , GROUP_CONCAT(b.pro_name ORDER BY b.pro_name) allProName FROM " +
+ " tj_dw_grouping a JOIN tj_grouping_pro b ON b.grouping_id=a.id \n" +
"WHERE a.deleted=0 and a.dw_id=#{dwId} AND (a.sex=#{sex} or a.sex=2) GROUP BY b.grouping_id")
List<TjPackage> huoqutuantitaocanxiangmu(@Param("dwId") String dwId,@Param("sex") Long sex);
}
--
Gitblit v1.8.0