Browse Source

fix:"重置机器报警状态,修复优惠码导出空白问题"

soobin 3 weeks ago
parent
commit
0fcce88477

+ 2 - 0
src/main/java/com/szwl/controller/IndexController.java

@@ -1455,6 +1455,8 @@ public class IndexController {
             equipment.setNetwork(netTime);
             equipment.setEqeStatus(eqeStatus);
             equipment.setModifyDate(new Date());
+            // 重置设备报警状态
+            equipment.setIsAlarm(false);
             // 查询是否有绑定微信
             LambdaQueryWrapper<TWechat> wechatQuery = Wrappers.lambdaQuery();
             wechatQuery.eq(TWechat::getAdminId, equipment.getAdminId());

+ 5 - 5
src/main/java/com/szwl/controller/TPromoCodeController.java

@@ -673,15 +673,15 @@ public class TPromoCodeController {
             query.eq(TPromoCode::getCode, code);
         }
         if (StringUtils.isNotEmpty(isUse)) {
-            query.like(TPromoCode::getIsUse, isUse);
+            query.eq(TPromoCode::getIsUse, isUse);
         }
         if (StringUtils.isNotEmpty(useStartDate) && StringUtils.isNotEmpty(useEndDate)) {
-            query.gt(TPromoCode::getUseDate, useStartDate);
-            query.lt(TPromoCode::getUseDate, useEndDate);
+            query.gt(TPromoCode::getUseDate, useStartDate + " 00:00:00");
+            query.lt(TPromoCode::getUseDate, useEndDate + " 23:59:59");
         }
         if (StringUtils.isNotEmpty(createStartDate) && StringUtils.isNotEmpty(createEndDate)) {
-            query.gt(TPromoCode::getCreateDate, createStartDate);
-            query.lt(TPromoCode::getCreateDate, createEndDate);
+            query.gt(TPromoCode::getCreateDate, createStartDate + " 00:00:00");
+            query.lt(TPromoCode::getCreateDate, createEndDate + " 23:59:59");
         }
         List<TPromoCode> list = promoCodeService.list(query);
         Workbook workbook = null;