导出功能修改

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,

src/main/java/com/tiptimes/service/impl/QuestionnaireServiceImpl.java

@@ -886,7 +886,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
 
 
     @Override
-    public void exportPerformanceSummaryNew(HttpServletRequest request, HttpServletResponse response) {
+    public void exportPerformanceSummaryNew(HttpServletRequest request, HttpServletResponse response, Integer qnYear) {
         try {
             WriteCellStyle headWriteCellStyle = new WriteCellStyle();
             //设置背景颜色
@@ -913,7 +913,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
             response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_a).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
 
             //查询引导指标和奖励指标数据
-            List<PerformanceSummaryTotal> summaryList = questionnaireDao.queryGuideAndRewardIndexListNew();
+            List<PerformanceSummaryTotal> summaryList = questionnaireDao.queryGuideAndRewardIndexListNew(qnYear);
 
             if (summaryList != null) {
                 for (int i = 0; i < summaryList.size(); i++) {
@@ -1403,8 +1403,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
      * @param recordId 上报记录id
      */
     @Override
-    public void exportFullTimeWorkPersonNew(HttpServletRequest request, HttpServletResponse response, String index,
-                                            String recordId,
+    public 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,
@@ -1465,7 +1464,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                             new String((fileName_a).getBytes("gb2312"),
                                     "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<SiteCondition> siteConditionList = questionnaireDao.selectSiteConditionListTemp(recordId, id1, id2, id3);
+                    List<SiteCondition> siteConditionList = questionnaireDao.selectSiteConditionListTemp(recordId, qnYear, id1, id2, id3);
                     if (siteConditionList != null) {
                         for (int i = 0; i < siteConditionList.size(); i++) {
                             //excel生成序号
@@ -1486,7 +1485,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     String fileName_b = "基础指标二";
                     response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_b).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<FullTimeWorkPerson> fullTimeWorkPersonList = questionnaireDao.selectFullTimeWorkPersonListNew(recordId, id9, id10, id11, id12, id13, id14);
+                    List<FullTimeWorkPerson> fullTimeWorkPersonList = questionnaireDao.selectFullTimeWorkPersonListNew(recordId, qnYear,id9, id10, id11, id12, id13, id14);
                     if (fullTimeWorkPersonList != null) {
                         for (int i = 0; i < fullTimeWorkPersonList.size(); i++) {
                             //excel生成序号
@@ -1506,7 +1505,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     String fileName_c = "基础指标三";
                     response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_c).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<IncubatedEnterprises> incubatedEnterprisesList = questionnaireDao.selectIncubatedEnterprisesListNew(id16, id17, id18, id19, id20);
+                    List<IncubatedEnterprises> incubatedEnterprisesList = questionnaireDao.selectIncubatedEnterprisesListNew(qnYear,id16, id17, id18, id19, id20);
                     if (incubatedEnterprisesList != null) {
                         for (int i = 0; i < incubatedEnterprisesList.size(); i++) {
                             //excel生成序号
@@ -1526,7 +1525,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     String fileName_d = "基础指标四";
                     response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_d).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<EmploymentSituation> employmentSituationList = questionnaireDao.selectEmploymentSituationListNew(id21, id22, id23, id24);
+                    List<EmploymentSituation> employmentSituationList = questionnaireDao.selectEmploymentSituationListNew(qnYear,id21, id22, id23, id24);
                     if (employmentSituationList != null) {
                         for (int i = 0; i < employmentSituationList.size(); i++) {
                             //excel生成序号
@@ -1546,7 +1545,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     String fileName_e = "基础指标五";
                     response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_e).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<EntrepreneurshipCourses> entrepreneurshipCoursesList = questionnaireDao.selectEntrepreneurshipCoursesListNew(id25, id26, id27, id28, id29, id30, id31, id32, id33, id34);
+                    List<EntrepreneurshipCourses> entrepreneurshipCoursesList = questionnaireDao.selectEntrepreneurshipCoursesListNew(qnYear,id25, id26, id27, id28, id29, id30, id31, id32, id33, id34);
                     if (entrepreneurshipCoursesList != null) {
                         for (int i = 0; i < entrepreneurshipCoursesList.size(); i++) {
                             //excel生成序号
@@ -1566,7 +1565,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     String fileName_f = "基础指标六";
                     response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_f).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<SigningMentors> signingMentorsList = questionnaireDao.selectSigningMentorsListNew(id35, id36, id37, id38, id39, id40, id41, id42, id43, id44, id45, id46, id47, id48, id49, id50, id51);
+                    List<SigningMentors> signingMentorsList = questionnaireDao.selectSigningMentorsListNew(qnYear,id35, id36, id37, id38, id39, id40, id41, id42, id43, id44, id45, id46, id47, id48, id49, id50, id51);
                     if (signingMentorsList != null) {
                         for (int i = 0; i < signingMentorsList.size(); i++) {
                             //excel生成序号
@@ -1586,7 +1585,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     String fileName_g = "基础指标七";
                     response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_g).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<OrganizationActivity> organizationActivityList = questionnaireDao.selectOrganizationActivityListNew(id52, id53, id54, id55, id56);
+                    List<OrganizationActivity> organizationActivityList = questionnaireDao.selectOrganizationActivityListNew(qnYear,id52, id53, id54, id55, id56);
                     if (organizationActivityList != null) {
                         for (int i = 0; i < organizationActivityList.size(); i++) {
                             //excel生成序号
@@ -1606,7 +1605,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     String fileName_h = "基础指标八";
                     response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_h).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<CompetingSituation> competingSituationList = questionnaireDao.selectCompetingSituationListNew(id57, id58, id59);
+                    List<CompetingSituation> competingSituationList = questionnaireDao.selectCompetingSituationListNew(qnYear,id57, id58, id59);
                     if (competingSituationList != null) {
                         for (int i = 0; i < competingSituationList.size(); i++) {
                             //excel生成序号
@@ -1626,7 +1625,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     String fileName_j = "基础指标九";
                     response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_j).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<EntrepreneurshipFunding> entrepreneurshipFundingList = questionnaireDao.selectEntrepreneurshipFundingListNew(id60);
+                    List<EntrepreneurshipFunding> entrepreneurshipFundingList = questionnaireDao.selectEntrepreneurshipFundingListNew(qnYear,id60);
                     if (entrepreneurshipFundingList != null) {
                         for (int i = 0; i < entrepreneurshipFundingList.size(); i++) {
                             //excel生成序号
@@ -1647,7 +1646,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     String fileName_aa = "引导指标一";
                     response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_aa).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<SiteCondition> leadingIndicatorOneList = questionnaireDao.selectSiteConditionListTemp(recordId, id1, id2, id3);
+                    List<SiteCondition> leadingIndicatorOneList = questionnaireDao.selectSiteConditionListTemp(recordId, qnYear,id1, id2, id3);
                     if (leadingIndicatorOneList != null) {
                         for (int i = 0; i < leadingIndicatorOneList.size(); i++) {
                             //excel生成序号
@@ -1668,7 +1667,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     String fileName_bb = "引导指标二";
                     response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_bb).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<SiteCondition> leadingIndicatorTwoList = questionnaireDao.selectSiteConditionListTemp(recordId, id1, id2, id3);
+                    List<SiteCondition> leadingIndicatorTwoList = questionnaireDao.selectSiteConditionListTemp(recordId,qnYear, id1, id2, id3);
                     if (leadingIndicatorTwoList != null) {
                         for (int i = 0; i < leadingIndicatorTwoList.size(); i++) {
                             //excel生成序号
@@ -1689,7 +1688,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     String fileName_cc = "引导指标三";
                     response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_cc).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<IncubatedEnterprises> leadingIndicatorThreeList = questionnaireDao.selectIncubatedEnterprisesListNew(id16, id17, id18, id19, id20);
+                    List<IncubatedEnterprises> leadingIndicatorThreeList = questionnaireDao.selectIncubatedEnterprisesListNew(qnYear,id16, id17, id18, id19, id20);
                     if (leadingIndicatorThreeList != null) {
                         for (int i = 0; i < leadingIndicatorThreeList.size(); i++) {
                             //excel生成序号
@@ -1710,7 +1709,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     String fileName_dd = "引导指标四";
                     response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_dd).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<IncubatedEnterprises> leadingIndicatorFoureList = questionnaireDao.selectIncubatedEnterprisesListNew(id16, id17, id18, id19, id20);
+                    List<IncubatedEnterprises> leadingIndicatorFoureList = questionnaireDao.selectIncubatedEnterprisesListNew(qnYear,id16, id17, id18, id19, id20);
                     if (leadingIndicatorFoureList != null) {
                         for (int i = 0; i < leadingIndicatorFoureList.size(); i++) {
                             //excel生成序号
@@ -1731,7 +1730,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     String fileName_ee = "引导指标五";
                     response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_ee).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<EmploymentSituation> employmentSituationList1 = questionnaireDao.selectEmploymentSituationListNew(id21, id22, id23, id24);
+                    List<EmploymentSituation> employmentSituationList1 = questionnaireDao.selectEmploymentSituationListNew(qnYear,id21, id22, id23, id24);
                     if (employmentSituationList1 != null) {
                         for (int i = 0; i < employmentSituationList1.size(); i++) {
                             //excel生成序号
@@ -1754,7 +1753,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
                     ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).build();
                     //查询数据
-                    List<EntrepreneurshipCourses> entrepreneurshipCoursesList5 = questionnaireDao.selectEntrepreneurshipCoursesListNew(id25, id26, id27, id28, id29, id30, id31, id32, id33, id34);
+                    List<EntrepreneurshipCourses> entrepreneurshipCoursesList5 = questionnaireDao.selectEntrepreneurshipCoursesListNew(qnYear,id25, id26, id27, id28, id29, id30, id31, id32, id33, id34);
                     if (entrepreneurshipCoursesList5 != null) {
                         for (int i = 0; i < entrepreneurshipCoursesList5.size(); i++) {
                             //excel生成序号
@@ -1769,7 +1768,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                         excelWriter.write(entrepreneurshipCoursesList5, writeSheet1);
                     }
                     //查询数据
-                    List<EntrepreneurshipProject> entrepreneurshipProjectList = questionnaireDao.selectEntrepreneurshipProjectListNew(id62, id63, id64);
+                    List<EntrepreneurshipProject> entrepreneurshipProjectList = questionnaireDao.selectEntrepreneurshipProjectListNew(qnYear,id62, id63, id64);
                     if (entrepreneurshipProjectList != null) {
                         for (int i = 0; i < entrepreneurshipProjectList.size(); i++) {
                             //excel生成序号
@@ -1793,7 +1792,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     String fileName_ff = "引导指标七";
                     response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_ff).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<SigningMentors> leadingIndicatorSixList = questionnaireDao.selectSigningMentorsListNew(id35, id36, id37, id38, id39, id40, id41, id42, id43, id44, id45, id46, id47, id48, id49, id50, id51);
+                    List<SigningMentors> leadingIndicatorSixList = questionnaireDao.selectSigningMentorsListNew(qnYear,id35, id36, id37, id38, id39, id40, id41, id42, id43, id44, id45, id46, id47, id48, id49, id50, id51);
                     if (leadingIndicatorSixList != null) {
                         for (int i = 0; i < leadingIndicatorSixList.size(); i++) {
                             //excel生成序号
@@ -1814,7 +1813,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     String fileName_gg = "引导指标八";
                     response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_gg).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<OrganizationActivity> leadingIndicatorSevenList = questionnaireDao.selectOrganizationActivityListNew(id52, id53, id54, id55, id56);
+                    List<OrganizationActivity> leadingIndicatorSevenList = questionnaireDao.selectOrganizationActivityListNew(qnYear,id52, id53, id54, id55, id56);
                     if (leadingIndicatorSevenList != null) {
                         for (int i = 0; i < leadingIndicatorSevenList.size(); i++) {
                             //excel生成序号
@@ -1835,7 +1834,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     String fileName_l = "引导指标九";
                     response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_l).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<EnterprisestAmount> enterprisestAmountList = questionnaireDao.selecEnterprisestAmountListNew(id65, id66, id67);
+                    List<EnterprisestAmount> enterprisestAmountList = questionnaireDao.selecEnterprisestAmountListNew(qnYear,id65, id66, id67);
                     if (enterprisestAmountList != null) {
                         for (int i = 0; i < enterprisestAmountList.size(); i++) {
                             //excel生成序号
@@ -1856,7 +1855,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     String fileName_z = "引导指标十";
                     response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_z).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<EvaluationBorrowing> evaluationBorrowingList = questionnaireDao.selectEvaluationBorrowingListNew(id68, id69, id70, id71);
+                    List<EvaluationBorrowing> evaluationBorrowingList = questionnaireDao.selectEvaluationBorrowingListNew(qnYear,id68, id69, id70, id71);
                     if (evaluationBorrowingList != null) {
                         for (int i = 0; i < evaluationBorrowingList.size(); i++) {
                             //excel生成序号
@@ -1877,7 +1876,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     String fileName_x = "引导指标十一";
                     response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_x).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<InnovationWeek> innovationWeekList = questionnaireDao.selectInnovationWeekListNew(id72, id73, id74);
+                    List<InnovationWeek> innovationWeekList = questionnaireDao.selectInnovationWeekListNew(qnYear,id72, id73, id74);
                     if (innovationWeekList != null) {
                         for (int i = 0; i < innovationWeekList.size(); i++) {
                             //excel生成序号
@@ -1898,7 +1897,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     String fileName_v = "引导指标十二";
                     response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_v).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<CollegeSituation> collegeSituationList = questionnaireDao.selectCollegeSituationListNew(id75, id76);
+                    List<CollegeSituation> collegeSituationList = questionnaireDao.selectCollegeSituationListNew(qnYear,id75, id76);
                     if (collegeSituationList != null) {
                         for (int i = 0; i < collegeSituationList.size(); i++) {
                             //excel生成序号
@@ -1919,7 +1918,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     String fileName_o = "引导指标十三";
                     response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_o).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<EnterprisesIntellectual> enterprisesIntellectualList = questionnaireDao.selectEnterprisesIntellectualListNew(id77, id78, id79, id80, id81);
+                    List<EnterprisesIntellectual> enterprisesIntellectualList = questionnaireDao.selectEnterprisesIntellectualListNew(qnYear,id77, id78, id79, id80, id81);
                     if (enterprisesIntellectualList != null) {
                         for (int i = 0; i < enterprisesIntellectualList.size(); i++) {
                             //excel生成序号
@@ -1940,7 +1939,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     String fileName_p = "奖励指标一";
                     response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_p).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<NationalCompetitionAwards> nationalCompetitionAwardsList = questionnaireDao.selectNationalCompetitionAwardsListNew(id82, id83, id84, id85, id86);
+                    List<NationalCompetitionAwards> nationalCompetitionAwardsList = questionnaireDao.selectNationalCompetitionAwardsListNew(qnYear,id82, id83, id84, id85, id86);
                     if (nationalCompetitionAwardsList != null) {
                         for (int i = 0; i < nationalCompetitionAwardsList.size(); i++) {
                             //excel生成序号
@@ -1961,7 +1960,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     String fileName_n = "奖励指标二";
                     response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_n).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<EducationCommission> educationCommissionList = questionnaireDao.selectEducationCommissionListNew(id87, id88, id89, id90, id91, id92);
+                    List<EducationCommission> educationCommissionList = questionnaireDao.selectEducationCommissionListNew(qnYear,id87, id88, id89, id90, id91, id92);
                     if (educationCommissionList != null) {
                         for (int i = 0; i < educationCommissionList.size(); i++) {
                             //excel生成序号
@@ -1982,7 +1981,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     String fileName_m = "奖励指标三";
                     response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_m).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<EntrepreneurialProject> entrepreneurialProjectList = questionnaireDao.selectEntrepreneurialProjectListNew(id93, id94, id95, id96);
+                    List<EntrepreneurialProject> entrepreneurialProjectList = questionnaireDao.selectEntrepreneurialProjectListNew(qnYear,id93, id94, id95, id96);
                     if (entrepreneurialProjectList != null) {
                         for (int i = 0; i < entrepreneurialProjectList.size(); i++) {
                             //excel生成序号
@@ -2004,7 +2003,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                     String fileName_u = "奖励指标四";
                     response.setHeader("Content-disposition", "attachment;filename=" + new String((fileName_u).getBytes("gb2312"), "ISO-8859-1") + ".xlsx");
                     //查询数据
-                    List<SpaceAndIncubation> spaceAndIncubationList = questionnaireDao.selectSpaceAndIncubationListNew(id97, id98);
+                    List<SpaceAndIncubation> spaceAndIncubationList = questionnaireDao.selectSpaceAndIncubationListNew(qnYear,id97, id98);
                     if (spaceAndIncubationList != null) {
                         for (int i = 0; i < spaceAndIncubationList.size(); i++) {
                             //excel生成序号

src/main/resources/mapper/Questionnaire.xml

@@ -122,6 +122,7 @@
         FROM t_record
         LEFT JOIN t_answer on t_record.id = t_answer.record_id
         <where>
+           (t_answer.options_id != '' or t_answer.options_id != null)
             <if test="qnYear == null or qnYear == ''"><!-- 年份 -->
                 AND t_record.qn_year = YEAR(NOW())
             </if>
@@ -1054,27 +1055,6 @@
             </if>
         </where>
         ORDER BY create_time DESC
-        <!--        SELECT-->
-        <!--        process_status as 'processStatus',-->
-        <!--        reason as 'reason',-->
-        <!--        create_by as 'createBy',-->
-        <!--        phone_number as 'phoneNumber',-->
-        <!--        qn_year as 'qnYear',-->
-        <!--        write_people as 'writePeople',-->
-        <!--        id as 'id',-->
-        <!--        create_time as 'createTime',-->
-        <!--        questionnaire_uuid as 'questionnaireUuid',-->
-        <!--        questionnaire_name as 'questionnaireName',-->
-        <!--        create_id as 'createId'-->
-        <!--        from t_record-->
-        <!--        <where>-->
-        <!--            <if test="qnYear == null or qnYear == ''">&lt;!&ndash; 年份 &ndash;&gt;-->
-        <!--                AND qn_year = YEAR(NOW())-1-->
-        <!--            </if>-->
-        <!--            <if test="qnYear != null and qnYear != ''">&lt;!&ndash; 年份 &ndash;&gt;-->
-        <!--                AND qn_year = #{qnYear}-->
-        <!--            </if>-->
-        <!--        </where>-->
     </select>
 
     <!-- 问卷管理-导出基础指标1 众创空间场地情况、是否租赁场地(新)-->
@@ -1088,7 +1068,15 @@
         MAX(IF(options_id = #{id3}, `value`, NULL)) as leasePremises
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
-                 where t_record.process_status = 3
+        <where>
+            t_record.process_status = 3
+            <if test="qnYear == null or qnYear == ''"><!-- 年份 -->
+                AND qn_year = YEAR(NOW())
+            </if>
+            <if test="qnYear != null and qnYear != ''"><!-- 年份 -->
+                AND qn_year = #{qnYear}
+            </if>
+        </where>
         GROUP BY t_answer.`group`, t_record.create_by
         ) as queation
         WHERE queation.area IS NOT NULL
@@ -1096,21 +1084,31 @@
     </select>
     <!-- 问卷管理-基础指标2 众创空间配备专职工作人员情况(新)-->
     <select id="selectFullTimeWorkPersonListNew" resultType="com.tiptimes.model.exportDTO.FullTimeWorkPerson">
-        SELECT * FROM
-        (
-        SELECT
-        t_answer.`group`,t_record.create_by as spaceName,
-        MAX(IF(options_id = #{id9},`value`,NULL)) as name,
-        MAX(IF(options_id = #{id10},`value`,NULL)) as office,
-        MAX(IF(options_id = #{id11},`value`,NULL)) as dpt,
-        MAX(IF(options_id = #{id12},`value`,NULL)) as spacePosition,
-        MAX(IF(options_id = #{id13},`value`,NULL)) as phone,
-        MAX(IF(options_id = #{id14},`value`,NULL)) as isfulltime
+        SELECT *
+        FROM (
+        SELECT t_answer.`group`,
+        t_record.create_by as spaceName,
+        MAX(IF(options_id = #{id9}, `value`, NULL)) as name,
+        MAX(IF(options_id = #{id10}, `value`, NULL)) as office,
+        MAX(IF(options_id = #{id11}, `value`, NULL)) as dpt,
+        MAX(IF(options_id = #{id12}, `value`, NULL)) as spacePosition,
+        MAX(IF(options_id = #{id13}, `value`, NULL)) as phone,
+        MAX(IF(options_id = #{id14}, `value`, NULL)) as isfulltime
         FROM t_answer
-        LEFT JOIN t_record ON t_record.id = t_answer.record_id where t_record.process_status=3
-        GROUP BY t_answer.`group`,t_record.create_by
+        LEFT JOIN t_record ON t_record.id = t_answer.record_id
+        <where>
+            t_record.process_status = 3
+            <if test="qnYear == null or qnYear == ''"><!-- 年份 -->
+                AND qn_year = YEAR(NOW())
+            </if>
+            <if test="qnYear != null and qnYear != ''"><!-- 年份 -->
+                AND qn_year = #{qnYear}
+            </if>
+        </where>
+        GROUP BY t_answer.`group`, t_record.create_by
         ) as queation
-        WHERE queation.name IS NOT NULL ORDER BY spaceName
+        WHERE queation.name IS NOT NULL
+        ORDER BY spaceName
     </select>
 
     <!-- 问卷管理-基础指标3 入孵企业情况(新)-->
@@ -1126,7 +1124,15 @@
         MAX(IF(options_id = #{id20}, `value`, NULL)) as isEntryYear
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
-                 where t_record.process_status = 3
+        <where>
+            t_record.process_status = 3
+            <if test="qnYear == null or qnYear == ''"><!-- 年份 -->
+                AND qn_year = YEAR(NOW())
+            </if>
+            <if test="qnYear != null and qnYear != ''"><!-- 年份 -->
+                AND qn_year = #{qnYear}
+            </if>
+        </where>
         GROUP BY t_answer.`group`, t_record.create_by
         ) as queation
         WHERE queation.enterpriseName IS NOT NULL
@@ -1145,7 +1151,15 @@
         MAX(IF(options_id = #{id24}, `value`, NULL)) as isAssessmentPeriod
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
-                 where t_record.process_status = 3
+        <where>
+            t_record.process_status = 3
+            <if test="qnYear == null or qnYear == ''"><!-- 年份 -->
+                AND qn_year = YEAR(NOW())
+            </if>
+            <if test="qnYear != null and qnYear != ''"><!-- 年份 -->
+                AND qn_year = #{qnYear}
+            </if>
+        </where>
         GROUP BY t_answer.`group`, t_record.create_by
         ) as queation
         WHERE queation.enterpriseName IS NOT NULL
@@ -1170,7 +1184,15 @@
         MAX(IF(options_id = #{id34}, `value`, NULL)) as alliance
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
-                 where t_record.process_status = 3
+        <where>
+            t_record.process_status = 3
+            <if test="qnYear == null or qnYear == ''"><!-- 年份 -->
+                AND qn_year = YEAR(NOW())
+            </if>
+            <if test="qnYear != null and qnYear != ''"><!-- 年份 -->
+                AND qn_year = #{qnYear}
+            </if>
+        </where>
         GROUP BY t_answer.`group`, t_record.create_by
         ) as queation
         WHERE queation.courseName IS NOT NULL
@@ -1189,21 +1211,39 @@
         MAX(IF(options_id = #{id38}, `value`, NULL)) as phoneNumber,
         MAX(IF(options_id = #{id39}, `value`, NULL)) as unit,
         MAX(IF(options_id = #{id40}, `value`, NULL)) as position,
-					MAX(IF(options_id = #{id41},`value`,NULL)) as theTitle,
-					MAX(IF(options_id = #{id42},`value`,NULL)) as signingDate,
-					MAX(IF(options_id = #{id43},`value`,NULL)) as contractTime,
-					MAX(IF(options_id = #{id44},`value`,NULL)) as coachingCategory,
-					MAX(IF(options_id = #{id45},`value`,NULL)) as coaching,
-					MAX(IF(options_id = #{id46},`value`,NULL)) as participated,
-					MAX(IF(options_id = #{id47},`value`,NULL)) as contestantYear,
-					MAX(IF(options_id = #{id48},`value`,NULL)) as guideTrack,
-					MAX(IF(options_id = #{id49},`value`,NULL)) as isMaterials,
-					MAX(IF(options_id = #{id50},`value`,NULL)) as mentor,
-					MAX(IF(options_id = #{id51},`value`,NULL)) as isSupporting
+        MAX(IF(options_id = #{id41}, `value`, NULL)) as theTitle,
+        MAX (IF(options_id =
+        #{id42}, `value`, NULL)) as signingDate,
+        MAX (IF(options_id =
+        #{id43}, `value`, NULL)) as contractTime,
+        MAX (IF(options_id =
+        #{id44}, `value`, NULL)) as coachingCategory,
+        MAX (IF(options_id =
+        #{id45}, `value`, NULL)) as coaching,
+        MAX (IF(options_id =
+        #{id46}, `value`, NULL)) as participated,
+        MAX (IF(options_id =
+        #{id47}, `value`, NULL)) as contestantYear,
+        MAX (IF(options_id =
+        #{id48}, `value`, NULL)) as guideTrack,
+        MAX (IF(options_id =
+        #{id49}, `value`, NULL)) as isMaterials,
+        MAX (IF(options_id =
+        #{id50}, `value`, NULL)) as mentor,
+        MAX (IF(options_id =
+        #{id51}, `value`, NULL)) as isSupporting
         FROM t_answer
         LEFT JOIN t_record
         ON t_record.id = t_answer.record_id
-                 where t_record.process_status=3
+        <where>
+            t_record.process_status = 3
+            <if test="qnYear == null or qnYear == ''"><!-- 年份 -->
+                AND qn_year = YEAR(NOW())
+            </if>
+            <if test="qnYear != null and qnYear != ''"><!-- 年份 -->
+                AND qn_year = #{qnYear}
+            </if>
+        </where>
         GROUP BY t_answer.`group`, t_record.create_by
         ) as queation
         WHERE queation.mentorName IS NOT NULL
@@ -1223,7 +1263,15 @@
         MAX(IF(options_id = #{id56}, `value`, NULL)) as platformNewsPhoto
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
-                 where t_record.process_status = 3
+        <where>
+            t_record.process_status = 3
+            <if test="qnYear == null or qnYear == ''"><!-- 年份 -->
+                AND qn_year = YEAR(NOW())
+            </if>
+            <if test="qnYear != null and qnYear != ''"><!-- 年份 -->
+                AND qn_year = #{qnYear}
+            </if>
+        </where>
         GROUP BY t_answer.`group`, t_record.create_by
         ) as queation
         WHERE queation.activityTime IS NOT NULL
@@ -1241,7 +1289,15 @@
         MAX(IF(options_id = #{id59}, `value`, NULL)) as projectName
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
-                 where t_record.process_status = 3
+        <where>
+            t_record.process_status = 3
+            <if test="qnYear == null or qnYear == ''"><!-- 年份 -->
+                AND qn_year = YEAR(NOW())
+            </if>
+            <if test="qnYear != null and qnYear != ''"><!-- 年份 -->
+                AND qn_year = #{qnYear}
+            </if>
+        </where>
         GROUP BY t_answer.`group`, t_record.create_by
         ) as queation
         WHERE queation.eventName IS NOT NULL
@@ -1257,7 +1313,15 @@
         MAX(IF(options_id = #{id60}, `value`, NULL)) as funding
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
-                 where t_record.process_status = 3
+        <where>
+            t_record.process_status = 3
+            <if test="qnYear == null or qnYear == ''"><!-- 年份 -->
+                AND qn_year = YEAR(NOW())
+            </if>
+            <if test="qnYear != null and qnYear != ''"><!-- 年份 -->
+                AND qn_year = #{qnYear}
+            </if>
+        </where>
         GROUP BY t_answer.`group`, t_record.create_by
         ) as queation
         WHERE queation.funding IS NOT NULL
@@ -1275,7 +1339,15 @@
         MAX(IF(options_id = #{id64}, `value`, NULL)) as projectLeaderName
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
-                 where t_record.process_status = 3
+        <where>
+            t_record.process_status = 3
+            <if test="qnYear == null or qnYear == ''"><!-- 年份 -->
+                AND qn_year = YEAR(NOW())
+            </if>
+            <if test="qnYear != null and qnYear != ''"><!-- 年份 -->
+                AND qn_year = #{qnYear}
+            </if>
+        </where>
         GROUP BY t_answer.`group`, t_record.create_by
         ) as queation
         WHERE queation.issueNumber IS NOT NULL
@@ -1293,7 +1365,15 @@
         MAX(IF(options_id = #{id67}, `value`, NULL)) as isSupportingMaterials
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
-                 where t_record.process_status = 3
+        <where>
+            t_record.process_status = 3
+            <if test="qnYear == null or qnYear == ''"><!-- 年份 -->
+                AND qn_year = YEAR(NOW())
+            </if>
+            <if test="qnYear != null and qnYear != ''"><!-- 年份 -->
+                AND qn_year = #{qnYear}
+            </if>
+        </where>
         GROUP BY t_answer.`group`, t_record.create_by
         ) as queation
         WHERE queation.enterpriseName IS NOT NULL
@@ -1312,7 +1392,15 @@
         MAX(IF(options_id = #{id71}, `value`, NULL)) as isSupportingMaterials
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
-                 where t_record.process_status = 3
+        <where>
+            t_record.process_status = 3
+            <if test="qnYear == null or qnYear == ''"><!-- 年份 -->
+                AND qn_year = YEAR(NOW())
+            </if>
+            <if test="qnYear != null and qnYear != ''"><!-- 年份 -->
+                AND qn_year = #{qnYear}
+            </if>
+        </where>
         GROUP BY t_answer.`group`, t_record.create_by
         ) as queation
         WHERE queation.financingEnterpriseName IS NOT NULL
@@ -1330,7 +1418,15 @@
         MAX(IF(options_id = #{id74}, `value`, NULL)) as municipalLevel
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
-                 where t_record.process_status = 3
+        <where>
+            t_record.process_status = 3
+            <if test="qnYear == null or qnYear == ''"><!-- 年份 -->
+                AND qn_year = YEAR(NOW())
+            </if>
+            <if test="qnYear != null and qnYear != ''"><!-- 年份 -->
+                AND qn_year = #{qnYear}
+            </if>
+        </where>
         GROUP BY t_answer.`group`, t_record.create_by
         ) as queation
         WHERE queation.activitiesName IS NOT NULL
@@ -1347,7 +1443,15 @@
         MAX(IF(options_id = #{id76}, `value`, NULL)) as activitiesFrom
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
-                 where t_record.process_status = 3
+        <where>
+            t_record.process_status = 3
+            <if test="qnYear == null or qnYear == ''"><!-- 年份 -->
+                AND qn_year = YEAR(NOW())
+            </if>
+            <if test="qnYear != null and qnYear != ''"><!-- 年份 -->
+                AND qn_year = #{qnYear}
+            </if>
+        </where>
         GROUP BY t_answer.`group`, t_record.create_by
         ) as queation
         WHERE queation.activitiesName IS NOT NULL
@@ -1367,7 +1471,15 @@
         MAX(IF(options_id = #{id81}, `value`, NULL)) as supportingMaterials
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
-                 where t_record.process_status = 3
+        <where>
+            t_record.process_status = 3
+            <if test="qnYear == null or qnYear == ''"><!-- 年份 -->
+                AND qn_year = YEAR(NOW())
+            </if>
+            <if test="qnYear != null and qnYear != ''"><!-- 年份 -->
+                AND qn_year = #{qnYear}
+            </if>
+        </where>
         GROUP BY t_answer.`group`, t_record.create_by
         ) as queation
         WHERE queation.enterpriseName IS NOT NULL
@@ -1388,7 +1500,15 @@
         MAX(IF(options_id = #{id86}, `value`, NULL)) as isSupportingMaterials
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
-                 where t_record.process_status = 3
+        <where>
+            t_record.process_status = 3
+            <if test="qnYear == null or qnYear == ''"><!-- 年份 -->
+                AND qn_year = YEAR(NOW())
+            </if>
+            <if test="qnYear != null and qnYear != ''"><!-- 年份 -->
+                AND qn_year = #{qnYear}
+            </if>
+        </where>
         GROUP BY t_answer.`group`, t_record.create_by
         ) as queation
         WHERE queation.track IS NOT NULL
@@ -1409,7 +1529,15 @@
         MAX(IF(options_id = #{id92}, `value`, NULL)) as supportingMaterials
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
-                 where t_record.process_status = 3
+        <where>
+            t_record.process_status = 3
+            <if test="qnYear == null or qnYear == ''"><!-- 年份 -->
+                AND qn_year = YEAR(NOW())
+            </if>
+            <if test="qnYear != null and qnYear != ''"><!-- 年份 -->
+                AND qn_year = #{qnYear}
+            </if>
+        </where>
         GROUP BY t_answer.`group`, t_record.create_by
         ) as queation
         WHERE queation.eventName IS NOT NULL
@@ -1428,7 +1556,15 @@
         MAX(IF(options_id = #{id96}, `value`, NULL)) as isOutstandingProject
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
-                 where t_record.process_status = 3
+        <where>
+            t_record.process_status = 3
+            <if test="qnYear == null or qnYear == ''"><!-- 年份 -->
+                AND qn_year = YEAR(NOW())
+            </if>
+            <if test="qnYear != null and qnYear != ''"><!-- 年份 -->
+                AND qn_year = #{qnYear}
+            </if>
+        </where>
         GROUP BY t_answer.`group`, t_record.create_by
         ) as queation
         WHERE queation.theYear IS NOT NULL
@@ -1445,7 +1581,15 @@
         MAX(IF(options_id = #{id98}, `value`, NULL)) as isWhetherIncubation
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
-                 where t_record.process_status = 3
+        <where>
+            t_record.process_status = 3
+            <if test="qnYear == null or qnYear == ''"><!-- 年份 -->
+                AND qn_year = YEAR(NOW())
+            </if>
+            <if test="qnYear != null and qnYear != ''"><!-- 年份 -->
+                AND qn_year = #{qnYear}
+            </if>
+        </where>
         GROUP BY t_answer.`group`, t_record.create_by
         ) as queation
         WHERE queation.isWhetherSpace IS NOT NULL