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-27 18:37:49 +08:00
parent c3b8f5bf89
commit 575eb5747e
10 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtProjectTaskProgress.java
View File

@ -61,6 +61,9 @@ public class BgtProjectTaskProgress implements Serializable {
@ApiModelProperty("用工数量")
private Integer taskStaffNum;
@ApiModelProperty("任务地址")
private String taskAddress;
/** 进度名称 */
@Excel(name = "进度名称")
@ApiModelProperty("进度名称")

2
ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtProjectTaskProgressDTO.java
View File

@ -47,6 +47,8 @@ public class BgtProjectTaskProgressDTO {
@ApiModelProperty("进度名称")
private String progressName;
@ApiModelProperty("任务地址")
private String taskAddress;
@ApiModelProperty("负责人")
private String director;

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

@ -198,8 +198,7 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl<BgtProjec
.setSubheading(map.get(SUBHEADING))
.setTableId(recruitApply.getId())
.setTableName(SqlHelper.table(BgtProjectRecruitApply.class).getTableName())
.setMessageLargeType(LARGE_APPLY)
.setMessageSmallType(SMALL_SYSTEM);
.setMessageLargeType(LARGE_APPLY);
iWgzMessageService.sendAMessage(wgzMessage);
return updateById(recruitApply);
}

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

@ -94,6 +94,9 @@ public class AppTaskDetailVO {
@ApiModelProperty("任务进度")
private Integer progress;
@ApiModelProperty("任务进度")
private Double progressDouble;
//结算情况
@ApiModelProperty("任务收款金额")
private Integer taskReceiveAmount;

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

@ -60,5 +60,5 @@ public class AppTaskVO {
private Integer applyNum;
@ApiModelProperty("任务收款金额")
private Integer taskReceiveAmount;
private Integer taskReceiveAmount = 0;
}

3
ruoyi-system/src/main/java/com/ruoyi/fbs/service/IFbsProjectTaskService.java
View File

@ -62,6 +62,9 @@ public interface IFbsProjectTaskService extends IServicePlus<FbsProjectTask> {
*/
TableDataInfo<AppTaskVO> appQueryPageList(AppTaskDTO dto);
/**
* App包工头任务列表（不分页）
*/
List<AppTaskVO> appQueryList();
/**

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

@ -156,7 +156,7 @@ public class FbsProjectTaskServiceImpl extends ServicePlusImpl<FbsProjectTaskMap
Page<AppTaskVO> appTaskVOPage = baseMapper.appQueryPageList(appTaskDTOPage, dto);
if(dto.getMyTask() && ProjectTaskStatus.APPLY.getCode().equals(dto.getStatus())
&&CollectionUtil.isEmpty(taskIds)){
appTaskVOPage.setRecords(new ArrayList<AppTaskVO>());
appTaskVOPage.setRecords(new ArrayList<>());
appTaskVOPage.setTotal(0);
}
return PageUtils.buildDataInfo(appTaskVOPage);
@ -183,8 +183,10 @@ public class FbsProjectTaskServiceImpl extends ServicePlusImpl<FbsProjectTaskMap
if(ProjectTaskStatus.PROGRESS.getCode().equals(byId.getStatus())
|| ProjectTaskStatus.COMPLETE.getCode().equals(byId.getStatus())){
//任务进度
appTaskDetailVO.setProgress(progressService.getLastProgress(id));
Integer lastProgress = progressService.getLastProgress(id);
appTaskDetailVO.setProgress(lastProgress);
BigDecimal bd = new BigDecimal(lastProgress).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
appTaskDetailVO.setProgressDouble(bd.doubleValue());
//结算情况
//收款申请列表
BgtWageApplicationQueryDTO wageDTO = new BgtWageApplicationQueryDTO();

3
ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java
View File

@ -298,8 +298,7 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl<WgzPayCalculat
.setSubheading(map.get(SUBHEADING))
.setTableId(payCalculation.getId())
.setTableName(SqlHelper.table(WgzPayCalculation.class).getTableName())
.setMessageLargeType(LARGE_SALARY)
.setMessageSmallType(SMALL_SYSTEM);
.setMessageLargeType(LARGE_SALARY);
wgzMessageService.sendAMessage(wgzMessage);
return updateById(payCalculation);
}