完成务工者考勤模块

This commit is contained in:
2025-02-20 18:22:58 +08:00
parent 935c804519
commit 67099601a7
22 changed files with 1245 additions and 37 deletions

View File

@ -0,0 +1,79 @@
package com.ruoyi.wgz.bo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.LocalDate;
import lombok.EqualsAndHashCode;
import java.util.Date;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 补卡申请分页查询对象 wgz_reissueacard
*
* @author ruoyi
* @date 2025-02-20
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel("补卡申请分页查询对象")
public class WgzReissueacardQueryBo extends BaseEntity {
/** 分页大小 */
@ApiModelProperty("分页大小")
private Integer pageSize;
/** 当前页数 */
@ApiModelProperty("当前页数")
private Integer pageNum;
/** 排序列 */
@ApiModelProperty("排序列")
private String orderByColumn;
/** 排序的方向desc或者asc */
@ApiModelProperty(value = "排序的方向", example = "asc,desc")
private String isAsc;
/** 项目ID */
@ApiModelProperty("项目ID")
private Long recruitId;
/** 人员ID */
@ApiModelProperty("人员ID")
private Long userId;
/** 打卡ID */
@ApiModelProperty("打卡ID")
private Long attendanceId;
/** 状态0上班补卡 1下班补卡 */
@ApiModelProperty("状态0上班补卡 1下班补卡")
private String type;
/** 项目名称 */
@ApiModelProperty("项目名称")
private String recruitName;
/** 原打卡时间 */
@ApiModelProperty("原打卡时间")
private String rawTime;
/** 现补卡时间 */
@ApiModelProperty("现补卡时间")
private LocalDateTime nowTime;
/** 补卡理由 */
@ApiModelProperty("补卡理由")
private String reason;
/** 审核人ID */
@ApiModelProperty("审核人ID")
private Long auditorUserId;
/** 审核状态0待审核 1审核中 2已同意 3已拒绝 */
@ApiModelProperty("审核状态0待审核 1审核中 2已同意 3已拒绝")
private String auditorType;
/** 审核意见 */
@ApiModelProperty("审核意见")
private String auditorOpinion;
/** 同意|拒绝时间 */
@ApiModelProperty("同意|拒绝时间")
private LocalDateTime auditorTime;
}

View File

@ -0,0 +1,44 @@
package com.ruoyi.wgz.bo.req;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.time.LocalDateTime;
@Data
@NoArgsConstructor
@Accessors(chain = true)
@ApiModel("补卡申请请求对象")
public class WgzAppCardReplacementApplicationReq implements Serializable {
/** 打卡ID */
@Excel(name = "打卡ID")
@ApiModelProperty("打卡ID")
private Long attendanceId;
/** 状态0上班补卡 1下班补卡 */
@Excel(name = "状态" , readConverterExp = "0=上班补卡,1=下班补卡")
@ApiModelProperty("状态0上班补卡 1下班补卡")
private String type;
/** 现补卡时间 */
@Excel(name = "现补卡时间" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("现补卡时间")
private LocalDateTime nowTime;
/** 补卡理由 */
@Excel(name = "补卡理由")
@ApiModelProperty("补卡理由")
private String reason;
}

View File

@ -0,0 +1,14 @@
package com.ruoyi.wgz.bo.req;
import com.ruoyi.common.bo.PageReq;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
@Data
@NoArgsConstructor
@Accessors(chain = true)
@ApiModel("补卡申请历史记录请求对象")
public class WgzAppReplacementCardRecordReq extends PageReq {
}

View File

@ -0,0 +1,22 @@
package com.ruoyi.wgz.bo.res;
import com.ruoyi.wgz.bo.rests.WgzAppCardReplacementApplicationTwo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@Data
@NoArgsConstructor
@Accessors(chain = true)
@ApiModel("补卡申请列表返回对象")
public class WgzAppCardReplacementApplicationRes implements Serializable {
List<WgzAppCardReplacementApplicationTwo> list;
}

View File

@ -44,10 +44,10 @@ public class WgzAppLeaveHistoryListPageRes implements Serializable {
private Long auditorUserId;
@ApiModelProperty("审核人头像")
private Long auditorHead;
private String auditorHead;
@ApiModelProperty("审核人名称")
private Long auditorName;
private String auditorname;
@ApiModelProperty("审核状态0待审核 1审核中 2已同意 3已拒绝 4已取消")
private String auditorType;

View File

@ -0,0 +1,22 @@
package com.ruoyi.wgz.bo.res;
import com.ruoyi.wgz.bo.rests.WgzAppPunchTheCalendarRecordTwo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.time.LocalDate;
import java.util.Map;
@Data
@NoArgsConstructor
@Accessors(chain = true)
@ApiModel("打卡-打卡日历返回对象")
public class WgzAppPunchTheCalendarRecordRes implements Serializable {
@ApiModelProperty("日历")
private Map<LocalDate, WgzAppPunchTheCalendarRecordTwo> mp;
}

View File

@ -0,0 +1,18 @@
package com.ruoyi.wgz.bo.res;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
@Data
@NoArgsConstructor
@Accessors(chain = true)
@ApiModel("考勤打卡·APP用户今日打卡状态")
public class WgzAppUserClockingConditionRes implements Serializable {
@ApiModelProperty("务工者今日打卡状态0上班 1下班 2请假")
private Integer clockingCondition;
}

View File

@ -0,0 +1,71 @@
package com.ruoyi.wgz.bo.res;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.time.LocalDateTime;
@Data
@NoArgsConstructor
@Accessors(chain = true)
@ApiModel("补卡申请历史记录返回对象")
public class WgzReplacementCardRecordRes implements Serializable {
@ApiModelProperty("项目ID")
private Long recruitId;
@ApiModelProperty("申请人ID")
private Long userId;
@ApiModelProperty("申请人姓名")
private String userName;
@ApiModelProperty("打卡ID")
private Long attendanceId;
@ApiModelProperty("状态0上班补卡 1下班补卡")
private String type;
@ApiModelProperty("项目名称")
private String recruitName;
@ApiModelProperty("原打卡时间")
private String rawTime;
@ApiModelProperty("现补卡时间")
private LocalDateTime nowTime;
@ApiModelProperty("补卡理由")
private String reason;
@ApiModelProperty("审核人ID")
private Long auditorUserId;
@ApiModelProperty("审核人头像")
private String auditorHead;
@ApiModelProperty("审核人名称")
private String auditorname;
@ApiModelProperty("审核状态0待审核 1审核中 2已同意 3已拒绝")
private String auditorType;
@ApiModelProperty("审核意见")
private String auditorOpinion;
/** 同意|拒绝时间 */
@Excel(name = "同意|拒绝时间" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("同意|拒绝时间")
private LocalDateTime auditorTime;
@ApiModelProperty("创建时间|申请时间")
private LocalDateTime createTime;
}

View File

@ -0,0 +1,31 @@
package com.ruoyi.wgz.bo.rests;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;
@Data
@NoArgsConstructor
@Accessors(chain = true)
public class WgzAppCardReplacementApplicationTwo implements Serializable {
@ApiModelProperty("补卡自增ID")
private Long id;
@ApiModelProperty("补卡状态1迟到 2早退 3上班缺卡 4下班缺卡")
private Integer type;
@ApiModelProperty("补卡时间")
private LocalDate fillingData;
@ApiModelProperty("星期")
private String week;
@ApiModelProperty("原本打卡时间(如果是缺卡会直接返回项目的上班或下班的时间)")
private LocalDateTime fillingDataTime;
}

View File

@ -0,0 +1,31 @@
package com.ruoyi.wgz.bo.rests;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.time.LocalDateTime;
@Data
@NoArgsConstructor
@Accessors(chain = true)
public class WgzAppPunchTheCalendarRecordThree implements Serializable {
@ApiModelProperty("打卡时间")
private LocalDateTime clockingTime;
@ApiModelProperty("打卡位置")
private String pnchOsition;
@ApiModelProperty("打卡状态0正常 1迟到 2早退 3上班缺卡 4下班缺卡 5上班补卡 6下班补卡 7请假")
private Integer clockingCondition;
// @ApiModelProperty("补卡自增ID")
// private Integer clockingCondition;
//
// @ApiModelProperty("补卡状态")
// private Integer clockingCondition;
}

View File

@ -0,0 +1,29 @@
package com.ruoyi.wgz.bo.rests;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
@Data
@NoArgsConstructor
@Accessors(chain = true)
public class WgzAppPunchTheCalendarRecordTwo implements Serializable {
@ApiModelProperty("主键自增ID")
private Long id;
@ApiModelProperty("今日打卡次数")
private Integer num;
@ApiModelProperty("今日工时")
private Double manHour;
@ApiModelProperty("上班情况")
private WgzAppPunchTheCalendarRecordThree sb;
@ApiModelProperty("下班情况")
private WgzAppPunchTheCalendarRecordThree xb;
}