完成【我的·工资结算记录】板块

ruoyi-system/src/main/java/com/ruoyi/bgt/mapper/BgtProjectRecruitApplyMapper.java

@@ -29,5 +29,5 @@ public interface BgtProjectRecruitApplyMapper extends BaseMapperPlus<BgtProjectR
 	List<BgtProjectRecruitApplyVO> todayAttendanceList(@Param("dto") BgtAttendanceDayDTO dto);
 
 	// 获取指定项目下的所有成员(分页)
-	Page<WgzAppUnderwayRes> underwayPage (@Param("page") Page<WgzAppUnderwayReq> page, @Param("userId") Long userId);
+	Page<WgzAppUnderwayRes> underwayPage (@Param("page") Page<WgzAppUnderwayReq> page);
 }

ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java

@@ -226,11 +226,11 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl<BgtProjec
 
 	@Override
 	public TableDataInfo<WgzAppUnderwayRes> userUnderway(WgzAppUnderwayReq req) {
-		Long userId = SecurityUtils.getAppUserId();
+		req.setUserId(SecurityUtils.getAppUserId());
 		Page<WgzAppUnderwayReq> pe = new Page<>();
 		pe.setCurrent(req.getPageNum());
 		pe.setSize(req.getPageSize());
-		return PageUtils.buildDataInfo(baseMapper.underwayPage(pe, userId));
+		return PageUtils.buildDataInfo(baseMapper.underwayPage(pe));
 	}
 
 }

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

@@ -14,6 +14,6 @@ import java.io.Serializable;
 @Accessors(chain = true)
 @ApiModel("申请工资结算（列表）请求对象")
 public class WgzAppApplyForPayrollSettlementListReq extends PageReq {
-	@ApiModelProperty("0已结算 1未结算")
+	@ApiModelProperty("0申请中 1已结算 2未通过 3未结算（申请中+未通过）")
 	private String auditorType;
 }

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

@@ -3,6 +3,7 @@ package com.ruoyi.wgz.bo.req;
 import com.ruoyi.common.bo.PageReq;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.Hidden;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -16,5 +17,11 @@ import java.time.LocalDateTime;
 @Accessors(chain = true)
 @ApiModel("项目进行中请求对象")
 public class WgzAppUnderwayReq extends PageReq {
+	@ApiModelProperty("招工ID")
+	private String type;
 
+
+	@ApiModelProperty("务工者唯一标识")
+	@Hidden
+	private Long userId;
 }

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

@@ -49,6 +49,9 @@ public class WgzApplyForPayrollSettlementAddReq implements Serializable {
 	@ApiModelProperty("进场时间")
 	private LocalDate entryTime;
 
+	@ApiModelProperty("退场时间（注意：完成项目才填写退场时间）")
+	private LocalDate leaveTime;
+
 	@ApiModelProperty("工资金额")
 	private BigDecimal recruitAmount;
 

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

@@ -50,6 +50,9 @@ public class WgzAppApplyForPayrollSettlementListRes implements Serializable {
 	@ApiModelProperty("进场时间")
 	private LocalDate entryTime;
 
+	@ApiModelProperty("退场时间")
+	private LocalDate leaveTime;
+
 	@ApiModelProperty("工资金额")
 	private BigDecimal recruitAmount;
 

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

@@ -8,6 +8,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Data
@@ -49,7 +50,16 @@ public class WgzAppUnderwayRes implements Serializable {
 	@ApiModelProperty("招工要求")
 	private String recruitRequirement;
 
-	@ApiModelProperty("已报名数量")
-	private Integer numberOfRegistered;
+	@ApiModelProperty("发布时间")
+	private LocalDateTime taskCreateTime;
+
+	@ApiModelProperty("进场时间")
+	private LocalDate entryTime;
+
+	@ApiModelProperty("离场时间")
+	private LocalDate leaveTime;
+
+//	@ApiModelProperty("已报名数量")
+//	private Integer numberOfRegistered;
 
 }