|
|
@@ -117,6 +117,11 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
}
|
|
|
//计算年度研发占比
|
|
|
//计算三年度的研发占比
|
|
|
+
|
|
|
+ LocalDate now = LocalDate.now();
|
|
|
+ int year = now.getYear();
|
|
|
+ List<TaskAnnualReport> taskAnnualReports = taskAnnualReportMapper.selectThreeYear(taskDetails.getTid(), year);
|
|
|
+
|
|
|
if(taskDetails.getRdBudget() !=null ||
|
|
|
taskDetails.getRdSalesAmount() !=null){
|
|
|
BigDecimal rdBudget = taskDetails.getRdBudget();
|
|
|
@@ -124,14 +129,12 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
BigDecimal res = rdBudget.divide(rdSalesAmount, 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
|
|
|
taskDetails.setRdBudgetRate(res.doubleValue());
|
|
|
//计算三年度的研发占比
|
|
|
- LocalDate now = LocalDate.now();
|
|
|
- int year = now.getYear();
|
|
|
- List<TaskAnnualReport> taskAnnualReports = taskAnnualReportMapper.selectThreeYear(taskDetails.getTid(), year);
|
|
|
if (taskAnnualReports.size()==2){
|
|
|
BigDecimal res2 = getBigDecimal(rdSalesAmount, rdBudget, taskAnnualReports);
|
|
|
taskDetails.setThreeYearsRdBudgetRate(res2.doubleValue());
|
|
|
}
|
|
|
|
|
|
+
|
|
|
}
|
|
|
//计算实际研发占比
|
|
|
if(taskDetails.getActualRdNumber() !=null ||
|
|
|
@@ -139,7 +142,12 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
BigDecimal actualRdNumber = BigDecimal.valueOf(taskDetails.getActualRdNumber());
|
|
|
BigDecimal actualRdAmount = taskDetails.getActualRdAmount();
|
|
|
BigDecimal res = actualRdNumber.divide(actualRdAmount, 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
|
|
|
- }
|
|
|
+ taskDetails.setActualRdRate(res.doubleValue());
|
|
|
+ if (taskAnnualReports.size()==2){
|
|
|
+ BigDecimal res2 = getBigDecimal(actualRdAmount, actualRdNumber, taskAnnualReports);
|
|
|
+ taskDetails.setThreeYearsActualRdRate(res2.doubleValue());
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
}
|
|
|
|