From de9ca7019e738589a8171ddd4d9df12d579948fb Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 21 Oct 2020 13:25:42 +0800
Subject: [PATCH] =?UTF-8?q?dimPartyMember=E4=BF=A1=E6=81=AF=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stats/impl/DimCustomerPartymemberServiceImpl.java       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerPartymemberServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerPartymemberServiceImpl.java
index 4215c1fe59..5aa8fb1d26 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerPartymemberServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerPartymemberServiceImpl.java
@@ -144,7 +144,11 @@ public class DimCustomerPartymemberServiceImpl extends BaseServiceImpl<DimCustom
             throw new RenException(StatsConstant.CUSTOMER_INFO_NULL);
         }
         if ((StringUtils.isBlank(customerIdAndDateIdFormDTO.getStartDate()) && StringUtils.isBlank(customerIdAndDateIdFormDTO.getEndDate()))){
-            dateIds.add(DimIdGenerator.getDateDimId(DateUtils.addDateDays(new Date(), -1)));
+            if (StringUtils.isNotBlank(customerIdAndDateIdFormDTO.getDateId())){
+                dateIds.add(customerIdAndDateIdFormDTO.getDateId());
+            }else {
+                dateIds.add(DimIdGenerator.getDateDimId(DateUtils.addDateDays(new Date(), -1)));
+            }
         }else {
             dateIds = DateUtils.getDaysBetween(customerIdAndDateIdFormDTO.getStartDate(), customerIdAndDateIdFormDTO.getEndDate());
         }