From dbc11598957806965ec0e6b15c91f3d017d5759f Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 03 一月 2025 20:16:53 +0800
Subject: [PATCH] 20250103
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjSamplingServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjSamplingServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjSamplingServiceImpl.java
index 2699780..b6ca330 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjSamplingServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjSamplingServiceImpl.java
@@ -157,18 +157,18 @@
@Transactional
@Override
- public AjaxResult mergeCaiYangTran(List<String> ids) {
- return mergeCaiYang(ids);
+ public AjaxResult mergeCaiYangTran(List<String> ids,String prefix) {
+ return mergeCaiYang(ids,prefix);
}
@Override
- public String mergeCaiYangApi(List<String> ids) {
- AjaxResult ajaxResult = mergeCaiYang(ids);
+ public String mergeCaiYangApi(List<String> ids,String prefix) {
+ AjaxResult ajaxResult = mergeCaiYang(ids,prefix);
log.info("鍚堝苟閲囨牱杩斿洖 ->{}",ajaxResult);
return ajaxResult.get("data").toString();
}
- private AjaxResult mergeCaiYang(List<String> ids) {
+ private AjaxResult mergeCaiYang(List<String> ids,String prefix) {
if (null != ids && !ids.isEmpty()) {
if(ids.size()==1) return AjaxResult.error("璇烽�夋嫨鑷冲皯涓ゆ潯椤圭洰杩涜鍚堝苟!");
int i = panduanshifoukeyihebing(ids);
@@ -193,7 +193,7 @@
sampling.setProId(proId);
sampling.setProName(proName);
sampling.setIsMerge(1);
- sampling.setJyxh(idUtils.generateLisID());
+ sampling.setJyxh(idUtils.generateLisID(prefix));
if (save(sampling)) {
if (updateHeBingXm(ids, sampling.getId())) {
return AjaxResult.success("鍚堝苟椤圭洰鎴愬姛!", sampling.getId());
--
Gitblit v1.8.0