优化

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

@@ -2,15 +2,10 @@ package com.ruoyi.wgz.bo.req;
 
 import com.ruoyi.common.bo.PageReq;
 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.math.BigDecimal;
-import java.time.LocalDateTime;
-
 
 @Data
 @NoArgsConstructor

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

@@ -0,0 +1,24 @@
+package com.ruoyi.wgz.bo.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel("已报名项目·项目详情请求对象")
+public class WgzAppUserCancelRegistrationProjectDetailsReq implements Serializable {
+	@ApiModelProperty("招工主键ID")
+	@NotNull
+	private Long recruitId;
+
+	@ApiModelProperty("招工申请主键ID")
+	@NotNull
+	private Long recruitApplyId;
+}

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

@@ -101,4 +101,16 @@ public class WgzAppCancelRegistrationProjectDetailsRes implements Serializable {
 
 	@ApiModelProperty("招工地址")
 	private String recruitAddress;
+
+	//-----------
+	//-----------
+	//-----------
+	@ApiModelProperty("是否需要操作（0不需要 1需要 2已操作）")
+	private String isOperation;
+
+	@ApiModelProperty("招工是否正常（0正常 1已招满 2已失效）")
+	private String full;
+
+	@ApiModelProperty("务工者同意拒绝状态：3务工者同意  4务工者拒绝")
+	private String status;
 }

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

@@ -68,6 +68,12 @@ public class WgzAppProjectDetailsRes implements Serializable {
 	@ApiModelProperty("联系电话")
 	private String recruitContactPhone;
 
+	@ApiModelProperty("创建者")
+	private String userId;
+
+	@ApiModelProperty("招工状态(1-进行中，2-已招满，3-已过期)")
+	private String status;
+
 	@ApiModelProperty("备注")
 	private String remark;
 

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

@@ -20,12 +20,9 @@ import java.time.LocalTime;
 @Accessors(chain = true)
 @ApiModel("已报名项目返回对象")
 public class WgzAppRegisteredProjectRes implements Serializable {
-	@ApiModelProperty("招工ID")
+	@ApiModelProperty("招工主键ID")
 	private Long id;
 
-//	@ApiModelProperty("招工ID")
-//	private Long projectId;
-
 	@ApiModelProperty("招工申请ID")
 	private Long recruitApplyId;
 

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

@@ -0,0 +1,73 @@
+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 WgzAppUserReplacementCardRecordDetailsRes implements Serializable {
+
+	@ApiModelProperty("主键ID")
+	private Long id;
+
+	@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;
+
+}