导出

pro-base/src/main/java/com/idea/buildManage/controller/MnpBuildingController.java

@@ -126,7 +126,7 @@ public class MnpBuildingController extends BaseController {
             if (null == excel) {
                 return AjaxResult.error("导入失败");
             }
-            EasyExcel.read(excel, MnpBuildingExcel.class, listener).headRowNumber(1).sheet().doRead();
+            EasyExcel.read(excel, MnpBuildingExcel.class, listener).headRowNumber(2).sheet().doRead();
             excel.delete();
         } catch (Exception e) {
             e.printStackTrace();

pro-base/src/main/java/com/idea/buildManage/controller/ParkFloorDiscController.java

@@ -121,7 +121,7 @@ public class ParkFloorDiscController extends BaseController {
             if (null == excel) {
                 return AjaxResult.error("导入失败");
             }
-            EasyExcel.read(excel, ParkFloorDiscExcel.class, listener).headRowNumber(1).sheet().doRead();
+            EasyExcel.read(excel, ParkFloorDiscExcel.class, listener).headRowNumber(2).sheet().doRead();
             excel.delete();
 //            List<ParkFloorDiscExcel> errorList = (List<ParkFloorDiscExcel>) jsonObject.get("errorList");
 //            modelService.errorListExport(errorList,response);

pro-base/src/main/java/com/idea/buildManage/excel/MnpBuildingExcel.java

@@ -7,55 +7,55 @@ import lombok.Data;
 @Data
 public class MnpBuildingExcel {
 
-    @ExcelProperty(value = "楼盘/小区名称")
+    @ExcelProperty(value = "*楼盘/小区名称")
     private String groupName;
 
-    @ExcelProperty(value = "分期名称")
+    @ExcelProperty(value = "*分期名称")
     private String discName;
 
-    @ExcelProperty(value = "单元/楼栋号")
+    @ExcelProperty(value = "*单元/楼栋号")
     private String buildNum;
 
-    @ExcelProperty(value = "施工号")
+    @ExcelProperty(value = "*施工号")
     private String constructionNum;
 
-    @ExcelProperty(value = "总面积（㎡）")
+    @ExcelProperty(value = "*总面积（㎡）")
     private String area;
 
-    @ExcelProperty(value = "住宅面积（㎡）")
+    @ExcelProperty(value = "*住宅面积（㎡）")
     private String residentialArea;
 
-    @ExcelProperty(value = "非住宅面积（㎡）")
+    @ExcelProperty(value = "*非住宅面积（㎡）")
     private String unResidentialArea;
 
-    @ExcelProperty(value = "占地面积（㎡）")
+    @ExcelProperty(value = "*占地面积（㎡）")
     private String coverAnArea;
 
-    @ExcelProperty(value = "地下面积（㎡）")
+    @ExcelProperty(value = "*地下面积（㎡）")
     private String undergroundArea;
 
-    @ExcelProperty(value = "房号")
+    @ExcelProperty(value = "*房号")
     private String roomNum;
 
-    @ExcelProperty(value = "套数")
+    @ExcelProperty(value = "*套数")
     private String numberInfo;
 
-    @ExcelProperty(value = "总层数")
+    @ExcelProperty(value = "*总层数")
     private String floors;
 
-    @ExcelProperty(value = "地上层数")
+    @ExcelProperty(value = "*地上层数")
     private String overgroundFloors;
 
-    @ExcelProperty(value = "地下层数")
+    @ExcelProperty(value = "*地下层数")
     private String undergroundFloors;
 
-    @ExcelProperty(value = "结构")
+    @ExcelProperty(value = "*结构")
     private String structure;
 
     @ExcelProperty(value = "行政区划")
     private String regionalismCode;
 
-    @ExcelProperty(value = "地号")
+    @ExcelProperty(value = "*地号")
     private String landCode;
 
     @ExcelProperty(value = "备注")

pro-base/src/main/java/com/idea/buildManage/excel/MnpBuildingListener.java

@@ -26,7 +26,7 @@ public class MnpBuildingListener extends AnalysisEventListener<MnpBuildingExcel>
 
     private List<MnpBuilding> list = new ArrayList<>();
 
-    private List<MnpBuildingExcel> excelList = new ArrayList<>();
+    private List<MnpBuildingExcel> excelList =  new ArrayList<>();
 
     private List<MnpBuildingExcel> badList = new ArrayList<>();
 
@@ -282,13 +282,13 @@ public class MnpBuildingListener extends AnalysisEventListener<MnpBuildingExcel>
                         excel.setStructure("{" + excel.getStructure() + "}");
                     }
 
-                    // 行政区划
-                    if (StringUtils.isEmpty(excel.getRegionalismCode())) {
-                        regionalismCodeFlag = false;
-                        builder.append("行政区划为空").append(",");
-                        excel.setRegionalismCode("{" + excel.getRegionalismCode() + "}");
-                    }
-                    data.setRegionalismCode(excel.getRegionalismCode());
+//                    // 行政区划
+//                    if (StringUtils.isEmpty(excel.getRegionalismCode())) {
+//                        regionalismCodeFlag = false;
+//                        builder.append("行政区划为空").append(",");
+//                        excel.setRegionalismCode("{" + excel.getRegionalismCode() + "}");
+//                    }
+//                    data.setRegionalismCode(excel.getRegionalismCode());
 
                     // 地号
                     if (StringUtils.isEmpty(excel.getLandCode())) {

pro-base/src/main/java/com/idea/buildManage/excel/ParkFloorDiscExcel.java

@@ -7,10 +7,10 @@ import lombok.Data;
 @Data
 public class ParkFloorDiscExcel {
 
-    @ExcelProperty(value = "楼盘/小区名称")
+    @ExcelProperty(value = "*楼盘/小区名称")
     private String groupName;
 
-    @ExcelProperty(value = "分期名称")
+    @ExcelProperty(value = "*分期名称")
     private String discName;
 
     @ExcelProperty(value = "房屋买卖单价（元/㎡）")