From 5c9658ddc804dbcf035f66a5d0847b1b418ef8c6 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Thu, 27 Aug 2020 13:41:59 +0800
Subject: [PATCH] =?UTF-8?q?11=E3=80=81=E5=9F=BA=E5=B1=82=E6=B2=BB=E7=90=86?=
 =?UTF-8?q?-=E5=85=AC=E4=BC=97=E5=8F=82=E4=B8=8E=20=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=B9=B3=E5=9D=87=E7=8E=87=E8=AE=A1=E7=AE=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/screen/impl/ScreenCollServiceImpl.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java
index 83162e601a..1411cd9c00 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java
@@ -334,9 +334,10 @@ public class ScreenCollServiceImpl implements ScreenCollService {
 
             String[] lastMonth = this.lastMonthDate();
             // 获取上个月的基本数据
+            String moneth = lastMonth[NumConstant.ZERO] + lastMonth[NumConstant.ONE];
             List<ScreenUserJoinEntity> lastMonthJoinList = screenUserJoinDao.selectLastMonthScreenUserJoinList(customerId,
                     lastMonth[NumConstant.ZERO],
-                    lastMonth[NumConstant.ONE],
+                    moneth,
                     orgIds);
 
             // 定义本月待添加数据的集合