From 7f9d058a0e632be6a3daf6f46d26b69742db0720 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 08 十一月 2023 13:13:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java b/src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java
index a5c7538..40a3088 100644
--- a/src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java
+++ b/src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.crm.manager.service.CstmrService;
import com.zy.crm.manager.service.OrderService;
import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.UserService;
@@ -214,11 +215,32 @@
// return null;
// }
- public String getPlanId$() {
+// public String getPlanId$() {
+// OrderService orderService = SpringUtils.getBean(OrderService.class);
+// Order order = orderService.selectById(this.itemId);
+// if (!Cools.isEmpty(order)){
+// return String.valueOf(order.getUuid()+"---"+order.getName());
+// }
+// return "闈為」鐩瀷鎶ラ攢";
+// }
+
+ public String getOrderId$() {
+ if (null == this.itemId){ return "闈為」鐩瀷鎶ラ攢"; }
OrderService orderService = SpringUtils.getBean(OrderService.class);
Order order = orderService.selectById(this.itemId);
if (!Cools.isEmpty(order)){
- return String.valueOf(order.getUuid()+"---"+order.getName());
+// return String.valueOf(order.getId()+"---"+order.getName());
+ return String.valueOf(order.getId());
+ }
+ return "闈為」鐩瀷鎶ラ攢";
+ }
+
+ public String getName$() {
+ if (null == this.itemId){ return "闈為」鐩瀷鎶ラ攢"; }
+ OrderService orderService = SpringUtils.getBean(OrderService.class);
+ Order order = orderService.selectById(this.itemId);
+ if (!Cools.isEmpty(order)){
+ return String.valueOf(order.getCstmrId$());
}
return "闈為」鐩瀷鎶ラ攢";
}
--
Gitblit v1.9.1