diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index 8e47db2..9d4720a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -30,6 +30,7 @@ String CHECK_DATA_APPROVAL = "核查数据审批"; String MEASURE_DATA_APPROVAL = "检定数据管理审批"; String ORIGINAL_RECORD_APPROVAL = "检定数据原始记录审批"; + String PISTON_PRESSURE = "0.02活塞式压力"; String RESISTANCE_CHECK_DATA = "活塞式压力"; String MULTI_ELECTRICAL_SAFETY = "多功能电气安全"; String ELECTRICAL_SAFETY_CHECK_DATA = "多功能电气安全核查数据"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index 8e47db2..9d4720a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -30,6 +30,7 @@ String CHECK_DATA_APPROVAL = "核查数据审批"; String MEASURE_DATA_APPROVAL = "检定数据管理审批"; String ORIGINAL_RECORD_APPROVAL = "检定数据原始记录审批"; + String PISTON_PRESSURE = "0.02活塞式压力"; String RESISTANCE_CHECK_DATA = "活塞式压力"; String MULTI_ELECTRICAL_SAFETY = "多功能电气安全"; String ELECTRICAL_SAFETY_CHECK_DATA = "多功能电气安全核查数据"; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DistortionFactorHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DistortionFactorHandler.java index 91327e8..3fe31a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DistortionFactorHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DistortionFactorHandler.java @@ -28,7 +28,7 @@ /** * @Author: TuT * @CreateTime: 2024-04-13 14:10 - * @Description: DistortionFactorHandler + * @Description: DistortionFactorHandler 失真度 */ @Component(MeasureItemBelongStandardEquipmentDictEnum.DISTORTION_FACTOR) @RequiredArgsConstructor diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index 8e47db2..9d4720a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -30,6 +30,7 @@ String CHECK_DATA_APPROVAL = "核查数据审批"; String MEASURE_DATA_APPROVAL = "检定数据管理审批"; String ORIGINAL_RECORD_APPROVAL = "检定数据原始记录审批"; + String PISTON_PRESSURE = "0.02活塞式压力"; String RESISTANCE_CHECK_DATA = "活塞式压力"; String MULTI_ELECTRICAL_SAFETY = "多功能电气安全"; String ELECTRICAL_SAFETY_CHECK_DATA = "多功能电气安全核查数据"; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DistortionFactorHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DistortionFactorHandler.java index 91327e8..3fe31a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DistortionFactorHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DistortionFactorHandler.java @@ -28,7 +28,7 @@ /** * @Author: TuT * @CreateTime: 2024-04-13 14:10 - * @Description: DistortionFactorHandler + * @Description: DistortionFactorHandler 失真度 */ @Component(MeasureItemBelongStandardEquipmentDictEnum.DISTORTION_FACTOR) @RequiredArgsConstructor diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/FrequencyStabilityHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/FrequencyStabilityHandler.java index 067e7bb..93cc354 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/FrequencyStabilityHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/FrequencyStabilityHandler.java @@ -28,7 +28,7 @@ /** * @Author: TuT * @CreateTime: 2024-04-13 13:43 - * @Description: FrequencyStabilityHandler + * @Description: FrequencyStabilityHandler 短期频率稳定度 */ @Component(MeasureItemBelongStandardEquipmentDictEnum.FREQUENCY_STABILITY) @RequiredArgsConstructor @@ -101,7 +101,7 @@ stability.setOutputFrequency(StringUtils.isNotBlank(stability.getOutputFrequency()) ? stability.getOutputFrequency() + stability.getOutputFrequencyUnit() : ""); stability.setTestedFrequency(StringUtils.isNotBlank(stability.getTestedFrequency()) ? stability.getTestedFrequency() + stability.getTestedFrequencyUnit() : ""); stability.setSampleTime(StringUtils.isNotBlank(stability.getSampleTime()) ? stability.getSampleTime() + stability.getSampleTimeUnit() : ""); - stability.setLessThanValue(StringUtils.isNotBlank(stability.getLessThanValue()) && "1".equals(stability.getLessThanValue()) ? "合格" : "不合格"); + stability.setLessThanValue(stability.getLessThan() != null && stability.getLessThan() == 1 ? "合格" : "不合格"); } /** diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index 8e47db2..9d4720a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -30,6 +30,7 @@ String CHECK_DATA_APPROVAL = "核查数据审批"; String MEASURE_DATA_APPROVAL = "检定数据管理审批"; String ORIGINAL_RECORD_APPROVAL = "检定数据原始记录审批"; + String PISTON_PRESSURE = "0.02活塞式压力"; String RESISTANCE_CHECK_DATA = "活塞式压力"; String MULTI_ELECTRICAL_SAFETY = "多功能电气安全"; String ELECTRICAL_SAFETY_CHECK_DATA = "多功能电气安全核查数据"; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DistortionFactorHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DistortionFactorHandler.java index 91327e8..3fe31a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DistortionFactorHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DistortionFactorHandler.java @@ -28,7 +28,7 @@ /** * @Author: TuT * @CreateTime: 2024-04-13 14:10 - * @Description: DistortionFactorHandler + * @Description: DistortionFactorHandler 失真度 */ @Component(MeasureItemBelongStandardEquipmentDictEnum.DISTORTION_FACTOR) @RequiredArgsConstructor diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/FrequencyStabilityHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/FrequencyStabilityHandler.java index 067e7bb..93cc354 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/FrequencyStabilityHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/FrequencyStabilityHandler.java @@ -28,7 +28,7 @@ /** * @Author: TuT * @CreateTime: 2024-04-13 13:43 - * @Description: FrequencyStabilityHandler + * @Description: FrequencyStabilityHandler 短期频率稳定度 */ @Component(MeasureItemBelongStandardEquipmentDictEnum.FREQUENCY_STABILITY) @RequiredArgsConstructor @@ -101,7 +101,7 @@ stability.setOutputFrequency(StringUtils.isNotBlank(stability.getOutputFrequency()) ? stability.getOutputFrequency() + stability.getOutputFrequencyUnit() : ""); stability.setTestedFrequency(StringUtils.isNotBlank(stability.getTestedFrequency()) ? stability.getTestedFrequency() + stability.getTestedFrequencyUnit() : ""); stability.setSampleTime(StringUtils.isNotBlank(stability.getSampleTime()) ? stability.getSampleTime() + stability.getSampleTimeUnit() : ""); - stability.setLessThanValue(StringUtils.isNotBlank(stability.getLessThanValue()) && "1".equals(stability.getLessThanValue()) ? "合格" : "不合格"); + stability.setLessThanValue(stability.getLessThan() != null && stability.getLessThan() == 1 ? "合格" : "不合格"); } /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java index 5e9c44f..35a24e2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java @@ -182,7 +182,7 @@ List dataItems = checkParamRemoveItem(measureItemInfo, map); //检定数据 //这一块逻辑比较复杂 - customTemplateUrls.add(bizBusinessMapper.customTemplateByCategory("1", measureItemInfo.getItemCategoryId())); + customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(RESISTANCE_CHECK_DATA, "1", measureItemInfo.getItemCategoryName())); map.put("id", snowflakeUtil.nextId()); map.put("pdfStatus", 1); //除了选用的模板不一致，模板配置流程是一致的 @@ -265,7 +265,7 @@ List customTemplateUrls = new ArrayList<>(); BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", measureItemInfo.getMeasureCategoryName())); - customTemplateUrls.add(bizBusinessMapper.customTemplateByCategory("4", measureItemInfo.getItemCategoryId())); + customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(RESISTANCE_CHECK_DATA,"4", measureItemInfo.getItemCategoryName())); map.put("id", snowflakeUtil.nextId()); map.put("pdfStatus", 1); List urlList = new ArrayList<>(); @@ -362,8 +362,8 @@ } //直流电压 List voltageList = request.getCheckDataPistonGaugeList().stream().filter( - e -> e.getParams().contains("电压") - ).sorted((e1, e2) -> Integer.valueOf(e1.getCheckPoint()) - Integer.valueOf(e2.getCheckPoint())) + e -> e.getParams().contains("电压") + ).sorted((e1, e2) -> Integer.valueOf(e1.getCheckPoint()) - Integer.valueOf(e2.getCheckPoint())) .collect(Collectors.toList()); if (CollectionUtils.isEmpty(voltageList)) { addDataRemoveItem(dataItems, 2, ""); @@ -371,8 +371,8 @@ populateCheckData(map, voltageList, "voltages", "maxs1", UNIT_V, "1"); //直流电流 List electricityList = request.getCheckDataPistonGaugeList().stream().filter( - e -> e.getParams().contains("电流") - ).sorted((e1, e2) -> Integer.valueOf(e1.getCheckPoint()) - Integer.valueOf(e2.getCheckPoint())) + e -> e.getParams().contains("电流") + ).sorted((e1, e2) -> Integer.valueOf(e1.getCheckPoint()) - Integer.valueOf(e2.getCheckPoint())) .collect(Collectors.toList()); if (CollectionUtils.isEmpty(electricityList)) { addDataRemoveItem(dataItems, 3, ""); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index 8e47db2..9d4720a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -30,6 +30,7 @@ String CHECK_DATA_APPROVAL = "核查数据审批"; String MEASURE_DATA_APPROVAL = "检定数据管理审批"; String ORIGINAL_RECORD_APPROVAL = "检定数据原始记录审批"; + String PISTON_PRESSURE = "0.02活塞式压力"; String RESISTANCE_CHECK_DATA = "活塞式压力"; String MULTI_ELECTRICAL_SAFETY = "多功能电气安全"; String ELECTRICAL_SAFETY_CHECK_DATA = "多功能电气安全核查数据"; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DistortionFactorHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DistortionFactorHandler.java index 91327e8..3fe31a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DistortionFactorHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DistortionFactorHandler.java @@ -28,7 +28,7 @@ /** * @Author: TuT * @CreateTime: 2024-04-13 14:10 - * @Description: DistortionFactorHandler + * @Description: DistortionFactorHandler 失真度 */ @Component(MeasureItemBelongStandardEquipmentDictEnum.DISTORTION_FACTOR) @RequiredArgsConstructor diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/FrequencyStabilityHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/FrequencyStabilityHandler.java index 067e7bb..93cc354 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/FrequencyStabilityHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/FrequencyStabilityHandler.java @@ -28,7 +28,7 @@ /** * @Author: TuT * @CreateTime: 2024-04-13 13:43 - * @Description: FrequencyStabilityHandler + * @Description: FrequencyStabilityHandler 短期频率稳定度 */ @Component(MeasureItemBelongStandardEquipmentDictEnum.FREQUENCY_STABILITY) @RequiredArgsConstructor @@ -101,7 +101,7 @@ stability.setOutputFrequency(StringUtils.isNotBlank(stability.getOutputFrequency()) ? stability.getOutputFrequency() + stability.getOutputFrequencyUnit() : ""); stability.setTestedFrequency(StringUtils.isNotBlank(stability.getTestedFrequency()) ? stability.getTestedFrequency() + stability.getTestedFrequencyUnit() : ""); stability.setSampleTime(StringUtils.isNotBlank(stability.getSampleTime()) ? stability.getSampleTime() + stability.getSampleTimeUnit() : ""); - stability.setLessThanValue(StringUtils.isNotBlank(stability.getLessThanValue()) && "1".equals(stability.getLessThanValue()) ? "合格" : "不合格"); + stability.setLessThanValue(stability.getLessThan() != null && stability.getLessThan() == 1 ? "合格" : "不合格"); } /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java index 5e9c44f..35a24e2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java @@ -182,7 +182,7 @@ List dataItems = checkParamRemoveItem(measureItemInfo, map); //检定数据 //这一块逻辑比较复杂 - customTemplateUrls.add(bizBusinessMapper.customTemplateByCategory("1", measureItemInfo.getItemCategoryId())); + customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(RESISTANCE_CHECK_DATA, "1", measureItemInfo.getItemCategoryName())); map.put("id", snowflakeUtil.nextId()); map.put("pdfStatus", 1); //除了选用的模板不一致，模板配置流程是一致的 @@ -265,7 +265,7 @@ List customTemplateUrls = new ArrayList<>(); BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", measureItemInfo.getMeasureCategoryName())); - customTemplateUrls.add(bizBusinessMapper.customTemplateByCategory("4", measureItemInfo.getItemCategoryId())); + customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(RESISTANCE_CHECK_DATA,"4", measureItemInfo.getItemCategoryName())); map.put("id", snowflakeUtil.nextId()); map.put("pdfStatus", 1); List urlList = new ArrayList<>(); @@ -362,8 +362,8 @@ } //直流电压 List voltageList = request.getCheckDataPistonGaugeList().stream().filter( - e -> e.getParams().contains("电压") - ).sorted((e1, e2) -> Integer.valueOf(e1.getCheckPoint()) - Integer.valueOf(e2.getCheckPoint())) + e -> e.getParams().contains("电压") + ).sorted((e1, e2) -> Integer.valueOf(e1.getCheckPoint()) - Integer.valueOf(e2.getCheckPoint())) .collect(Collectors.toList()); if (CollectionUtils.isEmpty(voltageList)) { addDataRemoveItem(dataItems, 2, ""); @@ -371,8 +371,8 @@ populateCheckData(map, voltageList, "voltages", "maxs1", UNIT_V, "1"); //直流电流 List electricityList = request.getCheckDataPistonGaugeList().stream().filter( - e -> e.getParams().contains("电流") - ).sorted((e1, e2) -> Integer.valueOf(e1.getCheckPoint()) - Integer.valueOf(e2.getCheckPoint())) + e -> e.getParams().contains("电流") + ).sorted((e1, e2) -> Integer.valueOf(e1.getCheckPoint()) - Integer.valueOf(e2.getCheckPoint())) .collect(Collectors.toList()); if (CollectionUtils.isEmpty(electricityList)) { addDataRemoveItem(dataItems, 3, ""); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SParameterHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SParameterHandler.java index 1d5b668..d92a249 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SParameterHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SParameterHandler.java @@ -110,7 +110,6 @@ s.setTestValueTen(StringUtils.isNotBlank(s.getTestValueTen()) ? s.getTestValueTen() + s.getAmplitudeUnit() : ""); s.setAmplitude(StringUtils.isNotBlank(s.getAmplitude()) ? s.getAmplitude() + s.getAmplitudeUnit() : ""); // s.setAverageValue(StringUtils.isNotBlank(s.getAverageValue()) ? s.getAverageValue() + s.getAmplitudeUnit() : ""); - s.setLessThanValue(s.getLessThan() == 1 ? "合格" : "不合格"); } if (params[2].equals(s.getParams())) { s.setTestValueOne(StringUtils.isNotBlank(s.getTestValueOne()) ? s.getTestValueOne() + s.getPhaseUnit() : ""); @@ -124,8 +123,7 @@ s.setTestValueNine(StringUtils.isNotBlank(s.getTestValueNine()) ? s.getTestValueNine() + s.getPhaseUnit() : ""); s.setTestValueTen(StringUtils.isNotBlank(s.getTestValueTen()) ? s.getTestValueTen() + s.getPhaseUnit() : ""); s.setPhase(StringUtils.isNotBlank(s.getPhase()) ? s.getPhase() + s.getPhaseUnit() : ""); - s.setAverageValue(StringUtils.isNotBlank(s.getAverageValue()) ? s.getAverageValue() + s.getPhaseUnit() : ""); - s.setLessThanValue(s.getLessThan() == 1 ? "合格" : "不合格"); +// s.setAverageValue(StringUtils.isNotBlank(s.getAverageValue()) ? s.getAverageValue() + s.getPhaseUnit() : ""); } }).collect(Collectors.toList()); map.put(REPEAT_PREFIX + (i + 1), repList); @@ -134,25 +132,27 @@ .filter(s -> param.equals(s.getParams()) && checkType[1].equals(s.getCheckType())) .peek(s -> { s.setFrequency(StringUtils.isNotBlank(s.getFrequency()) ? s.getFrequency() + s.getFrequencyUnit() : ""); + s.setLessThanValue(s.getLessThan() == 1 ? "合格" : "不合格"); if (params[1].equals(s.getParams())) { - s.setTestValueOne(StringUtils.isNotBlank(s.getTestValueOne()) ? s.getTestValueOne() + s.getAmplitudeUnit() : ""); - s.setTestValueTwo(StringUtils.isNotBlank(s.getTestValueTwo()) ? s.getTestValueTwo() + s.getAmplitudeUnit() : ""); - s.setTestValueThree(StringUtils.isNotBlank(s.getTestValueThree()) ? s.getTestValueThree() + s.getAmplitudeUnit() : ""); - s.setTestValueFour(StringUtils.isNotBlank(s.getTestValueFour()) ? s.getTestValueFour() + s.getAmplitudeUnit() : ""); - s.setTestValueFive(StringUtils.isNotBlank(s.getTestValueFive()) ? s.getTestValueFive() + s.getAmplitudeUnit() : ""); - s.setTestValueSix(StringUtils.isNotBlank(s.getTestValueSix()) ? s.getTestValueSix() + s.getAmplitudeUnit() : ""); +// s.setTestValueOne(StringUtils.isNotBlank(s.getTestValueOne()) ? s.getTestValueOne() + s.getAmplitudeUnit() : ""); +// s.setTestValueTwo(StringUtils.isNotBlank(s.getTestValueTwo()) ? s.getTestValueTwo() + s.getAmplitudeUnit() : ""); +// s.setTestValueThree(StringUtils.isNotBlank(s.getTestValueThree()) ? s.getTestValueThree() + s.getAmplitudeUnit() : ""); +// s.setTestValueFour(StringUtils.isNotBlank(s.getTestValueFour()) ? s.getTestValueFour() + s.getAmplitudeUnit() : ""); +// s.setTestValueFive(StringUtils.isNotBlank(s.getTestValueFive()) ? s.getTestValueFive() + s.getAmplitudeUnit() : ""); +// s.setTestValueSix(StringUtils.isNotBlank(s.getTestValueSix()) ? s.getTestValueSix() + s.getAmplitudeUnit() : ""); s.setAmplitude(StringUtils.isNotBlank(s.getAmplitude()) ? s.getAmplitude() + s.getAmplitudeUnit() : ""); s.setAverageValue(StringUtils.isNotBlank(s.getAverageValue()) ? s.getAverageValue() + s.getAmplitudeUnit() : ""); } if (params[2].equals(s.getParams())) { - s.setTestValueOne(StringUtils.isNotBlank(s.getTestValueOne()) ? s.getTestValueOne() + s.getPhaseUnit() : ""); - s.setTestValueTwo(StringUtils.isNotBlank(s.getTestValueTwo()) ? s.getTestValueTwo() + s.getPhaseUnit() : ""); - s.setTestValueThree(StringUtils.isNotBlank(s.getTestValueThree()) ? s.getTestValueThree() + s.getPhaseUnit() : ""); - s.setTestValueFour(StringUtils.isNotBlank(s.getTestValueFour()) ? s.getTestValueFour() + s.getPhaseUnit() : ""); - s.setTestValueFive(StringUtils.isNotBlank(s.getTestValueFive()) ? s.getTestValueFive() + s.getPhaseUnit() : ""); - s.setTestValueSix(StringUtils.isNotBlank(s.getTestValueSix()) ? s.getTestValueSix() + s.getPhaseUnit() : ""); +// s.setTestValueOne(StringUtils.isNotBlank(s.getTestValueOne()) ? s.getTestValueOne() + s.getPhaseUnit() : ""); +// s.setTestValueTwo(StringUtils.isNotBlank(s.getTestValueTwo()) ? s.getTestValueTwo() + s.getPhaseUnit() : ""); +// s.setTestValueThree(StringUtils.isNotBlank(s.getTestValueThree()) ? s.getTestValueThree() + s.getPhaseUnit() : ""); +// s.setTestValueFour(StringUtils.isNotBlank(s.getTestValueFour()) ? s.getTestValueFour() + s.getPhaseUnit() : ""); +// s.setTestValueFive(StringUtils.isNotBlank(s.getTestValueFive()) ? s.getTestValueFive() + s.getPhaseUnit() : ""); +// s.setTestValueSix(StringUtils.isNotBlank(s.getTestValueSix()) ? s.getTestValueSix() + s.getPhaseUnit() : ""); s.setPhase(StringUtils.isNotBlank(s.getPhase()) ? s.getPhase() + s.getPhaseUnit() : ""); s.setAverageValue(StringUtils.isNotBlank(s.getAverageValue()) ? s.getAverageValue() + s.getPhaseUnit() : ""); +// s.setLessThanValue(s.getLessThan() == 1 ? "合格" : "不合格"); } }).collect(Collectors.toList()); map.put(STA_PREFIX + (i + 1), staList);