From 5bdba4f712b203db5acdd981922a5bc1706b29ff Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 11 九月 2023 19:15:43 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java |   71 +++++++++++++++++++++++++++++++----
 1 files changed, 62 insertions(+), 9 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 f8ae8e9..d411a3c 100644
--- a/src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java
+++ b/src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java
@@ -6,7 +6,7 @@
 import com.baomidou.mybatisplus.enums.IdType;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
-import com.zy.crm.manager.service.PlanService;
+import com.zy.crm.manager.service.OrderService;
 import com.zy.crm.system.entity.User;
 import com.zy.crm.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
@@ -54,7 +54,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;
 
@@ -62,7 +62,7 @@
     @TableField("order_num")
     private String orderNum;
 
-    @ApiModelProperty(value= "妯℃澘鍚�")
+    @ApiModelProperty(value= "鎶ラ攢绫诲瀷")
     @TableField("template_name")
     private String templateName;
 
@@ -74,6 +74,10 @@
     @TableField("dept_id")
     private Long deptId;
 
+    @ApiModelProperty(value= "")
+    @TableField("host_id")
+    private Long hostId;
+
     @ApiModelProperty(value= "鐘舵�亄0锛氭湭瀹屾垚锛�1锛氬凡瀹屾垚}")
     @TableField("status")
     private Integer status;
@@ -83,7 +87,7 @@
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
-    @ApiModelProperty(value= "涓婁紶鎶ヤ环excel鏁版嵁")
+    @ApiModelProperty(value= "鏄惁鍐茶处")
     @TableField("check_data")
     private String checkData;
 
@@ -99,6 +103,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) {
@@ -106,6 +136,29 @@
         this.sheetData = sheetData;
         this.createTime = createTime;
         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(
@@ -138,12 +191,12 @@
 //    }
 
     public String getPlanId$() {
-        PlanService planService = SpringUtils.getBean(PlanService.class);
-        Plan plan = planService.selectById(this.itemId);
-        if (!Cools.isEmpty(plan)){
-            return String.valueOf(plan.getUuid());
+        OrderService orderService = SpringUtils.getBean(OrderService.class);
+        Order order = orderService.selectById(this.itemId);
+        if (!Cools.isEmpty(order)){
+            return String.valueOf(order.getUuid()+"---"+order.getName());
         }
-        return null;
+        return "闈為」鐩瀷鎶ラ攢";
     }
 
     public String getUser$() {

--
Gitblit v1.9.1