update

lius

2023-07-03 3f61152272e9694f98bb5fdba755e4f7ceddbb31

update

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEfficiencyReportController.java

@@ -45,7 +45,7 @@
    public Result shiftEfficiencyList(MdcEfficiencyReportQueryVo vo) {
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String userId = user.getId();
        MdcEfficiencyVo result = mdcEfficiencyReportService.efficiencyList(userId, vo);
        MdcEfficiencyVo result = mdcEfficiencyReportService.shiftEfficiencyList(userId, vo);
        return Result.OK(result);
    }


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

@@ -17,4 +17,13 @@
     * @return
     */
    MdcEfficiencyVo efficiencyList(String userId, MdcEfficiencyReportQueryVo vo);

    /**
     * 班次利用率报表
     *
     * @param userId
     * @param vo
     * @return
     */
    MdcEfficiencyVo shiftEfficiencyList(String userId, MdcEfficiencyReportQueryVo vo);
}

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

@@ -69,7 +69,9 @@
                equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
            }
        }
        mdcDeviceCalendarQueryVo.setEquipmentIdList(equipmentIds);
        if (mdcDeviceCalendarQueryVo.getEquipmentIdList().isEmpty()) {
            mdcDeviceCalendarQueryVo.setEquipmentIdList(equipmentIds);
        }

        return this.baseMapper.pageList(pageData, mdcDeviceCalendarQueryVo);
    }

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

@@ -72,7 +72,9 @@
                equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
            }
        }
        vo.setEquipmentIdList(equipmentIds);
        if (vo.getEquipmentIdList().isEmpty()) {
            vo.setEquipmentIdList(equipmentIds);
        }

        // 查询利用率数据
        List<MdcEfficiencyDto> efficiencyList = mdcEfficiencyReportMapper.efficiencyList(vo);
@@ -103,6 +105,11 @@
        return result;
    }

    @Override
    public MdcEfficiencyVo shiftEfficiencyList(String userId, MdcEfficiencyReportQueryVo vo) {
        return null;
    }

    private MdcEfficiencyResultDto efficiencyRate(List<MdcEfficiencyDto> efficiencyList, String date, MdcEquipment mdcEquipment, List<MdcUtilizationRate> mdcUtilizationRateList) {
        MdcEfficiencyResultDto mdcEfficiencyResultDto = new MdcEfficiencyResultDto();
        if (efficiencyList != null && !efficiencyList.isEmpty()) {

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

@@ -155,7 +155,11 @@
                equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
            }
        }
        repair.setMdcSectionIds(equipmentIds);

        if (repair.getMdcSectionIds().isEmpty()) {
            repair.setMdcSectionIds(equipmentIds);
        }

        return this.baseMapper.pageList(page, repair);
    }


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

@@ -17,10 +17,5 @@
     */
    private List<MdcEfficiencyListDto> mdcEfficiencyList;

//    /**
//     * 利用率数据
//     */
//    private List<MdcEfficiencyDto> list;

    private List<String> dates;
}