From acbe0c6c601ff1368002d701631a43a2c00b61f5 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 15 十月 2025 15:27:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/AssetInventoryTaskDTO.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/AddInventoryTaskDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/AssetInventoryTaskDTO.java
similarity index 62%
rename from ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/AddInventoryTaskDTO.java
rename to ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/AssetInventoryTaskDTO.java
index 3103645..fcbaeb6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/AddInventoryTaskDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/AssetInventoryTaskDTO.java
@@ -19,7 +19,7 @@
*/
@Data
@ApiModel("新增盘点任务DTO")
-public class AddInventoryTaskDTO {
+public class AssetInventoryTaskDTO {
@NotBlank(message = "任务名称不能为空")
@ApiModelProperty("盘点任务名称")
@@ -38,6 +38,22 @@
private LocalDate executeDate;
@NotEmpty(message = "盘点资产列表不能为空")
- @ApiModelProperty("盘点资产ID列表")
- private List<Integer> assetMainIds;
+ @ApiModelProperty("盘点资产列表")
+ private List<AssetMainDTO> assetMains;
+
+ /**
+ * 资产盘点项DTO
+ * 用于指定每个资产的盘点人信息
+ */
+ @Data
+ @ApiModel("资产盘点项DTO")
+ public static class AssetMainDTO {
+
+ @NotNull(message = "资产ID不能为空")
+ @ApiModelProperty(value = "资产ID", required = true, example = "1001")
+ private Integer assetMainId;
+
+ @ApiModelProperty(value = "盘点人ID，为空时默认使用当前创建用户", example = "1001")
+ private Integer userId;
+ }
}
\ No newline at end of file
--
Gitblit v1.7.1