|
|
@@ -188,7 +188,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
BigDecimal res = tn.divide(wn,4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
|
|
|
taskDetails.setWorkersRate(res.doubleValue());
|
|
|
}
|
|
|
- //计算研发预算完成进度 已归集研发费用总额÷年度研发预算总额X100%
|
|
|
+ //计算研发预算完成进度 已归集研发费用总额÷年度研发预算总额X100%
|
|
|
if (taskDetails.getActualRdAmount()!=null &&taskDetails.getRdBudget()!=null){
|
|
|
BigDecimal multiply = taskDetails.getActualRdAmount().divide(taskDetails.getRdBudget(), 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
|
|
|
taskDetails.setRdCompletionProgress(multiply.doubleValue());
|