From 2f8565b2623f2cb74fe71fa4c85226b66f5f3df7 Mon Sep 17 00:00:00 2001
From: du <1725534722@qq.com>
Date: Wed, 21 Aug 2024 15:37:45 +0800
Subject: [PATCH] bugfix

---
 .../jjh/ent/service/impl/JSmartRemindersServiceImpl.java      | 4 ++++
 .../src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml   | 1 +
 .../src/main/resources/mapper/jjh/ent/JProjectFundMapper.xml  | 4 ++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JSmartRemindersServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JSmartRemindersServiceImpl.java
index f47878a..5e7e723 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JSmartRemindersServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JSmartRemindersServiceImpl.java
@@ -68,6 +68,10 @@ public class JSmartRemindersServiceImpl extends ServiceImpl<JSmartRemindersMappe
         if (jSmartReminders.getAlertManner() == 2) {
             throw new ServiceException("不可新增不定期提醒!");
         }
+        LocalDateTime nt = LocalDateTime.now().plusMinutes(5);
+        if(jSmartRemindersDq.getAlertTime().isBefore(nt)){
+            throw new ServiceException("提醒时间必须在当前时间5分钟后!");
+        }
         save(jSmartReminders);
         updateAndAdd(jSmartReminders, true);
         return jSmartReminders.getId();
diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml
index de24beb..66c8e12 100644
--- a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml
@@ -59,6 +59,7 @@
         FROM j_smart_reminders a
                  left JOIN j_project b on a.project_id = b.id
         where a.alert_type = 4 and  NOW()  > a.alert_time
+        order by a.alert_time desc
     </select>
     <select id="servicesDevelop" resultType="com.ruoyi.jjh.ent.entity.response.JServicesDevelopResponse">
         SELECT
diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectFundMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectFundMapper.xml
index 884282c..dcb6ee8 100644
--- a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectFundMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectFundMapper.xml
@@ -62,6 +62,7 @@
                 and a.status != 5
             </if>
         </where>
+        order by create_time desc
     </select>
     <select id="usualFund" resultType="com.ruoyi.jjh.ent.entity.response.JProjectFundResponse">
         SELECT
@@ -71,8 +72,7 @@
             a.tyshxydm,
             a.project_name,
             a.appropriation_time,
-            IF
-            ( a.project_name = '区级总部' || a.project_name = '市级服务业领军', b.project_big_type, NULL ) AS projectBigType
+            MAX(IF(a.project_name = '区级总部' OR a.project_name = '市级服务业领军', b.project_big_type, NULL)) AS projectBigType
         FROM
             j_project_fund a
                 LEFT JOIN j_project b ON a.tyshxydm = b.credit_code