美莱德oa系统对接修改

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

@@ -207,7 +207,7 @@ public class TimingTask {
 
 
     //每天2:11 同步钉钉用户前2天到未来30天时间段的打卡，请假，出差数据
-    @Scheduled(cron = "0 25 15 ? * *")
+    @Scheduled(cron = "0 48 17 ? * *")
     private void synFanWeiWorkData() {
         /*if (isDev) return;*/
         List<TimeType> timeTypeList = timeTypeMapper.selectList(new QueryWrapper<TimeType>().eq("sync_fanwei", 1));
@@ -279,16 +279,43 @@ public class TimingTask {
                leaveSheet.setOwnerName(user.getName());
                leaveSheet.setStartDate(LocalDate.parse(String.valueOf(map.get("startDate")),dtf1));
                leaveSheet.setEndDate(LocalDate.parse(String.valueOf(map.get("endtDate")),dtf1));
-               int timeType = Integer.parseInt(String.valueOf(map.get("timeType")));
+               Integer timeType=null;
+               switch (String.valueOf(map.get("timeType"))){
+                   case "小时":timeType=1;
+                       break;
+                   case "天":timeType=0;
+                       break;
+               }
                leaveSheet.setTimeType(timeType);
-               leaveSheet.setTimeDays((Float) map.get("timeDays"));
+               leaveSheet.setTimeDays(Float.parseFloat((String) map.get("timeDays")));
                if (timeType == 0){
                    TimeType allDay = timeTypeMapper.selectOne(new QueryWrapper<TimeType>().eq("company_id", user.getCompanyId()));
                    leaveSheet.setTimeHours(leaveSheet.getTimeDays()*allDay.getAllday());
                }else {
-                   leaveSheet.setTimeHours((Float) map.get("timeHours"));
+                   leaveSheet.setTimeHours(Float.parseFloat((String) map.get("timeHours")));
+               }
+               Integer leaveType=null;
+               switch (String.valueOf(map.get("leaveType"))){
+                   case "事假":leaveType=0;
+                       break;
+                   case "病假":leaveType=1;
+                       break;
+                   case "年假":leaveType=2;
+                       break;
+                   case "产假":leaveType=3;
+                       break;
+                   case "婚假":leaveType=4;
+                       break;
+                   case "丧假":leaveType=5;
+                       break;
+                   case "调休":leaveType=6;
+                       break;
+                   case "陪产假":leaveType=7;
+                       break;
+                   case "其他":leaveType=8;
+                       break;
                }
-               leaveSheet.setLeaveType(Integer.parseInt(String.valueOf(map.get("leaveType"))));
+               leaveSheet.setLeaveType(leaveType);
                leaveSheet.setProcinstId(String.valueOf(map.get("procinstId")));
                leaveSheet.setGmtFinished(String.valueOf(map.get("gmtFinished")));
                 Optional<LeaveSheet> first = oldLeaveSheetList.stream().filter(ol -> ol.getStartDate().isEqual(leaveSheet.getStartDate())&&ol.getEndDate().isEqual(leaveSheet.getEndDate()) && ol.getOwnerId().equals(leaveSheet.getOwnerId())).findFirst();
@@ -312,13 +339,35 @@ public class TimingTask {
             if(compIds.contains(user.getCompanyId())){
                 BusinessTrip businessTrip=new BusinessTrip();
                 businessTrip.setCompanyId(user.getCompanyId());
-                businessTrip.setStartDate(LocalDate.parse(String.valueOf(map.get("startDate")),dtf));
-                businessTrip.setEndDate(LocalDate.parse(String.valueOf(map.get("endDate")),dtf));
-                businessTrip.setWay(Integer.valueOf(String.valueOf(map.get("way"))));
+                businessTrip.setOwnerId(user.getId());
+                businessTrip.setOwnerName(user.getName());
+                businessTrip.setStartDate(LocalDate.parse(String.valueOf(map.get("startDate")),dtf1));
+                businessTrip.setEndDate(LocalDate.parse(String.valueOf(map.get("endDate")),dtf1));
+                Integer way=null;
+                switch (String.valueOf(map.get("way"))){
+                    case "飞机":way=0;
+                    break;
+                    case "高铁/火车":way=1;
+                        break;
+                    case "汽车":way=2;
+                        break;
+                    case "轮船":way=3;
+                        break;
+                    case "其他":way=4;
+                        break;
+                }
+                businessTrip.setWay(way);
                 businessTrip.setCityFrom((String) map.get("cityFrom"));
                 businessTrip.setCityTo((String) map.get("cityTo"));
-                businessTrip.setGoBack(Integer.valueOf(String.valueOf(map.get("goBack"))));
-                businessTrip.setDayCount(Integer.valueOf(String.valueOf(map.get("dayCount"))));
+                Integer goBack=null;
+                switch (String.valueOf(map.get("goBack"))){
+                    case "单程":goBack=0;
+                    break;
+                    case "往返":goBack=1;
+                    break;
+                }
+                businessTrip.setGoBack(goBack);
+                businessTrip.setDayCount(Integer.parseInt(String.valueOf(map.get("dayCount")).substring(0,1)));
                 businessTrip.setProcinstId((String) map.get("procinstId"));
                 businessTrip.setGmtFinished((String)map.get("gmtFinished"));
                 Optional<BusinessTrip> first = oldBusinessTripList.stream().filter(ol -> ol.getStartDate().isEqual(businessTrip.getStartDate())&&ol.getEndDate().isEqual(businessTrip.getEndDate()) && ol.getOwnerId().equals(businessTrip.getOwnerId())).findFirst();