Merge remote-tracking branch 'origin/dev_5big_coverage' into dev_5big_coverage

3 years ago · 9185f4567c
3 changed files with 9 additions and 3 deletions
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java
@ -95,7 +95,9 @@ public class IcCityManagementExcelImportListener implements ReadListener<IcCityM
            IcCityManagementEntity.setSourceType("import");
            IcCityManagementEntity.setCategory(data.getCategoryName());
            IcCityManagementEntity.setAreaCovered(data.getAreaCoveredName());
+            if(StringUtils.isNotBlank(data.getCapacityName())){
                IcCityManagementEntity.setCapacity(Integer.parseInt(data.getCapacityName()));
+            }
            datas.add(IcCityManagementEntity);

            if (datas.size() == MAX_THRESHOLD) {
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPublicServiceExcelImportListener.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPublicServiceExcelImportListener.java
@ -95,7 +95,9 @@ public class IcPublicServiceExcelImportListener implements ReadListener<IcPublic
            IcPublicServiceEntity.setSourceType("import");
            IcPublicServiceEntity.setCategory(data.getCategoryName());
            IcPublicServiceEntity.setAreaCovered(data.getAreaCoveredName());
+            if(StringUtils.isNotBlank(data.getCapacityName())){
                IcPublicServiceEntity.setCapacity(Integer.parseInt(data.getCapacityName()));
+            }
            datas.add(IcPublicServiceEntity);

            if (datas.size() == MAX_THRESHOLD) {
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcSuperiorResourceExcelImportListener.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcSuperiorResourceExcelImportListener.java
@ -96,7 +96,9 @@ public class IcSuperiorResourceExcelImportListener implements ReadListener<IcSup
            icSuperiorResourceEntity.setSourceType("import");
            icSuperiorResourceEntity.setCategory(data.getCategoryName());
            icSuperiorResourceEntity.setAreaCovered(data.getAreaCoveredName());
+            if(StringUtils.isNotBlank(data.getCapacityName())){
                icSuperiorResourceEntity.setCapacity(Integer.parseInt(data.getCapacityName()));
+            }
            datas.add(icSuperiorResourceEntity);

            if (datas.size() == MAX_THRESHOLD) {