新增可忽略的维修时间

xyc

2025-02-21 664db98c9e8595ce4dd636a27f480e3a08b81ff5

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

@@ -34,6 +34,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.util.*;
import java.util.stream.Collectors;


/**
@@ -172,8 +173,8 @@
        Map<String, Object> errMap = new HashMap<>();
        Map<String, Integer> reliabType = new HashMap<>();
        reliabType.put("指数分布", 1);
        reliabType.put("二项分布", 3);
        reliabType.put("威布尔分布", 2);
        reliabType.put("二项分布", 3);
        Map<String, Integer> repairType = new HashMap<>();
        repairType.put("指数分布", 1);
        repairType.put("威布尔分布", 2);
@@ -248,6 +249,7 @@
                    String repairMttcrStr = com.zt.core.shiro.ImportUtil.getCellValue(row, 18, pattern); //mttcr
                    String repairMttcrOtherParams2Str = com.zt.core.shiro.ImportUtil.getCellValue(row, 19, pattern); //mttcr其他参数2
                    String repairMttcrOtherParams3Str = com.zt.core.shiro.ImportUtil.getCellValue(row, 20, pattern); //mttcr其他参数3
                    String negligibleRepairTimeStr = com.zt.core.shiro.ImportUtil.getCellValue(row, 21, pattern); //可忽略的维修时间

                    Integer sameSbNum = StringUtils.isNotBlank(sameSbNumStr) ? Integer.parseInt(sameSbNumStr) : 1;
                    Double basicMtbfRegulate = StringUtils.isNotBlank(basicMtbfRegulateStr) ? Double.valueOf(basicMtbfRegulateStr) : null;
@@ -261,6 +263,7 @@
                    Double repairMttcr = StringUtils.isNotBlank(repairMttcrStr) ? Double.parseDouble(repairMttcrStr) : null;
                    Double repairMttcrOtherParams2 = StringUtils.isNotBlank(repairMttcrOtherParams2Str) ? Double.parseDouble(repairMttcrOtherParams2Str) : null;
                    Double repairMttcrOtherParams3 = StringUtils.isNotBlank(repairMttcrOtherParams3Str) ? Double.parseDouble(repairMttcrOtherParams3Str) : null;
                    Double negligibleRepairTime = StringUtils.isNotBlank(negligibleRepairTimeStr) ? Double.parseDouble(negligibleRepairTimeStr) : null;


                    if (StringUtils.isBlank(sb))
@@ -402,6 +405,7 @@
                    itemEntity.setRepairMttcr(repairMttcr);
                    itemEntity.setRepairMttcrOtherParams2(repairMttcrOtherParams2);
                    itemEntity.setRepairMttcrOtherParams3(repairMttcrOtherParams3);
                    itemEntity.setNegligibleRepairTime(negligibleRepairTime);

                    if (modelMap.get(sbPath) == null) {
                        paramDataService.insert(itemEntity);
@@ -632,6 +636,7 @@
            Long id = UUIDUtil.generateId();
            xhProductModel.setId(id);
            xhProductModel.setShipId(id);
            this.insert(xhProductModel);

            ParamData data = new ParamData();
            data.setShipId(id);