diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java index 7ad1f32..c447837 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java @@ -80,7 +80,7 @@ @Override public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataSignalGenerator signalGenerator) { signalGenerator.setFrequency(StringUtils.isNotBlank(signalGenerator.getFrequency()) ? signalGenerator.getFrequency() + signalGenerator.getFrequencyUnit() : ""); - signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation()) ? signalGenerator.getRemainAmplitudeModulation() + "%" : ""); + signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation()) ? signalGenerator.getRemainAmplitudeModulation() + signalGenerator.getUpperIndexUnit() : ""); signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperIndex() + signalGenerator.getUpperIndexUnit() : ""); if (signalGenerator.getExceedMark() == 1) { signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation()) ? signalGenerator.getRemainAmplitudeModulation() + "*" : signalGenerator.getRemainAmplitudeModulation()); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java index 7ad1f32..c447837 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java @@ -80,7 +80,7 @@ @Override public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataSignalGenerator signalGenerator) { signalGenerator.setFrequency(StringUtils.isNotBlank(signalGenerator.getFrequency()) ? signalGenerator.getFrequency() + signalGenerator.getFrequencyUnit() : ""); - signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation()) ? signalGenerator.getRemainAmplitudeModulation() + "%" : ""); + signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation()) ? signalGenerator.getRemainAmplitudeModulation() + signalGenerator.getUpperIndexUnit() : ""); signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperIndex() + signalGenerator.getUpperIndexUnit() : ""); if (signalGenerator.getExceedMark() == 1) { signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation()) ? signalGenerator.getRemainAmplitudeModulation() + "*" : signalGenerator.getRemainAmplitudeModulation()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java index 8592ef2..4544a67 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java @@ -152,7 +152,7 @@ Paragraph footerParagraph = footer.addParagraph(); recordNo = StringUtils.isEmpty(recordNo) ? "" : recordNo; footerParagraph.appendText(" 证书号:" + recordNo); - footerParagraph.appendText(" "); + footerParagraph.appendText(" "); footerParagraph.appendText(" 第 "); footerParagraph.appendField("第 " + "page number" + "页", FieldType.Field_Page); footerParagraph.appendText(" 页 共 ");