From b84fc1807a6ce71f4d10cdb10da186abc5dcc173 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 19 九月 2025 19:37:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStoragePropertyDetailVO.java | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 170 insertions(+), 0 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
new file mode 100644
index 0000000..10c6515
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStoragePropertyDetailVO.java
@@ -0,0 +1,170 @@
+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;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * 房产资产入库申请详情VO（返回新增时填写的所有字段）
+ */
+@Data
+@ApiModel("房产资产入库申请详情VO")
+public class OaApprovalApplicationStoragePropertyDetailVO implements Serializable {
+
+ @ApiModelProperty(value = "申请部门ID")
+ private Integer deptId;
+
+ @ApiModelProperty(value = "申请部门名称")
+ private String deptName;
+
+ @ApiModelProperty(value = "申请人ID")
+ private Integer applicantUserId;
+
+ @ApiModelProperty(value = "申请人姓名")
+ private String applicantName;
+
+ @ApiModelProperty(value = "申请日期")
+ private LocalDate applicationDate;
+
+ @ApiModelProperty(value = "入库备注")
+ private String applicationReason;
+
+ @ApiModelProperty(value = "附件地址，多个使用英文逗号拼接")
+ private String attachmentUrl;
+
+ @ApiModelProperty(value = "事项标题")
+ private String title;
+
+ @ApiModelProperty(value = "资产类型ID")
+ private Integer assetTypeId;
+
+ @ApiModelProperty(value = "入库类型 0-正常入库")
+ private Boolean storageType;
+
+ @ApiModelProperty(value = "入库日期")
+ 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;
+
+ @Data
+ @ApiModel("房产资产明细VO")
+ public static class PropertyAssetItemVO implements Serializable {
+ @ApiModelProperty(value = "资产原编码")
+ private String assetOriginalCode;
+
+ @ApiModelProperty(value = "资产名称")
+ private String assetName;
+
+ @ApiModelProperty(value = "规格型号")
+ private String specificationModel;
+
+ @ApiModelProperty(value = "计量单位")
+ private String measurementUnit;
+
+ @ApiModelProperty(value = "数量")
+ private BigDecimal quantity;
+
+ @ApiModelProperty(value = "单价")
+ private BigDecimal unitPrice;
+
+ @ApiModelProperty(value = "使用年限（年）")
+ private Integer usefulLife;
+
+ @ApiModelProperty(value = "权属单位/部门名称")
+ private String ownerShipDeptName;
+
+ @ApiModelProperty(value = "使用人")
+ private String userName;
+
+ @ApiModelProperty(value = "资产状态")
+ private String assetStatus;
+
+ @ApiModelProperty(value = "备注")
+ private String remarks;
+
+ @ApiModelProperty(value = "入账状态")
+ private String accountingStatus;
+
+ @ApiModelProperty(value = "入账时间")
+ private LocalDate accountingDate;
+
+ @ApiModelProperty(value = "会计凭证号")
+ private String accountingVoucherNo;
+
+ @ApiModelProperty(value = "会计科目")
+ private String accountingSubject;
+
+ @ApiModelProperty(value = "入账金额")
+ private BigDecimal accountingAmount;
+
+ // 房产资产扩展表字段
+ @ApiModelProperty(value = "所在区域")
+ private String region;
+
+ @ApiModelProperty(value = "设计用途")
+ private String designPurpose;
+
+ @ApiModelProperty(value = "楼栋")
+ private String building;
+
+ @ApiModelProperty(value = "房间号")
+ private String roomNumber;
+
+ @ApiModelProperty(value = "建筑面积（平方米）")
+ private BigDecimal constructionArea;
+
+ @ApiModelProperty(value = "结构")
+ private String structureType;
+
+ @ApiModelProperty(value = "权证编号")
+ private String certificateNumber;
+
+ @ApiModelProperty(value = "建成年月")
+ private LocalDate completionDate;
+
+ @ApiModelProperty(value = "详细位置")
+ private String detailedLocation;
+
+ @ApiModelProperty(value = "省资产平台填报价值")
+ private BigDecimal provincialPlatformValue;
+
+ @ApiModelProperty(value = "安置情况")
+ private String resettlementSituation;
+
+ @ApiModelProperty(value = "是否抵押：0-否，1-是")
+ private Integer mortgaged;
+
+ @ApiModelProperty(value = "承租方")
+ private String tenantName;
+
+ @ApiModelProperty(value = "租金")
+ private BigDecimal rentalAmount;
+
+ @ApiModelProperty(value = "租赁期限起")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate leaseStartDate;
+
+ @ApiModelProperty(value = "租赁期限止")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate leaseEndDate;
+ }
+}
--
Gitblit v1.7.1