From 77b51f625a13a8254eb2e8a9aa53bacf575f7274 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期一, 04 十二月 2023 18:13:49 +0800
Subject: [PATCH] 1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 2bb9d0c..ac5be6f 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
@@ -12,6 +12,7 @@
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.vodomain.AddNewReservationConfirm;
+import com.ltkj.hosp.vodomain.LineChartsVo;
import com.ltkj.hosp.vodomain.PieChartVo;
import com.ltkj.hosp.vodomain.QjDomainVo;
import com.ltkj.mall.mallOrderUtils.TjConstants;
@@ -989,7 +990,8 @@
//棣栭〉鎶樼嚎鍥炬暟鎹�
private AjaxResult getLineCharts() {
- List<Map<Object, Object>> line = orderService.getLine();
+// List<Map<Object, Object>> line = orderService.getLine();
+ List<LineChartsVo> line = orderService.getLine();
Collections.reverse(line);
return AjaxResult.success("鎶樼嚎鍥炬暟鎹�", line);
}
@@ -1300,6 +1302,8 @@
customer.setTjTime(order.getCreateTime());
customer.setTjNumber(order.getTjNumber());
customer.setTjStatus(1L);
+ customer.setOrderId(order.getOrderId());
+ customer.setIsHz(order.getIsHz());
LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
wq.eq(TjOrderRemark::getTjNumber, order.getTjNumber());
wq.in(TjOrderRemark::getType, 0,3);
@@ -1354,6 +1358,8 @@
}
customer.setTjTime(order.getCreateTime());
customer.setTjNumber(order.getTjNumber());
+ customer.setOrderId(order.getOrderId());
+ customer.setIsHz(order.getIsHz());
customer.setTjStatus(0L);
LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
wq.eq(TjOrderRemark::getTjNumber, order.getTjNumber());
@@ -1495,7 +1501,14 @@
String summary = remark.getSummary();
if (null != summary) {
String[] split = summary.split(";");
- parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(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(longList));
+ parent.put("parentAdvice", tjAdviceService.getAdviceStringsByIds(Arrays.asList(split)));
} else {
parent.put("parentAdvice", null);
--
Gitblit v1.8.0