|
@@ -2010,9 +2010,12 @@ public class TimingTask {
|
|
|
String startTime=df.format(start);
|
|
|
String endTime=df.format(end);
|
|
|
List<BeisenConfig> beisenConfigs = beisenConfigMapper.selectList(null);
|
|
|
+ //更新电话到工时
|
|
|
+ List<User> needUpdateUsers=new ArrayList<>();
|
|
|
for (BeisenConfig beisenConfig : beisenConfigs) {
|
|
|
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()));
|
|
|
if(byTimeWindow.size()>0){
|
|
|
for (JSONArray array : byTimeWindow) {
|
|
|
for (int i = 0; i < array.size(); i++) {
|
|
@@ -2030,12 +2033,21 @@ public class TimingTask {
|
|
|
userWithBeisen.setId(first.get().getId());
|
|
|
}
|
|
|
userWithBeisenList.add(userWithBeisen);
|
|
|
+ Optional<User> user = userList.stream().filter(u -> u.getJobNumber().equals(userWithBeisen.getJobNumber())).findFirst();
|
|
|
+ if(user.isPresent()){
|
|
|
+ User u=new User();
|
|
|
+ u.setId(user.get().getId());
|
|
|
+ u.setPhone(userWithBeisen.getMobilePhone());
|
|
|
+ u.setJobNumber(userWithBeisen.getJobNumber());
|
|
|
+ userList.add(u);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
if(userWithBeisenList.size()>0){
|
|
|
userWithBeisenService.saveOrUpdateBatch(userWithBeisenList);
|
|
|
}
|
|
|
+ userService.updateBatchById(needUpdateUsers);
|
|
|
}
|
|
|
}
|
|
|
}
|