From a6afa4b5e1a919f752660911866b25a9cb8312f6 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 20 五月 2022 14:11:38 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
index 9e83af9..20a2347 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
@@ -29,10 +29,7 @@
import com.sandu.ximon.admin.vo.EquipmentInfomation;
import com.sandu.ximon.dao.bo.LightBo;
import com.sandu.ximon.dao.bo.PoleTaskLightPowerBo;
-import com.sandu.ximon.dao.domain.Light;
-import com.sandu.ximon.dao.domain.LightReportData;
-import com.sandu.ximon.dao.domain.Pole;
-import com.sandu.ximon.dao.domain.PoleBinding;
+import com.sandu.ximon.dao.domain.*;
import com.sandu.ximon.dao.enums.DeviceRespStatusEnums;
import com.sandu.ximon.dao.mapper.LightMapper;
import com.sandu.ximon.dao.mapper.LightTaskMapper;
@@ -611,7 +608,7 @@
* 鑺傝兘鐜囪绠楀紑濮�
*/
//TODO
- //鑾峰彇鏄ㄥぉ鐨勬槦鏈熸暟
+ //鑾峰彇鏄ㄥぉ鐨勬槦鏈熸暟
LocalDateTime now = LocalDateTime.now();
LocalDateTime yesterday = now.minusDays(1);
int week = yesterday.getDayOfWeek().getValue();
@@ -619,8 +616,10 @@
//鍒ゆ柇Task.getWeekList()鏄惁鍖呭惈鏄ㄥぉ鐨勬槦鏈熸暟 涓嶅寘鍚洿鎺ヨ繑鍥�0 涓嶈繘琛岃绠�
if (Task.getWeekList() != null && !Task.getWeekList().isEmpty()) {
if (!Task.getWeekList().contains(week)) {
- new BigDecimal(0.00);
+ return new BigDecimal(0.00);
}
+ } else {
+ return new BigDecimal(0.00);
}
--
Gitblit v1.9.3