From 8d3ff63ab144ad6b48015b01196bc901944a48f9 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期一, 16 十二月 2024 10:51:41 +0800
Subject: [PATCH] 煤质部分后端代码

---
 iailab-xmc-pms-biz/src/main/java/com/iailab/module/pms/coalquality/modules/detection/dto/QualityTailingDTO.java |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/iailab-xmc-pms-biz/src/main/java/com/iailab/module/pms/coalquality/modules/detection/dto/QualityTailingDTO.java b/iailab-xmc-pms-biz/src/main/java/com/iailab/module/pms/coalquality/modules/detection/dto/QualityTailingDTO.java
index 1f7088b..b9e62fd 100644
--- a/iailab-xmc-pms-biz/src/main/java/com/iailab/module/pms/coalquality/modules/detection/dto/QualityTailingDTO.java
+++ b/iailab-xmc-pms-biz/src/main/java/com/iailab/module/pms/coalquality/modules/detection/dto/QualityTailingDTO.java
@@ -1,16 +1,12 @@
 package com.iailab.module.pms.coalquality.modules.detection.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.iailab.iems.common.annotation.Dict;
-import com.iailab.iems.common.validator.group.AddGroup;
-import com.iailab.iems.common.validator.group.UpdateGroup;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Null;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @author PanZhibao
@@ -23,8 +19,6 @@
     private static final long serialVersionUID = 1L;
 
     @Schema(description = "id")
-    @Null(message="{id.null}", groups = AddGroup.class)
-    @NotNull(message="{id.require}", groups = UpdateGroup.class)
     private String id;
 
     @Schema(description = "流水号")
@@ -38,21 +32,21 @@
     private String bc;
 
     @Schema(description = "班次")
-    @Dict(dicCode = "bc", itemValue = "bc")
     private String bcName;
 
     @Schema(description = "采样点")
     private String cyd;
 
     @Schema(description = "采样点")
-    @Dict(dicCode = "cyd", itemValue = "cyd")
     private String cydName;
 
     @Schema(description = "采样时间")
-    private java.util.Date cysj;
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone = "GMT+8")
+    private Date cysj;
 
     @Schema(description = "化验时间")
-    private java.util.Date hysj;
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone = "GMT+8")
+    private Date hysj;
 
     @Schema(description = "采样数量")
     private BigDecimal cysl;

--
Gitblit v1.9.3