Commit c48290a8 authored by wujipeng's avatar wujipeng
Browse files

根据日期查询用户考勤数据

parent ea83ee81
...@@ -12,10 +12,14 @@ import com.dingtalk.api.response.OapiAttendanceListRecordResponse; ...@@ -12,10 +12,14 @@ import com.dingtalk.api.response.OapiAttendanceListRecordResponse;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.ruzhoukj.sms.common.Result; import com.ruzhoukj.sms.common.Result;
import com.ruzhoukj.sms.ding.PermissionConfig; import com.ruzhoukj.sms.ding.PermissionConfig;
import com.ruzhoukj.sms.entity.DingAttendanceTotalEntity;
import com.ruzhoukj.sms.model.vo.DingAttendanceDTO; import com.ruzhoukj.sms.model.vo.DingAttendanceDTO;
import com.ruzhoukj.sms.model.vo.DingAttendanceVO; import com.ruzhoukj.sms.model.vo.DingAttendanceVO;
import com.ruzhoukj.sms.model.vo.DingUserVO; import com.ruzhoukj.sms.model.vo.DingUserVO;
import com.ruzhoukj.sms.pojo.dto.DingAttendanceTotalDTO;
import com.ruzhoukj.sms.pojo.vo.DingAttendanceTotalVO;
import com.ruzhoukj.sms.service.DingAttendanceService; import com.ruzhoukj.sms.service.DingAttendanceService;
import com.ruzhoukj.sms.service.DingAttendanceTotalService;
import com.taobao.api.ApiException; import com.taobao.api.ApiException;
import com.taobao.api.internal.util.StringUtils; import com.taobao.api.internal.util.StringUtils;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -23,6 +27,7 @@ import io.swagger.annotations.ApiOperation; ...@@ -23,6 +27,7 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.management.ObjectName;
import java.util.List; import java.util.List;
/** /**
...@@ -42,6 +47,8 @@ public class DingAttendanceController { ...@@ -42,6 +47,8 @@ public class DingAttendanceController {
private DingAttendanceService dingAttendanceService; private DingAttendanceService dingAttendanceService;
@Resource @Resource
private DingEmployeeController dingEmployeeController; private DingEmployeeController dingEmployeeController;
@Resource
private DingAttendanceTotalService dingAttendanceTotalService;
@ApiOperation(value = "获取打卡时间区间数据") @ApiOperation(value = "获取打卡时间区间数据")
@PostMapping("/radius") @PostMapping("/radius")
...@@ -143,4 +150,9 @@ public class DingAttendanceController { ...@@ -143,4 +150,9 @@ public class DingAttendanceController {
} }
} }
@ApiOperation(value = "根据日期查询用户考勤数据")
@PostMapping("/user/clock/in/date")
public Result getUserClockInDate(@RequestBody DingAttendanceTotalDTO dingAttendanceTotalDTO) {
return Result.success(dingAttendanceTotalService.getUserClockInDate(dingAttendanceTotalDTO));
}
} }
...@@ -2,8 +2,12 @@ package com.ruzhoukj.sms.dao; ...@@ -2,8 +2,12 @@ package com.ruzhoukj.sms.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruzhoukj.sms.entity.DingAttendanceTotalEntity; import com.ruzhoukj.sms.entity.DingAttendanceTotalEntity;
import com.ruzhoukj.sms.pojo.dto.DingAttendanceTotalDTO;
import com.ruzhoukj.sms.pojo.vo.DingAttendanceTotalVO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/** /**
* @author : wujipeng * @author : wujipeng
* @date : 2025/3/3 14:45 * @date : 2025/3/3 14:45
...@@ -12,4 +16,12 @@ import org.apache.ibatis.annotations.Mapper; ...@@ -12,4 +16,12 @@ import org.apache.ibatis.annotations.Mapper;
*/ */
@Mapper @Mapper
public interface DingAttendanceTotalDao extends BaseMapper<DingAttendanceTotalEntity> { public interface DingAttendanceTotalDao extends BaseMapper<DingAttendanceTotalEntity> {
/**
* 根据用户id和日期查询用户考勤数据
*
* @param dingAttendanceTotalDTO dingAttendanceTotalDTO
* @return List<DingAttendanceTotalVO>
*/
List<DingAttendanceTotalVO> dingAttendanceTotalDTO(DingAttendanceTotalDTO dingAttendanceTotalDTO);
} }
package com.ruzhoukj.sms.pojo.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruzhoukj.sms.entity.DingAttendanceTotalEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @author : wujipeng
* @date : 2025/3/3 16:14
* @Version: 1.0
* @Desc : 描述信息
*/
@Data
public class DingAttendanceTotalDTO extends DingAttendanceTotalEntity {
@ApiModelProperty(value = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date startDate;
@ApiModelProperty(value = "结束时间")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date endDate;
}
package com.ruzhoukj.sms.pojo.vo;
import com.ruzhoukj.sms.entity.DingAttendanceTotalEntity;
import lombok.Data;
/**
* @author : wujipeng
* @date : 2025/3/3 16:14
* @Version: 1.0
* @Desc : 描述信息
*/
@Data
public class DingAttendanceTotalVO extends DingAttendanceTotalEntity {
}
...@@ -2,6 +2,10 @@ package com.ruzhoukj.sms.service; ...@@ -2,6 +2,10 @@ package com.ruzhoukj.sms.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruzhoukj.sms.entity.DingAttendanceTotalEntity; import com.ruzhoukj.sms.entity.DingAttendanceTotalEntity;
import com.ruzhoukj.sms.pojo.dto.DingAttendanceTotalDTO;
import com.ruzhoukj.sms.pojo.vo.DingAttendanceTotalVO;
import java.util.List;
/** /**
* @author : wujipeng * @author : wujipeng
...@@ -10,4 +14,12 @@ import com.ruzhoukj.sms.entity.DingAttendanceTotalEntity; ...@@ -10,4 +14,12 @@ import com.ruzhoukj.sms.entity.DingAttendanceTotalEntity;
* @Desc : 描述信息 * @Desc : 描述信息
*/ */
public interface DingAttendanceTotalService extends IService<DingAttendanceTotalEntity> { public interface DingAttendanceTotalService extends IService<DingAttendanceTotalEntity> {
/**
* 按日期查询用户考勤数据
*
* @param dingAttendanceTotalDTO dingAttendanceTotalDTO
* @return List<DingAttendanceTotalVO>
*/
List<DingAttendanceTotalVO> getUserClockInDate(DingAttendanceTotalDTO dingAttendanceTotalDTO);
} }
...@@ -3,9 +3,13 @@ package com.ruzhoukj.sms.service.impl; ...@@ -3,9 +3,13 @@ package com.ruzhoukj.sms.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruzhoukj.sms.dao.DingAttendanceTotalDao; import com.ruzhoukj.sms.dao.DingAttendanceTotalDao;
import com.ruzhoukj.sms.entity.DingAttendanceTotalEntity; import com.ruzhoukj.sms.entity.DingAttendanceTotalEntity;
import com.ruzhoukj.sms.pojo.dto.DingAttendanceTotalDTO;
import com.ruzhoukj.sms.pojo.vo.DingAttendanceTotalVO;
import com.ruzhoukj.sms.service.DingAttendanceTotalService; import com.ruzhoukj.sms.service.DingAttendanceTotalService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
/** /**
* @author : wujipeng * @author : wujipeng
* @date : 2025/3/3 14:46 * @date : 2025/3/3 14:46
...@@ -14,4 +18,8 @@ import org.springframework.stereotype.Service; ...@@ -14,4 +18,8 @@ import org.springframework.stereotype.Service;
*/ */
@Service @Service
public class DingAttendanceTotalServiceImpl extends ServiceImpl<DingAttendanceTotalDao, DingAttendanceTotalEntity> implements DingAttendanceTotalService { public class DingAttendanceTotalServiceImpl extends ServiceImpl<DingAttendanceTotalDao, DingAttendanceTotalEntity> implements DingAttendanceTotalService {
@Override
public List<DingAttendanceTotalVO> getUserClockInDate(DingAttendanceTotalDTO dingAttendanceTotalDTO) {
return baseMapper.dingAttendanceTotalDTO(dingAttendanceTotalDTO);
}
} }
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruzhoukj.sms.dao.DingAttendanceTotalDao">
<select id="dingAttendanceTotalDTO" resultType="com.ruzhoukj.sms.pojo.vo.DingAttendanceTotalVO">
select
id,
name,
user_id as userId,
work_time as workTime,
date as date,
duration,
duration_unit as durationUnit,
sub_type as subType,
tag_name as tagName,
biz_type as bizType
from
ding_attendance_total
<where>
<if test="userId != null and userId != ''">
and user_id = #{userId}
</if>
<if test="startDate != null and startDate != ''">
and date >= #{startDate}
</if>
<if test="endDate != null and endDate != ''">
and date &lt;= #{endDate}
</if>
</where>
</select>
</mapper>
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