From 3041a7d6dba13e237c4f21d3e46b88c35d376bf3 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 08 九月 2023 10:14:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 insertions(+), 4 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 d739794..d411a3c 100644
--- a/src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java
+++ b/src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java
@@ -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;
@@ -98,6 +102,32 @@
@ApiModelProperty(value= "涓婁紶鎶ヤ环excel鏁版嵁鐨勫師濮嬫枃浠跺湴鍧�")
@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() {}
@@ -119,6 +149,17 @@
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琛ㄦ爣棰�
@@ -153,9 +194,9 @@
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.getUuid()+"---"+order.getName());
}
- return null;
+ return "闈為」鐩瀷鎶ラ攢";
}
public String getUser$() {
--
Gitblit v1.9.1