From 8597cde32f9d7ad35028781cedff4ce79490c81f Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期二, 12 十二月 2023 17:44:58 +0800
Subject: [PATCH] zjh 本地 2023/12/12 -1

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 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 24eb716..342ba4b 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
@@ -320,6 +320,7 @@
                             customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
                             customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
                             customer.setConfirmStatus(String.valueOf(tjOrder.getStatus()));
+                            customer.setTjCategory(tjOrder.getTjCategory());
                             if (tjOrder.getFirmId().equals("0")) {
                                 customer.setTjCompName(null);
                             } else {
@@ -488,13 +489,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));
+//                        List<Long> longList = new ArrayList<>();
+//                        for (String str : split) {
+//                            if(!"".equals(str)){
+//                                longList.add(Long.valueOf(str));
+//                            }
+//                        }
                         parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(split));
 
                     } else {
@@ -564,6 +564,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 {

--
Gitblit v1.8.0