From 6a9c60d8efb3ca92b2f57c777e05fc0d39bdecdc Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 19 Apr 2022 09:33:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF=E8=A1=8C?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/model/BuildingErrorInfoModel.java | 3 +++
 .../src/main/java/com/epmet/model/BuildingInfoModel.java      | 4 ++++
 .../src/main/java/com/epmet/model/HouseErrorInfoModel.java    | 2 +-
 .../main/java/com/epmet/model/ImportBuildingInfoListener.java | 2 ++
 .../main/java/com/epmet/model/ImportHouseInfoListener.java    | 1 +
 .../java/com/epmet/model/ImportNeighborHoodInfoListener.java  | 2 ++
 .../main/java/com/epmet/model/NeighborHoodErrorInfoModel.java | 3 +++
 .../src/main/java/com/epmet/model/NeighborHoodInfoModel.java  | 4 ++++
 8 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingErrorInfoModel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingErrorInfoModel.java
index 7477c1a109..f2746aa90b 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingErrorInfoModel.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingErrorInfoModel.java
@@ -12,6 +12,9 @@ import lombok.Data;
 @Data
 public class BuildingErrorInfoModel {
 
+    @Excel(name = "行号", width = 20)
+    private Integer num;
+
     @Excel(name = "小区名称" , width = 20)
     private String neighborHoodName;
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java
index e76c391324..dac7c09015 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java
@@ -1,5 +1,6 @@
 package com.epmet.model;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 
@@ -35,4 +36,7 @@ public class BuildingInfoModel {
     @ExcelProperty(value = "户数")
     private Integer totalHouseNum;
 
+    @ExcelIgnore
+    private Integer num;
+
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseErrorInfoModel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseErrorInfoModel.java
index 4531b2c03f..c49ea51719 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseErrorInfoModel.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseErrorInfoModel.java
@@ -13,7 +13,7 @@ import org.hibernate.validator.constraints.Length;
 @Data
 public class HouseErrorInfoModel {
 
-    @Excel(name = "行号(不计算表头)", width = 20)
+    @Excel(name = "行号", width = 20)
     private Integer num;
 
     @Excel(name = "所属小区", width = 20)
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java
index 47681e15d1..cc0bc625ca 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java
@@ -86,6 +86,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
         ImportGeneralDTO dto = ConvertUtils.sourceToTarget(data, ImportGeneralDTO.class);
         dto.setNum(num);
         dto.setCustomerId(formDTO.getCustomerId());
+        info.setNum(num);
         if(StringUtils.isBlank(data.getAgencyName())){
             nums.add(num);
             disposeErrorMsg(info, "所属组织的值未填写");
@@ -384,6 +385,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
     public void disposeErrorMsg(BuildingInfoModel data,String msg){
         BuildingErrorInfoModel err = ConvertUtils.sourceToTarget(data, BuildingErrorInfoModel.class);
         err.setErrorMsg(msg);
+        err.setNum(err.getNum() + NumConstant.ONE);
         errorInfos.add(err);
     }
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
index 68b0571f93..08eb31a9cc 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
@@ -208,6 +208,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
     public void disposeErrorMsg(HouseInfoModel data,String msg){
         HouseErrorInfoModel err = ConvertUtils.sourceToTarget(data, HouseErrorInfoModel.class);
         err.setErrorMsg(msg);
+        err.setNum(err.getNum() + NumConstant.ONE);
         errorInfos.add(err);
     }
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java
index 2b9a20cf80..a75f0dc15f 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java
@@ -86,6 +86,7 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
         }
         info = data;
         num = num + NumConstant.ONE;
+        info.setNum(num);
         if (StringUtils.isBlank(data.getNeighborHoodName()) ||
                 StringUtils.isBlank(data.getGridName()) || StringUtils.isBlank(data.getAgencyName()) || StringUtils.isBlank(data.getAddress())){
             nums.add(num);
@@ -333,6 +334,7 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
     public void disposeErrorMsg(NeighborHoodInfoModel data,String msg){
         NeighborHoodErrorInfoModel err = ConvertUtils.sourceToTarget(data, NeighborHoodErrorInfoModel.class);
         err.setErrorMsg(msg);
+        err.setNum(err.getNum() + NumConstant.ONE);
         errorInfos.add(err);
     }
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodErrorInfoModel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodErrorInfoModel.java
index 2bdc863e00..fb25ab3ddb 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodErrorInfoModel.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodErrorInfoModel.java
@@ -12,6 +12,9 @@ import lombok.Data;
 @Data
 public class NeighborHoodErrorInfoModel {
 
+    @Excel(name = "行号", width = 20)
+    private Integer num;
+
     @Excel(name = "小区名称", width = 20)
     private String neighborHoodName;
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java
index 8dbdbafccd..63260ee190 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java
@@ -1,5 +1,6 @@
 package com.epmet.model;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 
@@ -29,4 +30,7 @@ public class NeighborHoodInfoModel {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    @ExcelIgnore
+    private Integer num;
+
 }