diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java index cca8a02..bb6e569 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java @@ -275,7 +275,7 @@ */ protected Integer checkRemoveItem(Map measureDataMap, String key, Map map, String titleParam, Integer titleIndex, List dataItems, Integer tableIndex, String titleKeyWords) { - if (map.containsKey(key) && ObjectUtils.isNotEmpty(map.get(key))) { + if (measureDataMap.containsKey(key) && ObjectUtils.isNotEmpty(measureDataMap.get(key))) { map.put(titleParam, (titleIndex++) + "."); } else { addDataRemoveItem(dataItems, tableIndex, titleKeyWords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java index cca8a02..bb6e569 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java @@ -275,7 +275,7 @@ */ protected Integer checkRemoveItem(Map measureDataMap, String key, Map map, String titleParam, Integer titleIndex, List dataItems, Integer tableIndex, String titleKeyWords) { - if (map.containsKey(key) && ObjectUtils.isNotEmpty(map.get(key))) { + if (measureDataMap.containsKey(key) && ObjectUtils.isNotEmpty(measureDataMap.get(key))) { map.put(titleParam, (titleIndex++) + "."); } else { addDataRemoveItem(dataItems, tableIndex, titleKeyWords); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/ParseWord07.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/ParseWord07.java index a3aea80..a979389 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/ParseWord07.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/ParseWord07.java @@ -8,10 +8,7 @@ import cn.afterturn.easypoi.word.parse.excel.ExcelEntityParse; import cn.afterturn.easypoi.word.parse.excel.ExcelMapParse; import cn.hutool.core.collection.CollectionUtil; -import liquibase.pro.packaged.A; -import liquibase.pro.packaged.C; import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.xwpf.usermodel.*; import org.openxmlformats.schemas.wordprocessingml.x2006.main.*; import org.slf4j.Logger; @@ -20,7 +17,6 @@ import java.math.BigInteger; import java.util.*; -import java.util.stream.Collector; import java.util.stream.Collectors; /**