修改删除停机数据错误的BUG

jjt-biz/src/main/java/com/jjt/calc/service/impl/TwinCalcAlarmsServiceImpl.java

@@ -181,7 +181,7 @@ public class TwinCalcAlarmsServiceImpl implements ITwinCalcAlarmsService {
                                 recordList.add(lastAlarms);
                             }
                             //如果无效数据是未统计完成的记录，则需要删除统计里面的数据
-                            if (StringUtils.isNotEmpty(lastAlarms.getRemark())) {
+                            if ("1".equals(lastAlarms.getCalcStatus()) && StringUtils.isNotEmpty(lastAlarms.getRemark())) {
                                 delIds.add(Long.parseLong(lastAlarms.getRemark()));
                             }
                         }

jjt-biz/src/main/java/com/jjt/calc/service/impl/TwinCalcStopServiceImpl.java

@@ -203,7 +203,7 @@ public class TwinCalcStopServiceImpl implements ITwinCalcStopService {
                             }
 
                             //如果无效数据是未统计完成的记录，则需要删除统计里面的数据
-                            if (StringUtils.isNotEmpty(lastStop.getRemark())) {
+                            if ("1".equals(lastStop.getCalcStatus()) && StringUtils.isNotEmpty(lastStop.getRemark())) {
                                 delIds.add(Long.parseLong(lastStop.getRemark()));
                             }
                         }
@@ -285,7 +285,7 @@ public class TwinCalcStopServiceImpl implements ITwinCalcStopService {
     public List<TwinCalcStop> selectTwinCalcStopListByDate(Date sTime, Date eTime) {
         TwinCalcStop stop = new TwinCalcStop();
         Map<String, Object> params = new HashMap<>(16);
-        params.put("sTime", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,sTime));
+        params.put("sTime", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, sTime));
         params.put("eTime", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, eTime));
         stop.setParams(params);
         return selectTwinCalcStopList(stop);