From e89a0bdd6041774d77408744993ba3b98a1e1c97 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 22 八月 2023 14:32:02 +0800
Subject: [PATCH] #报销完善
---
src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 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..2d7ab4b 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;
@@ -83,7 +83,7 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
- @ApiModelProperty(value= "涓婁紶鎶ヤ环excel鏁版嵁")
+ @ApiModelProperty(value= "鏄惁鍐茶处")
@TableField("check_data")
private String checkData;
@@ -107,6 +107,18 @@
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();
+ }
+
// PriOnline priOnline = new PriOnline(
// null, // excel琛ㄦ爣棰�
@@ -138,10 +150,10 @@
// }
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());
}
return null;
}
--
Gitblit v1.9.1