From 2c19fa65dc87ea8f3d81f84154f4eeabff7f8d00 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 05 六月 2025 12:36:47 +0800
Subject: [PATCH] zjh20250605
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
index 7bb9566..28223a3 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -2018,20 +2018,22 @@
LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.in(TjProject::getProParentId,strings);
wrapper1.eq(TjProject::getProStatus,0);
- wrapper1.eq(TjProject::getDeleted,0);
wrapper1.groupBy(TjProject::getProId);
List<TjProject> tjProjectList = projectService.list(wrapper1);
- Map<String, List<TjProject>> listMap = tjProjectList.stream().collect(Collectors.groupingBy(TjProject::getSpecimenType));
- log.info("鍒嗙粍鍚� ->{}",JSONUtil.toJsonStr(listMap));
- boolean save = lisApiMethod.save(listMap, tjOrder, customer);
- if (!save) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return AjaxResult.error("澶勭悊澶辫触");
+ if(null != tjProjectList && !tjProjectList.isEmpty()){
+ Map<String, List<TjProject>> listMap = tjProjectList.stream().collect(Collectors.groupingBy(TjProject::getSpecimenType));
+ log.info("鍒嗙粍鍚� ->{}",JSONUtil.toJsonStr(listMap));
+ boolean save = lisApiMethod.save(listMap, tjOrder, customer);
+ if (!save) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("澶勭悊澶辫触");
+ }
+ for (TjSampling tjSampling : list) {
+ tjSampling.setIsSignFor("0");
+ }
+ tjSamplingService.updateBatchById(list);
}
- for (TjSampling tjSampling : list) {
- tjSampling.setIsSignFor("0");
- }
- tjSamplingService.updateBatchById(list);
+
}else{
try {
LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
--
Gitblit v1.8.0