From 9ec0ecb6e1a81f1ce55935b9ba7fbda6c3a8810a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 15 十月 2025 15:27:00 +0800
Subject: [PATCH] 员工导入
---
ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationAssetReceiveDTO.java | 38 +++++++++++++++++---------------------
1 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationAssetReceiveDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationAssetReceiveDTO.java
index c151a49..a028cbb 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationAssetReceiveDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationAssetReceiveDTO.java
@@ -20,23 +20,27 @@
private static final long serialVersionUID = 2025091801L;
// 公共字段：领用部门、领用人、领用备注
- @ApiModelProperty("领用部门ID")
- @NotNull(message = "领用部门不能为空")
+ @ApiModelProperty("操作类型 0-领用，1-借用，2-归还")
+ @NotNull(message = "操作类型不能为空")
+ private Integer type;
+
+ @ApiModelProperty("领用/借用部门ID")
+ @NotNull(message = "领用/借用部门不能为空")
private Integer deptId;
- @ApiModelProperty("领用部门名称")
- @NotNull(message = "领用部门名称不能为空")
+ @ApiModelProperty("领用/借用部门名称")
+ @NotNull(message = "领用/借用部门名称不能为空")
private String deptName;
- @ApiModelProperty("领用人用户ID")
- @NotNull(message = "领用人不能为空")
+ @ApiModelProperty("领用/借用人用户ID")
+ @NotNull(message = "领用/借用人不能为空")
private Integer applicantUserId;
- @ApiModelProperty("领用人名称")
- @NotNull(message = "领用人名称不能为空")
+ @ApiModelProperty("领用/借用人名称")
+ @NotNull(message = "领用/借用人名称不能为空")
private String applicantName;
- @ApiModelProperty("领用备注")
+ @ApiModelProperty("领用/借用备注")
private String applicationReason;
@ApiModelProperty("附件URL，多个使用英文逗号拼接")
@@ -47,8 +51,8 @@
@NotNull(message = "事项标题不能为空")
private String title;
- @ApiModelProperty("领用日期")
- @NotNull(message = "领用日期不能为空")
+ @ApiModelProperty("领用/借用日期")
+ @NotNull(message = "领用/借用日期不能为空")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate operateTime;
@@ -56,21 +60,13 @@
@NotNull(message = "资产类型不能为空")
private Integer assetTypeId;
- @ApiModelProperty("预计退还日期，可为空")
+ @ApiModelProperty("预计退还日期，借用必填")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate expectReturnDate;
@ApiModelProperty("领用资产列表")
@NotEmpty(message = "领用资产列表不能为空")
- private List<ReceiveAssetItemDTO> assetItems;
+ private List<Integer> assetMainIds;
- @Data
- public static class ReceiveAssetItemDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty("资产主表ID")
- @NotNull(message = "资产ID不能为空")
- private Integer assetMainId;
- }
}
--
Gitblit v1.7.1