|
|
@@ -93,7 +93,8 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
}
|
|
|
}
|
|
|
if (taskDetails != null) {
|
|
|
- int year = now.getYear();
|
|
|
+ serviceYear=serviceYear.replace("年", "");
|
|
|
+ int year = Integer.parseInt(serviceYear);
|
|
|
List<TaskAnnualReport> taskAnnualReports = taskAnnualReportMapper.selectThreeYear(taskDetails.getTid(), year);
|
|
|
for (TaskAnnualReport e : taskAnnualReports) {
|
|
|
if (e.getYear()==(year-1)){
|
|
|
@@ -182,9 +183,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
}
|
|
|
//计算年度研发占比
|
|
|
//计算三年度的研发占比
|
|
|
- LocalDate now = LocalDate.now();
|
|
|
- int year = now.getYear();
|
|
|
- List<TaskAnnualReport> taskAnnualReports = taskAnnualReportMapper.selectThreeYear(taskDetails.getTid(), year);
|
|
|
+ List<TaskAnnualReport> taskAnnualReports = taskAnnualReportMapper.selectThreeYear(taskDetails.getTid(), null);
|
|
|
|
|
|
if(taskDetails.getRdBudget() !=null ||
|
|
|
taskDetails.getRdSalesAmount() !=null){
|