From b5960d1968e007b91d4d33dd7cbb74f1b566f2c1 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 24 May 2024 10:20:01 +0800
Subject: [PATCH] 到期时间修改

---
 src/main/java/org/springblade/modules/directive/mapper/DirectiveMapper.xml |   61 ++++++++++++++++++++++++++++--
 1 files changed, 57 insertions(+), 4 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 be4dfe3..5562a1d 100644
--- a/src/main/java/org/springblade/modules/directive/mapper/DirectiveMapper.xml
+++ b/src/main/java/org/springblade/modules/directive/mapper/DirectiveMapper.xml
@@ -12,17 +12,29 @@
         left join
             blade_user bu
         on
-            bu.id = sd.user_id
+            bu.id = sd.send_directive_id
         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.content!=null and directive.content!=''">
+            and sd.content like concat('%', #{directive.content},'%')
+        </if>
+        <if test="directive.sendName!=null and directive.sendName!=''">
+            and bu.real_name like concat('%', #{directive.sendName},'%')
+        </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>
 
@@ -48,4 +60,45 @@
         </if>
     </select>
 
+    <!--插入图片-->
+    <insert id="saveDirectiveFile">
+        insert into
+            sys_directive_file
+        (type,directive_id,url)
+            value
+        (#{directiveFile.type},#{directiveFile.directiveId},#{directiveFile.url})
+    </insert>
+
+    <!--删除图片-->
+    <delete id="deleteByDirectiveId">
+        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