赛元考勤

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

@@ -1752,7 +1752,7 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
                         }
                         if (showLog) System.out.println("工作时长==" + workHours);
 
-                        if (corpInfo.getCompanyId() == 481 || corpInfo.getCompanyId() == 469) {
+                        if (corpInfo.getCompanyId() == 481) {
                             //给盛立安元和赛元微电子0.5单位进位
                             ct.setWorkHours(DateTimeUtil.getHalfHoursFromDouble(workHours));
                         } else {
@@ -1826,12 +1826,13 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
                         JSONObject otInfo = jsonObject.getJSONObject("ot_info");
                         if (otInfo != null && otInfo.getIntValue("ot_duration") > 0 && otInfo.getIntValue("ot_status") == 1) {
                             double otTime = DateTimeUtil.getHoursFromSeconds(otInfo.getIntValue("ot_duration"));
-                            ct.setWorkHours(otTime);
+                            double hourValue = DateTimeUtil.getHoursFromDouble(otTime);
+                            ct.setWorkHours(hourValue);
                             ct.setCardTime(0.0);
                             ct.setAskLeaveTime(0.0);
                             ct.setOutdoorTime(0.0);
                             ct.setOtStatus(1);
-                            ct.setOtTime(otTime);
+                            ct.setOtTime(hourValue);
                             JSONArray holidayItems = jsonObject.getJSONArray("holiday_infos");
                             for (int t = 0; t < holidayItems.size(); t++) {
                                 JSONObject holiday = holidayItems.getJSONObject(t);

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

@@ -1352,6 +1352,7 @@ public class TimingTask {
         }
     }
 
+    //每天下午五点到七点，每半小时获取一次当天考勤记录
     @Scheduled(cron = "0 30,0/5 17-19 * * ?")
     public void  getClockRecordWithCorpWx(){
         if(isDev) return;