From 31783a75581a8ba325cb5830b1bc85988d4e55c8 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 14 八月 2023 18:13:29 +0800
Subject: [PATCH] # 工资表配置表 联调修改
---
server/src/main/java/doumeemes/dao/ext/dto/QueryUserSalaryListDTO.java | 38 ++++++++++++
server/src/main/java/doumeemes/dao/ext/vo/UserSalaryListVO.java | 72 ++++++++++++++++++++++++
server/src/main/java/doumeemes/dao/ext/vo/UserBaseInfoVO.java | 36 ++++++++++++
3 files changed, 146 insertions(+), 0 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/ext/dto/QueryUserSalaryListDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/QueryUserSalaryListDTO.java
new file mode 100644
index 0000000..049cf7d
--- /dev/null
+++ b/server/src/main/java/doumeemes/dao/ext/dto/QueryUserSalaryListDTO.java
@@ -0,0 +1,38 @@
+package doumeemes.dao.ext.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import doumeemes.core.annotation.excel.ExcelColumn;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2022/04/20 10:56
+ */
+@Data
+@ApiModel("鍛樺伐缁╂晥鍒嗛〉鏌ヨ璇锋眰鍙傛暟")
+public class QueryUserSalaryListDTO {
+ @ApiModelProperty(value = "鐢熶骇浜哄憳缂栫爜", example = "1")
+ private Integer userId;
+ @ApiModelProperty(value = "宸ュ簭缂栫爜", example = "1")
+ private Integer procedureId;
+ @ApiModelProperty(value = "鐗╂枡缂栫爜", example = "1")
+ private Integer materialId;
+ @ApiModelProperty(value = "鐗╂枡鍚嶇О鎴栫墿鏂檆ode缂栫爜" )
+ private String materialName;
+ @ApiModelProperty(value = "鏍圭粍缁囩紪鐮�", example = "1",hidden = true)
+ private Integer rootDepartId;
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date startDate;
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date endDate;
+ @ApiModelProperty(value = "鏁版嵁鏉冮檺閮ㄩ棬缂栫爜闆嗗悎" ,hidden = true)
+ private List<Integer> departIds;
+
+}
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/UserBaseInfoVO.java b/server/src/main/java/doumeemes/dao/ext/vo/UserBaseInfoVO.java
new file mode 100644
index 0000000..c65802b
--- /dev/null
+++ b/server/src/main/java/doumeemes/dao/ext/vo/UserBaseInfoVO.java
@@ -0,0 +1,36 @@
+package doumeemes.dao.ext.vo;
+
+import doumeemes.core.annotation.excel.ExcelColumn;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2022/04/20 10:56
+ */
+@Data
+@ApiModel("鐢ㄦ埛鍩烘湰淇℃伅鏁版嵁")
+public class UserBaseInfoVO implements Serializable{
+
+ @ApiModelProperty(value = "鐢熶骇浜哄憳缂栫爜", example = "1")
+ @ExcelColumn(name="鐢熶骇浜哄憳缂栫爜")
+ private Integer userId;
+ @ApiModelProperty(value = "鐢熶骇浜哄憳濮撳悕鍜岄儴闂ㄥ悕绉扮粍鍚�")
+ @ExcelColumn(name="鐢熶骇浜哄憳濮撳悕鍜岄儴闂ㄥ悕绉扮粍鍚�")
+ private String nameAndDepart;
+ @ApiModelProperty(value = "鐢熶骇浜哄憳濮撳悕")
+ @ExcelColumn(name="鐢熶骇浜哄憳濮撳悕")
+ private String userName;
+ @ApiModelProperty(value = "鎵�灞為儴闂ㄧ紪鐮�", example = "1")
+ @ExcelColumn(name="鎵�灞為儴闂ㄧ紪鐮�")
+ private Integer departId;
+
+ @ApiModelProperty(value = "鎵�灞為儴闂ㄥ悕绉�")
+ @ExcelColumn(name="鎵�灞為儴闂ㄥ悕绉�")
+ private String departName;
+
+}
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/UserSalaryListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/UserSalaryListVO.java
new file mode 100644
index 0000000..7e44571
--- /dev/null
+++ b/server/src/main/java/doumeemes/dao/ext/vo/UserSalaryListVO.java
@@ -0,0 +1,72 @@
+package doumeemes.dao.ext.vo;
+
+import doumeemes.core.annotation.excel.ExcelColumn;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2022/04/20 10:56
+ */
+@Data
+@ApiModel("鍛樺伐缁╂晥鍒嗛〉鏁版嵁")
+public class UserSalaryListVO implements Serializable{
+
+ @ApiModelProperty(value = "鐢熶骇浜哄憳缂栫爜", example = "1")
+ @ExcelColumn(name="鐢熶骇浜哄憳缂栫爜")
+ private Integer userId;
+ @ApiModelProperty(value = "鐢熸垚浜哄憳淇℃伅")
+ private UserBaseInfoVO userInfo;
+
+ @ApiModelProperty(value = "鐢熶骇浜哄憳濮撳悕",hidden = true)
+ @ExcelColumn(name="鐢熶骇浜哄憳濮撳悕")
+ private String userName;
+ @ApiModelProperty(value = "鎵�灞為儴闂ㄧ紪鐮�", example = "1",hidden = true)
+ @ExcelColumn(name="鎵�灞為儴闂ㄧ紪鐮�")
+ private Integer departId;
+
+ @ApiModelProperty(value = "鎵�灞為儴闂ㄥ悕绉�",hidden = true)
+ @ExcelColumn(name="鎵�灞為儴闂ㄥ悕绉�")
+ private String departName;
+ @ApiModelProperty(value = "鐗╂枡缂栫爜", example = "1")
+ @ExcelColumn(name="鐗╂枡缂栫爜")
+ private String materialCode;
+ @ApiModelProperty(value = "鐗╂枡鍚嶇О", example = "1")
+ @ExcelColumn(name="鐗╂枡鍚嶇О")
+ private String materialName;
+ @ApiModelProperty(value = "鐗╂枡涓婚敭", example = "1")
+ @ExcelColumn(name="鐗╂枡涓婚敭")
+ private Integer materialId;
+ @ApiModelProperty(value = "宸ュ崟缂栫爜", example = "1")
+ @ExcelColumn(name="宸ュ崟缂栫爜")
+ private String workorderCode;
+ @ApiModelProperty(value = "宸ュ崟鏂欎富閿�", example = "1")
+ @ExcelColumn(name="宸ュ崟涓婚敭")
+ private Integer workorderId;
+ @ApiModelProperty(value = "宸ュ簭涓婚敭", example = "1")
+ @ExcelColumn(name="宸ュ簭涓婚敭")
+ private Integer procedureId;
+ @ApiModelProperty(value = "宸ュ簭鍚嶇О")
+ @ExcelColumn(name="宸ュ簭鍚嶇О")
+ private String procedureName;
+ @ApiModelProperty(value = "鍗曚綅")
+ @ExcelColumn(name="鍗曚綅")
+ private String unitName;
+ @ApiModelProperty(value = "鎶ュ伐鏁�")
+ @ExcelColumn(name="鎶ュ伐鏁�")
+ private BigDecimal num;
+ @ApiModelProperty(value = "鑹搧鏁�")
+ @ExcelColumn(name="鑹搧鏁�")
+ private BigDecimal qualifiedNum;
+ @ApiModelProperty(value = "涓嶈壇鍝佹暟")
+ @ExcelColumn(name="涓嶈壇鍝佹暟")
+ private BigDecimal unQualifiedNum;
+ @ApiModelProperty(value = "鍚堟牸鐜囷紙%锛�")
+ @ExcelColumn(name="鍚堟牸鐜�")
+ private BigDecimal rate;
+
+}
--
Gitblit v1.9.3