话题用户统计修改时间参数

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsTopicServiceImpl.java

@@ -64,6 +64,7 @@ public class StatsTopicServiceImpl implements StatsTopicService {
         //1.初始化时间参数
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(new Date());
+        calendar.add(Calendar.DATE, NumConstant.ONE_NEG);
         calendar.set(Calendar.HOUR_OF_DAY, 0);
         calendar.set(Calendar.MINUTE, 0);
         calendar.set(Calendar.SECOND, 0);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java

@@ -61,7 +61,8 @@ public class StatsUserServiceImpl implements StatsUserService {
         //1.初始化时间参数
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(new Date());
-        //获取今日的零点
+        //获取当日的零点
+        calendar.add(Calendar.DATE, NumConstant.ONE_NEG);
        calendar.set(Calendar.HOUR_OF_DAY, 0);
         calendar.set(Calendar.MINUTE, 0);
         calendar.set(Calendar.SECOND, 0);
@@ -71,7 +72,7 @@ public class StatsUserServiceImpl implements StatsUserService {
 
         //3.初始化机关维度
         List<AgencySubTreeDto> agencies =  dimAgencyService.getAllAgency(customerId);
-        List<AgencySubTreeDto> topAgencies = dimAgencyService.getTopAgency(customerId);
+        //List<AgencySubTreeDto> topAgencies = dimAgencyService.getTopAgency(customerId);
 
         //4.计算机关统计数据、生成唯一性统计数据
         UserStatisticalData agencyData = userService.traverseAgencyUser(agencies,date,timeDimension);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java

@@ -169,6 +169,7 @@ public class TopicServiceImpl implements TopicService {
         Boolean isMonthEnd = false;
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(new Date());
+        //前一天
         calendar.add(Calendar.DATE, NumConstant.ONE_NEG);
         Date targetDateCheck = null == targetDate ? calendar.getTime() : targetDate;
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java

@@ -284,8 +284,8 @@ public class UserServiceImpl implements UserService {
             partiAgencyD.setWarmIncr(warmPartiData.getIncr());
             partiAgencyD.setPartymemberIncr(partyPartiData.getIncr());
             partiAgencyD.setResiProportion(new BigDecimal(NumConstant.ONE));
-            partiAgencyD.setPartymemberProportion(null == partiData.getTotal() || partiData.getTotal() == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float)partyPartiData.getTotal()/(float)partiData.getIncr() )));
-            partiAgencyD.setWarmHeartedProportion(null == partiData.getTotal() || partiData.getTotal() == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float)warmPartiData.getTotal()/(float)partiData.getIncr() )));
+            partiAgencyD.setPartymemberProportion(null == partiData.getTotal() || partiData.getTotal() == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float)partyPartiData.getTotal()/(float)partiData.getTotal() )));
+            partiAgencyD.setWarmHeartedProportion(null == partiData.getTotal() || partiData.getTotal() == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float)warmPartiData.getTotal()/(float)partiData.getTotal() )));
             partiAgencyD.setCreatedBy(ModuleConstant.CREATED_BY_STATISTICAL_ROBOT);
 
             if(null != dataPacket.getPartiAgencyDailyList()){