3.19优化

ruoyi-system/src/main/java/com/ruoyi/wgz/bo/WgzPayCalculationQueryBo.java

@@ -71,7 +71,7 @@ public class WgzPayCalculationQueryBo extends BaseEntity {
 	@ApiModelProperty("出勤天数")
 	private Long num;
 	/** 务工状态 */
-	@ApiModelProperty("务工状态")
+	@ApiModelProperty("务工状态(1进场 2离场)")
 	private String workingState;
 	/** 联系电话 */
 	@ApiModelProperty("联系电话")

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

@@ -13,6 +13,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.Min;
+import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -56,9 +58,10 @@ public class WgzApplyForPayrollSettlementAddReq implements Serializable {
 	private BigDecimal recruitAmount;
 
 	@ApiModelProperty("出勤天数")
+	@Min(value = 1, message = "出勤天数不能为 0")
 	private Integer num;
 
-	@ApiModelProperty("务工状态")
+	@ApiModelProperty("务工状态(1进场 2离场)")
 	private String workingState;
 
 	@ApiModelProperty("联系电话")

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

@@ -55,7 +55,7 @@ public class WgzAppApplyForPayrollSettlementListRes implements Serializable {
 	@ApiModelProperty("出勤天数")
 	private Long num;
 
-	@ApiModelProperty("务工状态")
+	@ApiModelProperty("务工状态(1进场 2离场)")
 	private String workingState;
 
 	@ApiModelProperty("联系电话")

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

@@ -0,0 +1,107 @@
+package com.ruoyi.wgz.bo.res;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.wgz.bo.WgzPayCalculationFilesQueryBo;
+import com.ruoyi.wgz.domain.WgzPayCalculationFiles;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel("工资结算详情")
+public class WgzAppUserApplyForPayrollSettlementDetails {
+
+	@ApiModelProperty("任务名称")
+	private String taskName;
+
+	@ApiModelProperty("任务地址")
+	private String taskAddress;
+
+	@ApiModelProperty("招工主题")
+	private String recruitName;
+
+	@ApiModelProperty("申请人名称")
+	private String userName;
+
+	@ApiModelProperty("进场时间")
+	private LocalDate entryTime;
+
+	@ApiModelProperty("离场时间")
+	private LocalDate leaveTime;
+
+	@ApiModelProperty("结算人")
+	private String auditorUserName;
+
+	@ApiModelProperty("结算时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty("工资金额")
+	private BigDecimal recruitAmount;
+
+	@ApiModelProperty("出勤天数")
+	private Integer num;
+
+	@ApiModelProperty("务工状态(1进场 2离场)")
+	private String workingState;
+
+	@ApiModelProperty("联系电话")
+	private String phone;
+
+	@ApiModelProperty("银行")
+	private String bank;
+
+	@ApiModelProperty("银行卡号")
+	private String cardNo;
+
+	@ApiModelProperty("附件")
+	private List<WgzPayCalculationFiles> files;
+
+
+
+
+
+	@TableId(value = "id", type = IdType.AUTO)
+	private Long id;
+
+	@ApiModelProperty("任务ID")
+	private Long taskId;
+
+	@ApiModelProperty("招工ID")
+	private Long recruitId;
+
+	@ApiModelProperty("务工者ID")
+	private Long userId;
+
+	@ApiModelProperty("审核人ID")
+	private Long auditorUserId;
+
+	@ApiModelProperty("审核状态（0未读 1待审核 2已同意 3已拒绝）")
+	private String auditorType;
+
+	@ApiModelProperty("审核意见")
+	private String auditorOpinion;
+
+	@ApiModelProperty("同意|拒绝时间")
+	private LocalDateTime auditorTime;
+
+	@ApiModelProperty("申请人类型")
+	private String operatorType;
+
+	@ApiModelProperty("备注")
+	private String remark;
+
+
+}