From a0d5f2224a6ec422f9f9d1493d81bdc0b161e18b Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期四, 15 十月 2026 11:21:22 +0800
Subject: [PATCH] 质量监督：新增监督计划下发接口（校验已批准且未重复下发，向监督员及被监督人推送站内消息与企业微信通知）；详情记录新增监督内容、监督记录、存在问题、整改意见字段；计划导出监督频次按月份数自动计算、监督时间仅显示月份、签名缺失兜底透明图避免导出失败，模板补全标题并新增记录编号；新增日常监督检查记录表 Word 模板并接入记录单导出；方法验证：新增数据处理、质量控制方法、方法结果验证、验证结论及评审、审批意见字段，导出支持评审、审批勾选项与日期格式化，同步调整 Word 模板
---
cnas-require/src/main/java/com/ruoyi/require/vo/SubstanceRecordVo.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/cnas-require/src/main/java/com/ruoyi/require/vo/SubstanceRecordVo.java b/cnas-require/src/main/java/com/ruoyi/require/vo/SubstanceRecordVo.java
index d98cad5..7907cc7 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/vo/SubstanceRecordVo.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/vo/SubstanceRecordVo.java
@@ -1,5 +1,6 @@
package com.ruoyi.require.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -17,29 +18,27 @@
@Schema(description = "瑙勬牸鍨嬪彿")
private String model;
- @Schema(description = "鍑哄満缂栧彿")
+ @Schema(description = "鍑哄巶缂栧彿")
private String factoryNum;
@Schema(description = "鏁伴噺")
private Long quantity;
+ @Schema(description = "鍗曚綅")
+ private String unit;
+
+ @Schema(description = "鏈棰嗙敤鏁伴噺")
+ private Long borrowQuantity;
+
+ @Schema(description = "棰嗙敤鍚庡墿浣欐暟閲�")
+ private Long remainingQuantity;
+
@Schema(description = "棰嗙敤浜�")
private String borrowUser;
@Schema(description = "鍊熷嚭鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime borrowDate;
-
- @Schema(description = "褰掕繕鏃ユ湡")
- private LocalDateTime returnDate;
-
- @Schema(description = "褰掕繕浜�")
- private String returnedPerson;
-
- @Schema(description = "瀹屽ソ鎬�")
- private String returnIntegrity;
-
- @Schema(description = "0锛氬�熺敤 1:褰掕繕")
- private String status;
@Schema(description = "澶囨敞")
private String remark;
--
Gitblit v1.9.3