admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guo 2024-03-16 11:29:04 +08:00
parent e501aa5b8a
commit 122ac145f9
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/smoke/entity/SmokeDevAlarm.java
View File

@ -141,7 +141,7 @@ public class SmokeDevAlarm implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private Date queryEndTime; private Date queryEndTime;
@TableField(exist = false) @TableField(exist = false)
@DateTimeFormat(pattern = "查询参数：1今天") @DateTimeFormat(pattern = "查询参数：1今天2当月3累积")
private Integer type; private Integer type;
} }

4
src/main/java/com/zhgd/xmgl/modules/smoke/service/impl/SmokeDevAlarmServiceImpl.java
View File

@ -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.SmokeDevAlarmMapper;
import com.zhgd.xmgl.modules.smoke.mapper.SmokeDevMapper; import com.zhgd.xmgl.modules.smoke.mapper.SmokeDevMapper;
import com.zhgd.xmgl.modules.smoke.service.ISmokeDevAlarmService; import com.zhgd.xmgl.modules.smoke.service.ISmokeDevAlarmService;
import com.zhgd.xmgl.util.DateUtils;
import com.zhgd.xmgl.util.RefUtil; import com.zhgd.xmgl.util.RefUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -69,6 +68,9 @@ public class SmokeDevAlarmServiceImpl extends ServiceImpl<SmokeDevAlarmMapper, S
.orderByDesc(RefUtil.fieldNameUlc(SmokeDevAlarm::getAlarmTime)); .orderByDesc(RefUtil.fieldNameUlc(SmokeDevAlarm::getAlarmTime));
if (Objects.equals(smokeDevAlarm.getType(), 1)) { if (Objects.equals(smokeDevAlarm.getType(), 1)) {
queryWrapper.ge(RefUtil.fieldNameUlc(SmokeDevAlarm::getAlarmTime), DateUtil.today()); 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); Page<SmokeDevAlarm> page = new Page<>(pageNo, pageSize);
return smokeDevAlarmMapper.queryPageList(page, queryWrapper); return smokeDevAlarmMapper.queryPageList(page, queryWrapper);