修改点检结果为异常，异常是否报修为否的情况下生成故障数据的逻辑；设备附件列表新增描述信息丢失

hyingbo

9 小时以前 876e8a1c9e6e950d51e42f265ad3027869d4f908

修改点检结果为异常，异常是否报修为否的情况下生成故障数据的逻辑；设备附件列表新增描述信息丢失

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java

@@ -136,11 +136,11 @@
            throw new JeecgBootException("设备不存在！");
        }
        if (!AssetStatusEnum.NORMAL.name().equals(equipment.getAssetStatus())) {
            throw new JeecgBootException("此设备当前资产状态不允许借出！");
            throw new JeecgBootException("此设备当前资产状态不允许封存！");
        }
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            throw new JeecgBootException("当前用户无法添加借用记录！");
            throw new JeecgBootException("当前用户无法添加封存记录！");
        }
        request.setReportUser(sysUser.getUsername());
        return equipmentSealUpMapper.insert(request) > 0;
@@ -161,9 +161,12 @@
        if (equipment == null) {
            throw new JeecgBootException("设备不存在！");
        }
        if (!AssetStatusEnum.NORMAL.name().equals(equipment.getAssetStatus())) {
            throw new JeecgBootException("此设备当前资产状态不允许封存！");
        }
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            throw new JeecgBootException("当前用户无法编辑借用记录！");
            throw new JeecgBootException("当前用户无法编辑封存记录！");
        }
        UpdateWrapper<EamEquipmentSealUp> updateWrapper = new UpdateWrapper<>();
        updateWrapper.set("equipment_id", request.getEquipmentId());

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSysFilesServiceImpl.java

@@ -62,7 +62,7 @@
    @Override
    public EamSysFiles getByPath(String path) {
        LambdaQueryWrapper<EamSysFiles> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EamSysFiles::getFileEncodeName, path);
        queryWrapper.eq(EamSysFiles::getFilePath, path);
        List<EamSysFiles> list = eamSysFilesMapper.selectList(queryWrapper);
        if (CollectionUtil.isEmpty(list)) {
            return null;

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/EquipmentEfficiencyAnalyzeDto.java

@@ -12,6 +12,8 @@
@Data
public class EquipmentEfficiencyAnalyzeDto {

    private String equipmentId;

    private String equipmentName;

    /**

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

@@ -197,6 +197,7 @@

    <select id="equipmentEfficiencyAnalyze" resultType="org.jeecg.modules.mdc.dto.EquipmentEfficiencyAnalyzeDto">
        SELECT
            t3.equipment_Id,
            t3.equipment_name,
            t1.utilization_rate AS utilizationRate,
            t2.utilization_rate AS shiftUtilizationRate,

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

@@ -1794,7 +1794,7 @@
            List<String> equipmentIdList = equipmentList.stream().map(MdcEquipment::getEquipmentId).collect(Collectors.toList());
            List<EquipmentEfficiencyAnalyzeDto> dataList = mdcEfficiencyReportMapper.equipmentEfficiencyAnalyze(equipmentIdList, equEffVo.getMonth());
            result.put("dataList", dataList);
            List<String> equipmentNameList = dataList.stream().map(EquipmentEfficiencyAnalyzeDto::getEquipmentName).collect(Collectors.toList());
            List<String> equipmentNameList = dataList.stream().map(EquipmentEfficiencyAnalyzeDto::getEquipmentId).collect(Collectors.toList());
            result.put("equipmentNameList", equipmentNameList);
        }
        return result;