From c29ab7da40455c3c62e27ac6e001c13a589798c9 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期三, 13 十二月 2023 15:22:00 +0800
Subject: [PATCH] zjh 本地 2023/12/13 -1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index 80c770e..1e29744 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -444,6 +444,21 @@
@Override
@Async("async")
+ public void updateOrdeltile2(TjOrderDetail detail, SysUser sysUser) {
+// for (TjOrderDetail detail : tjOrderDetailList) {
+ detail.setTjStatus(1L);
+ LambdaQueryWrapper<TjStandard> wq0 = new LambdaQueryWrapper<>();
+ wq0.eq(TjStandard::getProId, detail.getProId());
+ detail.setUpdateBy(sysUser.getNickName());
+ detail.setUpdateTime(new Date());
+ detail.setCreateId(String.valueOf(sysUser.getUserId()));
+ detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+ tjOrderDetailService.updateById(detail);
+// }
+ }
+
+ @Override
+ @Async("async")
public void iundividualCharges(TjFlowingWater tjFlowingWater, TjOrder order, TjCustomer customer, SysUser sysUser) {
List<TjConsumables> list2 = new ArrayList<>();
String[] tjProIds = tjFlowingWater.getTjProIds();
@@ -1320,6 +1335,7 @@
customer.setTjStatus(1L);
customer.setOrderId(order.getOrderId());
customer.setIsHz(order.getIsHz());
+ customer.setTjCategory(order.getTjCategory());
LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
wq.eq(TjOrderRemark::getTjNumber, order.getTjNumber());
wq.in(TjOrderRemark::getType, 0, 3);
@@ -1393,6 +1409,7 @@
customer.setTjNumber(order.getTjNumber());
customer.setOrderId(order.getOrderId());
customer.setIsHz(order.getIsHz());
+ customer.setTjCategory(order.getTjCategory());
customer.setTjStatus(0L);
LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
wq.eq(TjOrderRemark::getTjNumber, order.getTjNumber());
@@ -1441,6 +1458,7 @@
customer.setTjTime(tjOrder.getCreateTime());
customer.setFinishTime(tjOrder.getFinishTime());
customer.setConfirmStatus(String.valueOf(tjOrder.getStatus()));
+ customer.setTjCategory(tjOrder.getTjCategory());
if (tjOrder.getFirmId() == null) {
customer.setTjCompName("鏃�");
} else {
@@ -1481,6 +1499,7 @@
customer.setTjTime(tjOrder.getCreateTime());
customer.setFinishTime(tjOrder.getFinishTime());
customer.setConfirmStatus(String.valueOf(tjOrder.getStatus()));
+ customer.setTjCategory(tjOrder.getTjCategory());
if (tjOrder.getFirmId() == null) {
customer.setTjCompName("鏃�");
} else {
@@ -1538,14 +1557,12 @@
String summary = remark.getSummary();
if (null != summary) {
String[] split = summary.split(";");
- List<Long> longList = new ArrayList<>();
- for (String str : split) {
- if(!"".equals(str)){
- longList.add(Long.valueOf(str));
- }
- }
-// parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(longList));
- //parent.put("parentAdvice", tjAdviceService.getAdviceStringsByIds(Arrays.asList(split)));
+// List<Long> longList = new ArrayList<>();
+// for (String str : split) {
+// if(!"".equals(str)){
+// longList.add(Long.valueOf(str));
+// }
+// }
parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(split));
} else {
parent.put("parentAdvice", null);
@@ -1582,6 +1599,7 @@
customer.setCusIdcard(hideIdCardNum(customer.getCusIdcard()));
customer.setTjNumber(entry.getValue().get(0).getTjNum());
customer.setApplicationTime(entry.getValue().get(0).getApplicationTime());
+
List<TjSampling> samplings = entry.getValue();
if (null != samplings && samplings.size() > 0) {
List<TjSampling> projectList = new ArrayList<>();
--
Gitblit v1.8.0