修改

jinlin

2024-07-16 ee2a27313fbf5e7741644f9f3701d243487dbaa4

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

@@ -65,7 +65,7 @@
        List<XhProductModel> productList = null;
        if (showXdy) {
            productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                    Constant.Bool.NO).lt("product_type", 5).orderByAsc(Constant.TableColumn.SORT));
                    Constant.Bool.NO).ne("product_type", 5).orderByAsc(Constant.TableColumn.SORT));
        } else {
            if (ztShow == 1) {
                productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
@@ -220,31 +220,6 @@
                        com.zt.life.util.ImportUtil.updateErrMap(errMap, "没有填写设备名称", sheetName, row1);
                        continue;
                    }
                    if (StringUtils.isEmpty(reliabDistribType)) {
                        com.zt.life.util.ImportUtil.updateErrMap(errMap, "没有填写可靠性分布类型", sheetName, row1);
                        continue;
                    }
                    if (StringUtils.isEmpty(basicJoinCompute)) {
                        com.zt.life.util.ImportUtil.updateErrMap(errMap, "没有填写是否参加计算", sheetName, row1);
                        continue;
                    }
                    if (StringUtils.isEmpty(basicMtbfRegulate)) {
                        com.zt.life.util.ImportUtil.updateErrMap(errMap, "没有填写mtbf", sheetName, row1);
                        continue;
                    }
                    if (StringUtils.isEmpty(taskMtbcfRegulate)) {
                        com.zt.life.util.ImportUtil.updateErrMap(errMap, "没有填写mtbcf", sheetName, row1);
                        continue;
                    }
                    if (StringUtils.isEmpty(repairable)) {
                        com.zt.life.util.ImportUtil.updateErrMap(errMap, "没有填写是否可维修", sheetName, row1);
                        continue;
                    }
                    if (StringUtils.isNotBlank(repairable) && StringUtils.isEmpty(repairDistribType)) {
                        com.zt.life.util.ImportUtil.updateErrMap(errMap, "有未填写的维修分布类型", sheetName, row1);
                        continue;
                    }

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

@@ -320,6 +295,8 @@
                    }
                    if (StringUtils.isNotBlank(basicMtbfOperatingRatio)){
                        itemEntity.setBasicMtbfOperatingRatio(Double.valueOf(basicMtbfOperatingRatio));
                    }else{
                        itemEntity.setBasicMtbfOperatingRatio(1.0);
                    }
                    if (StringUtils.isNotBlank(taskMtbcfRegulate)){
                        itemEntity.setTaskMtbcfRegulate(Double.valueOf(taskMtbcfRegulate));
@@ -335,6 +312,8 @@
                    }
                    if (StringUtils.isNotBlank(taskMtbcfOperatingRatio)){
                        itemEntity.setTaskMtbcfOperatingRatio(Double.valueOf(taskMtbcfOperatingRatio));
                    }else{
                        itemEntity.setTaskMtbcfOperatingRatio(1.0);
                    }
                    itemEntity.setRepairable(isOrNot.get(repairable));
                    itemEntity.setRepairDistribType(repairType.get(repairDistribType));