From 978a3733aedaaa505867b64edfbe1f6caedbc798 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 04 十一月 2023 09:56:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/entity/PriOnline2.java | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/entity/PriOnline2.java b/src/main/java/com/zy/crm/manager/entity/PriOnline2.java
index 3e17c27..e106de5 100644
--- a/src/main/java/com/zy/crm/manager/entity/PriOnline2.java
+++ b/src/main/java/com/zy/crm/manager/entity/PriOnline2.java
@@ -8,7 +8,9 @@
import com.core.common.SpringUtils;
import com.zy.crm.manager.service.CstmrService;
import com.zy.crm.manager.service.PlanService;
+import com.zy.crm.system.entity.Dept;
import com.zy.crm.system.entity.User;
+import com.zy.crm.system.service.DeptService;
import com.zy.crm.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -44,6 +46,20 @@
@TableField("sheet_data")
private String sheetData;
+ /**
+ * excel琛ㄦ爣棰�
+ */
+ @ApiModelProperty(value= "excel琛ㄦ爣棰�")
+ @TableField("sales_title")
+ private String salesTitle;
+
+ /**
+ * excel琛ㄦ暟鎹�
+ */
+ @ApiModelProperty(value= "excel琛ㄦ暟鎹�")
+ @TableField("sales_sheet_data")
+ private String salesSheetData;
+
@ApiModelProperty(value= "鏂囦欢淇濆瓨鍦板潃")
private String filepath;
@@ -55,7 +71,7 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @ApiModelProperty(value= "椤圭洰id{man_item}")
+ @ApiModelProperty(value= "瑙勫垝鍗旾D plan_id")
@TableField("item_id")
private Long itemId;
@@ -95,6 +111,10 @@
@ApiModelProperty(value= "涓氬姟鍛�")
@TableField("member_id")
private Long memberId;
+
+ @ApiModelProperty(value= "瑙勫垝鍗旾D")
+ @TableField("plan_id")
+ private Long planId;
@ApiModelProperty(value= "涓婁紶鎶ヤ环excel鏁版嵁鐨勫師濮嬫枃浠跺湴鍧�")
@TableField("check_data_file")
@@ -145,10 +165,8 @@
case 0:
return "绛夊緟鎻愪氦";
case 1:
- return "绛夊緟瀹℃壒";
- case 2:
return "绛夊緟纭";
- case 3:
+ case 2:
return "瀹℃壒閫氳繃";
default:
return String.valueOf(this.settle);
@@ -179,8 +197,10 @@
// }
public Long getCstmrId$(){
+ PlanService planService = SpringUtils.getBean(PlanService.class);
+ Plan plan = planService.selectById(this.itemId);
CstmrService cstmrService = SpringUtils.getBean(CstmrService.class);
- Cstmr cstmr = cstmrService.selectByName(1L, this.templateName);
+ Cstmr cstmr = cstmrService.selectById(plan.getCstmrId());
if (!Cools.isEmpty(cstmr)){
return cstmr.getId();
}
@@ -205,6 +225,15 @@
return null;
}
+ public String getDeptId$(){
+ DeptService service = SpringUtils.getBean(DeptService.class);
+ Dept dept = service.selectById(this.deptId);
+ if (!Cools.isEmpty(dept)){
+ return String.valueOf(dept.getName());
+ }
+ return null;
+ }
+
public String getUpdateUserId$() {
UserService userService = SpringUtils.getBean(UserService.class);
User user = userService.selectById(this.updateUserId);
--
Gitblit v1.9.1