From 0b0c5c743ebfd53deed0614e02a21b94dfe46f24 Mon Sep 17 00:00:00 2001
From: Administrator <1923636941@qq.com>
Date: Fri, 24 Feb 2023 15:40:47 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xmgl/modules/material/entity/MaterialApproachRecord.java   | 2 +-
 .../xmgl/modules/material/entity/MaterialDetectionReport.java  | 3 +++
 .../modules/material/entity/qo/MaterialDetectionReportQO.java  | 3 ++-
 .../service/impl/MaterialDetectionReportServiceImpl.java       | 3 ++-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/material/entity/MaterialApproachRecord.java b/src/main/java/com/zhgd/xmgl/modules/material/entity/MaterialApproachRecord.java
index 0440226f0..4af930571 100644
--- a/src/main/java/com/zhgd/xmgl/modules/material/entity/MaterialApproachRecord.java
+++ b/src/main/java/com/zhgd/xmgl/modules/material/entity/MaterialApproachRecord.java
@@ -56,7 +56,7 @@ public class MaterialApproachRecord implements Serializable {
 	 */
 	@Excel(name = "车牌号", width = 15)
 	@ApiModelProperty(value = "车牌号")
-	private Integer licensePlateNumber;
+	private String licensePlateNumber;
 	/**
 	 * 进场量
 	 */
diff --git a/src/main/java/com/zhgd/xmgl/modules/material/entity/MaterialDetectionReport.java b/src/main/java/com/zhgd/xmgl/modules/material/entity/MaterialDetectionReport.java
index 29d276b28..45d881012 100644
--- a/src/main/java/com/zhgd/xmgl/modules/material/entity/MaterialDetectionReport.java
+++ b/src/main/java/com/zhgd/xmgl/modules/material/entity/MaterialDetectionReport.java
@@ -86,5 +86,8 @@ public class MaterialDetectionReport implements Serializable {
     @ApiModelProperty(value = "楼层")
     private String floor;
 
+     @ApiModelProperty(value = "材料种类")
+    private String materialType;
+
 }
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/material/entity/qo/MaterialDetectionReportQO.java b/src/main/java/com/zhgd/xmgl/modules/material/entity/qo/MaterialDetectionReportQO.java
index 0234b299a..643d5a6e8 100644
--- a/src/main/java/com/zhgd/xmgl/modules/material/entity/qo/MaterialDetectionReportQO.java
+++ b/src/main/java/com/zhgd/xmgl/modules/material/entity/qo/MaterialDetectionReportQO.java
@@ -94,6 +94,7 @@ public class MaterialDetectionReportQO implements Serializable {
 
     @ApiModelProperty(value = "楼层")
     private String floor;
-
+    @ApiModelProperty(value = "材料种类")
+    private String materialType;
 }
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/material/service/impl/MaterialDetectionReportServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/material/service/impl/MaterialDetectionReportServiceImpl.java
index 3674fbbd3..d2f4388ac 100644
--- a/src/main/java/com/zhgd/xmgl/modules/material/service/impl/MaterialDetectionReportServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/material/service/impl/MaterialDetectionReportServiceImpl.java
@@ -50,7 +50,8 @@ public class MaterialDetectionReportServiceImpl extends ServiceImpl<MaterialDete
                 // 更新时间 yyyy-MM-dd HH:mm:ss 之后
                 .ge(CharSequenceUtil.isNotBlank(materialDetectionReportQo.getStartUpdateDate()), MaterialDetectionReport::getUpdateDate, materialDetectionReportQo.getStartUpdateDate())
                 // 更新时间 yyyy-MM-dd HH:mm:ss 之前
-                .le(CharSequenceUtil.isNotBlank(materialDetectionReportQo.getEndUpdateDate()), MaterialDetectionReport::getUpdateDate, materialDetectionReportQo.getEndUpdateDate());
+                .le(CharSequenceUtil.isNotBlank(materialDetectionReportQo.getEndUpdateDate()), MaterialDetectionReport::getUpdateDate, materialDetectionReportQo.getEndUpdateDate())
+                .eq(CharSequenceUtil.isNotBlank(materialDetectionReportQo.getMaterialType()), MaterialDetectionReport::getMaterialType, materialDetectionReportQo.getMaterialType());
         wrapper.orderByDesc(MaterialDetectionReport::getUpdateDate);
         return materialDetectionReportMapper.selectPage(page, wrapper);
     }