修改

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/DeviceCostServiceImpl.java

@@ -236,10 +236,10 @@ public class DeviceCostServiceImpl extends ServiceImpl<DeviceCostMapper, DeviceC
                 String startDate = String.format("%04d-%02d-01", year, month);
                 // 获取该月的最后一天
                 LocalDate lastDate = LocalDate.of(year, month, 1).plusDays(LocalDate.of(year, month, 1).lengthOfMonth() - 1);
-                String endDate = String.format("%04d-%02d-%02d", year, month, lastDate.getDayOfMonth());
+                String endDate = String.format("%04d-%02d-%02d 23:59", year, month, lastDate.getDayOfMonth());
 
                 List<DeviceLog> deviceLogs = deviceLogMapper.selectList(new QueryWrapper<DeviceLog>()
-                        .between("create_date", startDate, endDate)
+                        .between("start_time", startDate, endDate)
                         .isNotNull("end_time").isNotNull("use_time"));
                 for (DeviceCost deviceCost : deviceCostArrayList) {
                     BigDecimal monthCost = deviceCost.getMonthCost();

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -841,11 +841,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
         if (type==0){
             lastList.stream().
-                    filter(l -> Double.parseDouble(l.getRemainWorkTimeProportion()) < projectWarningPercent)
+                    filter(l -> !StringUtils.isEmpty(l.getRemainWorkTimeProportion()) && !l.getRemainWorkTimeProportion().equals("\\")&&Double.parseDouble(l.getRemainWorkTimeProportion()) < projectWarningPercent)
                     .forEach(s->s.setIsRed(true));
         }else {
             lastList.stream().
-                    filter(l -> Double.parseDouble(l.getRemainWorkTimeProportion()) < groupWarningPercent)
+                    filter(l -> !StringUtils.isEmpty(l.getRemainWorkTimeProportion()) && !l.getRemainWorkTimeProportion().equals("\\")&&Double.parseDouble(l.getRemainWorkTimeProportion()) < groupWarningPercent)
                     .forEach(s->s.setIsRed(true));
         }