优化

ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/AppTaskDetailAttendanceVO.java

@@ -0,0 +1,36 @@
+package com.ruoyi.fbs.domain.vo;
+
+import com.ruoyi.bgt.domain.vo.BgtAttendanceCountVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+@Data
+@ApiModel("包工头项目任务详情-考勤")
+public class AppTaskDetailAttendanceVO {
+
+	@ApiModelProperty("主键ID")
+	private Long id;
+
+	//总体考勤情况
+
+	@ApiModelProperty("总人数")
+	private Integer totalNum = 0;
+
+	@ApiModelProperty("今日到岗人数")
+	private Integer reportToDutyNum= 0;
+
+	@ApiModelProperty("今日到岗率")
+	private Integer reportToDutyRate= 0;
+
+	@ApiModelProperty("考勤列表")
+	List<BgtAttendanceCountVO> countVOS;
+
+
+
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/AppTaskDetailProgressVO.java

@@ -0,0 +1,19 @@
+package com.ruoyi.fbs.domain.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+@ApiModel("包工头项目任务详情-进度")
+public class AppTaskDetailProgressVO {
+
+	@ApiModelProperty("主键ID")
+	private Long id;
+
+	//任务进度
+	@ApiModelProperty("任务进度")
+	private Integer progress;
+
+}

ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/AppTaskDetailRecruitVO.java

@@ -0,0 +1,24 @@
+package com.ruoyi.fbs.domain.vo;
+
+import com.ruoyi.bgt.domain.vo.BgtProjectRecruitApplyVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+@Data
+@ApiModel("包工头项目任务详情-务工者")
+public class AppTaskDetailRecruitVO {
+
+	@ApiModelProperty("主键ID")
+	private Long id;
+	//务工者数量列表
+	@ApiModelProperty("申请者列表")
+	List<BgtProjectRecruitApplyVO> applyList;
+
+
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/AppTaskDetailVO.java

@@ -98,8 +98,8 @@ public class AppTaskDetailVO {
 	@ApiModelProperty("任务付款金额")
 	private BigDecimal taskPaymentAmount;
 
-	@ApiModelProperty("收款申请列表")
-	private List<BgtWageApplicationListVO> wageApplicationList;
+	@ApiModelProperty("最新一条收款申请")
+	private BgtWageApplicationListVO wageApplication;
 
 
 	//总体考勤情况

ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/AppTaskDetailWageVO.java

@@ -0,0 +1,29 @@
+package com.ruoyi.fbs.domain.vo;
+
+import com.ruoyi.bgt.domain.vo.BgtWageApplicationListVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+
+@Data
+@ApiModel("包工头项目任务详情-结算情况")
+public class AppTaskDetailWageVO {
+
+	@ApiModelProperty("主键ID")
+	private Long id;
+
+	//结算情况
+	@ApiModelProperty("任务收款金额")
+	private Integer taskReceiveAmount;
+
+	@ApiModelProperty("任务付款金额")
+	private BigDecimal taskPaymentAmount;
+
+	@ApiModelProperty("最新一条收款申请")
+	private BgtWageApplicationListVO wageApplication;
+
+
+}