From caa7b4b4b269e5d92fd0cc7029ac316c95f99f06 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 25 Mar 2022 10:12:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?import=20=E9=94=99=E8=AF=AF=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/model/ImportBuildingInfoListener.java | 6 ++++-- .../main/java/com/epmet/model/ImportHouseInfoListener.java | 6 ++++-- .../com/epmet/model/ImportNeighborHoodInfoListener.java | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) 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 d4d9bde5b2..1de117ca35 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 @@ -145,7 +145,8 @@ public class ImportBuildingInfoListener extends AnalysisEventListener { if (!e.getAddStatus()){ nums.add(e.getNum()); - disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR); + BuildingInfoModel buildingInfoModel = ConvertUtils.sourceToTarget(e, BuildingInfoModel.class); + disposeErrorMsg(buildingInfoModel,ImportErrorMsgConstants.EXIST_ERROR); e.setAddStatus(true); } }); 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 f54eb2fa7f..ea8c98c040 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 @@ -217,7 +217,8 @@ public class ImportHouseInfoListener extends AnalysisEventListener { if (!e.getAddStatus()){ nums.add(e.getNum()); - disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR); + NeighborHoodInfoModel neighborHoodInfoModel = ConvertUtils.sourceToTarget(e, NeighborHoodInfoModel.class); + disposeErrorMsg(neighborHoodInfoModel,ImportErrorMsgConstants.EXIST_ERROR); e.setAddStatus(true); } }); From 546cb7d6feae0aec034e96283811ea698bb9f1e4 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 25 Mar 2022 15:14:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?grid=E7=BC=93=E5=AD=98=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/CustomerGridDao.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index 357c8cebdc..bfbf419b42 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -756,10 +756,11 @@ cg.mobile, IFNULL(cg.longitude,ca.longitude) longitude, - IFNULL(cg.latitude,ca.latitude) latitude + IFNULL(cg.latitude,ca.latitude) latitude, + ca.organization_name FROM customer_grid cg - INNER JOIN customer_agency ca ON ca.pid = '0' AND ca.customer_id = cg.customer_id + INNER JOIN customer_agency ca ON (ca.ID = cg.PID AND ca.customer_id = cg.customer_id) WHERE cg.del_flag = '0' AND ca.del_flag = '0' From f8d9e871fbb7c38b5910c3ec43f8e16398893d1b Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 25 Mar 2022 15:17:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?grid=E7=BC=93=E5=AD=98=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/CustomerGridDao.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index bfbf419b42..1008b61af9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -756,8 +756,7 @@ cg.mobile, IFNULL(cg.longitude,ca.longitude) longitude, - IFNULL(cg.latitude,ca.latitude) latitude, - ca.organization_name + IFNULL(cg.latitude,ca.latitude) latitude FROM customer_grid cg INNER JOIN customer_agency ca ON (ca.ID = cg.PID AND ca.customer_id = cg.customer_id)