From c7e8b28a453bf85fb78c1f09a6d613ecef9ea240 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期一, 11 十二月 2023 08:27:12 +0800
Subject: [PATCH] 23
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index 2b3c520..bef5dce 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -155,6 +155,15 @@
wqs.in(TjOrderRemark::getType, 0,3);
List<TjOrderRemark> lists = remarkService.list(wqs);
TjCustomer customer = customerService.getById(order.getUserId());
+
+ //閬嶅巻椤圭洰 鍒ゆ柇鏄惁鏈夐噸澶ч槼鎬� 鏍囪
+ for (TjOrderDetail tjOrderDetail11 : list) {
+ customer.setIsPositive(tjOrderDetail11.getIsPositive());
+ if (tjOrderDetail11.getIsPositive()==1){
+ break;
+ }
+ }
+
customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
@@ -184,8 +193,8 @@
customer.setTjNumber(order.getTjNumber());
customer.setOrderId(order.getOrderId());
customer.setIsHz(order.getIsHz());
+ customer.setTjCategory(order.getTjCategory());
customerLis.add(customer);
-
}
if (customerLis.size() > 0) {
List<TjCustomer> customerList = customerLis.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
@@ -217,6 +226,13 @@
if (list111.size() == 0) {
continue;
}
+ //閬嶅巻椤圭洰 鍒ゆ柇鏄惁鏈夐噸澶ч槼鎬� 鏍囪
+ for (TjOrderDetail tjOrderDetail11 : list111) {
+ customer.setIsPositive(tjOrderDetail11.getIsPositive());
+ if (tjOrderDetail11.getIsPositive()==1){
+ break;
+ }
+ }
List<TjOrderRemark> lists = remarkService.getTjOrderRemarkListByYjNum(order.getTjNumber());
if (null != lists && lists.size() > 0) {
StringBuilder stringBuilder = new StringBuilder();
@@ -244,6 +260,7 @@
customer.setTjNumber(order.getTjNumber());
customer.setOrderId(order.getOrderId());
customer.setIsHz(order.getIsHz());
+ customer.setTjCategory(order.getTjCategory());
list11111.add(customer);
}
}
@@ -348,6 +365,13 @@
wqs.in(TjOrderRemark::getType, 0,3);
List<TjOrderRemark> lists = remarkService.list(wqs);
TjCustomer customer = customerService.getById(order.getUserId());
+ //閬嶅巻椤圭洰 鍒ゆ柇鏄惁鏈夐噸澶ч槼鎬� 鏍囪
+ for (TjOrderDetail tjOrderDetail11 : list) {
+ customer.setIsPositive(tjOrderDetail11.getIsPositive());
+ if (tjOrderDetail11.getIsPositive()==1){
+ break;
+ }
+ }
customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
@@ -410,6 +434,13 @@
if (list111.size() == 0) {
continue;
}
+ //閬嶅巻椤圭洰 鍒ゆ柇鏄惁鏈夐噸澶ч槼鎬� 鏍囪
+ for (TjOrderDetail tjOrderDetail11 : list111) {
+ customer.setIsPositive(tjOrderDetail11.getIsPositive());
+ if (tjOrderDetail11.getIsPositive()==1){
+ break;
+ }
+ }
List<TjOrderRemark> lists = remarkService.getTjOrderRemarkListByYjNum(order.getTjNumber());
if (null != lists && lists.size() > 0) {
StringBuilder stringBuilder = new StringBuilder();
--
Gitblit v1.8.0