hecheng лет назад: 3
Родитель
Сommit
cf1446527d

+ 2 - 1
zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/AlarmRecordServiceImpl.java

@@ -1,5 +1,6 @@
 package com.zd.bottle.service.impl;
 package com.zd.bottle.service.impl;
 
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zd.bottle.domain.AlarmRecord;
 import com.zd.bottle.domain.AlarmRecord;
@@ -127,7 +128,7 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
             String airName = bottleStorage.getAirName();
             String airName = bottleStorage.getAirName();
             LambdaQueryWrapper<UsegasApply> lambdaQuery = Wrappers.lambdaQuery(UsegasApply.class);
             LambdaQueryWrapper<UsegasApply> lambdaQuery = Wrappers.lambdaQuery(UsegasApply.class);
             lambdaQuery.eq(UsegasApply::getUseGasName,airName)
             lambdaQuery.eq(UsegasApply::getUseGasName,airName)
-                    .eq(UsegasApply::getEndTime,Calendar.getInstance().getTime()).eq(UsegasApply::getLeadAuditStaus,1);
+                    .ge(UsegasApply::getEndTime, DateUtil.formatDate(Calendar.getInstance().getTime())).eq(UsegasApply::getLeadAuditStaus,1);
             List<UsegasApply> applies = applyService.list(lambdaQuery);
             List<UsegasApply> applies = applyService.list(lambdaQuery);
             if (applies.isEmpty()){
             if (applies.isEmpty()){
                 Long id = bottleStorage.getId();
                 Long id = bottleStorage.getId();