From 56ed1beb04cb44f534b90df7f0589b0609c410d1 Mon Sep 17 00:00:00 2001
From: 252535409 <252535409@qq.com>
Date: Wed, 29 Nov 2023 22:13:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/jeecg/modules/ai/mapper/xml/PreReviewRecordsMapper.xml | 3 +++
 .../java/org/jeecg/modules/ai/qo/PreReviewRecordsQuery.java    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/xml/PreReviewRecordsMapper.xml b/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/xml/PreReviewRecordsMapper.xml
index b8bb536..cce3fc0 100644
--- a/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/xml/PreReviewRecordsMapper.xml
+++ b/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/xml/PreReviewRecordsMapper.xml
@@ -22,6 +22,9 @@
     	<where>
     		<if test="query.displayName != null and query.displayName != ''"> and b.display_name like CONCAT('%', #{query.displayName}, '%') </if>
     		<if test="query.eventCode != null and query.eventCode != ''"> and a.event_code like CONCAT('%', #{query.eventCode}, '%') </if>
+    		<if test="query.materialBag != null and query.materialBag != ''"> and a.material_bag = #{query.materialBag,jdbcType=VARCHAR} </if>
+    		<if test="query.materialType != null and query.materialType != ''"> and c.type = #{query.materialType,jdbcType=VARCHAR} </if>
+    		<if test="query.orgCode != null and query.orgCode != ''"> and c.site = #{query.orgCode,jdbcType=VARCHAR} </if>
     		<if test="query.validStatus != null"> and a.valid_status = #{query.validStatus,jdbcType=INTEGER} </if>
     		<if test="query.evaluateStatus != null"> and a.evaluate_status = #{query.evaluateStatus,jdbcType=INTEGER} </if>
     	</where>
diff --git a/service-management-system/src/main/java/org/jeecg/modules/ai/qo/PreReviewRecordsQuery.java b/service-management-system/src/main/java/org/jeecg/modules/ai/qo/PreReviewRecordsQuery.java
index e0f15a3..ecccb88 100644
--- a/service-management-system/src/main/java/org/jeecg/modules/ai/qo/PreReviewRecordsQuery.java
+++ b/service-management-system/src/main/java/org/jeecg/modules/ai/qo/PreReviewRecordsQuery.java
@@ -7,6 +7,9 @@ public class PreReviewRecordsQuery {
 	
 	private String displayName;
 	private String eventCode;
+	private String orgCode;
+	private String materialBag;
+	private String materialType;
 	private Integer validStatus;
 	private Integer evaluateStatus;