修改

lyh

5 天以前 6ff0f3e9cbb0b0f138fdabedeb23531d3cf06f1f

修改

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

@@ -589,19 +589,21 @@
                    return Result.error(name + ": 设备标准已存在，不能重复添加");
                }
            }
            if (eamMaintenanceStandardOld.getEquipmentId().equals(eamMaintenanceStandard.getEquipmentId())
                &&eamMaintenanceStandardOld.getMaintenanceCategory().equals(eamMaintenanceStandard.getMaintenanceCategory())) {
                //升版操作，作废原有
                eamMaintenanceStandardOld.setStandardStatus(MaintenanceStandardStatusEnum.ABOLISH.name());
                eamMaintenanceStandardMapper.updateById(eamMaintenanceStandard);
                //版本递增获取数字
                Pattern pattern = Pattern.compile("(\\d+)(?:\\.\\d+)*$");
                Matcher matcher = pattern.matcher(eamMaintenanceStandardOld.getStandardVersion());
                if (matcher.find()) {
                    try {
                        int mainVersion = Integer.parseInt(matcher.group(1));
                        eamMaintenanceStandard.setStandardVersion("v" + (mainVersion + 1));
                    } catch (NumberFormatException ignored) {
            if (StrUtil.isNotEmpty(id)){
                if (eamMaintenanceStandardOld.getEquipmentId().equals(eamMaintenanceStandard.getEquipmentId())
                        &&eamMaintenanceStandardOld.getMaintenanceCategory().equals(eamMaintenanceStandard.getMaintenanceCategory())) {
                    //升版操作，作废原有
                    eamMaintenanceStandardOld.setStandardStatus(MaintenanceStandardStatusEnum.ABOLISH.name());
                    eamMaintenanceStandardMapper.updateById(eamMaintenanceStandard);
                    //版本递增获取数字
                    Pattern pattern = Pattern.compile("(\\d+)(?:\\.\\d+)*$");
                    Matcher matcher = pattern.matcher(eamMaintenanceStandardOld.getStandardVersion());
                    if (matcher.find()) {
                        try {
                            int mainVersion = Integer.parseInt(matcher.group(1));
                            eamMaintenanceStandard.setStandardVersion("v" + (mainVersion + 1));
                        } catch (NumberFormatException ignored) {
                        }
                    }
                }
            }
@@ -1176,19 +1178,21 @@
                        }
                    }

                    if (eamMaintenanceStandardOld.getEquipmentId().equals(standard.getEquipmentId())
                            &&eamMaintenanceStandardOld.getMaintenanceCategory().equals(standard.getMaintenanceCategory())) {
                        //升版操作，作废原有
                        eamMaintenanceStandardOld.setStandardStatus(MaintenanceStandardStatusEnum.ABOLISH.name());
                        eamMaintenanceStandardMapper.updateById(eamMaintenanceStandardOld);
                        //版本递增获取数字
                        Pattern pattern = Pattern.compile("(\\d+)(?:\\.\\d+)*$");
                        Matcher matcher = pattern.matcher(eamMaintenanceStandardOld.getStandardVersion());
                        if (matcher.find()) {
                            try {
                                int mainVersion = Integer.parseInt(matcher.group(1));
                                standard.setStandardVersion("v" + (mainVersion + 1));
                            } catch (NumberFormatException ignored) {
                    if (StrUtil.isNotEmpty(id)){
                        if (eamMaintenanceStandardOld.getEquipmentId().equals(standard.getEquipmentId())
                                &&eamMaintenanceStandardOld.getMaintenanceCategory().equals(standard.getMaintenanceCategory())) {
                            //升版操作，作废原有
                            eamMaintenanceStandardOld.setStandardStatus(MaintenanceStandardStatusEnum.ABOLISH.name());
                            eamMaintenanceStandardMapper.updateById(eamMaintenanceStandardOld);
                            //版本递增获取数字
                            Pattern pattern = Pattern.compile("(\\d+)(?:\\.\\d+)*$");
                            Matcher matcher = pattern.matcher(eamMaintenanceStandardOld.getStandardVersion());
                            if (matcher.find()) {
                                try {
                                    int mainVersion = Integer.parseInt(matcher.group(1));
                                    standard.setStandardVersion("v" + (mainVersion + 1));
                                } catch (NumberFormatException ignored) {
                                }
                            }
                        }
                    }