From f0e82c458cfe984ecb1b38b9297b661846eecfe2 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Thu, 7 Nov 2024 20:52:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/gather/machine/device/pojo/param/PqDevParam.java | 4 ++--
 .../gather/machine/pojo/constant/MachineValidMessage.java     | 2 +-
 .../njcn/gather/system/dictionary/service/IDictPqService.java | 3 +++
 .../system/dictionary/service/impl/DictPqServiceImpl.java     | 3 +++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/machine/src/main/java/com/njcn/gather/machine/device/pojo/param/PqDevParam.java b/machine/src/main/java/com/njcn/gather/machine/device/pojo/param/PqDevParam.java
index 110d184d..b8b1d9e7 100644
--- a/machine/src/main/java/com/njcn/gather/machine/device/pojo/param/PqDevParam.java
+++ b/machine/src/main/java/com/njcn/gather/machine/device/pojo/param/PqDevParam.java
@@ -91,8 +91,8 @@ public class PqDevParam {
     @ApiModelProperty("样品编号")
     private String sampleId;
 
-    @ApiModelProperty(value = "送样日期", required = false)
-    @DateTimeStrValid(format = "yyyy-MM-dd", message = MachineValidMessage.ARRIVEDATETIME_FORMAT_ERROR)
+    @ApiModelProperty(value = "送样日期")
+    @DateTimeStrValid(message = MachineValidMessage.ARRIVE_DATE_TIME_FORMAT_ERROR)
     private String arrivedDate;
 
     @ApiModelProperty("所属地市名称")
diff --git a/machine/src/main/java/com/njcn/gather/machine/pojo/constant/MachineValidMessage.java b/machine/src/main/java/com/njcn/gather/machine/pojo/constant/MachineValidMessage.java
index 4da3e90b..412ba257 100644
--- a/machine/src/main/java/com/njcn/gather/machine/pojo/constant/MachineValidMessage.java
+++ b/machine/src/main/java/com/njcn/gather/machine/pojo/constant/MachineValidMessage.java
@@ -48,5 +48,5 @@ public interface MachineValidMessage {
 
     String RECHECK_NUM_NOT_NULL = "复检次数不能为空，请检查reCheckNum参数";
 
-    String ARRIVEDATETIME_FORMAT_ERROR = "送样日期格式错误，请检查arrivedDateTime参数";
+    String ARRIVE_DATE_TIME_FORMAT_ERROR = "送样日期格式错误，请检查arrivedDateTime参数";
 }
diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/service/IDictPqService.java b/system/src/main/java/com/njcn/gather/system/dictionary/service/IDictPqService.java
index 1b4cb4ec..97d862d3 100644
--- a/system/src/main/java/com/njcn/gather/system/dictionary/service/IDictPqService.java
+++ b/system/src/main/java/com/njcn/gather/system/dictionary/service/IDictPqService.java
@@ -7,6 +7,9 @@ import com.njcn.gather.system.dictionary.pojo.po.DictPq;
 
 import java.util.List;
 
+/**
+ * @author caizehui
+ */
 public interface IDictPqService extends IService<DictPq> {
     /**
      * 分页查询电能质量指标字典列表
diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictPqServiceImpl.java b/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictPqServiceImpl.java
index 7a2659a0..e93f5b41 100644
--- a/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictPqServiceImpl.java
+++ b/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictPqServiceImpl.java
@@ -21,6 +21,9 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 
+/**
+ * @author caozehui
+ */
 @Service
 @RequiredArgsConstructor
 public class DictPqServiceImpl extends ServiceImpl<DictPqMapper, DictPq> implements IDictPqService {