网格小组日统计补漏

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

@@ -32,6 +32,11 @@ public class GroupDataServiceImpl implements GroupDataService {
     @Autowired
     private DimDateDao dimDateDao;
 
+    public DimTimeResultDTO getTimeDim(){
+        String dateId = LocalDate.now().minusDays(NumConstant.ONE).toString().replace("-", "");
+        return dimDateDao.selectDimTime(dateId);
+    }
+
     /**
      * @Description  统计 “小组” 有关数据， dim：【网格-日】
      * @param customerId
@@ -40,8 +45,7 @@ public class GroupDataServiceImpl implements GroupDataService {
      */
     @Override
     public List<GroupGridDailyResultDTO> groupGridDaily(String customerId, List<CustomerGridInfoResultDTO> gridsInfo) {
-        String dateId = LocalDate.now().minusDays(NumConstant.ONE).toString().replace("-", "");
+        DimTimeResultDTO dimTime = this.getTimeDim();
-        DimTimeResultDTO dimTime = dimDateDao.selectDimTime(dateId);
         List<GroupGridDailyResultDTO> result = new ArrayList<>();
 
         // 1. 网格下有多少小组，只算   state = ‘approved’
@@ -104,7 +108,7 @@ public class GroupDataServiceImpl implements GroupDataService {
         //TODO 网格下小组增量
         GroupIncrFormDTO groupIncr = new GroupIncrFormDTO();
         groupIncr.setCustomerId(customerId);
-        groupIncr.setYesterday(dateId);
+        groupIncr.setYesterday(dimTime.getDateId());
         List<GroupIncrResultDTO> groupIncrResult = groupDataDao.selectGroupIncr(groupIncr);
         result.forEach(grid -> {
             groupIncrResult.forEach(gridIncr -> {