Merge branch 'dev_data_stats' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_data_stats

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsGroupController.java

@@ -6,8 +6,6 @@ import com.epmet.service.StatsGroupService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
-
 /**
  * @Author zxc
  * @CreateTime 2020/6/16 13:21

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

@@ -2,8 +2,6 @@ package com.epmet.service;
 
 import com.epmet.dto.group.form.GroupStatsFormDTO;
 
-import java.util.Date;
-
 /**
  * @Author zxc
  * @CreateTime 2020/6/16 14:14

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

@@ -16,7 +16,6 @@ import com.epmet.service.stats.*;
 import com.epmet.util.DimIdGenerator;
 import com.epmet.util.ModuleConstant;
 import lombok.extern.slf4j.Slf4j;
-import oracle.sql.NUMBER;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -63,7 +62,7 @@ public class StatsGroupServiceImpl implements StatsGroupService {
         Integer pageSize = NumConstant.ONE_HUNDRED;
         List<String> customerIds;
         do {
-            customerIds = dimCustomerService.selectCustomerIdPage(pageNo,pageSize);
+            customerIds = dimCustomerService.selectCustomerIdPage(pageNo++,pageSize);
             DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(formDTO);
             if (customerIds.size() != NumConstant.ZERO){
                 customerIds.forEach(customerId -> {