From b35eae37bf2ab5cd1861bd774e56ec780ad8b116 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期三, 06 三月 2024 15:09:43 +0800
Subject: [PATCH] zjh 本地 2024/03/6 --3
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 5877bb7..74c5d82 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -317,7 +317,12 @@
List<LtkjHysqd> one = testMapper.getHysqdByTmh(order.getCardId());
if (one != null && one.size() > 0) {
for (LtkjHysqd ltkjHysqd : one) {
-// DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+// LambdaQueryWrapper<LtkjHysqd> wq0=new LambdaQueryWrapper<>();
+// wq0.eq(LtkjHysqd::getTjh,ltkjHysqd.getTjh());
+// wq0.eq(LtkjHysqd::getTmh,ltkjHysqd.getTmh());
+// ltkjHysqdService.remove(wq0);
+ ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(ltkjHysqd.getTjh(), ltkjHysqd.getTmh());
+ ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(ltkjHysqd.getTmh());
LtkjHysqd hysqd = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(ltkjHysqd.getTjh(), ltkjHysqd.getTmh());
if (hysqd == null) {
ltkjHysqdService.save(ltkjHysqd);
@@ -652,6 +657,9 @@
if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
if(remark.getProId().equals(tjOrderDetail.getProId())){
+ if(null !=tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")){
+ tjOrderDetail.setProResult(tjOrderDetail.getProResult()+" ["+tjOrderDetail.getYcbz()+"]");
+ }
dels.add(tjOrderDetail);
}
}
--
Gitblit v1.8.0