|
@@ -155,8 +155,10 @@ public class IndividualLogApiController {
|
|
|
|
|
|
//最多查一年
|
|
//最多查一年
|
|
for(int i=0;i<365;i++) {
|
|
for(int i=0;i<365;i++) {
|
|
- DateTime startTime = today.minusDays(i);
|
|
|
|
- DateTime endTime = today.minusDays(i-1);
|
|
|
|
|
|
+ DateTime prevDay = today.minusDays(i);
|
|
|
|
+
|
|
|
|
+ DateTime startTime = prevDay;
|
|
|
|
+ DateTime endTime = prevDay.plusDays(1);
|
|
|
|
|
|
//先排除一周非工作日
|
|
//先排除一周非工作日
|
|
if (!weekdaySet.contains(startTime.getDayOfWeek())){
|
|
if (!weekdaySet.contains(startTime.getDayOfWeek())){
|
|
@@ -175,7 +177,6 @@ public class IndividualLogApiController {
|
|
|
|
|
|
if(curTemperature<=temperatureConfig.getMax()){
|
|
if(curTemperature<=temperatureConfig.getMax()){
|
|
totalDays++;
|
|
totalDays++;
|
|
- i++;
|
|
|
|
}
|
|
}
|
|
else{
|
|
else{
|
|
//有异常温度跳出循环
|
|
//有异常温度跳出循环
|