From d5cd702a6985a208dae4a2e532c984252fbca4d4 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 06 一月 2025 17:27:26 +0800
Subject: [PATCH] 20250106
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
index 802c01d..23e430e 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
@@ -260,10 +260,14 @@
wrapper.eq(TjSampling::getTjNum, tjNumber);
wrapper.eq(TjSampling::getIsSignFor,isSignFor);
wrapper.and(i -> i.isNull(TjSampling::getParentId).or().eq(TjSampling::getIsMerge,1));
+// wrapper.eq(TjSampling::getIsPay,1);
+// if (isSignFor == 1)
+// wrapper.eq(TjSampling::getIsApply,0);
wrapper.orderByDesc(TjSampling::getIsMerge);
List<TjSampling> list = tjSamplingService.list(wrapper);
if (list.isEmpty()){
logger.info("jtNum ->{}",tjNumber);
+// return AjaxResult.error("鏈煡璇㈠埌鏁版嵁锛屼汉鍛樻湭缂磋垂鎴栨病鏈夋湭閲囨牱椤圭洰");
return AjaxResult.error("鍙傛暟閿欒,鏈煡璇㈠埌鏁版嵁");
}
// for (TjSampling sampling : list) {
@@ -282,10 +286,11 @@
list.removeIf(item -> Objects.equals(item.getId(), s));
}
}
+ String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
Map<String, List<TjSampling>> map = list.stream().filter(i->StrUtil.isNotBlank(i.getSpecimenTypeCode())).collect(Collectors.groupingBy(item -> item.getSpecimenTypeCode()));
for (Map.Entry<String, List<TjSampling>> entry : map.entrySet()) {
List<TjSampling> entryValue = entry.getValue();
- tjSamplingService.mergeCaiYangTran(entryValue.stream().map(TjSampling::getId).collect(Collectors.toList()));
+ tjSamplingService.mergeCaiYangTran(entryValue.stream().map(TjSampling::getId).collect(Collectors.toList()),lis_tmh_prefix);
}
}
wrapper = new LambdaQueryWrapper<>();
@@ -307,7 +312,8 @@
@PostMapping("/mergeCaiYang")
@ApiOperation(value = "閲囨牱鐧昏鍚堝苟椤圭洰鎺ュ彛")
public AjaxResult mergeCaiYang(@RequestBody List<String> ids) {
- return tjSamplingService.mergeCaiYangTran(ids);
+ String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
+ return tjSamplingService.mergeCaiYangTran(ids,lis_tmh_prefix);
}
--
Gitblit v1.8.0