导出功能修改

src/main/java/com/tiptimes/ctrl/QuestionnaireCtrl.java

@@ -496,8 +496,8 @@ public class QuestionnaireCtrl {
      */
     @RequestMapping(value = {"/exportPerformanceSummaryNew"})
     @ResponseBody
-    public void exportPerformanceSummaryNew(HttpServletRequest request, HttpServletResponse response) {
-        questionnaireService.exportPerformanceSummaryNew(request, response);
+    public void exportPerformanceSummaryNew(HttpServletRequest request, HttpServletResponse response, Integer qnYear) {
+        questionnaireService.exportPerformanceSummaryNew(request, response, qnYear);
     }
 
     @RequestMapping(value = "/checkComplete")
@@ -605,10 +605,10 @@ public class QuestionnaireCtrl {
                                             Integer id82, Integer id83, Integer id84, Integer id85, Integer id86,
                                             Integer id87, Integer id88, Integer id89, Integer id90, Integer id91, Integer id92,
                                             Integer id93, Integer id94, Integer id95, Integer id96,
-                                            Integer id97, Integer id98
+                                            Integer id97, Integer id98, Integer qnYear
 
     ) {
-        questionnaireService.exportFullTimeWorkPersonNew(request, response, index, recordId,
+        questionnaireService.exportFullTimeWorkPersonNew(request, response, index, recordId, qnYear,
                 id1, id2, id3,
                 id9, id10, id11, id12, id13, id14,
                 id16, id17, id18, id19, id20,

src/main/java/com/tiptimes/dao/QuestionnaireDao.java

@@ -96,7 +96,7 @@ public interface QuestionnaireDao {
 
     List<PerformanceSummaryTotal> queryGuideAndRewardIndexList();
 
-    List<PerformanceSummaryTotal> queryGuideAndRewardIndexListNew();
+    List<PerformanceSummaryTotal> queryGuideAndRewardIndexListNew(@Param("qnYear") Integer qnYear);
 
     Integer updateAnswerScore(Answer answer);
 
@@ -116,6 +116,7 @@ public interface QuestionnaireDao {
 
     List<SiteCondition> selectSiteConditionListTemp(
             @Param("recordId") String recordId,
+            @Param("qnYear") Integer qnYear,
             @Param("id1") Integer id1,
             @Param("id2") Integer id2,
             @Param("id3") Integer id3
@@ -123,6 +124,7 @@ public interface QuestionnaireDao {
 
     List<FullTimeWorkPerson> selectFullTimeWorkPersonListNew(
             @Param("recordId") String recordId,
+            @Param("qnYear") Integer qnYear,
             @Param("id9") Integer id9,
             @Param("id10") Integer id10,
             @Param("id11") Integer id11,
@@ -132,6 +134,7 @@ public interface QuestionnaireDao {
     );
 
     List<IncubatedEnterprises> selectIncubatedEnterprisesListNew(
+            @Param("qnYear") Integer qnYear,
             @Param("id16") Integer id16,
             @Param("id17") Integer id17,
             @Param("id18") Integer id18,
@@ -140,6 +143,7 @@ public interface QuestionnaireDao {
     );
 
     List<EmploymentSituation> selectEmploymentSituationListNew(
+            @Param("qnYear") Integer qnYear,
             @Param("id21") Integer id21,
             @Param("id22") Integer id22,
             @Param("id23") Integer id23,
@@ -147,6 +151,7 @@ public interface QuestionnaireDao {
     );
 
     List<EntrepreneurshipCourses> selectEntrepreneurshipCoursesListNew(
+            @Param("qnYear") Integer qnYear,
             @Param("id25") Integer id25,
             @Param("id26") Integer id26,
             @Param("id27") Integer id27,
@@ -160,6 +165,7 @@ public interface QuestionnaireDao {
     );
 
     List<SigningMentors> selectSigningMentorsListNew(
+            @Param("qnYear") Integer qnYear,
             @Param("id35") Integer id35,
             @Param("id36") Integer id36,
             @Param("id37") Integer id37,
@@ -181,6 +187,7 @@ public interface QuestionnaireDao {
 
 
     List<OrganizationActivity> selectOrganizationActivityListNew(
+            @Param("qnYear") Integer qnYear,
             @Param("id52") Integer id52,
             @Param("id53") Integer id53,
             @Param("id54") Integer id54,
@@ -189,28 +196,33 @@ public interface QuestionnaireDao {
     );
 
     List<CompetingSituation> selectCompetingSituationListNew(
+            @Param("qnYear") Integer qnYear,
             @Param("id57") Integer id57,
             @Param("id58") Integer id58,
             @Param("id59") Integer id59
     );
 
     List<EntrepreneurshipFunding> selectEntrepreneurshipFundingListNew(
+            @Param("qnYear") Integer qnYear,
             @Param("id60") Integer id60
     );
 
     List<EntrepreneurshipProject> selectEntrepreneurshipProjectListNew(
+            @Param("qnYear") Integer qnYear,
             @Param("id62") Integer id62,
             @Param("id63") Integer id63,
             @Param("id64") Integer id64
     );
 
     List<EnterprisestAmount> selecEnterprisestAmountListNew(
+            @Param("qnYear") Integer qnYear,
             @Param("id65") Integer id65,
             @Param("id66") Integer id66,
             @Param("id67") Integer id67
     );
 
     List<EvaluationBorrowing> selectEvaluationBorrowingListNew(
+            @Param("qnYear") Integer qnYear,
             @Param("id68") Integer id68,
             @Param("id69") Integer id69,
             @Param("id70") Integer id70,
@@ -218,17 +230,20 @@ public interface QuestionnaireDao {
     );
 
     List<InnovationWeek> selectInnovationWeekListNew(
+            @Param("qnYear") Integer qnYear,
             @Param("id72") Integer id72,
             @Param("id73") Integer id73,
             @Param("id74") Integer id74
     );
 
     List<CollegeSituation> selectCollegeSituationListNew(
+            @Param("qnYear") Integer qnYear,
             @Param("id75") Integer id75,
             @Param("id76") Integer id76
     );
 
     List<EnterprisesIntellectual> selectEnterprisesIntellectualListNew(
+            @Param("qnYear") Integer qnYear,
             @Param("id77") Integer id77,
             @Param("id76") Integer id78,
             @Param("id77") Integer id79,
@@ -237,6 +252,7 @@ public interface QuestionnaireDao {
     );
 
     List<NationalCompetitionAwards> selectNationalCompetitionAwardsListNew(
+            @Param("qnYear") Integer qnYear,
             @Param("id82") Integer id82,
             @Param("id83") Integer id83,
             @Param("id84") Integer id84,
@@ -245,6 +261,7 @@ public interface QuestionnaireDao {
     );
 
     List<EducationCommission> selectEducationCommissionListNew(
+            @Param("qnYear") Integer qnYear,
             @Param("id87") Integer id87,
             @Param("id88") Integer id88,
             @Param("id89") Integer id89,
@@ -254,6 +271,7 @@ public interface QuestionnaireDao {
     );
 
     List<EntrepreneurialProject> selectEntrepreneurialProjectListNew(
+            @Param("qnYear") Integer qnYear,
             @Param("id93") Integer id93,
             @Param("id94") Integer id94,
             @Param("id95") Integer id95,
@@ -261,6 +279,7 @@ public interface QuestionnaireDao {
     );
 
     List<SpaceAndIncubation> selectSpaceAndIncubationListNew(
+            @Param("qnYear") Integer qnYear,
             @Param("id97") Integer id97,
             @Param("id98") Integer id98
     );

src/main/java/com/tiptimes/service/QuestionnaireService.java

@@ -112,7 +112,7 @@ public interface QuestionnaireService {
 
   void exportPerformanceSummary(HttpServletRequest request, HttpServletResponse response);
 
-  void exportPerformanceSummaryNew(HttpServletRequest request, HttpServletResponse response);
+  void exportPerformanceSummaryNew(HttpServletRequest request, HttpServletResponse response,Integer qnYear);
 
   Integer updateAnswerScore(Answer answer);
 
@@ -132,7 +132,7 @@ public interface QuestionnaireService {
 
   List<Record> AboutViewList(Record record);
 
-  void exportFullTimeWorkPersonNew(HttpServletRequest request, HttpServletResponse response, String index, String recordId,
+  void exportFullTimeWorkPersonNew(HttpServletRequest request, HttpServletResponse response, String index, String recordId,Integer qnYear,
                                    Integer id1, Integer id2, Integer id3,
                                    Integer id9, Integer id10, Integer id11, Integer id12, Integer id13, Integer id14,
                                    Integer id16, Integer id17, Integer id18, Integer id19, Integer id20,