From 34f99d106551b51bf2af3bbd40c64624a3af25eb Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 09 九月 2023 09:43:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 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 2d7ab4b..d411a3c 100644
--- a/src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java
+++ b/src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java
@@ -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;
@@ -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) {
@@ -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