lius
2023-08-02 2d061ec924b4b55ea825bfb0ea5b602cc4f8b94b
update
已修改2个文件
10 ■■■■ 文件已修改
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/DayUtilizationRateDto.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/DayUtilizationRateDto.java
@@ -12,6 +12,10 @@
@Data
public class DayUtilizationRateDto {
    private String equipmentId;
    private String equipmentName;
    private List<String> dateList;
    private List<DayRateDto> dayRateDto;
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
@@ -887,7 +887,9 @@
                vo.setEquipmentId(equipmentIds.get(0));
            }
        }
        result.setEquipmentId(vo.getEquipmentId());
        MdcEquipment mdcEquipment = mdcEquipmentService.getOne(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentId, vo.getEquipmentId()));
        result.setEquipmentName(mdcEquipment.getEquipmentName());
        List<String> dateList = new ArrayList<>();
        for (int i = 1; i <= 24 / vo.getTimeType(); i++) {
            if (i * vo.getTimeType() < 10) {
@@ -896,8 +898,6 @@
                dateList.add(i * vo.getTimeType() + ":00");
            }
        }
//        result.setDateList(dateList);
        dateList.add(0, "00:00");