Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp

5 years ago · df0d5e4ca7
1 changed files with 2 additions and 1 deletions
--- 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);

            // 定义本月待添加数据的集合