From 2a08b97f0aad3af5d981a722efb218fb201f821f Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 10 十一月 2023 11:23:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/entity/PriOnline2.java | 187 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 178 insertions(+), 9 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 244d26b..4c9f42d 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;
@@ -96,17 +112,94 @@
@TableField("member_id")
private Long memberId;
+ @ApiModelProperty(value= "瑙勫垝鍗旾D")
+ @TableField("plan_id")
+ private Long planId;
+
@ApiModelProperty(value= "涓婁紶鎶ヤ环excel鏁版嵁鐨勫師濮嬫枃浠跺湴鍧�")
@TableField("check_data_file")
private String checkDataFile;
+ /**
+ * hostId
+ */
+ @ApiModelProperty(value= "hostId")
+ @TableField("host_id")
+ private Long hostId;
+
+ /**
+ * 杩涘害
+ */
+ @ApiModelProperty(value= "杩涘害")
+ private Integer settle;
+
+ /**
+ * 杩涘害
+ */
+ @ApiModelProperty(value= "杩涘害")
+ @TableField("settle_size")
+ private Integer settleSize;
+
+ /**
+ * 娴佺▼杩涘害
+ */
+ @ApiModelProperty(value= "娴佺▼杩涘害")
+ @TableField("settle_msg")
+ private String settleMsg;
+
+ @ApiModelProperty(value= "")
+ private String form;
+
+ /**
+ * 闆嗘垚椤圭洰璐ф灦鏍镐环鐘舵��
+ */
+ @ApiModelProperty(value = "鐘舵�� 3: 瀹屾垚鏍镐环 2: 寮�濮嬫牳浠� 1: 绛夊緟鏍镐环 0: 鍒濆 ")
+ private Integer status2;
+
+ /**
+ * 鑺傜偣璐熻矗浜�
+ */
+ @ApiModelProperty(value = "鍓痯lanId")
+ @TableField("assistant_plan_id")
+ private Long assistantPlanId;
+
+ /**
+ * 鑺傜偣璐熻矗浜�
+ */
+ @ApiModelProperty(value = "涓籶lanId")
+ @TableField("host_plan_id")
+ private Long hostPlanId;
+
+ /**
+ * 鑺傜偣璐熻矗浜�
+ */
+ @ApiModelProperty(value = "鍓痯lanId")
+ @TableField("assistant_pri_id")
+ private Long assistantPriId;
+
+ /**
+ * 鑺傜偣璐熻矗浜�
+ */
+ @ApiModelProperty(value = "涓籶lanId")
+ @TableField("host_pri_id")
+ private Long hostPriId;
+
+ /**
+ * 鑺傜偣璐熻矗浜�
+ */
+ @ApiModelProperty(value = "涓籶lanId")
+ @TableField("assistant_host_sign")
+ private Integer assistantHostSign;
+
public PriOnline2() {}
- public PriOnline2(String title, String sheetData, Date createTime, String filepath) {
+ public PriOnline2(String title, String sheetData, Date createTime, String filepath,Integer settle,Integer settleSize) {
this.title = title;
this.sheetData = sheetData;
this.createTime = createTime;
this.filepath = filepath;
+ this.settle = settle;
+ this.settleSize = settleSize;
}
// PriOnline priOnline = new PriOnline(
@@ -114,6 +207,36 @@
// null, // excel琛ㄦ暟鎹�
// null // 鍒涘缓鏃堕棿
// );
+
+ public String getSettle$(){
+ if (null == this.settle){ return null; }
+ switch (this.settle){
+ case 0:
+ return "绛夊緟鎻愪氦";
+ case 1:
+ return "绛夊緟纭";
+ case 2:
+ return this.settleSize.equals(this.settle+1)? "瀹℃壒閫氳繃" : "绛夊緟纭";
+ case 3:
+ return "瀹℃壒閫氳繃";
+ default:
+ return String.valueOf(this.settle);
+ }
+ }
+
+ public String getAssistantHostSign$() {
+ if (null == this.assistantHostSign) {
+ return null;
+ }
+ switch (this.assistantHostSign) {
+ case 1:
+ return "鍓祦绋�";
+ case 0:
+ return "涓绘祦绋�";
+ default:
+ return String.valueOf(this.assistantHostSign);
+ }
+ }
public String getCreateTime$(){
if (Cools.isEmpty(this.createTime)){
@@ -139,8 +262,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();
}
@@ -165,6 +290,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);
@@ -183,15 +317,50 @@
return null;
}
- public String getStatus$() {
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatusAll$(){
+ PlanService planService = SpringUtils.getBean(PlanService.class);
+ Plan plan = planService.selectById(this.itemId);
+ if (plan.getStatus2()>3 || (!Cools.isEmpty(this.getAssistantHostSign()) && this.getAssistantHostSign()==1)){
+ return getStatus$();
+ }else {
+ return "闆嗘垚"+getStatus$()+"/"+"璐ф灦"+getStatus2$();
+ }
+
+ }
+
+ public String getStatus$(){
+ PlanService planService = SpringUtils.getBean(PlanService.class);
+ Plan plan = planService.selectById(this.itemId);
+ if (null == plan.getStatus()){ return null; }
+ switch (plan.getStatus()){
+ case 3:
+ return "瀹屾垚鏍镐环";
+ case 2:
+ return "寮�濮嬫牳浠�";
case 1:
- return "宸插畬鎴�";
+ return "绛夊緟鏍镐环";
case 0:
- return "鏈畬鎴�";
+ return "鍒濆";
default:
- return String.valueOf(this.status);
+ return String.valueOf(plan.getStatus());
+ }
+ }
+
+ public String getStatus2$(){
+ PlanService planService = SpringUtils.getBean(PlanService.class);
+ Plan plan = planService.selectById(this.itemId);
+ if (null == plan.getStatus2()){ return null; }
+ switch (plan.getStatus2()){
+ case 3:
+ return "瀹屾垚鏍镐环";
+ case 2:
+ return "寮�濮嬫牳浠�";
+ case 1:
+ return "绛夊緟鏍镐环";
+ case 0:
+ return "鍒濆";
+ default:
+ return String.valueOf(plan.getStatus2());
}
}
--
Gitblit v1.9.1