From 1f4e7d0f73a73e7350cf5a1df279d5f30904c5d5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 06 十二月 2023 08:41:32 +0800
Subject: [PATCH] bug
---
server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java | 39 ++++++++++++++++++++++++++-------------
1 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java b/server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java
index 7d01beb..1dd8edb 100644
--- a/server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java
+++ b/server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java
@@ -7,65 +7,78 @@
import lombok.Data;
import javax.validation.constraints.NotEmpty;
import java.math.BigDecimal;
+import java.util.Date;
@Data
@ApiModel("")
public class SalaryParamVO {
@ApiModelProperty(value = "涓婚敭")
+ @ExcelColumn(name="搴忓彿",index = 1)
private Integer id;
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
+ @ExcelColumn(name="鍒涘缓浜哄悕绉�",index = 11)
+ private String createUserName;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @ExcelColumn(name="鍒涘缓鏃堕棿",index = 10, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
@ApiModelProperty(value = "涓荤粍缁囩紪鐮侊紙鍏宠仈department琛ㄦ牴缁勭粐锛�")
- @ExcelColumn(name="涓荤粍缁囩紪鐮侊紙鍏宠仈department琛ㄦ牴缁勭粐锛�")
+// @ExcelColumn(name="涓荤粍缁囩紪鐮侊紙鍏宠仈department琛ㄦ牴缁勭粐锛�")
private Integer rootDepartId;
@ApiModelProperty(value = "宸ュ巶缂栫爜锛堝叧鑱攄epartment琛級")
- @ExcelColumn(name="宸ュ巶缂栫爜锛堝叧鑱攄epartment琛級")
+// @ExcelColumn(name="宸ュ巶缂栫爜锛堝叧鑱攄epartment琛級")
@NotEmpty(message = "宸ュ巶缂栫爜涓嶈兘涓虹┖")
private Integer departId;
@ApiModelProperty(value = "宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
- @ExcelColumn(name="宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
+// @ExcelColumn(name="宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
@NotEmpty(message = "宸ュ簭缂栫爜涓嶈兘涓虹┖")
private Integer procedureId;
@ApiModelProperty(value = "宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
- @ExcelColumn(name="宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
+// @ExcelColumn(name="宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
@NotEmpty(message = "宸ュ簭缂栫爜涓嶈兘涓虹┖")
private Integer procedureCode;
@ApiModelProperty(value = "宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
- @ExcelColumn(name="宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
+ @ExcelColumn(name="宸ュ簭鍚嶇О",index =5)
private String procedureName;
@ApiModelProperty(value = "浜у搧鍚嶇О" )
- @Excel(name="浜у搧鍚嶇О",orderNum ="3")
+ @ExcelColumn(name="鐗╂枡鍚嶇О",index =3)
private String materialName;
+ @ApiModelProperty(value = "宸ュ巶鍚嶇О" )
+ @ExcelColumn(name="宸ュ巶鍚嶇О",index =13)
+ private String departName;
@ApiModelProperty(value = "浜у搧缂栫爜" )
- @Excel(name="浜у搧缂栫爜",orderNum ="4")
+ @ExcelColumn(name="鐗╂枡缂栫爜",index =4)
private String materialCode;
@ApiModelProperty(value = "鐗╂枡缂栫爜锛堝叧鑱攎aterial_distribute琛級", example = "1")
private Integer materialId;
@ApiModelProperty(value = "宸ヨ祫鍗曚环锛堝厓)")
- @ExcelColumn(name="宸ヨ祫鍗曚环锛堝厓)")
+ @ExcelColumn(name="宸ヨ祫鍗曚环锛堝厓)",index =6)
private BigDecimal salary;
@ApiModelProperty(value = "鏍囧噯鏁伴噺")
- @ExcelColumn(name="鏍囧噯鏁伴噺")
+ @ExcelColumn(name="鏍囧噯浜у嚭",index =7)
private Integer num;
@ApiModelProperty(value = "鏍囧噯鏃堕暱锛堢锛�")
- @ExcelColumn(name="鏍囧噯鏃堕暱锛堢锛�")
+ @ExcelColumn(name="鏍囧噯鏃堕暱锛堢锛�",index =8)
private String times;
- @ApiModelProperty(value = "涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�")
- @ExcelColumn(name="涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�")
+ @ApiModelProperty(value = "涓嶈壇鍝佹槸鍚﹁鍏�")
+ @ExcelColumn(name="涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�",index = 9 ,valueMapping = "0=鍚�;1=鏄�")
private Integer unqualified;
@ApiModelProperty(value = "璁′环鏂瑰紡 0璁′欢 1璁℃椂")
- @ExcelColumn(name="璁′环鏂瑰紡 0璁′欢 1璁℃椂")
+ @ExcelColumn(name="璁′环鏂瑰紡",index = 2 ,valueMapping = "0=璁′欢;1=璁℃椂")
private Integer type;
}
--
Gitblit v1.9.3