From 77a409bdbaa1ed9f8ac7829f6ffbb7521e61f854 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 12 四月 2025 16:21:42 +0800
Subject: [PATCH] 课题方案，实验调度管理
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TSamplingRecordOperation.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSamplingRecordOperation.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSamplingRecordOperation.java
index b6c5cd3..76ddc0f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSamplingRecordOperation.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSamplingRecordOperation.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.model;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -34,6 +35,7 @@
private String samplingId;
@ApiModelProperty(value = "工艺时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("process_time")
private LocalDateTime processTime;
@@ -102,6 +104,7 @@
private Integer sampleAmount;
@ApiModelProperty(value = "送样时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("send_sample_time")
private LocalDateTime sendSampleTime;
@@ -111,7 +114,7 @@
@ApiModelProperty(value = "操作人")
@TableField("handle_person_id")
- private Integer handlePersonId;
+ private Long handlePersonId;
@ApiModelProperty(value = "状态 1=待发送 2=待接收 3=已接收")
@TableField("status")
@@ -119,25 +122,27 @@
@ApiModelProperty(value = "送样人")
@TableField("send_person_id")
- private Integer sendPersonId;
+ private Long sendPersonId;
@ApiModelProperty(value = "送样签字")
@TableField("send_sign")
private String sendSign;
@ApiModelProperty(value = "送样时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("send_time")
private LocalDateTime sendTime;
@ApiModelProperty(value = "接收人")
@TableField("receipts_person_id")
- private Integer receiptsPersonId;
+ private Long receiptsPersonId;
@ApiModelProperty(value = "接收签字")
@TableField("receipts_sign")
private String receiptsSign;
@ApiModelProperty(value = "接收时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("receipts_time")
private LocalDateTime receiptsTime;
--
Gitblit v1.7.1