From b6c8cfb873fdb34e2a78acf8ce189f77d50c4be9 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 14 八月 2023 15:16:06 +0800
Subject: [PATCH] # 工资表配置表
---
server/src/main/java/doumeemes/dao/business/model/SalaryParam.java | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/business/model/SalaryParam.java b/server/src/main/java/doumeemes/dao/business/model/SalaryParam.java
index e686ebc..1a79df2 100644
--- a/server/src/main/java/doumeemes/dao/business/model/SalaryParam.java
+++ b/server/src/main/java/doumeemes/dao/business/model/SalaryParam.java
@@ -8,6 +8,9 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+
+import javax.validation.constraints.NotEmpty;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -20,57 +23,59 @@
@TableName("`salary_param`")
public class SalaryParam {
- @ApiModelProperty(value = "涓婚敭", example = "1")
+ @ApiModelProperty(value = "涓婚敭")
@ExcelColumn(name="涓婚敭")
+ @TableId(value = "id",type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
+ @ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
@ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
private Byte deleted;
- @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer createUser;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime;
- @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
+ @ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
@ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer updateUser;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date updateTime;
@ApiModelProperty(value = "澶囨敞")
@ExcelColumn(name="澶囨敞")
private String remark;
- @ApiModelProperty(value = "涓荤粍缁囩紪鐮侊紙鍏宠仈department琛ㄦ牴缁勭粐锛�", example = "1")
+ @ApiModelProperty(value = "涓荤粍缁囩紪鐮侊紙鍏宠仈department琛ㄦ牴缁勭粐锛�")
@ExcelColumn(name="涓荤粍缁囩紪鐮侊紙鍏宠仈department琛ㄦ牴缁勭粐锛�")
private Integer rootDepartId;
- @ApiModelProperty(value = "宸ュ巶缂栫爜锛堝叧鑱攄epartment琛級", example = "1")
+ @ApiModelProperty(value = "宸ュ巶缂栫爜锛堝叧鑱攄epartment琛級")
@ExcelColumn(name="宸ュ巶缂栫爜锛堝叧鑱攄epartment琛級")
+ @NotEmpty(message = "宸ュ巶缂栫爜涓嶈兘涓虹┖")
private Integer departId;
- @ApiModelProperty(value = "宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級", example = "1")
+ @ApiModelProperty(value = "宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
@ExcelColumn(name="宸ュ簭缂栫爜锛堝叧鑱攑rocedure琛級")
+ @NotEmpty(message = "宸ュ簭缂栫爜涓嶈兘涓虹┖")
private Integer procedureId;
- @ApiModelProperty(value = "bom缂栫爜锛堝叧鑱攂om琛級", example = "1")
+ @ApiModelProperty(value = "bom缂栫爜锛堝叧鑱攂om琛級")
@ExcelColumn(name="bom缂栫爜锛堝叧鑱攂om琛級")
- private Integer bomId;
+ @NotEmpty(message = "鐗╂枡缂栫爜涓嶈兘涓虹┖")
+ private Integer materialId;
- @ApiModelProperty(value = "宸ヨ祫鍗曚环锛堝厓)", example = "1")
+ @ApiModelProperty(value = "宸ヨ祫鍗曚环锛堝厓)")
@ExcelColumn(name="宸ヨ祫鍗曚环锛堝厓)")
- private Integer salary;
+ private BigDecimal salary;
- @ApiModelProperty(value = "鏍囧噯鏁伴噺", example = "1")
+ @ApiModelProperty(value = "鏍囧噯鏁伴噺")
@ExcelColumn(name="鏍囧噯鏁伴噺")
private Integer num;
@@ -78,11 +83,11 @@
@ExcelColumn(name="鏍囧噯鏃堕暱锛堢锛�")
private String times;
- @ApiModelProperty(value = "涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�", example = "1")
+ @ApiModelProperty(value = "涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�")
@ExcelColumn(name="涓嶈壇鍝佹槸鍚﹁鍏� 0鍚� 1鏄�")
private Integer unqualified;
- @ApiModelProperty(value = "璁′环鏂瑰紡 0璁′欢 1璁℃椂", example = "1")
+ @ApiModelProperty(value = "璁′环鏂瑰紡 0璁′欢 1璁℃椂")
@ExcelColumn(name="璁′环鏂瑰紡 0璁′欢 1璁℃椂")
private Integer type;
--
Gitblit v1.9.3