Merge branch 'dev'

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java

@@ -1876,6 +1876,7 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve
      */
     @Override
     public void CustomerDataManage(CustomerDataManageFormDTO formDTO, HttpServletResponse response) throws Exception {
+        String openTime = formDTO.getStartTime();
         List<CustomerDataManageResultDTO.CustomerDataManage> result = operateExport(formDTO).getList();
         if (!CollectionUtils.isEmpty(result)){
             CustomerDataManageResultDTO.CustomerDataManage c = new CustomerDataManageResultDTO.CustomerDataManage();
@@ -1894,6 +1895,7 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve
             c.setPatrolDuration(getHm(c.getPatrolDurationInteger()));
             result.add(c);
         }
+        formDTO.setStartTime(openTime);
         String fileName = excelName(formDTO);
         ExcelUtils.exportExcelToTargetDisposeAll(response,fileName,result, CustomerDataManageExcel.class);
     }