From 236fb6ff1f6a955db5f78560204e042e977e2167 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期一, 22 九月 2025 20:47:52 +0800 Subject: [PATCH] 资产入库审批通过保存资产数据 --- ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStorageVehicleDetailVO.java | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStorageVehicleDetailVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStorageVehicleDetailVO.java index d44729a..c1a2fbf 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStorageVehicleDetailVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStorageVehicleDetailVO.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; @@ -29,6 +30,7 @@ private String applicantName; @ApiModelProperty(value = "申请日期") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate applicationDate; @ApiModelProperty(value = "入库备注") @@ -44,22 +46,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<VehicleAssetItemVO> assetItems; @@ -139,5 +130,18 @@ @ApiModelProperty(value = "产权形式") private String propertyRightForm; + + @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