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-28 17:15:33 +08:00
parent b32a787f5f
commit 23bf1f46ee
19 changed files with 175 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,6 +79,9 @@ public class AppTaskDetailVO {
@ApiModelProperty("任务状态（1进行中 2已完成）")
private String status;
@ApiModelProperty("创建者ID")
private Long createId;
/** 备注 */
@ApiModelProperty("备注")
private String remark;

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

@ -25,5 +25,7 @@ public class AppTaskDetailWageVO {
@ApiModelProperty("最新一条收款申请")
private BgtWageApplicationListVO wageApplication;
@ApiModelProperty("任务金额")
private Integer taskAmount;
}

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

@ -62,6 +62,9 @@ public class AppTaskVO {
@ApiModelProperty("申请数量")
private Integer applyNum;
@ApiModelProperty("判断标志")
private Boolean myTask;
@ApiModelProperty("任务收款金额")
private Integer taskReceiveAmount = 0;
}

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

@ -144,21 +144,8 @@ public class FbsProjectTaskServiceImpl extends ServicePlusImpl<FbsProjectTaskMap
Page<AppTaskDTO> appTaskDTOPage = new Page<>();
appTaskDTOPage.setCurrent(dto.getPageNum());
appTaskDTOPage.setSize(dto.getPageSize());
List<Long> taskIds = new ArrayList<>();
if(ProjectTaskStatus.APPLY.getCode().equals(dto.getStatus())){
taskIds = taskApplyService.getTaskIdsByUserId(SecurityUtils.getAppUserId());
dto.setTaskIds(taskIds);
}
if(dto.getMyTask() && !ProjectTaskStatus.APPLY.getCode().equals(dto.getStatus())){
dto.setUserId(SecurityUtils.getAppUserId());
}
dto.setUserId(SecurityUtils.getAppUserId());
Page<AppTaskVO> appTaskVOPage = baseMapper.appQueryPageList(appTaskDTOPage, dto);
if(dto.getMyTask() && ProjectTaskStatus.APPLY.getCode().equals(dto.getStatus())
&&CollectionUtil.isEmpty(taskIds)){
appTaskVOPage.setRecords(new ArrayList<>());
appTaskVOPage.setTotal(0);
}
return PageUtils.buildDataInfo(appTaskVOPage);
}
@ -250,8 +237,10 @@ public class FbsProjectTaskServiceImpl extends ServicePlusImpl<FbsProjectTaskMap
@Override
public AppTaskDetailWageVO wage(Long id) {
FbsProjectTask task = getById(id);
AppTaskDetailWageVO appTaskDetailVO = new AppTaskDetailWageVO();
appTaskDetailVO.setId(id);
appTaskDetailVO.setTaskAmount(task.getTaskAmount());
//结算情况
//收款申请列表
BgtWageApplicationQueryDTO wageDTO = new BgtWageApplicationQueryDTO();