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/pojo/FeStandardSubstanceRecord.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstanceRecord.java b/cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstanceRecord.java
index 0a576cd..ecb6818 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstanceRecord.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstanceRecord.java
@@ -1,6 +1,7 @@
package com.ruoyi.require.pojo;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -30,6 +31,15 @@
@Schema(description = "鐗╄川id")
private Integer substanceId;
+ @Schema(description = "鏈棰嗙敤鏁伴噺")
+ private Long borrowQuantity;
+
+ @Schema(description = "鍘熷鏁伴噺(棰嗙敤鏃跺揩鐓�)")
+ private Long originalQuantity;
+
+ @Schema(description = "棰嗙敤鍚庡墿浣欐暟閲�")
+ private Long remainingQuantity;
+
@Schema(description = "鍊熺敤-瀹屽ソ鎬�")
private String integrity;
@@ -40,9 +50,11 @@
private String phone;
@Schema(description = "鍊熺敤-鍊熷嚭鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime borrowDate;
@Schema(description = "褰掕繕鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime borrowReturnDate;
@Schema(description = "鍊熷嚭浜�")
@@ -58,6 +70,7 @@
private String returnedPerson;
@Schema(description = "褰掕繕-鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime returnDate;
@Schema(description = "褰掕繕-瀹屽ソ鎬�")
@@ -67,11 +80,13 @@
private String createUser;
@TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateUser;
@TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
}
--
Gitblit v1.9.3