From 482033ad6accee24ae2a530ad5fbc42febb0f2f1 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 16 三月 2026 13:31:56 +0800
Subject: [PATCH] 质量管理：优化更新逻辑，增加原料导出、下载接口
---
src/main/java/com/ruoyi/quality/dto/RawMaterialDto.java | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/dto/RawMaterialDto.java b/src/main/java/com/ruoyi/quality/dto/RawMaterialDto.java
index d1c1224..7357a19 100644
--- a/src/main/java/com/ruoyi/quality/dto/RawMaterialDto.java
+++ b/src/main/java/com/ruoyi/quality/dto/RawMaterialDto.java
@@ -1,16 +1,13 @@
package com.ruoyi.quality.dto;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.inspectiontask.pojo.QualityInspectItem;
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;
/**
@@ -24,18 +21,14 @@
/**
* 寮�濮嬫椂闂�
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty("琛ㄥ崟鎼滅储鏃堕棿鑼冨洿锛氬紑濮嬫椂闂�")
- private LocalDate entryDateStart;
+ private String entryDateStart;
/**
* 缁撴潫鏃堕棿
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty("琛ㄥ崟鎼滅储鏃堕棿鑼冨洿锛氱粨鏉熸椂闂�")
- private LocalDate entryDateEnd;
+ private String entryDateEnd;
@ApiModelProperty("妫�楠岀被鍨� 0鍏ュ満妫� 1杞﹂棿妫� 2鍑哄巶妫�")
private String checkTypeText;
@@ -46,6 +39,20 @@
@ApiModelProperty("绫诲埆(0:鏈彁浜�;1:宸叉彁浜�)")
private String inspectStateText;
- @ApiModelProperty("鍘熸枡妫�娴嬮」鍒楄〃ids")
- private List<Long> qualityInspectItemIds;
+ @ApiModelProperty("鍘熸枡妫�娴嬮」鍒楄〃")
+ private List<QualityInspectItem> qualityInspectItem;
+
+ @ApiModelProperty("浜у搧鍚嶇О")
+ @Excel(name = "浜у搧鍚嶇О")
+ private String productName;
+
+ @ApiModelProperty("瑙勬牸鍨嬪彿")
+ @Excel(name = "瑙勬牸鍨嬪彿")
+ private String model;
+
+ @ApiModelProperty("浜у搧id")
+ private Long productId;
+
+ @ApiModelProperty("鍗曚綅")
+ private String unit;
}
--
Gitblit v1.9.3