zt/platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

任务

Browse Source
This commit is contained in:
zt
2025-02-20 13:48:17 +08:00
parent d98028cf78
commit 3d232faad8
35 changed files with 1041 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 = "任务开始时间")

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

@ -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;
}

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

@ -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;
}