修改

jinlin

2024-08-02 91c26508f76c35d9cc889958426fbe48cc205ed9

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java

@@ -175,7 +175,6 @@
            String curXtName = "";
            String curFxtName = "";


            Map<String, XhProductModel> modelMap = new HashMap<>();
            List<XhProductModel> prductList =baseDao.getProductPath(shipId);

@@ -280,19 +279,21 @@
                        }
                    }

                    Long paramId = null;
                    String sbPath = curXtName + "," + (StringUtils.isBlank(curFxtName) ? "" : curFxtName + ",") + sb;
                    if (modelMap.get(sbPath) == null) {
                        curSbId = UUIDUtil.generateId();
                        insertSb = true;
                    } else {
                        curSbId = modelMap.get(sbPath).getId();
                        paramId = modelMap.get(sbPath).getParamId();
                    }


                    if (StringUtils.isEmpty(sb)) {
                        com.zt.life.util.ImportUtil.updateErrMap(errMap, "没有填写设备名称", sheetName, row1);
                        continue;
                    }

                    //导入型号产品结果库
                    XhProductModel xhProductModel = new XhProductModel();

@@ -352,7 +353,6 @@
                        this.insert(xhProductModel);
                    }


                    //导入预计参数
                    ParamData itemEntity = new ParamData();
                    //绑定设备ID
@@ -400,12 +400,14 @@
                    if (StringUtils.isNotBlank(repairMttcrOtherParams3)) {
                        itemEntity.setRepairMttcrOtherParams3(Double.valueOf(repairMttcrOtherParams3));
                    }
                    if (modelMap.get(sbPath) == null)
                    if (modelMap.get(sbPath) == null) {
                        paramDataService.insert(itemEntity);
                    else
                    } else {
                        itemEntity.setId(paramId);
                        paramDataService.update(itemEntity);
                }
            }
            }

        } catch (Exception e) {
            e.printStackTrace();