anderx 1 год назад
Родитель
Сommit
28e8756c2e

+ 1 - 1
src/main/java/com/goafanti/common/dao/TaskAnnualReportMapper.java

@@ -83,6 +83,6 @@ public interface TaskAnnualReportMapper {
 
     TaskAnnualReport selectByTidAndYear(@Param("tid") Integer tid, @Param("year") Integer year);
 
-    List<TaskAnnualReport> selectThreeYear(@Param("tid") Integer tid, @Param("year") int year);
+    List<TaskAnnualReport> selectThreeYear(@Param("tid") Integer tid, @Param("year") Integer year);
 }
 

+ 4 - 1
src/main/java/com/goafanti/common/mapper/TaskAnnualReportMapper.xml

@@ -174,7 +174,10 @@
         select
         <include refid="TaskAnnualReportAllSql"/>
         from task_annual_report
-        where tid = #{tid} and year in (#{year}-1,#{year}-2)
+        where tid = #{tid}
+        <if test="year !=null">
+            and year in (#{year}-1,#{year}-2)
+        </if>
     </select>
 
 </mapper>

+ 3 - 4
src/main/java/com/goafanti/techproject/service/impl/TaskDetailsServiceImpl.java

@@ -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){