完成请假模块

ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppCancelLeaveReq.java

@@ -0,0 +1,19 @@
+package com.ruoyi.wgz.bo.req;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+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("请假·取消请假请求对象")
+public class WgzAppCancelLeaveReq implements Serializable {
+	@ApiModelProperty("主键自增ID")
+	private Long id;
+}

ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppLeaveHistoryListPageReq.java

@@ -0,0 +1,15 @@
+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 WgzAppLeaveHistoryListPageReq extends PageReq {
+}

ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppSubmitLeaveReq.java

@@ -1,8 +1,5 @@
 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;
@@ -12,13 +9,12 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
-import java.time.LocalTime;
 
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
 @ApiModel("务工者APP-提交请假请求对象")
-public class WgzAppSubmitLeaveRes implements Serializable {
+public class WgzAppSubmitLeaveReq implements Serializable {
 	/** 请假类型（字典） */
 	@Excel(name = "请假类型" , readConverterExp = "字=典")
 	@ApiModelProperty("请假类型（字典）")

ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppLeaveHistoryListPageRes.java

@@ -0,0 +1,81 @@
+package com.ruoyi.wgz.bo.res;
+
+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;
+import java.time.LocalTime;
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel("请假-历史请假列表返回对象")
+public class WgzAppLeaveHistoryListPageRes implements Serializable {
+	@TableId(value = "id")
+	private Long id;
+
+	@ApiModelProperty("项目ID")
+	private Long recruitId;
+
+	@ApiModelProperty("招工主题")
+	private String subject;
+
+	@ApiModelProperty("请假类型（字典）")
+	private String leaveType;
+
+	@ApiModelProperty("开始时间")
+	private LocalDateTime startTime;
+
+	@ApiModelProperty("结束时间")
+	private LocalDateTime endTime;
+
+	@ApiModelProperty("请假事由")
+	private String reason;
+
+	@ApiModelProperty("审核人ID")
+	private Long auditorUserId;
+
+	@ApiModelProperty("审核人头像")
+	private Long auditorHead;
+
+	@ApiModelProperty("审核人名称")
+	private Long auditorName;
+
+	@ApiModelProperty("审核状态（0待审核 1审核中 2已同意 3已拒绝 4已取消）")
+	private String auditorType;
+
+	@ApiModelProperty("审核意见")
+	private String auditorOpinion;
+
+	@ApiModelProperty("同意|拒绝时间")
+	private LocalDateTime auditorTime;
+
+	@ApiModelProperty("上班时间")
+	private LocalTime workingTime;
+
+	@ApiModelProperty("下班时间")
+	private LocalTime closingTime;
+
+	@ApiModelProperty("取消请假")
+	private LocalDateTime cancelLeave;
+
+	@ApiModelProperty("创建者")
+	private String createBy;
+
+	@ApiModelProperty("请假时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty("更新者")
+	private String updateBy;
+
+	@ApiModelProperty("更新时间")
+	private LocalDateTime updateTime;
+}

ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzUserDailyCalendarRes.java

@@ -1,7 +1,6 @@
 package com.ruoyi.wgz.bo.res;
 
 import com.ruoyi.wgz.bo.rests.WgzAppAttachmentAcquisitionTwo;
-import com.ruoyi.wgz.bo.rests.WgzAutonymAnnex;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,14 +8,13 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
-import java.util.List;
 import java.util.Map;
 
 @Data
 @NoArgsConstructor
 @Accessors(chain = true)
 @ApiModel("日报日历结构返回对象")
-public class WfzUserDailyCalendarRes implements Serializable {
+public class WgzUserDailyCalendarRes implements Serializable {
 	@ApiModelProperty("日报日历")
 	private Map<String, WgzAppAttachmentAcquisitionTwo> dailyCalendar;
 }