|
@@ -2005,7 +2005,6 @@ public class TimingTask {
|
|
|
if(isDev){
|
|
|
return;
|
|
|
}
|
|
|
- List<UserWithBeisen> allBeisenList = userWithBeisenService.list(new LambdaQueryWrapper<UserWithBeisen>().eq(UserWithBeisen::getCompanyId, 936));
|
|
|
List<UserWithBeisen> userWithBeisenList=new ArrayList<>();
|
|
|
LocalDate now=LocalDate.now();
|
|
|
DateTimeFormatter df=DateTimeFormatter.ofPattern("yyyy-MM-dd");
|
|
@@ -2020,6 +2019,7 @@ public class TimingTask {
|
|
|
if(beisenConfig!=null){
|
|
|
List<JSONArray> byTimeWindow = BeiSenUtils.getByTimeWindow("",startTime,endTime,beisenConfig.getCompanyId(),beisenConfig.getAppKey(),beisenConfig.getAppSecret());
|
|
|
List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getCompanyId, beisenConfig.getCompanyId()));
|
|
|
+ List<UserWithBeisen> allBeisenList = userWithBeisenService.list(new LambdaQueryWrapper<UserWithBeisen>().eq(UserWithBeisen::getCompanyId, beisenConfig.getCompanyId()));
|
|
|
if(byTimeWindow.size()>0){
|
|
|
for (JSONArray array : byTimeWindow) {
|
|
|
for (int i = 0; i < array.size(); i++) {
|