From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjSamplingService.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjSamplingService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjSamplingService.java
index abb1411..bad2931 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjSamplingService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjSamplingService.java
@@ -4,6 +4,7 @@
import java.util.Map;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.hosp.domain.TjSampling;
import org.apache.ibatis.annotations.Param;
@@ -62,8 +63,42 @@
*/
public int deleteTjSamplingById(String id);
+ //鎷兼帴瑕佸悎骞堕」鐩殑椤圭洰id鍜岄」鐩悕绉�
Map<String, Object> hebingCaiYangInFo(List<String> ids);
+ //鍒ゆ柇鎵�閫夐」鐩槸鍚﹀彲浠ュ悎骞�
+ int panduanshifoukeyihebing(List<String> ids);
- int panduanshifoukeyihebing(@Param("ids") List<String> ids);
+ //淇敼鍚堝苟鐨勯」鐩坊鍔犲悎骞剁紪鍙�
+ boolean updateHeBingXm(List<String> ids, String parentId);
+
+ //鍒ゆ柇鏄惁瀛樺湪鍚堝苟椤圭洰
+ int pdsfczhbxm(List<String> ids);
+
+ //鍚堝苟椤圭洰鎺ュ彛涓幏鍙栧悎骞剁殑椤圭洰
+ TjSampling getTjSamplingByHb(List<String> ids);
+
+ //鑾峰彇鎵�閫夐」鐩腑鏈悎骞剁殑鍗曢」
+ List<TjSampling> getTjSamplingListByHb(List<String> ids);
+
+ //鍒犻櫎鎵�閫夌殑鍚堝苟椤圭洰
+ boolean deletedTjSamplingListByHb(@Param("ids") List<String> ids);
+
+ //淇敼鍘熸潵鍚堝苟杩囧緱椤圭洰
+ boolean updateHeBingXm(@Param("ids") List<String> ids);
+
+ String getBuKeHebingProName(List<String> ids);
+
+ AjaxResult mergeCaiYangTran(List<String> ids,String prefix);
+
+ String mergeCaiYangApi(List<String> ids,String prefix);
+
+ /**
+ * 鍒ゆ柇椤圭洰鏄惁鑳借繘琛屽悎骞�
+ * @param id 閲囨牱琛╥d
+ * @return
+ */
+ int isMergeItem(String id);
+
+ int isExistProId(String tjh,String proId);
}
--
Gitblit v1.8.0