修复管线详情导入bug

‘liusuyi’

2023-06-14 7340977c8326c27ec484a815131bff03ad0468c5

 ard-work/src/main/java/com/ruoyi/alarmpoints/tube/service/impl/ArdTubesDetailsServiceImpl.java

@@ -127,7 +127,7 @@
    @Override
    public String importArdTubesDetails(List<ArdTubesDetails> ardTubesDetailsList, Boolean isUpdateSupport, String operName, String tubeId) {
        if (StringUtils.isNull(ardTubesDetailsList) || ardTubesDetailsList.size() == 0) {
            throw new ServiceException("导入井数据不能为空！");
            throw new ServiceException("导入管线数据不能为空！");
        }
        ArdTubes tubes = ardTubesMapper.selectArdTubesById(tubeId);
        int successNum = 0;
@@ -140,7 +140,7 @@
                String userId = SecurityUtils.getUserId();
                tubesDetails.setUserId(userId);
                // 验证是否存在这个管线编号详情
                ArdTubesDetails atd = ardTubesDetailsMapper.selectArdTubesDetailsByReelNumber(tubesDetails.getReelNumber());
                ArdTubesDetails atd = ardTubesDetailsMapper.selectArdTubesDetailsByReelNumber(tubesDetails.getReelNumber(),tubesDetails.getInflectionPointNumber());
                if (StringUtils.isNull(atd)) {
                    BeanValidators.validateWithException(validator, tubesDetails);
                    tubesDetails.setCreateBy(operName);
@@ -148,7 +148,7 @@
                    tubesDetails.setDeptId(tubes.getDeptId());
                    this.insertArdTubesDetails(tubesDetails);
                    successNum++;
                    successMsg.append("<br/>" + successNum + "、管线编号 " + tubesDetails.getReelNumber() + " 导入成功");
                    successMsg.append("<br/>" + successNum + "、管线编号 " + tubesDetails.getReelNumber() +"-"+tubesDetails.getInflectionPointNumber()+ " 导入成功");
                } else if (isUpdateSupport) {
                    BeanValidators.validateWithException(validator, tubesDetails);
                    checkTubesDetailAllowed(tubesDetails);
@@ -158,14 +158,14 @@
                    tubesDetails.setDeptId(tubes.getDeptId());
                    this.updateArdTubesDetailsByReelNumber(tubesDetails);
                    successNum++;
                    successMsg.append("<br/>" + successNum + "、管线编号 " + tubesDetails.getReelNumber() + " 更新成功");
                    successMsg.append("<br/>" + successNum + "、管线编号 " + tubesDetails.getReelNumber() +"-"+tubesDetails.getInflectionPointNumber()+ " 更新成功");
                } else {
                    failureNum++;
                    failureMsg.append("<br/>" + failureNum + "、管线编号 " + tubesDetails.getReelNumber() + " 已存在");
                    failureMsg.append("<br/>" + failureNum + "、管线编号 " + tubesDetails.getReelNumber()+"-"+tubesDetails.getInflectionPointNumber() + " 已存在");
                }
            } catch (Exception e) {
                failureNum++;
                String msg = "<br/>" + failureNum + "、管线编号 " + tubesDetails.getReelNumber() + " 导入失败：";
                String msg = "<br/>" + failureNum + "、管线编号 " + tubesDetails.getReelNumber() +"-"+tubesDetails.getInflectionPointNumber()+ " 导入失败：";
                failureMsg.append(msg + e.getMessage());
                log.error(msg, e);
            }