From 664db98c9e8595ce4dd636a27f480e3a08b81ff5 Mon Sep 17 00:00:00 2001 From: xyc <jc_xiong@hotmail.com> Date: 星期五, 21 二月 2025 11:13:51 +0800 Subject: [PATCH] 新增可忽略的维修时间 --- modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java index c1a9f68..e0f5dbd 100644 --- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java +++ b/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); -- Gitblit v1.9.1