From 0388d54af57e8d3d4a99554501b232ca572b50c6 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 12 十月 2026 17:48:51 +0800
Subject: [PATCH] 客户满意度新增附件与委托单关联；供应商管理新增附件；标准物质接收、记录、验收模块调整；委托单新增已完成列表接口（满意度下拉用）；管理记录服务调整
---
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