From 291a72bf35e2d39b816abc0ebf085cfa9da3ee06 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 23 九月 2025 14:11:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStoragePropertyDetailVO.java | 49 +++++++++++++++++++++++++++++++------------------
1 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStoragePropertyDetailVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStoragePropertyDetailVO.java
index e1e2179..7586819 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStoragePropertyDetailVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStoragePropertyDetailVO.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.vo.asset;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -28,7 +29,11 @@
@ApiModelProperty(value = "申请人姓名")
private String applicantName;
+ @ApiModelProperty(value = "审批状态 0-草稿，1-待审批，2-审批通过，3-审批拒绝 ，4-已撤回")
+ private Integer approvalStatus;
+
@ApiModelProperty(value = "申请日期")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate applicationDate;
@ApiModelProperty(value = "入库备注")
@@ -44,22 +49,11 @@
private Integer assetTypeId;
@ApiModelProperty(value = "入库类型 0-正常入库")
- private Boolean storageType;
+ private Integer storageType;
@ApiModelProperty(value = "入库日期")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate storageTime;
-
- @ApiModelProperty(value = "位置类型 0-部门，1-仓库，2-录入地址")
- private Integer addressType;
-
- @ApiModelProperty(value = "使用部门/位置名称")
- private String useDeptName;
-
- @ApiModelProperty(value = "仓库名称")
- private String warehouseName;
-
- @ApiModelProperty(value = "所在位置")
- private String address;
@ApiModelProperty(value = "房产资产明细列表（按保存展开后的一条资产记录对应一条明细）")
private List<PropertyAssetItemVO> assetItems;
@@ -67,11 +61,17 @@
@Data
@ApiModel("房产资产明细VO")
public static class PropertyAssetItemVO implements Serializable {
+ @ApiModelProperty(value = "资产主表ID")
+ private Integer id;
+
@ApiModelProperty(value = "资产原编码")
private String assetOriginalCode;
@ApiModelProperty(value = "资产名称")
private String assetName;
+
+ @ApiModelProperty(value = "类别")
+ private String category;
@ApiModelProperty(value = "规格型号")
private String specificationModel;
@@ -88,8 +88,8 @@
@ApiModelProperty(value = "使用年限（年）")
private Integer usefulLife;
- @ApiModelProperty(value = "权属单位/部门ID")
- private Integer ownershipDeptId;
+ @ApiModelProperty(value = "权属单位/部门名称")
+ private String ownershipDeptName;
@ApiModelProperty(value = "使用人")
private String userName;
@@ -149,8 +149,8 @@
@ApiModelProperty(value = "安置情况")
private String resettlementSituation;
- @ApiModelProperty(value = "是否抵押：0-否，1-是")
- private Boolean isMortgaged;
+ @ApiModelProperty(value = "是否抵押：否，是")
+ private String mortgaged;
@ApiModelProperty(value = "承租方")
private String tenantName;
@@ -159,10 +159,23 @@
private BigDecimal rentalAmount;
@ApiModelProperty(value = "租赁期限起")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate leaseStartDate;
@ApiModelProperty(value = "租赁期限止")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate leaseEndDate;
+
+ @ApiModelProperty(value = "位置类型 0-部门，1-仓库，2-录入地址")
+ private Integer addressType;
+
+ @ApiModelProperty(value = "使用部门/位置名称")
+ private String useDeptName;
+
+ @ApiModelProperty(value = "仓库名称")
+ private String warehouseName;
+
+ @ApiModelProperty(value = "所在位置")
+ private String address;
}
}
-
--
Gitblit v1.7.1