From 1af369e972dc29cae66137345a4efc5dba8c0160 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 12 九月 2025 15:42:32 +0800
Subject: [PATCH] 修改
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TSamplingRecordOperation.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 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..e72841e 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,13 +1,16 @@
package com.ruoyi.system.model;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import java.io.Serializable;
import java.time.LocalDateTime;
/**
@@ -35,7 +38,7 @@
@ApiModelProperty(value = "工艺时间")
@TableField("process_time")
- private LocalDateTime processTime;
+ private String processTime;
@ApiModelProperty(value = "取样名称")
@TableField("sampling_name")
@@ -47,15 +50,15 @@
@ApiModelProperty(value = "温度")
@TableField("temperature")
- private Integer temperature;
+ private String temperature;
@ApiModelProperty(value = "PH值")
@TableField("sample_ph")
- private Integer samplePh;
+ private String samplePh;
@ApiModelProperty(value = "加水量")
@TableField("water_addition")
- private Integer waterAddition;
+ private String waterAddition;
@ApiModelProperty(value = "加辅1")
@TableField("add_auxiliary_one")
@@ -102,6 +105,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 +115,7 @@
@ApiModelProperty(value = "操作人")
@TableField("handle_person_id")
- private Integer handlePersonId;
+ private Long handlePersonId;
@ApiModelProperty(value = "状态 1=待发送 2=待接收 3=已接收")
@TableField("status")
@@ -119,27 +123,40 @@
@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;
+ @ApiModelProperty(value = "操作人姓名")
+ @TableField(exist = false)
+ private String handlePersonName;
+
+ @ApiModelProperty(value = "送样人姓名")
+ @TableField(exist = false)
+ private String sendPersonName;
+
+ @ApiModelProperty(value = "接收人姓名")
+ @TableField(exist = false)
+ private String receiptsPersonName;
}
--
Gitblit v1.7.1