Merge remote-tracking branch 'origin/master'

xyc

2024-08-02 c80aedf517205fd50e608efc17ead73a3667d506

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

@@ -175,13 +175,12 @@
            String curXtName = "";
            String curFxtName = "";


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

            for (XhProductModel product :prductList){
                if(StringUtils.isNotBlank(product.getNamePath())){
                    modelMap.put(product.getNamePath(),product);
            for (XhProductModel product : prductList) {
                if (StringUtils.isNotBlank(product.getNamePath())) {
                    modelMap.put(product.getNamePath(), product);
                }
            }

@@ -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,10 +400,12 @@
                    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);
                    }
                }
            }