|
|
@@ -221,9 +221,11 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
BigDecimal actualRdAmount = taskDetails.getActualRdAmount();
|
|
|
BigDecimal res3 = actualRdNumber.divide(actualRdAmount, 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
|
|
|
taskDetails.setActualRdRate(res3.doubleValue());
|
|
|
- BigDecimal res4 = getBigDecimal(actualRdAmount, actualRdNumber, taskDetails);
|
|
|
+ if (taskDetails.getLastRdSalesAmount()!=null && taskDetails.getLastRdBudget()!=null&&
|
|
|
+ taskDetails.getBeforeLastRdSalesAmount()!=null && taskDetails.getBeforeLastRdBudget()!=null){
|
|
|
+ BigDecimal res4 = getBigDecimal(actualRdAmount, actualRdNumber, taskDetails);
|
|
|
taskDetails.setThreeYearsActualRdRate(res4.doubleValue());
|
|
|
-
|
|
|
+ }
|
|
|
}
|
|
|
//计算立项资料占比
|
|
|
if (taskDetails.getProjectApprovalWriteNumber()!=null){
|
|
|
@@ -313,7 +315,8 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
|
|
|
@Override
|
|
|
public Object logDetails(Integer id) {
|
|
|
- TaskDetailsLog taskDetailsLog = taskDetailsLogMapper.selectById(id);
|
|
|
+ TaskDetailsLog log = taskDetailsLogMapper.selectById(id);
|
|
|
+ TaskDetails taskDetails = taskDetailsMapper.selectById(log.getTdid());
|
|
|
return null;
|
|
|
}
|
|
|
|