diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 5030c93b..acd0a8b0 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -873,7 +873,7 @@ public class ResultRecordController extends AbstractController { taskReq.setTaskId(taskDto.getId()); taskReq.setName(taskDto.getName()); taskReq.setOrderBy(orderBy); - taskReq.setProcessRate(taskDto.getProcessRate()); + taskReq.setProcessRate(BigDecimal.valueOf(taskDto.getProcessRate())); resultTaskService.saveOrUpdateResultTask(taskReq); orderBy++; } diff --git a/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java b/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java index d0bff310..a27cf643 100644 --- a/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java +++ b/src/main/java/com/lz/modules/performance/dto/ResultTaskDto.java @@ -28,7 +28,7 @@ public class ResultTaskDto { private String name; //任务的当前进度 @ApiModelProperty(value = "任务的当前进度", name = "processRate") - private BigDecimal processRate; + private Double processRate; //头像 @ApiModelProperty(value = "头像", name = "avatar") private String avatar; diff --git a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java index 9b685ba2..135068c6 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java @@ -145,38 +145,40 @@ public class ResultTaskServiceImpl extends ServiceImpl resultTaskDtos = resultTaskMapper.selectResultTaskDtosByDetailId(detailId); if(CollectionUtils.isEmpty(resultTaskDtos)){ log.info("未找到该绩效详情下得任务信息"); - return BigDecimal.ZERO; + return 0d; } int size = resultTaskDtos.size(); - BigDecimal rate = BigDecimal.ZERO; + Double rate = 0d; for(ResultTaskDto dto:resultTaskDtos){ rate = BigDecimalUtil.add(rate,dto.getProcessRate()); } - return BigDecimalUtil.divide(rate,BigDecimal.valueOf(size)).setScale(4); + double result = BigDecimalUtil.div(rate, size, 4); + return result; } @@ -187,16 +189,16 @@ public class ResultTaskServiceImpl extends ServiceImpl selectResultTasksByDetailId(Long detailId){ return resultTaskMapper.selectResultTasksByDetailId(detailId); @@ -240,7 +244,7 @@ public class ResultTaskServiceImpl extends ServiceImpl