3.20优化

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

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.Min;
 import java.io.Serializable;
 
 @Data
@@ -14,6 +15,9 @@ import java.io.Serializable;
 @Accessors(chain = true)
 @ApiModel("申请工资结算（列表）请求对象")
 public class WgzAppApplyForPayrollSettlementListReq extends PageReq {
-	@ApiModelProperty("0申请中 1已结算 2未通过 3未结算（申请中+未通过）")
+	@ApiModelProperty(value = "用户id",hidden = true)
+	private Long userId;
+
+	@ApiModelProperty("0申请中 1已通过 2未通过 3全部")
 	private String auditorType;
 }

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

@@ -21,7 +21,10 @@ public class WgzAppDailyRecordReq extends PageReq {
 	@ApiModelProperty(value = "0正常 1补卡 2全部 ")
 	private String types;
 
-	@ApiModelProperty(value = "日期（格式：年-月-日）")
+	@ApiModelProperty(value = "日期（格式：年-月-日）,不填查全部")
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private LocalDate rq;
+
+	@ApiModelProperty(value = "招工ID，不填查全部")
+	private Long recruitId;
 }

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

@@ -2,9 +2,13 @@ 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 org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
 
 
 @Data
@@ -13,4 +17,13 @@ import lombok.experimental.Accessors;
 @ApiModel("请假·历史请假记录请求对象")
 public class WgzAppLeaveHistoryListPageReq extends PageReq {
 
+	@ApiModelProperty(value = "当前用户ID",hidden = true)
+	private Long userId;
+
+	@ApiModelProperty(value = "招工ID，不填查全部")
+	private Long recruitId;
+
+	@ApiModelProperty(value = "日期（格式：年-月-日）,不填查全部")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private LocalDate rq;
 }

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

@@ -74,6 +74,7 @@ public class WgzAppRealNameAuthenticationReq implements Serializable {
 //	private List<Annex> annex;
 
 	@ApiModelProperty("工种，多个逗号分隔")
+	@NotBlank(message = "工种不能为空")
 	private String typeOfWork;
 
 }

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

@@ -25,6 +25,9 @@ public class WgzAppUnderwayRes implements Serializable {
 	@ApiModelProperty("项目ID")
 	private Long projectId;
 
+	@ApiModelProperty("招工申请ID")
+	private Long recruitApplyId;
+
 	@ApiModelProperty("招工名称")
 	private String recruitName;
 

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

@@ -110,7 +110,7 @@ public class WgzApplyForPayrollSettlementAddRes implements Serializable {
 	private Integer num;
 
 	@ApiModelProperty("总的金额")
-	private BigDecimal TotalAmount;
+	private BigDecimal totalAmount;
 
 	//---------
 	//---------