From 8341ec7982e0d0fdae67ae32c8f55e4292c9605a Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 18 三月 2026 14:12:59 +0800
Subject: [PATCH] 1.报表管理（报表管理：原材料、半成品、成品的数据统计，做成入厂检、车间检、出厂检的数据统计）
---
src/main/java/com/ruoyi/quality/pojo/RawMaterial.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/pojo/RawMaterial.java b/src/main/java/com/ruoyi/quality/pojo/RawMaterial.java
index df0c2d2..bf7d158 100644
--- a/src/main/java/com/ruoyi/quality/pojo/RawMaterial.java
+++ b/src/main/java/com/ruoyi/quality/pojo/RawMaterial.java
@@ -1,19 +1,17 @@
package com.ruoyi.quality.pojo;
import com.baomidou.mybatisplus.annotation.*;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.Date;
-
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
/**
* <p>
@@ -46,7 +44,7 @@
private String batchNo;
@ApiModelProperty("妫�楠岀粨鏋� 0鍚堟牸 1涓嶅悎鏍�")
- @Excel(name = "妫�楠岀粨鏋�", readConverterExp = "0=鍚堟牸,1=涓嶅悎鏍�")
+ @Excel(name = "妫�楠岀粨鏋�", readConverterExp = "0=涓嶅悎鏍�,1=鍚堟牸")
private Integer checkResult;
@ApiModelProperty("绫诲埆(0:鏈彁浜�;1:宸叉彁浜�)")
@@ -59,6 +57,7 @@
@ApiModelProperty("妫�楠屾棩鏈�")
@JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "妫�娴嬫棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
private Date checkTime;
--
Gitblit v1.9.3