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 | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 105 insertions(+), 7 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 5ca5422..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,8 +6,8 @@
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.manager.service.PlanService;
import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -55,7 +55,7 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @ApiModelProperty(value= "椤圭洰id{man_item}")
+ @ApiModelProperty(value= "椤圭洰id{man_item}/planId")
@TableField("item_id")
private Long itemId;
@@ -63,7 +63,7 @@
@TableField("order_num")
private String orderNum;
- @ApiModelProperty(value= "妯℃澘鍚�")
+ @ApiModelProperty(value= "鎶ラ攢绫诲瀷")
@TableField("template_name")
private String templateName;
@@ -75,6 +75,10 @@
@TableField("dept_id")
private Long deptId;
+ @ApiModelProperty(value= "")
+ @TableField("host_id")
+ private Long hostId;
+
@ApiModelProperty(value= "鐘舵�亄0锛氭湭瀹屾垚锛�1锛氬凡瀹屾垚}")
@TableField("status")
private Integer status;
@@ -84,7 +88,7 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
- @ApiModelProperty(value= "涓婁紶鎶ヤ环excel鏁版嵁")
+ @ApiModelProperty(value= "鏄惁鍐茶处")
@TableField("check_data")
private String checkData;
@@ -100,6 +104,32 @@
@TableField("check_data_file")
private String checkDataFile;
+ /**
+ * 琛ㄥ崟鍐呭
+ */
+ @ApiModelProperty(value= "琛ㄥ崟鍐呭")
+ private String form;
+
+ /**
+ * 杩涘害 1: 寮�濮� 2: 缁勯暱瀹℃牳 3: 鍞墠缁勯暱瀹℃牳 4: 瑙勫垝鍛樺鏍� 5: 瀹℃壒閫氳繃
+ */
+ @ApiModelProperty(value= "杩涘害 1: 寮�濮� 2: 缁勯暱瀹℃牳 3: 鍞墠瀹℃牳 4: 瀹℃壒閫氳繃 ")
+ private Integer settle;
+
+ /**
+ * 瀹℃牳杩涘害
+ */
+ @ApiModelProperty(value= "瀹℃牳杩涘害")
+ @TableField("settle_msg")
+ private String settleMsg;
+
+ /**
+ * 瀹㈡埛鍚嶇О
+ */
+ @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
+ @TableField("name")
+ private String name;
+
public ReimburseOnline() {}
public ReimburseOnline(String title, String sheetData, Date createTime, String filepath) {
@@ -109,11 +139,58 @@
this.filepath = filepath;
}
+ public ReimburseOnline(Long itemId,String orderNum,Date createTime,User user) {
+ this.itemId = itemId;
+ this.orderNum = orderNum;
+ this.createTime = createTime;
+ this.updateTime = createTime;
+ this.userId = user.getId();
+ this.deptId = user.getDeptId();
+ this.status = 0;
+ this.updateUserId = user.getId();
+ }
+
+ public ReimburseOnline(Long itemId,String orderNum,Date createTime,User user,Integer settle) {
+ this.itemId = itemId;
+ this.orderNum = orderNum;
+ this.createTime = createTime;
+ this.updateTime = createTime;
+ this.userId = user.getId();
+ this.deptId = user.getDeptId();
+ this.status = 0;
+ this.updateUserId = user.getId();
+ this.settle = settle;
+ }
+
// PriOnline priOnline = new PriOnline(
// null, // excel琛ㄦ爣棰�
// null, // excel琛ㄦ暟鎹�
// null // 鍒涘缓鏃堕棿
// );
+
+ public String getSettle$(){
+ if (null == this.settle){ return null; }
+ switch (this.settle){
+ case 0:
+ return "寰呮彁浜�";
+ case 1:
+ return "绛夊緟閮ㄩ棬缁忕悊瀹℃牳";
+ case 2:
+ return "绛夊緟缁撶偣3瀹℃牳";
+ case 3:
+ return "绛夊緟缁撶偣4瀹℃牳";
+ case 4:
+ return "绛夊緟缁撶偣5瀹℃牳";
+ case 5:
+ return "绛夊緟缁撶偣6瀹℃牳";
+ case 6:
+ return "鐢宠閫氳繃";
+ case 7:
+ return "鐢宠閫氳繃";
+ default:
+ return String.valueOf(this.settle);
+ }
+ }
public String getCreateTime$(){
if (Cools.isEmpty(this.createTime)){
@@ -138,13 +215,34 @@
// 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());
+// return String.valueOf(order.getId()+"---"+order.getName());
+ return String.valueOf(order.getId());
}
- return null;
+ 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 "闈為」鐩瀷鎶ラ攢";
}
public String getUser$() {
--
Gitblit v1.9.1