From 7129953a647c4ea65c729d75e806c42b6b7cdb08 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Mon, 25 Jul 2022 15:46:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?eventreport=5Fpingyin=E8=A1=A8=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../opendata/entity/EventreportPingyinEntity.java      | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/EventreportPingyinEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/EventreportPingyinEntity.java
index 0dc15d325a..1298790b7c 100755
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/EventreportPingyinEntity.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/EventreportPingyinEntity.java
@@ -130,16 +130,6 @@ public class EventreportPingyinEntity {
      */
 	private String relatedUnites;
 
-    /**
-     * 出租人姓名
-     */
-	private String lessorName;
-
-    /**
-     * 出租屋巡查结果，符合《标准》10.24
-     */
-	private String rentingResult;
-
     /**
      * 重点场所类别，符合《标准》10.25
      */

From 02e5ff85028e1c51f318e641238001658aa3956d Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 25 Jul 2022 15:47:06 +0800
Subject: [PATCH 2/2] gridLevel String

---
 .../java/com/epmet/opendata/dao/GridInfoPingyinDao.java   | 2 +-
 .../com/epmet/opendata/entity/GridInfoPingyinEntity.java  | 2 +-
 .../opendata/service/impl/GridInfoPingyinServiceImpl.java | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/GridInfoPingyinDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/GridInfoPingyinDao.java
index 986b8f2ff7..0aae21b99f 100755
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/GridInfoPingyinDao.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/GridInfoPingyinDao.java
@@ -25,7 +25,7 @@ public interface GridInfoPingyinDao extends BaseDao<GridInfoPingyinEntity> {
 
     int updateSomeCol(@Param("gridCode") String gridCode,
                        @Param("gridName")String gridName,
-                       @Param("gridLevel")Integer gridLevel,
+                       @Param("gridLevel")String gridLevel,
                        @Param("lng")BigDecimal lng,
                        @Param("lat")BigDecimal lat);
 
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/GridInfoPingyinEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/GridInfoPingyinEntity.java
index 9f64f9175d..d469072534 100755
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/GridInfoPingyinEntity.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/GridInfoPingyinEntity.java
@@ -43,7 +43,7 @@ public class GridInfoPingyinEntity {
     /**
      * 网格层级，应符合10.1组织层级，所有层级上报
      */
-	private Integer gridLevel;
+	private String gridLevel;
 
     /**
      * 专属网格类型，应符合10.28专属网格类型
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java
index 2f54aecee6..18c2f11420 100755
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java
@@ -72,11 +72,11 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl<GridInfoPingyinD
             entity.setGridCode(ag.getCode());
             entity.setGridName(ag.getOrganizationName());
             if (Constant.DISTRICT.equals(ag.getLevel())) {
-                entity.setGridLevel(3);
+                entity.setGridLevel("03");
             } else if (Constant.STREET.equals(ag.getLevel())) {
-                entity.setGridLevel(4);
+                entity.setGridLevel("04");
             } else if (Constant.COMMUNITY.equals(ag.getLevel())) {
-                entity.setGridLevel(6);
+                entity.setGridLevel("06");
             }
             entity.setLat(new BigDecimal(ag.getLatitude()));
             entity.setLng(new BigDecimal(ag.getLongitude()));
@@ -162,7 +162,7 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl<GridInfoPingyinD
             entity.setQxMc("平阴县");
             entity.setGridCode(ag.getCode());
             entity.setGridName(ag.getGridName());
-            entity.setGridLevel(7);
+            entity.setGridLevel("7");
             if (ag.getLatitude().length() > 10) {
                 entity.setLat(new BigDecimal(ag.getLatitude().substring(0, 10)));
             } else {