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/pojo/MeasuringInstrumentLedgerRecord.java | 62 +++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedgerRecord.java b/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedgerRecord.java
index d69b57a..fd5d3f5 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedgerRecord.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedgerRecord.java
@@ -4,8 +4,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.CommonFile;
-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;
@@ -19,58 +18,58 @@
*/
@Data
@TableName("measuring_instrument_ledger_record")
-@ApiModel
+@Schema
public class MeasuringInstrumentLedgerRecord {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("璁￠噺鍣ㄥ叿缂栧彿")
+ @Schema(description = "璁￠噺鍣ㄥ叿缂栧彿")
@TableField(exist = false)
@Excel(name = "璁￠噺鍣ㄥ叿缂栧彿")
private String code;
- @ApiModelProperty("鍚嶇О")
+ @Schema(description = "鍚嶇О")
@TableField(exist = false)
@Excel(name = "鍚嶇О")
private String name;
- @ApiModelProperty("璁￠噺鍣ㄥ叿鍚嶇О")
+ @Schema(description = "璁￠噺鍣ㄥ叿鍚嶇О")
@TableField(exist = false)
@Excel(name = "璁￠噺鍣ㄥ叿鍚嶇О")
private String model;
- @ApiModelProperty("闄勪欢id")
+ @Schema(description = "闄勪欢id")
@TableField(exist = false)
private List<String> tempFileIds;
@TableField(exist = false)
- @ApiModelProperty("闄勪欢鍒楄〃")
+ @Schema(description = "闄勪欢鍒楄〃")
private List<CommonFile> commonFiles;
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("璁￠噺鍣ㄥ叿鍙拌处id")
+ @Schema(description = "璁￠噺鍣ㄥ叿鍙拌处id")
private Long measuringInstrumentLedgerId;
- @ApiModelProperty("妫�瀹氫汉id")
+ @Schema(description = "妫�瀹氫汉id")
private Long userId;
- @ApiModelProperty("妫�瀹氫汉鍚嶇О")
+ @Schema(description = "妫�瀹氫汉鍚嶇О")
@Excel(name = "妫�瀹氫汉鍚嶇О")
private String userName;
/**
* 妫�瀹氭棩鏈�
*/
- @ApiModelProperty("妫�瀹氭棩鏈�")
+ @Schema(description = "妫�瀹氭棩鏈�")
@Excel(name = "妫�瀹氭棩鏈�" , width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date recordDate;
- @ApiModelProperty("褰曞叆鏃ユ湡")
+ @Schema(description = "褰曞叆鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "褰曞叆鏃ユ湡" , width = 30, dateFormat = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd", iso = DateTimeFormat.ISO.DATE)
@@ -79,14 +78,47 @@
/**
* 鏈夋晥鏈燂紙鍗曚綅澶╋級
*/
- @ApiModelProperty("鏈夋晥鏈燂紙鍗曚綅澶╋級")
+ @Schema(description = "鏈夋晥鏈燂紙鍗曚綅澶╋級")
private Integer valid;
+
+ @Schema(description = "婧簮/鏍告煡绫诲瀷")
+ @Excel(name = "婧簮/鏍告煡绫诲瀷")
+ private String traceabilityType;
+
+ @Schema(description = "瀹炴柦鏈烘瀯")
+ @Excel(name = "瀹炴柦鏈烘瀯")
+ private String implementingAgency;
+
+ @Schema(description = "璇佷功缂栧彿")
+ @Excel(name = "璇佷功缂栧彿")
+ private String certificateNumber;
+
+ @Schema(description = "鏍稿績缁撴灉")
+ @Excel(name = "鏍稿績缁撴灉")
+ private String coreResult;
+
+ @Schema(description = "缁撴灉纭")
+ @Excel(name = "缁撴灉纭")
+ private String resultConfirmation;
+
+ @Schema(description = "鏈夋晥鏈熻嚦")
+ @Excel(name = "鏈夋晥鏈熻嚦", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date validUntil;
+
+ @Schema(description = "纭浜篿d")
+ private Long confirmerId;
+
+ @Schema(description = "纭浜�")
+ @Excel(name = "纭浜�")
+ private String confirmerName;
/**
* 鐘舵�侊紙1-鏈夋晥 2-閫炬湡锛�
*/
- @ApiModelProperty("鐘舵�侊紙1-鏈夋晥 2-閫炬湡锛�")
+ @Schema(description = "鐘舵�侊紙1-鏈夋晥 2-閫炬湡锛�")
private Integer status;
/**
--
Gitblit v1.9.3