From 214b025bdab7721f1eb46c3586140b2c87831e23 Mon Sep 17 00:00:00 2001 From: wxz Date: Fri, 15 Oct 2021 20:36:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=20/resi/point/g?= =?UTF-8?q?ridpointrank=20=E6=8E=A5=E5=8F=A3=EF=BC=8C=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=8F=AA=E6=98=BE=E7=A4=BA=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E5=90=8D=EF=BC=8C=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=A4=BE=E5=8C=BA?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/UserPointStatisticalDailyServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java index c6a23b59df..e7b476d99d 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java @@ -380,7 +380,8 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl list = getGridPointList(tokenDto.getCustomerId(), null); From 8852ce3ebda4b83556ee6be012adc4b0e5b43561 Mon Sep 17 00:00:00 2001 From: wxz Date: Fri, 15 Oct 2021 23:05:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=20dim=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=EF=BC=8C=E5=A2=9E=E5=8A=A0code=E5=AD=97=E6=AE=B5=20?= =?UTF-8?q?=E7=9A=84=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluationindex/screen/ScreenCustomerAgencyEntity.java | 2 ++ .../evaluationindex/screen/ScreenCustomerGridEntity.java | 2 ++ .../java/com/epmet/entity/org/CustomerAgencyEntity.java | 2 ++ .../main/java/com/epmet/entity/org/CustomerGridEntity.java | 2 ++ .../main/java/com/epmet/entity/stats/DimAgencyEntity.java | 2 ++ .../src/main/java/com/epmet/entity/stats/DimGridEntity.java | 2 ++ .../screen/impl/ScreenCustomerAgencyServiceImpl.java | 2 ++ .../screen/impl/ScreenCustomerGridServiceImpl.java | 2 ++ .../java/com/epmet/service/impl/StatsDimServiceImpl.java | 2 ++ .../com/epmet/service/stats/impl/DimAgencyServiceImpl.java | 3 +++ .../evaluationindex/screen/ScreenCustomerAgencyDao.xml | 2 ++ .../mapper/evaluationindex/screen/ScreenCustomerGridDao.xml | 6 ++++-- .../src/main/resources/mapper/org/CustomerGridDao.xml | 1 + .../main/resources/mapper/org/StatsCustomerAgencyDao.xml | 1 + .../src/main/resources/mapper/stats/DimAgencyDao.xml | 2 ++ .../src/main/resources/mapper/stats/DimGridDao.xml | 4 +++- 16 files changed, 34 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerAgencyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerAgencyEntity.java index ba06221d17..cf7f550d7a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerAgencyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerAgencyEntity.java @@ -88,6 +88,8 @@ public class ScreenCustomerAgencyEntity extends BaseEpmetEntity { */ private String level; + private String code; + /** * 行政地区编码 */ diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java index 4a0d8e53c8..cbe1c62956 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java @@ -92,4 +92,6 @@ public class ScreenCustomerGridEntity extends BaseEpmetEntity { * desc: 是否参与上级计算yes:参与;no:不参与 add 01.14 */ private String upToCal; + + private String code; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerAgencyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerAgencyEntity.java index f521f0aa60..e3ea7f6109 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerAgencyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerAgencyEntity.java @@ -69,6 +69,8 @@ public class CustomerAgencyEntity extends BaseEpmetEntity { */ private String level; + private String code; + /** * 地区编码 */ diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerGridEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerGridEntity.java index dc760a4b5e..ba86713249 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerGridEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerGridEntity.java @@ -55,6 +55,7 @@ public class CustomerGridEntity extends BaseEpmetEntity { */ private String latitude; + private String code; /** * 所属地区码（所属组织地区码） */ @@ -84,4 +85,5 @@ public class CustomerGridEntity extends BaseEpmetEntity { * 是否同步到统计库和指标库,1同步。0不同步 */ private String syncFlag; + } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimAgencyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimAgencyEntity.java index 411c633990..93ce0f0bfc 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimAgencyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimAgencyEntity.java @@ -76,4 +76,6 @@ public class DimAgencyEntity extends BaseEpmetEntity { */ private String level; + private String code; + } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimGridEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimGridEntity.java index 8c49f7f9d9..2d3fc94740 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimGridEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimGridEntity.java @@ -57,4 +57,6 @@ public class DimGridEntity extends BaseEpmetEntity { */ private String areaCode; + private String code; + } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java index 16ba642e62..20d242bb29 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java @@ -141,6 +141,7 @@ public class ScreenCustomerAgencyServiceImpl implements ScreenCustomerAgencyServ } exists.setAllParentNames(e.getAllParentName()); exists.setParentAreaCode(e.getParentAreaCode()); + exists.setCode(e.getCode()); updateAgency(exists); } } @@ -243,6 +244,7 @@ public class ScreenCustomerAgencyServiceImpl implements ScreenCustomerAgencyServ cae.setPids(e.getPids()); cae.setSourceType(OrgSourceTypeConstant.INTERNAL); cae.setParentAreaCode(e.getParentAreaCode()); + cae.setCode(e.getCode()); screenCustomerAgencyDao.insert(cae); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java index 1ae24e2d25..f4bba9b2a7 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java @@ -83,6 +83,7 @@ public class ScreenCustomerGridServiceImpl extends BaseServiceImpl Date: Sat, 16 Oct 2021 23:17:16 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=20=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E7=BC=96=E8=AF=91=E7=9A=84=E4=BB=A3=E7=A0=81=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluationindex/screen/ScreenCustomerAgencyEntity.java | 1 - .../entity/evaluationindex/screen/ScreenCustomerGridEntity.java | 1 - 2 files changed, 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerAgencyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerAgencyEntity.java index 4fc6f6bee8..475e9907bd 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerAgencyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerAgencyEntity.java @@ -94,7 +94,6 @@ public class ScreenCustomerAgencyEntity extends BaseEpmetEntity { * 行政地区编码 */ private String areaCode; - private String code; private String sourceType; /** diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java index 5a2b97896a..cbe1c62956 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenCustomerGridEntity.java @@ -39,7 +39,6 @@ public class ScreenCustomerGridEntity extends BaseEpmetEntity { * 客户id */ private String customerId; - private String code; /** * 网格id