From 4ecf2dbe2c255c3b556ff4bfb49b4e2e8285bd17 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 31 Aug 2021 11:24:45 +0800
Subject: [PATCH] 1.ftp

---
 src/main/java/org/springblade/modules/directive/mapper/DirectiveMapper.xml |   39 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/directive/mapper/DirectiveMapper.xml b/src/main/java/org/springblade/modules/directive/mapper/DirectiveMapper.xml
index 38ee2c1..634329a 100644
--- a/src/main/java/org/springblade/modules/directive/mapper/DirectiveMapper.xml
+++ b/src/main/java/org/springblade/modules/directive/mapper/DirectiveMapper.xml
@@ -16,13 +16,19 @@
         where
         1=1
         <if test="directive.type!=null and directive.type!=''">
-            and sll.type = #{directive.type}
+            and sd.type = #{directive.type}
         </if>
         <if test="directive.startTime!=null and directive.startTime!=''">
-            and sl.send_time &gt;= #{directive.startTime}
+            and sd.send_time &gt;= #{directive.startTime}
         </if>
         <if test="directive.endTime!=null and directive.endTime!=''">
-            and sl.send_time &lt;= #{directive.endTime}
+            and sd.send_time &lt;= #{directive.endTime}
+        </if>
+        <if test="directive.sendDirectiveId!=null and directive.sendDirectiveId!=''">
+            and sd.send_directive_id like concat('%', #{directive.sendDirectiveId},'%')
+        </if>
+        <if test="directive.receiveDirectiveIds!=null and directive.receiveDirectiveIds!=''">
+            and sd.receive_directive_ids like concat('%', #{directive.receiveDirectiveIds},'%')
         </if>
     </select>
 
@@ -62,4 +68,31 @@
         delete from sys_directive_file where directive_id = #{id}
     </delete>
 
+    <!--自定义分页-接收到的指令-->
+    <select id="selectDirectiveReplyPage" resultType="org.springblade.modules.directive.vo.DirectiveVo">
+        SELECT
+        sd.*,
+        bu.real_name sendName
+        FROM
+        sys_directive sd
+        left join
+        blade_user bu
+        on
+        bu.id = sd.send_directive_id
+        where
+        1=1
+        <if test="directive.type!=null and directive.type!=''">
+            and sd.type = #{directive.type}
+        </if>
+        <if test="directive.startTime!=null and directive.startTime!=''">
+            and sd.send_time &gt;= #{directive.startTime}
+        </if>
+        <if test="directive.endTime!=null and directive.endTime!=''">
+            and sd.send_time &lt;= #{directive.endTime}
+        </if>
+        <if test="directive.receiveDirectiveIds!=null and directive.receiveDirectiveIds!=''">
+            and sd.receive_directive_ids like concat('%', #{directive.receiveDirectiveIds},'%')
+        </if>
+    </select>
+
 </mapper>

--
Gitblit v1.9.3