From 1d915922d8197aa5d5dc3e40e3088d983dd6e141 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 13 三月 2026 17:57:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg
---
src/main/java/com/ruoyi/quality/dto/RawMaterialDto.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 51 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/dto/RawMaterialDto.java b/src/main/java/com/ruoyi/quality/dto/RawMaterialDto.java
new file mode 100644
index 0000000..d1c1224
--- /dev/null
+++ b/src/main/java/com/ruoyi/quality/dto/RawMaterialDto.java
@@ -0,0 +1,51 @@
+package com.ruoyi.quality.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.quality.pojo.RawMaterial;
+
+import com.ruoyi.quality.pojo.RawMaterialQualityInspectItem;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * 鍘熸枡DTO
+ */
+@Data
+@ApiModel(value = "RawMaterialDto", description = "鍘熸枡DTO")
+public class RawMaterialDto extends RawMaterial implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 寮�濮嬫椂闂�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty("琛ㄥ崟鎼滅储鏃堕棿鑼冨洿锛氬紑濮嬫椂闂�")
+ private LocalDate entryDateStart;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty("琛ㄥ崟鎼滅储鏃堕棿鑼冨洿锛氱粨鏉熸椂闂�")
+ private LocalDate entryDateEnd;
+
+ @ApiModelProperty("妫�楠岀被鍨� 0鍏ュ満妫� 1杞﹂棿妫� 2鍑哄巶妫�")
+ private String checkTypeText;
+
+ @ApiModelProperty("妫�楠岀粨鏋� 0鍚堟牸 1涓嶅悎鏍�")
+ private String checkResultText;
+
+ @ApiModelProperty("绫诲埆(0:鏈彁浜�;1:宸叉彁浜�)")
+ private String inspectStateText;
+
+ @ApiModelProperty("鍘熸枡妫�娴嬮」鍒楄〃ids")
+ private List<Long> qualityInspectItemIds;
+}
--
Gitblit v1.9.3