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

hyingbo

2 天以前 876e8a1c9e6e950d51e42f265ad3027869d4f908

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

@@ -18,8 +18,10 @@
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
import org.jeecg.modules.eam.constant.AssetStatusEnum;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.EquipmentOperationTagEnum;
import org.jeecg.modules.eam.constant.EquipmentSealUpStatusEnum;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamEquipmentSealUp;
@@ -134,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;
@@ -159,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());
@@ -278,6 +283,7 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    @EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.SEAL_UP, businessTable = "eam_equipment_seal_up")
    public EamEquipmentSealUp approval(EamEquipmentSealUpRequest request) {
        EamEquipmentSealUp entity = equipmentSealUpMapper.selectById(request.getId());
        if (entity == null) {
@@ -336,7 +342,7 @@
                    values.put("NextAssignee", userApprovalList);
                } else {
                    //设置entity
                    entity.setSealStatus(EquipmentSealUpStatusEnum.WAIT_SUBMIT.name());
                    entity.setSealStatus(EquipmentSealUpStatusEnum.COMPLETE.name());
                    // 修改设备状态
                    equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
                    eamEquipmentService.updateById(equipment);