Merge remote-tracking branch 'origin/master'

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

@@ -8,6 +8,7 @@ import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.time.Year;
@@ -17,13 +18,9 @@ import java.time.Year;
 @Accessors(chain = true)
 @ApiModel("务工者APP-实名认证·附件结构请求对象")
 public class WgzAppAttachmentAcquisitionReq implements Serializable {
-	@ApiModelProperty("唯一标识")
-	@NotNull(message = "唯一标识不能为空")
-	private Long userId;
 
-	@ApiModelProperty("0资格证书 1劳动合同 2保单")
-	@NotNull(message = "唯一标识不能为空")
-	@Size(min = 1, message = "唯一标识数组必须至少包含一个元素")
+	@ApiModelProperty("0资格证书 1劳动合同 2保单 3入场材料 4电子税票 5工作明细报告")
+	@Pattern(regexp = "^[0-5]$", message = "status 只能是 0 到 5 之间的数字")
 	private String[] specifiedAttachment;
 
 }

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

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.Pattern;
 import java.io.Serializable;
 
 @Data
@@ -14,8 +15,9 @@ import java.io.Serializable;
 @ApiModel("确认|拒绝报名请求对象")
 public class WgzAppConfirmRegistrationReq implements Serializable {
 	@ApiModelProperty("招工ID")
-	private Long recruitId;
+	private Long recruitApplyId;
 
-	@ApiModelProperty("0拒绝 1确认")
+	@ApiModelProperty("3务工者同意  4务工者拒绝 ")
+	@Pattern(regexp = "^(3|4)$", message = "status 只能是 3 或 4")
 	private String status;
 }

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

@@ -20,11 +20,14 @@ 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 projectId;
+
+	@ApiModelProperty("招工申请ID")
+	private Long recruitApplyId;
 
 	@ApiModelProperty("招工名称")
 	private String recruitName;

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

@@ -0,0 +1,72 @@
+package com.ruoyi.wgz.bo.res;
+
+import com.ruoyi.common.domain.Annex;
+import com.ruoyi.wgz.bo.rests.WgzAppCancelRegistrationProjectDetailsTwo;
+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.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel("消息报名信息返回对象")
+public class WgzAppRegistrationInformationRes implements Serializable {
+	@ApiModelProperty("招工ID")
+	private Long recruitId;
+
+	@ApiModelProperty("招工申请ID")
+	private Long recruitApplyId;
+
+	//==============
+	@ApiModelProperty("封面图（多个逗号分隔）")
+	private String coverPlan;
+
+	@ApiModelProperty("创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty("招工名称")
+	private String recruitName;
+
+	@ApiModelProperty("招工金额")
+	private BigDecimal recruitAmount;
+
+	@ApiModelProperty("招工数量")
+	private Integer recruitStaffNum;
+
+	@ApiModelProperty("任务名称")
+	private String taskName;
+
+	@ApiModelProperty("任务地址")
+	private String taskAddress;
+
+	@ApiModelProperty("招工描述")
+	private String subDescribe;
+
+	@ApiModelProperty("开工日期")
+	private LocalDate recruitWorkBeginTime;
+
+	@ApiModelProperty("进场日期")
+	private LocalDate entryTime;
+
+	@ApiModelProperty("联系人")
+	private String recruitContactPerson;
+
+	@ApiModelProperty("联系电话")
+	private String recruitContactPhone;
+
+	@ApiModelProperty("备注")
+	private String remark;
+
+//	@ApiModelProperty("附件实体数据")
+//	private List<Annex> annex;
+
+}