From 122ac145f95cd3e295de113a4edb4099d2077116 Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Sat, 16 Mar 2024 11:29:04 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zhgd/xmgl/modules/smoke/entity/SmokeDevAlarm.java     | 2 +-
 .../modules/smoke/service/impl/SmokeDevAlarmServiceImpl.java  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/smoke/entity/SmokeDevAlarm.java b/src/main/java/com/zhgd/xmgl/modules/smoke/entity/SmokeDevAlarm.java
index 8a4de495c..b66fff90e 100644
--- a/src/main/java/com/zhgd/xmgl/modules/smoke/entity/SmokeDevAlarm.java
+++ b/src/main/java/com/zhgd/xmgl/modules/smoke/entity/SmokeDevAlarm.java
@@ -141,7 +141,7 @@ public class SmokeDevAlarm implements Serializable {
     @TableField(exist = false)
     private Date queryEndTime;
     @TableField(exist = false)
-    @DateTimeFormat(pattern = "查询参数：1今天")
+    @DateTimeFormat(pattern = "查询参数：1今天2当月3累积")
     private Integer type;
 
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/smoke/service/impl/SmokeDevAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/smoke/service/impl/SmokeDevAlarmServiceImpl.java
index 17a591c3a..ba2038d88 100644
--- a/src/main/java/com/zhgd/xmgl/modules/smoke/service/impl/SmokeDevAlarmServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/smoke/service/impl/SmokeDevAlarmServiceImpl.java
@@ -15,7 +15,6 @@ import com.zhgd.xmgl.modules.smoke.entity.vo.CountSmokeDevAlarmVo;
 import com.zhgd.xmgl.modules.smoke.mapper.SmokeDevAlarmMapper;
 import com.zhgd.xmgl.modules.smoke.mapper.SmokeDevMapper;
 import com.zhgd.xmgl.modules.smoke.service.ISmokeDevAlarmService;
-import com.zhgd.xmgl.util.DateUtils;
 import com.zhgd.xmgl.util.RefUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -69,6 +68,9 @@ public class SmokeDevAlarmServiceImpl extends ServiceImpl<SmokeDevAlarmMapper, S
                 .orderByDesc(RefUtil.fieldNameUlc(SmokeDevAlarm::getAlarmTime));
         if (Objects.equals(smokeDevAlarm.getType(), 1)) {
             queryWrapper.ge(RefUtil.fieldNameUlc(SmokeDevAlarm::getAlarmTime), DateUtil.today());
+        } else if (Objects.equals(smokeDevAlarm.getType(), 2)) {
+            queryWrapper.ge(RefUtil.fieldNameUlc(SmokeDevAlarm::getAlarmTime), DateUtil.beginOfMonth(DateUtil.date()));
+        } else if (Objects.equals(smokeDevAlarm.getType(), 3)) {
         }
         Page<SmokeDevAlarm> page = new Page<>(pageNo, pageSize);
         return smokeDevAlarmMapper.queryPageList(page, queryWrapper);