钉钉相关接口

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dingmsg/api/DingMessageController.java

@@ -145,6 +145,7 @@ public class DingMessageController {
                                 attendanceVacationBalanceEntity.setEntryTime(staffEntity.getEntryDate());
 
                                 if(result.getTasks().size() >0 ){
+                                    if(result.getTasks().get(0).getCreateTime() != null && result.getTasks().get(0).getFinishTime() != null){
                                         Date startTime = dateFormat(result.getTasks().get(0).getCreateTime(),"yyyy-MM-dd'T'HH:mm'Z'");
 
                                         Date endTime = dateFormat(result.getTasks().get(0).getFinishTime(),"yyyy-MM-dd'T'HH:mm'Z'");
@@ -152,6 +153,7 @@ public class DingMessageController {
                                         leaveRecordEntity.setEndTime(endTime);
                                         leaveRecordEntity.setDuration((int) ((endTime.getTime() - startTime.getTime())/1000));
                                     }
+                                }
 
                                 String leave_code = LeaveRulesEnum.事假.getLeave_code();
                                 String leave_name = "事假";
@@ -239,7 +241,7 @@ public class DingMessageController {
                                                 break;
                                             case "探亲假":
                                                 leaveRecordEntity.setLeaveType(21);
-                                                leave_code = LeaveRulesEnum.年假.getLeave_code();
+                                                leave_code = LeaveRulesEnum.探亲假.getLeave_code();
                                                 break;
                                             default:
                                                 leaveRecordEntity.setLeaveType(1);  //默认事假