#水位数据&水电站生产运行月报时间格式化修改

hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/RunMonthServiceImpl.java

@@ -247,6 +247,7 @@ public class RunMonthServiceImpl extends ServiceImpl<RunMonthMapper, RunMonthEnt
         calendar.setTime(DateUtil.parse(mon,"yyyy-MM"));
         String start = DateUtil.format(calendar.getTime(),DateUtil.PATTERN_DATETIME);
         calendar.add(Calendar.MONTH,1);
+        calendar.add(Calendar.DAY_OF_MONTH,-1);
         String end = DateUtil.format(calendar.getTime(),DateUtil.PATTERN_DATETIME);
         // 告警数据
         run.setAlarmData(this.alarmData(station.getCode(),start,end));
@@ -768,7 +769,6 @@ public class RunMonthServiceImpl extends ServiceImpl<RunMonthMapper, RunMonthEnt
                 attributes.add(attribute);
                 break;
             case 1:
-
                 AttributeVo upper_temp = new AttributeVo();
                 upper_temp.setSignage(HomePageConstant.UPPER_GUIDE_BEARING_TEMP);
                 upper_temp.setSignageName("上导轴承瓦温1");