1

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserWithBeisenController.java

@@ -52,8 +52,9 @@ public class UserWithBeisenController {
                 UserWithBeisen userWithBeisen=new UserWithBeisen();
                 JSONObject targetItem = array.getJSONObject(i);
                 JSONObject employeeInfo = targetItem.getJSONObject("employeeInfo");
+                JSONObject recordInfo = targetItem.getJSONObject("recordInfo");
                 userWithBeisen.setCompanyId(companyId);
-                userWithBeisen.setJobNumber(employeeInfo.getString("jobNumber"));
+                userWithBeisen.setJobNumber(recordInfo.getString("jobNumber"));
                 userWithBeisen.setMobilePhone(employeeInfo.getString("mobilePhone"));
                 userWithBeisen.setName(employeeInfo.getString("name"));
                 userWithBeisen.setUserId(employeeInfo.getString("userID"));

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -8028,6 +8028,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
     @Override
     public HttpRespMsg getUserWorkTimeByCategory(Integer categoryId, Integer deptId, String userId, String startDate, String endDate, Integer pageIndex, Integer pageSize) {
         HttpRespMsg httpRespMsg=new HttpRespMsg();
+        if(categoryId==0){
+            categoryId=null;
+        }
         User user = userMapper.selectById(request.getHeader("token"));
         List<UserCustom> userCustomList = userCustomMapper.selectList(new LambdaQueryWrapper<UserCustom>().eq(UserCustom::getCompanyId, user.getCompanyId()));
         DateTimeFormatter dtf=DateTimeFormatter.ofPattern("yyyy-MM-dd");

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java

@@ -174,6 +174,8 @@ public class TimingTask {
     private SapProjectServiceService sapProjectServiceService;
     @Resource
     private SapSyncLogService sapSyncLogService;
+    @Resource
+    private UserWithBeisenService userWithBeisenService;
 
 
     private static final List<Integer> VALID_TOKEN_CHARS = new ArrayList<>();
@@ -2008,4 +2010,36 @@ public class TimingTask {
         }
     }
 
+    //每天凌晨  2:30 获取前一天时间增量的人员数据  BeiSenHR---->工时管家  针对威派格
+    @Scheduled(cron = "0 30 2 ? * *")
+    public void getByTimeWindow(){
+        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");
+        String time=df.format(now.plusDays(1));
+        List<JSONArray> byTimeWindow = BeiSenUtils.getByTimeWindow("",time,time);
+        for (JSONArray array : byTimeWindow) {
+            for (int i = 0; i < array.size(); i++) {
+                UserWithBeisen userWithBeisen=new UserWithBeisen();
+                JSONObject targetItem = array.getJSONObject(i);
+                JSONObject employeeInfo = targetItem.getJSONObject("employeeInfo");
+                JSONObject recordInfo = targetItem.getJSONObject("recordInfo");
+                userWithBeisen.setCompanyId(936);
+                userWithBeisen.setJobNumber(recordInfo.getString("jobNumber"));
+                userWithBeisen.setMobilePhone(employeeInfo.getString("mobilePhone"));
+                userWithBeisen.setName(employeeInfo.getString("name"));
+                userWithBeisen.setUserId(employeeInfo.getString("userID"));
+                Optional<UserWithBeisen> first = allBeisenList.stream().filter(a -> a.getUserId().equals(employeeInfo.getString("userID"))).findFirst();
+                if(first.isPresent()){
+                    userWithBeisen.setId(first.get().getId());
+                }
+                userWithBeisenList.add(userWithBeisen);
+            }
+        }
+        if(userWithBeisenList.size()>0){
+            userWithBeisenService.saveOrUpdateBatch(userWithBeisenList);
+        }
+    }
+
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/BeiSenUtils.java

@@ -51,8 +51,8 @@ public class BeiSenUtils {
         headers.setContentType(type);
         JSONObject requestMap = new JSONObject();
         requestMap.put("grant_type","client_credentials");
-        requestMap.put("app_key","94DC8A7C7D3146FD9ECA8641208D7A2D");
-        requestMap.put("app_secret","FAC17C75768B4160A3D0C5250629AD92B5AF0AF70B824809BFBD20F1A6C9CF88");
+        requestMap.put("app_key","0AE887ADF87148EABF38B64BBE5B6BA6");
+        requestMap.put("app_secret","23054CE7CBAF4B1A8BA5FC878077A35A5BF7FF3AAC4D4A828CC7043E8017FF5A");
         HttpEntity<JSONObject> entity = new HttpEntity<>(requestMap, headers);
         ResponseEntity<String> ResponseEntity = restTemplate.postForEntity(url, entity, String.class);
         if (ResponseEntity.getStatusCode() == HttpStatus.OK) {