指标导出/当前年份问题id查询

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

@@ -23,38 +23,40 @@ public interface QuestionnaireDao {
 
     Questionnaire queryQuestionnaireList(@Param("qnYear") Integer qnYear);
 
-    Long selectRecordId(@Param("questionnaireUuid")Long questionnaireUuid,
-                        @Param("createId")String createId);
+    Long selectRecordId(@Param("questionnaireUuid") Long questionnaireUuid,
+                        @Param("createId") String createId);
 
     Long insertRecord(Record record);
 
-    Integer delAnswer(@Param("recordId")Long recordId);
+    Integer delAnswer(@Param("recordId") Long recordId);
 
     Integer insertAnswer(@Param("list") List<Answer> answerList,
-                         @Param("recordId")Long recordId);
+                         @Param("recordId") Long recordId);
 
     Integer updateRecord(Record record);
 
-    Integer delView(@Param("recordId")Long recordId,@Param("questionsId")Long questionsId);
+    Integer delView(@Param("recordId") Long recordId, @Param("questionsId") Long questionsId);
 
-    Integer insertReview(@Param("list") List<Review> list, @Param("recordId")Long recordId);
+    Integer insertReview(@Param("list") List<Review> list, @Param("recordId") Long recordId);
 
-    List<Answer> selectAnswerByRecordId(@Param("recordId")Long recordId);
+    List<Answer> selectAnswerByRecordId(@Param("recordId") Long recordId);
 
-    List<Review> selectReviewByRecordId(@Param("recordId")Long recordId);
+    List<Review> selectReviewByRecordId(@Param("recordId") Long recordId);
+
+    List<YearId> selectQnYearId(@Param("qnYear") Integer qnYear);
 
     Record selectById(Long recordId);
 
     List<Record> selectRecordList(Record record);
 
     List<String> selectFileId(@Param("optionId") Long optionId,
-                              @Param("recordId")Long recordId);
+                              @Param("recordId") Long recordId);
 
     List<PerformanceSummary> selectPerformanceSummaryList(PerformanceSummary performanceSummary);
 
     List<PerformanceSummary> selectPerformanceSummaryListNew(PerformanceSummary performanceSummary);
 
-    List<FullTimeWorkPerson> selectFullTimeWorkPersonList(@Param("recordId")String recordId);
+    List<FullTimeWorkPerson> selectFullTimeWorkPersonList(@Param("recordId") String recordId);
 
     List<SiteCondition> selectSiteConditionList();
 
@@ -68,7 +70,7 @@ public interface QuestionnaireDao {
 
     List<OrganizationActivity> selectOrganizationActivityList();
 
-    List<CompetingSituation>  selectCompetingSituationList();
+    List<CompetingSituation> selectCompetingSituationList();
 
     List<EntrepreneurshipFunding> selectEntrepreneurshipFundingList();
 
@@ -102,7 +104,7 @@ public interface QuestionnaireDao {
 
     List<Integer> selectAnswerByQuestion(@Param("recordId") Long recordId);
 
-    Review selectOneReviewByRecordIdAndQuestionsId(@Param("recordId") Long recordId,@Param("questionsId") Long questionsId);
+    Review selectOneReviewByRecordIdAndQuestionsId(@Param("recordId") Long recordId, @Param("questionsId") Long questionsId);
 
     Integer updateOneReviewByRecordIdAndQuestionsId(@Param("review") Review review);
 
@@ -111,4 +113,156 @@ public interface QuestionnaireDao {
     List<Review> selectReviewListByRecordId(@Param("recordId") Long recordId);
 
     List<Record> AboutViewList(Record record);
+
+    List<SiteCondition> selectSiteConditionListTemp(
+            @Param("recordId") String recordId,
+            @Param("id1") Integer id1,
+            @Param("id2") Integer id2,
+            @Param("id3") Integer id3
+    );
+
+    List<FullTimeWorkPerson> selectFullTimeWorkPersonListNew(
+            @Param("recordId") String recordId,
+            @Param("id9") Integer id9,
+            @Param("id10") Integer id10,
+            @Param("id11") Integer id11,
+            @Param("id12") Integer id12,
+            @Param("id13") Integer id13,
+            @Param("id14") Integer id14
+    );
+
+    List<IncubatedEnterprises> selectIncubatedEnterprisesListNew(
+            @Param("recordId") String recordId,
+            @Param("id16") Integer id16,
+            @Param("id17") Integer id17,
+            @Param("id18") Integer id18,
+            @Param("id19") Integer id19,
+            @Param("id20") Integer id20
+    );
+
+    List<EmploymentSituation> selectEmploymentSituationListNew(
+            @Param("id21") Integer id21,
+            @Param("id22") Integer id22,
+            @Param("id23") Integer id23,
+            @Param("id24") Integer id24
+    );
+
+    List<EntrepreneurshipCourses> selectEntrepreneurshipCoursesListNew(
+            @Param("id25") Integer id25,
+            @Param("id26") Integer id26,
+            @Param("id27") Integer id27,
+            @Param("id28") Integer id28,
+            @Param("id29") Integer id29,
+            @Param("id30") Integer id30,
+            @Param("id31") Integer id31,
+            @Param("id32") Integer id32,
+            @Param("id33") Integer id33,
+            @Param("id34") Integer id34
+    );
+
+    List<SigningMentors> selectSigningMentorsListNew(
+            @Param("id35") Integer id35,
+            @Param("id36") Integer id36,
+            @Param("id37") Integer id37,
+            @Param("id38") Integer id38,
+            @Param("id39") Integer id39,
+            @Param("id40") Integer id40,
+            @Param("id41") Integer id41,
+            @Param("id42") Integer id42,
+            @Param("id43") Integer id43,
+            @Param("id44") Integer id44,
+            @Param("id45") Integer id45,
+            @Param("id46") Integer id46,
+            @Param("id47") Integer id47,
+            @Param("id48") Integer id48,
+            @Param("id49") Integer id49,
+            @Param("id50") Integer id50,
+            @Param("id51") Integer id51
+    );
+
+
+    List<OrganizationActivity> selectOrganizationActivityListNew(
+            @Param("id52") Integer id52,
+            @Param("id53") Integer id53,
+            @Param("id54") Integer id54,
+            @Param("id55") Integer id55,
+            @Param("id56") Integer id56
+    );
+
+    List<CompetingSituation> selectCompetingSituationListNew(
+            @Param("id57") Integer id57,
+            @Param("id58") Integer id58,
+            @Param("id59") Integer id59
+    );
+
+    List<EntrepreneurshipFunding> selectEntrepreneurshipFundingListNew(
+            @Param("id60") Integer id60
+    );
+
+    List<EntrepreneurshipProject> selectEntrepreneurshipProjectListNew(
+            @Param("id62") Integer id62,
+            @Param("id63") Integer id63,
+            @Param("id64") Integer id64
+    );
+
+    List<EnterprisestAmount> selecEnterprisestAmountListNew(
+            @Param("id65") Integer id65,
+            @Param("id66") Integer id66,
+            @Param("id67") Integer id67
+    );
+
+    List<EvaluationBorrowing> selectEvaluationBorrowingListNew(
+            @Param("id68") Integer id68,
+            @Param("id69") Integer id69,
+            @Param("id70") Integer id70,
+            @Param("id71") Integer id71
+    );
+
+    List<InnovationWeek> selectInnovationWeekListNew(
+            @Param("id72") Integer id72,
+            @Param("id73") Integer id73,
+            @Param("id74") Integer id74
+    );
+
+    List<CollegeSituation> selectCollegeSituationListNew(
+            @Param("id75") Integer id75,
+            @Param("id76") Integer id76
+    );
+
+    List<EnterprisesIntellectual> selectEnterprisesIntellectualListNew(
+            @Param("id77") Integer id77,
+            @Param("id76") Integer id78,
+            @Param("id77") Integer id79,
+            @Param("id76") Integer id80,
+            @Param("id77") Integer id81
+    );
+
+    List<NationalCompetitionAwards> selectNationalCompetitionAwardsListNew(
+            @Param("id82") Integer id82,
+            @Param("id83") Integer id83,
+            @Param("id84") Integer id84,
+            @Param("id85") Integer id85,
+            @Param("id86") Integer id86
+    );
+
+    List<EducationCommission> selectEducationCommissionListNew(
+            @Param("id87") Integer id87,
+            @Param("id88") Integer id88,
+            @Param("id89") Integer id89,
+            @Param("id90") Integer id90,
+            @Param("id91") Integer id91,
+            @Param("id92") Integer id92
+    );
+
+    List<EntrepreneurialProject> selectEntrepreneurialProjectListNew(
+            @Param("id93") Integer id93,
+            @Param("id94") Integer id94,
+            @Param("id95") Integer id95,
+            @Param("id96") Integer id96
+    );
+
+    List<SpaceAndIncubation> selectSpaceAndIncubationListNew(
+            @Param("id97") Integer id97,
+            @Param("id98") Integer id98
+    );
 }

src/main/java/com/tiptimes/model/Questionnaire.java

@@ -17,6 +17,8 @@ public class Questionnaire {//问卷相关数据返回Vo
     private String writePeople;//填报人
     private Integer qnYear; //上报年份
     private List<Review>reviewList;//审核备注
+    private List<YearId> yearIdList;//当前年份--问题id
+
 
     public String getQuestionnaireUuid() {
         return questionnaireUuid;
@@ -42,6 +44,10 @@ public class Questionnaire {//问卷相关数据返回Vo
         this.reviewList = reviewList;
     }
 
+    public List<YearId> getYearIdList(){return  yearIdList;}
+
+    public void setYearIdList(List<YearId> yearIdList){this.yearIdList = yearIdList;}
+
     public String getCreateId() {
         return createId;
     }

src/main/java/com/tiptimes/model/Record.java

 package com.tiptimes.model;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.util.Date;
 import java.util.List;
 

src/main/java/com/tiptimes/model/YearId.java

+package com.tiptimes.model;
+
+public class YearId {
+    private Long id;
+    private Integer qnYear;//上报年份
+    private Integer  optionsId;//题目id
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Integer getQnYear() {
+        return qnYear;
+    }
+
+    public void setQnYear(Integer qnYear) {
+        this.qnYear = qnYear;
+    }
+
+    public Integer getOptionsId() {
+        return optionsId;
+    }
+
+    public void setOptionsId(Integer optionsId) {
+        this.optionsId = optionsId;
+    }
+
+    public YearId(){
+
+    }
+
+    public YearId(Long id,Integer qnYear,Integer optionsId){
+        this.id = id;
+        this.qnYear = qnYear;
+        this.optionsId = optionsId;
+    }
+
+}

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

@@ -4,9 +4,9 @@ import com.tiptimes.model.Answer;
 import com.tiptimes.model.PerformanceSummary;
 import com.tiptimes.model.Record;
 import com.tiptimes.model.Review;
-import com.tiptimes.model.exportDTO.FullTimeWorkPerson;
+import com.tiptimes.model.YearId;
 import com.tiptimes.model.exportDTO.SiteCondition;
-import org.apache.ibatis.annotations.Param;
+import org.springframework.data.annotation.Id;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -80,6 +80,12 @@ public interface QuestionnaireService {
    */
   List<Review> selectReviewByRecordId(Long recordId);
 
+  /**
+   * 根据年份查询当前年份对应的问题id
+   * @return
+   */
+  List<YearId> selectQnYearId(Integer qnYear);
+
   /**
    *根据记录id查询评审备注详情
    * @param recordId 记录id
@@ -125,6 +131,31 @@ public interface QuestionnaireService {
   Map<String,Object> generateRecordTask();
 
   List<Record> AboutViewList(Record record);
+
+  void exportFullTimeWorkPersonNew(HttpServletRequest request, HttpServletResponse response, String index, String recordId,
+                                   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,
+                                   Integer id21, Integer id22, Integer id23, Integer id24,
+                                   Integer id25, Integer id26, Integer id27, Integer id28, Integer id29, Integer id30, Integer id31, Integer id32, Integer id33, Integer id34,
+                                   Integer id35, Integer id36, Integer id37, Integer id38, Integer id39, Integer id40,Integer id41,Integer id42,Integer id43,Integer id44,
+                                   Integer id45, Integer id46,Integer id47,Integer id48,Integer id49,Integer id50,Integer id51,
+                                   Integer id52,Integer id53,Integer id54,Integer id55,Integer id56,
+                                   Integer id57,Integer id58,Integer id59,
+                                   Integer id60,
+                                   Integer id62, Integer id63, Integer id64,
+                                   Integer id65,Integer id66,Integer id67,
+                                   Integer id68,Integer id69,Integer id70,Integer id71,
+                                   Integer id72,Integer id73,Integer id74,
+                                   Integer id75,Integer id76,
+                                   Integer id77,Integer id78,Integer id79,Integer id80,Integer id81,
+                                   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
+                                   );
+
+
 }