|
|
@@ -92,23 +92,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
list.add(map);
|
|
|
}
|
|
|
}
|
|
|
- if (taskDetails != null) {
|
|
|
- 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)){
|
|
|
- res.setLastYear(e.getYear().toString());
|
|
|
- res.setLastSalesAmount(e.getSalesAmount());
|
|
|
- res.setLastRdBudget(e.getResearchAmount());
|
|
|
- }else if (e.getYear()==(year-2)){
|
|
|
- res.setBeforeLastYear(e.getYear().toString());
|
|
|
- res.setBeforeLastSalesAmount(e.getSalesAmount());
|
|
|
- res.setBeforeLastRdBudget(e.getResearchAmount());
|
|
|
- }
|
|
|
- }
|
|
|
- BeanUtils.copyProperties(taskDetails, res);
|
|
|
- }
|
|
|
+
|
|
|
BigDecimal totalAmount = tOrderNew.getTotalAmount();
|
|
|
String lvl=null;
|
|
|
if (totalAmount.compareTo(new BigDecimal("3"))<0){
|