任务

ruoyi-system/src/main/java/com/ruoyi/fbs/bo/FbsProjectTaskQueryBo.java

@@ -49,10 +49,10 @@ public class FbsProjectTaskQueryBo extends BaseEntity {
 	private String taskAddress;
 	/** 任务金额 */
 	@ApiModelProperty("任务金额")
-	private Long taskAmount;
+	private Integer taskAmount;
 	/** 用工数量 */
 	@ApiModelProperty("用工数量")
-	private Long taskStaffNum;
+	private Integer taskStaffNum;
 	/** 任务开始时间 */
 	@ApiModelProperty("任务开始时间")
 	private String taskBeginTime;

ruoyi-system/src/main/java/com/ruoyi/fbs/domain/FbsProjectTask.java

@@ -59,12 +59,12 @@ public class FbsProjectTask implements Serializable {
     /** 任务金额 */
     @Excel(name = "任务金额")
     @ApiModelProperty("任务金额")
-    private Long taskAmount;
+    private Integer taskAmount;
 
     /** 用工数量 */
     @Excel(name = "用工数量")
     @ApiModelProperty("用工数量")
-    private Long taskStaffNum;
+    private Integer taskStaffNum;
 
     /** 任务开始时间 */
     @Excel(name = "任务开始时间")

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

@@ -2,6 +2,7 @@ package com.ruoyi.fbs.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.bgt.domain.vo.BgtProjectRecruitApplyVO;
+import com.ruoyi.bgt.domain.vo.BgtWageApplicationListVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -27,11 +28,11 @@ public class AppTaskDetailVO {
 
 	/** 任务金额 */
 	@ApiModelProperty("任务金额")
-	private Long taskAmount;
+	private Integer taskAmount;
 
 	/** 用工数量 */
 	@ApiModelProperty("用工数量")
-	private Long taskStaffNum;
+	private Integer taskStaffNum;
 
 	/** 任务开始时间 */
 	@ApiModelProperty("任务开始时间")
@@ -68,9 +69,25 @@ public class AppTaskDetailVO {
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private LocalDateTime createTime;
 
+	//任务进度
+	@ApiModelProperty("任务进度")
+	private Integer progress;
 
+	//结算情况
+	@ApiModelProperty("任务收款金额")
+	private Integer taskReceiveAmount;
+
+	@ApiModelProperty("任务付款金额")
+	private Integer taskPaymentAmount;
+
+	@ApiModelProperty("收款申请列表")
+	private List<BgtWageApplicationListVO> wageApplicationList;
+
+	//务工者数量列表
 	@ApiModelProperty("申请者列表")
-	List<BgtProjectRecruitApplyVO> applylist;
+	List<BgtProjectRecruitApplyVO> applyList;
+
+
 
 
 }

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

@@ -22,10 +22,10 @@ public class AppTaskVO {
 	private String taskAddress;
 	/** 任务金额 */
 	@ApiModelProperty("任务金额")
-	private Long taskAmount;
+	private Integer taskAmount;
 	/** 用工数量 */
 	@ApiModelProperty("用工数量")
-	private Long taskStaffNum;
+	private Integer taskStaffNum;
 
 	@ApiModelProperty("项目名")
 	private String projectName;
@@ -36,4 +36,7 @@ public class AppTaskVO {
 
 	@ApiModelProperty("申请数量")
 	private Integer applyNum;
+
+	@ApiModelProperty("任务收款金额")
+	private Integer taskReceiveAmount;
 }

ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsProjectTaskServiceImpl.java

@@ -9,10 +9,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.bgt.bo.BgtProjectRecruitQueryBo;
 import com.ruoyi.bgt.domain.BgtProjectRecruit;
 import com.ruoyi.bgt.domain.dto.BgtProjectRecruitApplyQueryDTO;
+import com.ruoyi.bgt.domain.dto.BgtWageApplicationQueryDTO;
+import com.ruoyi.bgt.domain.vo.BgtWageApplicationListVO;
 import com.ruoyi.bgt.service.IBgtProjectRecruitApplyService;
 import com.ruoyi.bgt.service.IBgtProjectRecruitService;
+import com.ruoyi.bgt.service.IBgtProjectTaskProgressService;
+import com.ruoyi.bgt.service.IBgtWageApplicationService;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.AuditStatus;
 import com.ruoyi.common.enums.ProjectTaskStatus;
 import com.ruoyi.common.enums.RecruitApplyStatus;
 import com.ruoyi.common.utils.PageUtils;
@@ -46,16 +51,17 @@ public class FbsProjectTaskServiceImpl extends ServicePlusImpl<FbsProjectTaskMap
 
 	@Autowired
 	private IZbfProjectService zbfProjectService;
-
 	@Autowired
 	private IFbsProjectTaskApplyService taskApplyService;
-
 	@Autowired
 	@Lazy
 	private IBgtProjectRecruitService recruitService;
-
 	@Autowired
 	private IBgtProjectRecruitApplyService recruitApplyService;
+	@Autowired
+	private IBgtProjectTaskProgressService progressService;
+	@Autowired
+	private IBgtWageApplicationService wageApplicationService;
 
     @Override
     public FbsProjectTask queryById(Long id){
@@ -144,7 +150,7 @@ public class FbsProjectTaskServiceImpl extends ServicePlusImpl<FbsProjectTaskMap
 		//项目信息
 		ZbfProject project = zbfProjectService.getById(byId.getProjectId());
 		appTaskDetailVO.setProjectName(project.getProjectName());
-		//申请者信息
+		//务工者数量列表
 		BgtProjectRecruitQueryBo bgtProjectRecruitQueryBo = new BgtProjectRecruitQueryBo();
 		bgtProjectRecruitQueryBo.setTaskId(id);
 		List<Long> recruitIds = recruitService.queryList(bgtProjectRecruitQueryBo).stream().map(BgtProjectRecruit::getId).collect(Collectors.toList());
@@ -152,8 +158,25 @@ public class FbsProjectTaskServiceImpl extends ServicePlusImpl<FbsProjectTaskMap
 		BgtProjectRecruitApplyQueryDTO bgtProjectRecruitApplyQueryDTO = new BgtProjectRecruitApplyQueryDTO();
 		bgtProjectRecruitApplyQueryDTO.setRecruitIds(recruitIds);
 		bgtProjectRecruitApplyQueryDTO.setStatus(RecruitApplyStatus.PASS.getCode());
-		appTaskDetailVO.setApplylist(recruitApplyService.appQueryList(bgtProjectRecruitApplyQueryDTO));
+		appTaskDetailVO.setApplyList(recruitApplyService.appQueryList(bgtProjectRecruitApplyQueryDTO));
+		//任务进度
+		appTaskDetailVO.setProgress(progressService.getLastProgress(id));
 
+		//结算情况
+		//收款申请列表
+		BgtWageApplicationQueryDTO wageDTO = new BgtWageApplicationQueryDTO();
+		wageDTO.setTaskId(id);
+		List<BgtWageApplicationListVO> wageList = wageApplicationService.appQueryList(wageDTO);
+		appTaskDetailVO.setWageApplicationList(wageList);
+		//收款金额
+		Integer taskReceiveAmount = wageList.stream().filter(wage -> AuditStatus.PASS.getCode().equals(wage.getAuditStatus()))
+			.mapToInt(BgtWageApplicationListVO::getApplicantAmount)
+			.sum();
+		appTaskDetailVO.setTaskReceiveAmount(taskReceiveAmount);
+		//付款金额
+
+
+		//考勤情况
 
 
 		return appTaskDetailVO;