利用率分析页面添加筛选条件

Lius

2025-03-05 e65c0249b66ffd1a4f96752a0f4a86f4f2e01314

利用率分析页面添加筛选条件

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml

@@ -182,6 +182,18 @@
            <if test="vo.driveType != null and vo.driveType != null">
                AND me.drive_type = #{ vo.driveType }
            </if>
            <if test="vo.equipmentType != null and vo.equipmentType != '' ">
                AND me.equipment_type = #{ vo.equipmentType }
            </if>
            <if test="vo.deviceLevel != null and vo.deviceLevel != '' ">
                AND me.device_level = #{vo.deviceLevel}
            </if>
            <if test="vo.deviceCategory != null and vo.deviceCategory != '' ">
                AND me.device_category = #{vo.deviceCategory}
            </if>
            <if test="vo.deviceImportanceLevel != null and vo.deviceImportanceLevel != '' ">
                AND me.device_importance_level = #{vo.deviceImportanceLevel}
            </if>
            AND mesi.the_date BETWEEN #{ vo.startTime } AND #{ vo.endTime }
        </where>
        GROUP BY

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java

@@ -15,6 +15,7 @@
import org.jeecg.modules.system.entity.SysDepart;
import org.jeecg.modules.system.service.IMdcProductionService;
import org.jeecg.modules.system.service.ISysDepartService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -1599,6 +1600,17 @@
        if (vo.getEquipmentIdList() == null || vo.getEquipmentIdList().isEmpty()) {
            result.setMdcEfficiencyList(listDtos);
        } else {

            MdcEfficiencyReportQueryVo vo1 = new MdcEfficiencyReportQueryVo();
            BeanUtils.copyProperties(vo, vo1);
            List<String> equipmentIdList = mdcEquipmentService.listEquipmentId(vo1);
            if (equipmentIdList != null && !equipmentIdList.isEmpty()) {
                vo.setEquipmentIdList(equipmentIdList);
            } else {
                result.setMdcEfficiencyList(listDtos);
                return result;
            }

            // 利用率等级
            List<MdcUtilizationRate> mdcUtilizationRateList = mdcUtilizationRateService.listByType("lyl");

@@ -1691,6 +1703,16 @@
        if (vo.getEquipmentIdList() == null || vo.getEquipmentIdList().isEmpty()) {
            result.setMdcEfficiencyList(listDtos);
        } else {
            MdcEfficiencyReportQueryVo vo1 = new MdcEfficiencyReportQueryVo();
            BeanUtils.copyProperties(vo, vo1);
            List<String> equipmentIdList = mdcEquipmentService.listEquipmentId(vo1);
            if (equipmentIdList != null && !equipmentIdList.isEmpty()) {
                vo.setEquipmentIdList(equipmentIdList);
            } else {
                result.setMdcEfficiencyList(listDtos);
                return result;
            }

            // 利用率等级
            List<MdcUtilizationRate> mdcUtilizationRateList = mdcUtilizationRateService.listByType("lyl");
            if ("2".equals(vo.getTypeTree())) {

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/ComparativeAnalysisQueryVo.java

@@ -41,4 +41,20 @@
     * 设备ids
     */
    private List<String> equipmentIdList;
    /**
     * 设备类型
     */
    private String equipmentType;
    /**
     * 设备级别
     */
    private String deviceLevel;
    /**
     * 设备种类
     */
    private String deviceCategory;
    /**
     * 重要程度
     */
    private Integer deviceImportanceLevel;
}

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/DayUtilizationRateContrastQueryVo.java

@@ -44,5 +44,26 @@
     * 设备ids
     */
    private List<String> equipmentIdList;
    /**
     * 设备类型
     */
    private String equipmentType;

    /**
     * 驱动类型
     */
    private String driveType;
    /**
     * 设备级别
     */
    private String deviceLevel;
    /**
     * 设备种类
     */
    private String deviceCategory;
    /**
     * 重要程度
     */
    private Integer deviceImportanceLevel;

}