From 9472d5dc2f433ebb0b0b5efc836632474aca9ca7 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期一, 17 六月 2024 20:30:55 +0800
Subject: [PATCH] 通用审批接口添加
---
project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java | 34 ++++++++++++----------------------
1 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java
index 5303b0e..1573111 100644
--- a/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java
+++ b/project-enforce/src/main/java/com/project/enforce/domain/vo/EnforceOrderVo.java
@@ -59,22 +59,22 @@
private Long applyId;
@Excel(name = "鐢宠浜�")
@ApiModelProperty("鐢宠浜�")
- private Long applyUser;
+ private String applyUser;
@Excel(name = "鐢宠浜虹數璇�")
@ApiModelProperty("鐢宠浜虹數璇�")
- private Long applyPhone;
+ private String applyPhone;
@Excel(name = "鐢宠浜哄崟浣�")
@ApiModelProperty("鐢宠浜哄崟浣�")
private Long applyDeptId;
@Excel(name = "鐢宠浜哄崟浣�")
@ApiModelProperty("鐢宠浜哄崟浣�")
- private Long applyDeptName;
+ private String applyDeptName;
@Excel(name = "鐢宠鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("鐢宠鏃堕棿")
private Date applyTime;
- @Excel(name = "鎵ф硶闃熷憳鏁伴噺")
- @ApiModelProperty("鎵ф硶闃熷憳鏁伴噺")
+ @Excel(name = "鎵ф硶闃熷憳浜烘暟")
+ @ApiModelProperty("鎵ф硶闃熷憳浜烘暟")
private Integer userNum;
@Excel(name = "棰勮鐘舵�侊細0姝ｅ父锛�1棰勮")
@ApiModelProperty("棰勮鐘舵�侊細0姝ｅ父锛�1棰勮")
@@ -85,46 +85,36 @@
@Excel(name = "璁㈠崟鐘舵�侊細-1鎾ゅ洖锛�0寰呮彁浜わ紝1宸叉彁浜わ紝2寰呮墽琛岋紝3宸叉墽琛岋紝4宸茶瘎浠�")
@ApiModelProperty("璁㈠崟鐘舵�侊細-1鎾ゅ洖锛�0寰呮彁浜わ紝1宸叉彁浜わ紝2寰呮墽琛岋紝3宸叉墽琛岋紝4宸茶瘎浠�")
private Integer orderStatus;
- @Excel(name = "瀹℃壒浜篿d")
- @ApiModelProperty("瀹℃壒浜篿d")
- private Long checkId;
- @Excel(name = "瀹℃壒浜�")
- @ApiModelProperty("瀹℃壒浜�")
- private Long checkUser;
- @Excel(name = "瀹℃壒浜虹數璇�")
- @ApiModelProperty("瀹℃壒浜虹數璇�")
- private Long checkPhone;
@Excel(name = "瀹℃壒浜哄崟浣�")
@ApiModelProperty("瀹℃壒浜哄崟浣�")
private Long checkDeptId;
@Excel(name = "瀹℃壒浜哄崟浣�")
@ApiModelProperty("瀹℃壒浜哄崟浣�")
- private Long checkDeptName;
- @Excel(name = "瀹℃壒鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty("瀹℃壒鏃堕棿")
- private Date checkTime;
+ private String checkDeptName;
@Excel(name = "璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
@ApiModelProperty("璁㈠崟鐘舵�侊細-1鎷掔粷锛�0寰呭鎵癸紝1瀹℃壒涓紝2閫氳繃")
private Integer checkStatus;
@Excel(name = "瀹℃壒鍘熷洜")
@ApiModelProperty("瀹℃壒鍘熷洜")
private String checkReason;
+ @Excel(name = "褰撳墠瀹℃壒灞傜骇:")
+ @ApiModelProperty("褰撳墠瀹℃壒灞傜骇:")
+ private Integer checkLevel;
@Excel(name = "鎵ц浜篿d")
@ApiModelProperty("鎵ц浜篿d")
private Long executeId;
@Excel(name = "鎵ц浜�")
@ApiModelProperty("鎵ц浜�")
- private Long executeUser;
+ private String executeUser;
@Excel(name = "鎵ц浜虹數璇�")
@ApiModelProperty("鎵ц浜虹數璇�")
- private Long executePhone;
+ private String executePhone;
@Excel(name = "鎵ц浜哄崟浣�")
@ApiModelProperty("鎵ц浜哄崟浣�")
private Long executeDeptId;
@Excel(name = "鎵ц浜哄崟浣�")
@ApiModelProperty("鎵ц浜哄崟浣�")
- private Long executeDeptName;
+ private String executeDeptName;
@Excel(name = "鎵ц鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("鎵ц鏃堕棿")
--
Gitblit v1.9.1