From 26936e18b152482a675a25385f8e7d11f5cf900f Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 14 Feb 2022 15:49:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=98=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E6=8E=A5=E5=8F=A3=E4=B8=8A=E4=BC=A0=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AEpids=E6=98=AF=E4=BB=8E=E4=B8=89=E4=B8=AA?=
 =?UTF-8?q?=E8=A1=97=E9=81=93=E5=BC=80=E5=A7=8B=E7=9A=84=EF=BC=8C=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E5=9C=A8=E5=89=8D=E8=BE=B9=E6=8B=BC=E4=B8=8A=E5=B9=B3?=
 =?UTF-8?q?=E9=98=B4=E5=8E=BF=E7=9A=84=E7=BB=84=E7=BB=87id=E6=89=8D?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/commons/tools/constant/StrConstant.java    | 2 ++
 .../java/com/epmet/service/impl/StatsUserServiceImpl.java     | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java
index a18f34f72b..67f467f63c 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java
@@ -95,6 +95,8 @@ public interface StrConstant {
     String SPECIAL_CUSTOMER = "150282ed25c14ff0785e7e06283b6283";
     //平音客户
     String PY_CUSTOMER = "6f203e30de1a65aab7e69c058826cd80";
+    //平音客户跟组织Id
+    String PY_ROOT_AGENCY = "53613e1c5de6ed473467f0159a10b135";
 
     /**
      * 单位积分,积分上限，积分说明，积分事件
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java
index a3ccd6c5a1..0f3f9de0ce 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java
@@ -3,6 +3,7 @@ package com.epmet.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.DateUtils;
@@ -252,7 +253,8 @@ public class StatsUserServiceImpl implements StatsUserService {
                     m.setSourceType("external");
                     m.setParentCustomerId(crm.getParentCustomerId());
                     m.setPid(pid.toString());
-                    m.setPids(pids.toString());
+                    //20220214 上报数据的pids是从街道开始,需要在前边拼接上平阴县的id才能保证后续的查询用like时可以筛选出数据  sun
+                    m.setPids(StrConstant.PY_ROOT_AGENCY + ":" + pids.toString());
                 } else {
                     log.warn(String.format("网格员数据分析上报,数据错误,根据agencyId未查询到组织信息,客户Id->%s,组织Id->%s", m.getCustomerId(), m.getAgencyId()));
                     iterator.remove();