diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/ToBeRemoveDataItem.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/ToBeRemoveDataItem.java index 1129c0a..eb9caa3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/ToBeRemoveDataItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/ToBeRemoveDataItem.java @@ -27,10 +27,4 @@ private int tableIndex; - /** - * 表格下标,表格依据下标进行删除 - */ - private int customOffset; - - } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/ToBeRemoveDataItem.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/ToBeRemoveDataItem.java index 1129c0a..eb9caa3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/ToBeRemoveDataItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/ToBeRemoveDataItem.java @@ -27,10 +27,4 @@ private int tableIndex; - /** - * 表格下标,表格依据下标进行删除 - */ - private int customOffset; - - } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCalibrator.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCalibrator.java index f10ba6a..fa98bd1 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCalibrator.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCalibrator.java @@ -277,8 +277,13 @@ switch (type) { case "钳形电流表"://绝对误差 case "数字多用表(手持)": + case "数字多用表(台式)": case "指针式万用表": - case "交流电压表、交流电流表、直流电压表、直流电流表、75mV电流表": + case "交流电压表": + case "交流电流表": + case "直流电压表": + case "直流电流表": + case "75mV电流表": MultiCalibrationType calibrationType = meterHandlerMap.get("1"); calibrationType.appendAsterisksIfNeeded(this); break; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/ToBeRemoveDataItem.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/ToBeRemoveDataItem.java index 1129c0a..eb9caa3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/ToBeRemoveDataItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/ToBeRemoveDataItem.java @@ -27,10 +27,4 @@ private int tableIndex; - /** - * 表格下标,表格依据下标进行删除 - */ - private int customOffset; - - } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCalibrator.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCalibrator.java index f10ba6a..fa98bd1 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCalibrator.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCalibrator.java @@ -277,8 +277,13 @@ switch (type) { case "钳形电流表"://绝对误差 case "数字多用表(手持)": + case "数字多用表(台式)": case "指针式万用表": - case "交流电压表、交流电流表、直流电压表、直流电流表、75mV电流表": + case "交流电压表": + case "交流电流表": + case "直流电压表": + case "直流电流表": + case "75mV电流表": MultiCalibrationType calibrationType = meterHandlerMap.get("1"); calibrationType.appendAsterisksIfNeeded(this); break; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java index d78ccf3..fc0b90c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java @@ -255,8 +255,8 @@ safety.setMaximumError("±" + safety.getMaximumError()); } if (StringUtils.isNotEmpty(safety.getUnit()) && !safety.getUnit().contains("/")) { - //单位 - safety.setUnit(safety.getUnit() + "/" + safety.getCapacity()); + // 量/单位 + safety.setUnit(safety.getCapacity() + "/" + safety.getUnit()); } safety.applyStrategyBasedOnDataType(measureItemInfo.getItemCategoryName()); safetyList.add(safety); @@ -264,11 +264,6 @@ } Map map = BeanUtil.beanToMap(measureItemInfo); List dataItems = checkParamAddRomveItem(measureItemInfo, 4, map); - if (measureItemInfo.getMeasureCategoryName().contains("检定") || measureItemInfo.getMeasureCategoryName().contains("校检")) { - for (ToBeRemoveDataItem dataItem : dataItems) { - dataItem.setCustomOffset(1); - } - } //准备填充参数 map.put("measureDataCalibratorList", safetyList); //准备封面参数 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/ToBeRemoveDataItem.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/ToBeRemoveDataItem.java index 1129c0a..eb9caa3 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/ToBeRemoveDataItem.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/ToBeRemoveDataItem.java @@ -27,10 +27,4 @@ private int tableIndex; - /** - * 表格下标,表格依据下标进行删除 - */ - private int customOffset; - - } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCalibrator.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCalibrator.java index f10ba6a..fa98bd1 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCalibrator.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataCalibrator.java @@ -277,8 +277,13 @@ switch (type) { case "钳形电流表"://绝对误差 case "数字多用表(手持)": + case "数字多用表(台式)": case "指针式万用表": - case "交流电压表、交流电流表、直流电压表、直流电流表、75mV电流表": + case "交流电压表": + case "交流电流表": + case "直流电压表": + case "直流电流表": + case "75mV电流表": MultiCalibrationType calibrationType = meterHandlerMap.get("1"); calibrationType.appendAsterisksIfNeeded(this); break; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java index d78ccf3..fc0b90c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java @@ -255,8 +255,8 @@ safety.setMaximumError("±" + safety.getMaximumError()); } if (StringUtils.isNotEmpty(safety.getUnit()) && !safety.getUnit().contains("/")) { - //单位 - safety.setUnit(safety.getUnit() + "/" + safety.getCapacity()); + // 量/单位 + safety.setUnit(safety.getCapacity() + "/" + safety.getUnit()); } safety.applyStrategyBasedOnDataType(measureItemInfo.getItemCategoryName()); safetyList.add(safety); @@ -264,11 +264,6 @@ } Map map = BeanUtil.beanToMap(measureItemInfo); List dataItems = checkParamAddRomveItem(measureItemInfo, 4, map); - if (measureItemInfo.getMeasureCategoryName().contains("检定") || measureItemInfo.getMeasureCategoryName().contains("校检")) { - for (ToBeRemoveDataItem dataItem : dataItems) { - dataItem.setCustomOffset(1); - } - } //准备填充参数 map.put("measureDataCalibratorList", safetyList); //准备封面参数 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/WordUtil.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/WordUtil.java index 582a3a4..5174d90 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/WordUtil.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/WordUtil.java @@ -50,7 +50,7 @@ if (dataItemIndex < paragraphDataItem.size()) { ToBeRemoveDataItem removeDataItem = paragraphDataItem.get(dataItemIndex); if (document.getParagraphs().get(paragraphIndex).getText().contains(removeDataItem.getParamContent())) { - document.removeBodyElement(tableIndex + paragraphIndex + removeDataItem.getCustomOffset()); + document.removeBodyElement(tableIndex + paragraphIndex); dataItemIndex++; continue; } @@ -60,7 +60,7 @@ if (tableItemIndex < tableDataItem.size()) { ToBeRemoveDataItem removeTableItem = tableDataItem.get(tableItemIndex); //表格的情况下根据下标进行删除内容 - if (currentTableIndex++ == (removeTableItem.getTableIndex() - removeTableItem.getCustomOffset() - 1)) { + if (currentTableIndex++ == (removeTableItem.getTableIndex() - 1)) { document.removeBodyElement(tableIndex + paragraphIndex); tableItemIndex++; removeSpace(tableIndex,paragraphIndex,document);