Merge branch 'developer' of http://36.40.66.175:5000/moa/jxdj_zx/amos-boot-zx-biz into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/IdxBizFanHealthIndexServiceImpl.java

@@ -107,19 +107,18 @@ public class IdxBizFanHealthIndexServiceImpl extends BaseService<IdxBizFanHealth
          startTime = sdf.format(currentDayStartTime);
          endTime= sdf.format(currentDayEndTime);
     }else{
-        if("1".equals(type)){
+        if (startTime.length() == 10) {
             startTime = startTime.concat(" 00:00:00");
             endTime = endTime.concat(" 23:59:59");
-        }
-
-        if("2".equals(type)){
+        } else if (startTime.length() == 13) {
             startTime = startTime.concat(":00:00");
             endTime = endTime.concat(":59:59");
-        }
-
-        if("3".equals(type)){
+        } else if (startTime.length() == 16) {
             startTime = startTime.concat(":00");
             endTime = endTime.concat(":59");
+        } else {
+            startTime = startTime.concat(" 00:00:00");
+            endTime = endTime.concat(" 23:59:59");
         }
         Date currentDayStartTime = DateUtils.dateAddHours(DateUtils.dateParse(startTime), -8);
         Date currentDayEndTime = DateUtils.dateAddHours(DateUtils.dateParse(endTime), -8);