diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java index dd9d7ca..bd72efb 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java @@ -140,8 +140,8 @@ //划分为直流电压,电源效应和负载效应Power and load effects,直流电流(直接测量)Direct current (direct measurement),直流电流(间接测量)Direct current (indirect measurement),纹波电压Ripple Voltage String POWER_AND_LOAD_EFFECTS = "电源效应和负载效应"; - String DC_CURRENT_DIRECT_MEASUREMENT = "直接电流(直接测量)"; - String DC_CURRENT_INDIRECT_MEASUREMENT = "直接电流(间接测量)"; + String DC_CURRENT_DIRECT_MEASUREMENT = "直流电流(直接测量)"; + String DC_CURRENT_INDIRECT_MEASUREMENT = "直流电流(间接测量)"; String RIPPLE_VOLTAGE = "纹波电压"; String NOMINAL_TEMPERATURE_ZERO = "0℃"; String NOMINAL_TEMPERATURE_HUNDRED = "100℃"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java index dd9d7ca..bd72efb 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java @@ -140,8 +140,8 @@ //划分为直流电压,电源效应和负载效应Power and load effects,直流电流(直接测量)Direct current (direct measurement),直流电流(间接测量)Direct current (indirect measurement),纹波电压Ripple Voltage String POWER_AND_LOAD_EFFECTS = "电源效应和负载效应"; - String DC_CURRENT_DIRECT_MEASUREMENT = "直接电流(直接测量)"; - String DC_CURRENT_INDIRECT_MEASUREMENT = "直接电流(间接测量)"; + String DC_CURRENT_DIRECT_MEASUREMENT = "直流电流(直接测量)"; + String DC_CURRENT_INDIRECT_MEASUREMENT = "直流电流(间接测量)"; String RIPPLE_VOLTAGE = "纹波电压"; String NOMINAL_TEMPERATURE_ZERO = "0℃"; String NOMINAL_TEMPERATURE_HUNDRED = "100℃"; 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 064884e..3f46e15 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 @@ -98,7 +98,7 @@ private void appendUnit(BizEquipmentStandardCheckDataDistortionFactor distortionFactor){ distortionFactor.setFrequency(StringUtils.isNotBlank(distortionFactor.getFrequency()) ? distortionFactor.getFrequency() + distortionFactor.getFrequencyUnit() : ""); - distortionFactor.setLessThanValue(StringUtils.isNotBlank(distortionFactor.getLessThanValue()) && "1".equals(distortionFactor.getLessThanValue()) ? "合格" : "不合格"); +// distortionFactor.setLessThanValue(StringUtils.isNotBlank(distortionFactor.getLessThanValue()) && "1".equals(distortionFactor.getLessThanValue()) ? "合格" : "不合格"); } /** diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java index dd9d7ca..bd72efb 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java @@ -140,8 +140,8 @@ //划分为直流电压,电源效应和负载效应Power and load effects,直流电流(直接测量)Direct current (direct measurement),直流电流(间接测量)Direct current (indirect measurement),纹波电压Ripple Voltage String POWER_AND_LOAD_EFFECTS = "电源效应和负载效应"; - String DC_CURRENT_DIRECT_MEASUREMENT = "直接电流(直接测量)"; - String DC_CURRENT_INDIRECT_MEASUREMENT = "直接电流(间接测量)"; + String DC_CURRENT_DIRECT_MEASUREMENT = "直流电流(直接测量)"; + String DC_CURRENT_INDIRECT_MEASUREMENT = "直流电流(间接测量)"; String RIPPLE_VOLTAGE = "纹波电压"; String NOMINAL_TEMPERATURE_ZERO = "0℃"; String NOMINAL_TEMPERATURE_HUNDRED = "100℃"; 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 064884e..3f46e15 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 @@ -98,7 +98,7 @@ private void appendUnit(BizEquipmentStandardCheckDataDistortionFactor distortionFactor){ distortionFactor.setFrequency(StringUtils.isNotBlank(distortionFactor.getFrequency()) ? distortionFactor.getFrequency() + distortionFactor.getFrequencyUnit() : ""); - distortionFactor.setLessThanValue(StringUtils.isNotBlank(distortionFactor.getLessThanValue()) && "1".equals(distortionFactor.getLessThanValue()) ? "合格" : "不合格"); +// distortionFactor.setLessThanValue(StringUtils.isNotBlank(distortionFactor.getLessThanValue()) && "1".equals(distortionFactor.getLessThanValue()) ? "合格" : "不合格"); } /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ETwoWeightHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ETwoWeightHandler.java index 673c0d6..d66a1bb 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ETwoWeightHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ETwoWeightHandler.java @@ -227,10 +227,17 @@ if (sta.getLessThan() != null) { repMap.put("lessThan", 0 == sta.getLessThan() ? "否" : "是"); } else { - repMap.put("lessThan", ""); + repMap.put("lessThan", "/"); } repMapList.add(repMap); } + for (int i = 0; i < 6 - staList.size(); i++) { + BizEquipmentStandardCheckDataETwo dataETwo = new BizEquipmentStandardCheckDataETwo(); + Map repMap = BeanUtil.beanToMap(dataETwo); + repMap.put("lessThan", "/"); + mapReplace(repMap); + repMapList.add(repMap); + } map.put("staList", repMapList); } }