Commit 0e39c57d authored by wujipeng's avatar wujipeng
Browse files

添加考勤字段

parent 392451f4
...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; ...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -50,7 +51,23 @@ public class DingAttendanceEntity { ...@@ -50,7 +51,23 @@ public class DingAttendanceEntity {
@TableField(value = "check_type") @TableField(value = "check_type")
private String checkType; private String checkType;
@ApiModelProperty(value = "请假时长(min)") @ApiModelProperty("请假时长")
@TableField(value = "length_of_leave") @TableField(value = "duration")
private Long lengthOfLeave; private String duration;
@ApiModelProperty(value = "请假时长单位")
@TableField(value = "duration_unit")
private String durationUnit;
@ApiModelProperty(value = "子类型名称")
@TableField(value = "sub_type")
private String subType;
@ApiModelProperty(value = "审批单类型 请假 出差 外出 加班")
@TableField(value = "tag_name")
private String tagName;
@ApiModelProperty(value = "审批单类型 1:加班 2:出差/外出 3:请假")
@TableField(value = "biz_type")
private Long bizType;
} }
package com.ruzhoukj.sms.task; package com.ruzhoukj.sms.task;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.dingtalk.api.response.OapiAttendanceGetupdatedataResponse;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.ruzhoukj.sms.controller.DingAttendanceController; import com.ruzhoukj.sms.controller.DingAttendanceController;
import com.ruzhoukj.sms.controller.DingEmployeeController; import com.ruzhoukj.sms.controller.DingEmployeeController;
...@@ -94,9 +95,16 @@ public class DingTask { ...@@ -94,9 +95,16 @@ public class DingTask {
List<DingAttendanceEntity> dingAttendanceEntities = BeanUtil.copyToList(checkInRecord, DingAttendanceEntity.class); List<DingAttendanceEntity> dingAttendanceEntities = BeanUtil.copyToList(checkInRecord, DingAttendanceEntity.class);
for (DingAttendanceEntity dingAttendanceEntity : dingAttendanceEntities) { for (DingAttendanceEntity dingAttendanceEntity : dingAttendanceEntities) {
DingUserVO employeeDetail = dingEmployeeController.getEmployeeDetail(dingAttendanceEntity.getUserId()); DingUserVO employeeDetail = dingEmployeeController.getEmployeeDetail(dingAttendanceEntity.getUserId());
Long lengthOfLeave = dingAttendanceController.getLeaveDuration(dingAttendanceEntity.getUserId(), startAndEndOfDay[0], startAndEndOfDay[1]); List<OapiAttendanceGetupdatedataResponse.AtApproveForOpenVo> userClockIn = dingAttendanceController.getUserClockIn(dingAttendanceEntity.getUserId(), startAndEndOfDay[0]);
dingAttendanceEntity.setName(employeeDetail.getName()); dingAttendanceEntity.setName(employeeDetail.getName());
dingAttendanceEntity.setLengthOfLeave(lengthOfLeave); if(!userClockIn.isEmpty()){
dingAttendanceEntity.setDuration(userClockIn.get(0).getDuration());
dingAttendanceEntity.setDurationUnit(userClockIn.get(0).getDurationUnit());
dingAttendanceEntity.setSubType(userClockIn.get(0).getSubType());
dingAttendanceEntity.setTagName(userClockIn.get(0).getTagName());
dingAttendanceEntity.setBizType(userClockIn.get(0).getBizType());
}
} }
dingAttendanceService.saveOrUpdateBatch(dingAttendanceEntities); dingAttendanceService.saveOrUpdateBatch(dingAttendanceEntities);
log.info("同步考勤数据结束"); log.info("同步考勤数据结束");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment