From c9b1a88ad8f42454673c411cfac74284e68c1ac0 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 12 十二月 2023 09:48:19 +0800
Subject: [PATCH] zjh 2023/12/12--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 21 +++++++++++++--------
1 files changed, 13 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 82561aa..fba5891 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
@@ -1320,6 +1320,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 +1394,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 +1443,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 +1484,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,15 +1542,15 @@
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));
-// }
-// }
+ 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)));
-
+ //parent.put("parentAdvice", tjAdviceService.getAdviceStringsByIds(Arrays.asList(split)));
+ parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(split));
} else {
parent.put("parentAdvice", null);
}
@@ -1582,6 +1586,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