From db8c8f33eeeb890fc1eaf07f0802c00728fc686a Mon Sep 17 00:00:00 2001
From: wans <747101512@qq.com>
Date: Wed, 5 May 2021 15:17:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A1=E5=88=92=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=92=8C=E5=85=81=E8=AE=B8=E6=8A=A5=E5=90=8D=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E7=BA=A6=E6=9D=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/classplan/class-plan-mapper.xml    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mybatis/mapper/classplan/class-plan-mapper.xml b/src/main/resources/mybatis/mapper/classplan/class-plan-mapper.xml
index 05f6438..c1155a2 100644
--- a/src/main/resources/mybatis/mapper/classplan/class-plan-mapper.xml
+++ b/src/main/resources/mybatis/mapper/classplan/class-plan-mapper.xml
@@ -292,8 +292,15 @@
         <if test="orgId != null">
             AND t1.org_id = #{orgId}
         </if>
-        <if test="repotType != null and repotType != ''">
-            AND t1.report_type = #{repotType}
+        <if test="reportType != null and reportType != ''">
+            AND t1.report_type = #{reportType}
+        </if>
+        <if test="signNowDate != null and signNowDate != ''">
+            AND t1.sign_up_start_time <![CDATA[ <= ]]> #{signNowDate}
+            AND t1.sign_up_end_time <![CDATA[ >= ]]> #{signNowDate}
+        </if>
+        <if test="planType != null and planType != ''">
+            AND t1.plan_type = #{planType}
         </if>
         <if test="keywords != null and keywords != ''">
             AND (