cuizhibin
/
znpt-backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

忽略提交pom.xml，yaml文件，完成设备采购模块的新增和编辑功能

This commit is contained in:
Mr.j 2025-08-07 08:37:30 +08:00
parent 8a1c5b04c5
commit c6d44f1787
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitignore vendored
View File

@ -35,4 +35,10 @@ build/
### VS Code ### ### VS Code ###
.vscode/ .vscode/
target/ target/
logs/ logs/
### Maven ###
pom.xml
### YAML ###
*.yaml

17
core/src/main/java/com/dite/znpt/domain/vo/EquipmentResp.java
View File

@ -1,5 +1,6 @@
package com.dite.znpt.domain.vo; package com.dite.znpt.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -29,7 +30,7 @@ public class EquipmentResp implements Serializable {
@ApiModelProperty("设备名称") @ApiModelProperty("设备名称")
private String equipmentName; private String equipmentName;
@ApiModelProperty("设备类型") @ApiModelProperty("类型")
private String equipmentType; private String equipmentType;
@ApiModelProperty("设备类型描述") @ApiModelProperty("设备类型描述")
@ -75,21 +76,27 @@ public class EquipmentResp implements Serializable {
private String healthStatusLabel; private String healthStatusLabel;
@ApiModelProperty("采购时间") @ApiModelProperty("采购时间")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
private LocalDateTime purchaseTime; private LocalDateTime purchaseTime;
@ApiModelProperty("入库时间") @ApiModelProperty("入库时间")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
private LocalDateTime inStockTime; private LocalDateTime inStockTime;
@ApiModelProperty("启用时间") @ApiModelProperty("启用时间")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
private LocalDateTime activationTime; private LocalDateTime activationTime;
@ApiModelProperty("预计报废时间") @ApiModelProperty("预计报废时间")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
private LocalDateTime expectedScrapTime; private LocalDateTime expectedScrapTime;
@ApiModelProperty("实际报废时间") @ApiModelProperty("实际报废时间")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
private LocalDateTime actualScrapTime; private LocalDateTime actualScrapTime;
@ApiModelProperty("状态变更时间") @ApiModelProperty("状态变更时间")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
private LocalDateTime statusChangeTime; private LocalDateTime statusChangeTime;
@ApiModelProperty("采购订单") @ApiModelProperty("采购订单")
@ -115,12 +122,15 @@ public class EquipmentResp implements Serializable {
private BigDecimal salvageValue; private BigDecimal salvageValue;
@ApiModelProperty("保修截止日期") @ApiModelProperty("保修截止日期")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
private LocalDateTime warrantyExpireDate; private LocalDateTime warrantyExpireDate;
@ApiModelProperty("上次维护日期") @ApiModelProperty("上次维护日期")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
private LocalDateTime lastMaintenanceDate; private LocalDateTime lastMaintenanceDate;
@ApiModelProperty("下次维护日期") @ApiModelProperty("下次维护日期")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
private LocalDateTime nextMaintenanceDate; private LocalDateTime nextMaintenanceDate;
@ApiModelProperty("维护人员") @ApiModelProperty("维护人员")
@ -168,12 +178,15 @@ public class EquipmentResp implements Serializable {
private String usingDepartment; private String usingDepartment;
@ApiModelProperty("领用时间") @ApiModelProperty("领用时间")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
private LocalDateTime borrowingTime; private LocalDateTime borrowingTime;
@ApiModelProperty("归还时间") @ApiModelProperty("归还时间")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
private LocalDateTime returnTime; private LocalDateTime returnTime;
@ApiModelProperty("出库时间") @ApiModelProperty("出库时间")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
private LocalDateTime outStockTime; private LocalDateTime outStockTime;
@ApiModelProperty("总使用时间") @ApiModelProperty("总使用时间")
@ -234,8 +247,10 @@ public class EquipmentResp implements Serializable {
private String name; private String name;
@ApiModelProperty("创建时间") @ApiModelProperty("创建时间")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
@ApiModelProperty("更新时间") @ApiModelProperty("更新时间")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;
} }