daoru

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java

@@ -21,6 +21,16 @@ public class EnterpriseImportExcelDTO {
     private String placeTypeName;
 
 
+    /**
+     * 10.26需求：
+     * 场所类别：0九小场所、1企事业单位
+     * 默认0
+     */
+    @NotBlank(message = "场所类别不能为空")
+    @ExcelProperty(value = "场所类别(九小场所/企事业单位)")
+    private String placeCategoryName;
+
+
     @NotBlank(message = "场所区域不能为空")
     @ExcelProperty(value = "场所区域")
     private String gridName;
@@ -72,6 +82,15 @@ public class EnterpriseImportExcelDTO {
         @ExcelProperty(value = "场所类型")
         private String placeTypeName;
 
+        /**
+         * 10.26需求：
+         * 场所类别：0九小场所、1企事业单位
+         * 默认0
+         */
+        @ColumnWidth(20)
+        @ExcelProperty(value = "场所类别(九小场所/企事业单位)")
+        private String placeCategoryName;
+
         @ColumnWidth(20)
         @ExcelProperty(value = "场所区域")
         private String gridName;

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java

@@ -86,7 +86,7 @@ public class IcEnterpriseExcelImportListener implements ReadListener<EnterpriseI
             enterpriseEntity.setLatitude(StrConstant.EPMETY_STR);
             //规模
             enterpriseEntity.setScale(scaleMap.get(data.getScaleName()));
-
+            enterpriseEntity.setPlaceCategory("九小场所".equals(data.getPlaceCategoryName()) ? "0" : "1");
 
             //网格id+场所名称
             List<IcEnterpriseEntity> originList=icEnterpriseServiceImpl.selectForUniqueName(enterpriseEntity.getGridId(),enterpriseEntity.getPlaceOrgName(),null);
@@ -117,6 +117,7 @@ public class IcEnterpriseExcelImportListener implements ReadListener<EnterpriseI
             }
             EnterpriseImportExcelDTO.ErrorRow errorRow = new EnterpriseImportExcelDTO.ErrorRow();
             errorRow.setPlaceTypeName(data.getPlaceTypeName());
+            errorRow.setPlaceCategoryName(data.getPlaceCategoryName());
             errorRow.setGridName(data.getGridName());
             errorRow.setPlaceOrgName(data.getPlaceOrgName());
             errorRow.setAddress(data.getAddress());