From d699794bb024ae7d5bb66fa24070745eb92c9b05 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 03 八月 2023 12:36:07 +0800
Subject: [PATCH] #核价管理功能完善
---
src/main/java/com/zy/crm/manager/entity/PriOnline.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/entity/PriOnline.java b/src/main/java/com/zy/crm/manager/entity/PriOnline.java
index bc08c1c..45e4b45 100644
--- a/src/main/java/com/zy/crm/manager/entity/PriOnline.java
+++ b/src/main/java/com/zy/crm/manager/entity/PriOnline.java
@@ -8,6 +8,7 @@
import com.core.common.SpringUtils;
import com.zy.crm.manager.service.ItemService;
+import com.zy.crm.manager.service.OrderService;
import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.UserService;
import org.springframework.format.annotation.DateTimeFormat;
@@ -70,6 +71,10 @@
@TableField("user_id")
private Long userId;
+ @ApiModelProperty(value= "鍒涘缓浜哄憳鐢ㄦ埛閮ㄩ棬")
+ @TableField("dept_id")
+ private Long deptId;
+
@ApiModelProperty(value= "鐘舵�亄0锛氭湭瀹屾垚锛�1锛氬凡瀹屾垚}")
@TableField("status")
private Integer status;
@@ -90,6 +95,10 @@
@ApiModelProperty(value= "涓氬姟鍛�")
@TableField("member_id")
private Long memberId;
+
+ @ApiModelProperty(value= "涓婁紶鎶ヤ环excel鏁版嵁鐨勫師濮嬫枃浠跺湴鍧�")
+ @TableField("check_data_file")
+ private String checkDataFile;
public PriOnline() {}
@@ -120,11 +129,20 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
- public String getItemId$() {
- ItemService itemService = SpringUtils.getBean(ItemService.class);
- Item item = itemService.selectById(this.itemId);
- if (!Cools.isEmpty(item)){
- return String.valueOf(item.getName());
+// public String getItemId$() {
+// ItemService itemService = SpringUtils.getBean(ItemService.class);
+// Item item = itemService.selectById(this.itemId);
+// if (!Cools.isEmpty(item)){
+// return String.valueOf(item.getName());
+// }
+// return null;
+// }
+
+ public String getOrderId$() {
+ OrderService orderService = SpringUtils.getBean(OrderService.class);
+ Order order = orderService.selectById(this.itemId);
+ if (!Cools.isEmpty(order)){
+ return String.valueOf(order.getName());
}
return null;
}
--
Gitblit v1.9.1