From a8e4132c3e2e9c3b3fcb0360901b35571b6464ea Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期五, 28 八月 2026 10:13:01 +0800
Subject: [PATCH] feat: 综合业务模块功能补充与实体拓展
---
src/main/java/com/ruoyi/measuringinstrumentledger/dto/MeasuringInstrumentLedgerDto.java | 43 ++++++++++++++++++++++++++++++++-----------
1 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/dto/MeasuringInstrumentLedgerDto.java b/src/main/java/com/ruoyi/measuringinstrumentledger/dto/MeasuringInstrumentLedgerDto.java
index 8ecfdcb..75d71c4 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/dto/MeasuringInstrumentLedgerDto.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/dto/MeasuringInstrumentLedgerDto.java
@@ -1,10 +1,7 @@
package com.ruoyi.measuringinstrumentledger.dto;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -16,31 +13,55 @@
* @date : 2025/8/5 9:50
*/
@Data
-@ApiModel
+@Schema
public class MeasuringInstrumentLedgerDto {
- @ApiModelProperty("ID")
+ @Schema(description = "ID")
private Long id;
- @ApiModelProperty("闄勪欢id")
+ @Schema(description = "闄勪欢id")
private List<String> tempFileIds;
- @ApiModelProperty("妫�瀹氭棩鏈�")
+ @Schema(description = "妫�瀹氭棩鏈�")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd", iso = DateTimeFormat.ISO.DATE)
private Date recordDate;
- @ApiModelProperty("褰曞叆鏃ユ湡")
+ @Schema(description = "褰曞叆鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd", iso = DateTimeFormat.ISO.DATE)
private Date entryDate;
- @ApiModelProperty("鏈夋晥鏈�")
+ @Schema(description = "鏈夋晥鏈�")
private Integer valid;
- @ApiModelProperty("妫�瀹氫汉")
+ @Schema(description = "妫�瀹氫汉")
private Long userId;
+ @Schema(description = "婧簮/鏍告煡绫诲瀷")
+ private String traceabilityType;
+ @Schema(description = "瀹炴柦鏈烘瀯")
+ private String implementingAgency;
+
+ @Schema(description = "璇佷功缂栧彿")
+ private String certificateNumber;
+
+ @Schema(description = "鏍稿績缁撴灉")
+ private String coreResult;
+
+ @Schema(description = "缁撴灉纭")
+ private String resultConfirmation;
+
+ @Schema(description = "纭浜篿d")
+ private Long confirmerId;
+
+ @Schema(description = "纭浜�")
+ private String confirmerName;
+
+ @Schema(description = "鏈夋晥鏈熻嚦")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date validUntil;
}
--
Gitblit v1.9.3