Lius
2023-12-08 a8b7758ca2b0641482ff709bbee8c172b8c5d7bb
利用率报表
已修改3个文件
17 ■■■■ 文件已修改
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcProcessCountDto.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyVo.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcProcessCountDto.java
@@ -11,7 +11,7 @@
    private String equipmentId;
    private String equipmentName;
    private String driveType;
    private String theData;
    private String theDate;
    private String sequenceNumber;
    private Long duration;
    private Integer processCount;
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
@@ -109,7 +109,7 @@
            List<MdcEfficiencyDto> efficiencyList = mdcEfficiencyReportMapper.efficiencyList(vo);
            // 利用率等级
            List<MdcUtilizationRate> mdcUtilizationRateList = mdcUtilizationRateService.listByType("lyl");
            result.setUtilizationRateList(mdcUtilizationRateList);
            // 封装结果
            if ("2".equals(vo.getTypeTree())) {
                // 部门层级
@@ -239,6 +239,16 @@
            result.setMdcEfficiencyList(listDtos);
        }
/*        // 添加合计值和平均值
        result.getDates().add("平均值");
        MdcEfficiencyListDto sum = new MdcEfficiencyListDto();
        sum.setLevel1("合计值");
        sum.setLevel2("合计值");
        sum.setLevel3("合计值");
        sum.setEquipmentId("合计值");
        sum.setEquipmentName("合计值");
        sum.setEquipmentType("合计值");
        result.getMdcEfficiencyList().add(sum);*/
        return result;
    }
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcEfficiencyVo.java
@@ -2,6 +2,7 @@
import lombok.Data;
import org.jeecg.modules.mdc.dto.MdcEfficiencyListDto;
import org.jeecg.modules.mdc.entity.MdcUtilizationRate;
import java.util.List;
@@ -18,4 +19,6 @@
    private List<MdcEfficiencyListDto> mdcEfficiencyList;
    private List<String> dates;
    private List<MdcUtilizationRate> utilizationRateList;
}