From b1e6fbedb5c6384f5c53f6073d17606919c593c1 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期五, 08 三月 2024 17:30:03 +0800
Subject: [PATCH] zjh 本地 2024/03/8 --2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 43 ++++++++++++++++++++++++++-----------------
1 files changed, 26 insertions(+), 17 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..c99500a 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
@@ -314,23 +314,7 @@
if ("Y".equals(getInfoFromSqlData)) {
TjOrder order = orderService.getOrderByTjNum(tjNumber);
if (null != order) {
- List<LtkjHysqd> one = testMapper.getHysqdByTmh(order.getCardId());
- if (one != null && one.size() > 0) {
- for (LtkjHysqd ltkjHysqd : one) {
-// DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
- LtkjHysqd hysqd = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(ltkjHysqd.getTjh(), ltkjHysqd.getTmh());
- if (hysqd == null) {
- ltkjHysqdService.save(ltkjHysqd);
- DynamicDataSourceContextHolder.clearDataSourceType();
- List<LtkjHybgd> one1 = testMapper.getHybgdByTmh(ltkjHysqd.getTmh());
- if (one1 != null && one1.size() > 0) {
- DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
- ltkjHybgdService.saveBatch(one1);
- DynamicDataSourceContextHolder.clearDataSourceType();
- }
- }
- }
- }
+ tbhyxm(order);
// List<LtkjExamJcsqd> one2 = testMapper.getExamJcsqdTmh(tjNumber);
// if (one2 != null && one2.size() > 0) {
@@ -354,6 +338,27 @@
}
}
return AjaxResult.success("鍚屾鎴愬姛");
+ }
+
+ private void tbhyxm(TjOrder order) {
+ List<LtkjHysqd> one = testMapper.getHysqdByTmh(order.getCardId());
+ if (one != null && one.size() > 0) {
+ for (LtkjHysqd ltkjHysqd : one) {
+ ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(ltkjHysqd.getTjh(), ltkjHysqd.getTmh());
+ ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(ltkjHysqd.getTmh());
+ LtkjHysqd hysqd = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(ltkjHysqd.getTjh(), ltkjHysqd.getTmh());
+ if (hysqd == null) {
+ ltkjHysqdService.save(ltkjHysqd);
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ List<LtkjHybgd> one1 = testMapper.getHybgdByTmh(ltkjHysqd.getTmh());
+ if (one1 != null && one1.size() > 0) {
+ DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+ ltkjHybgdService.saveBatch(one1);
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ }
+ }
+ }
+ }
}
@@ -636,6 +641,7 @@
if (one == null) {
return AjaxResult.error("鏆傛棤鏁版嵁锛侊紒");
}
+ tbhyxm(one);
// TjCustomer customer = customerService.getById(one.getUserId());
List<TjOrderRemark> remarkList = orderRemarkService.addHuaYanTable(tjNumber);
List<TjOrderDetail> tjOrderDetails = detailService.addHuaYanTable(tjNumber);
@@ -652,6 +658,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