修改

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

@@ -546,6 +546,27 @@ public class QuestionnaireCtrl {
         return questionnaireService.AboutViewList(record);
     }
 
+    /**
+     * 统计生成上报记录条数
+     * @param record
+     * @return
+     */
+    @RequestMapping(value = {"/CountYearId"})
+    @ResponseBody
+    public List<Record> CountYearId(@RequestBody Record record) {
+        return questionnaireService.CountYearId(record);
+    }
+
+    /**
+     * 统计生成问卷条数
+     * @param questionnaire
+     * @return
+     */
+    @RequestMapping(value = {"/CountYearIdQuestion"})
+    @ResponseBody
+    public List<Questionnaire> CountYearIdQuestion(@RequestBody Questionnaire questionnaire) {
+        return questionnaireService.CountYearIdQuestion(questionnaire);
+    }
     /**
      * 查询当前登陆人信息
      *
@@ -558,6 +579,7 @@ public class QuestionnaireCtrl {
         return questionnaireService.AboutViewListCopy(record);
     }
 
+
     /**
      * 根据年份查询当前年份所有问题id
      *

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

@@ -47,8 +47,6 @@ public interface QuestionnaireDao {
 
     List<YearId> selectQnYearId(@Param("qnYear") Integer qnYear);
 
-
-
     Record selectById(Long recordId);
 
     List<Record> selectRecordList(Record record);
@@ -118,8 +116,13 @@ public interface QuestionnaireDao {
 
     List<Record> AboutViewList(Record record);
 
+    List<Record> CountYearId(Record record);
+
+    List<Questionnaire> CountYearIdQuestion(Questionnaire questionnaire);
+
     List<Record> AboutViewListCopy(Record record);
 
+
     List<SiteCondition> selectSiteConditionListTemp(
             @Param("recordId") String recordId,
             @Param("qnYear") Integer qnYear,

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

@@ -17,6 +17,16 @@ public class Questionnaire {//问卷相关数据返回Vo
     private String writePeople;//填报人
     private Integer qnYear; //上报年份
     private List<Review>reviewList;//审核备注
+
+    public Integer getCountYearQuestion() {
+        return countYearQuestion;
+    }
+
+    public void setCountYearQuestion(Integer countYearQuestion) {
+        this.countYearQuestion = countYearQuestion;
+    }
+
+    private Integer countYearQuestion;
     private List<YearId> yearIdList;//当前年份--问题id
 
 

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

@@ -17,6 +17,16 @@ public class Record {//上报记录表
     private List<Review> reviews;//评审备注
     private String writePeople;//填报人
     private Integer qnYear; //上报年份
+
+    public Integer getCountYear() {
+        return countYear;
+    }
+
+    public void setCountYear(Integer countYear) {
+        this.countYear = countYear;
+    }
+
+    private Integer countYear;
     private Integer start;
     private Integer length;
 

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

 package com.tiptimes.service;
 
-import com.tiptimes.model.Answer;
-import com.tiptimes.model.PerformanceSummary;
-import com.tiptimes.model.Record;
-import com.tiptimes.model.Review;
-import com.tiptimes.model.YearId;
+import com.tiptimes.model.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -138,6 +134,10 @@ public interface QuestionnaireService {
 
   List<Record> AboutViewList(Record record);
 
+  List<Record> CountYearId(Record record);
+
+  List<Questionnaire> CountYearIdQuestion(Questionnaire questionnaire);
+
   List<Record> AboutViewListCopy(Record record);
 
   void exportFullTimeWorkPersonNew(HttpServletRequest request, HttpServletResponse response, String index, String recordId,Integer qnYear,String createId,

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

@@ -25,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 
 @Service
@@ -48,8 +49,9 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
 
     /**
      * 根据上报人和问卷id查询上报记录id
+     * <p>
+     * //     * @param questionnaireUuid 问卷id
      *
-//     * @param questionnaireUuid 问卷id
      * @param createId 上报人唯一标识
      * @return
      */
@@ -1408,7 +1410,15 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
         return questionnaireDao.AboutViewList(record);
     }
 
+    @Override
+    public List<Record> CountYearId(Record record) {
+        return questionnaireDao.CountYearId(record);
+    }
 
+    @Override
+    public List<Questionnaire> CountYearIdQuestion(Questionnaire questionnaire) {
+        return questionnaireDao.CountYearIdQuestion(questionnaire);
+    }
     @Override
     public List<Record> AboutViewListCopy(Record record) {
         return questionnaireDao.AboutViewListCopy(record);
@@ -1423,7 +1433,7 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
      * @param recordId 上报记录id
      */
     @Override
-    public void exportFullTimeWorkPersonNew(HttpServletRequest request, HttpServletResponse response, String index, String recordId, Integer qnYear,String createId,
+    public void exportFullTimeWorkPersonNew(HttpServletRequest request, HttpServletResponse response, String index, String recordId, Integer qnYear, String createId,
                                             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,
@@ -2040,7 +2050,6 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
                 default:
                     break;
             }
-
         } catch (Exception e) {
             e.printStackTrace();
         }

src/main/resources/mapper/Questionnaire.xml

@@ -1063,6 +1063,19 @@
         </where>
         ORDER BY create_time DESC
     </select>
+
+    <select id="CountYearId" resultType="com.tiptimes.model.Record">
+        SELECT
+            COUNT(CASE WHEN qn_year = YEAR(NOW()) THEN 1 END) AS 'countYear'
+        from t_record
+    </select>
+
+    <select id="CountYearIdQuestion"  resultType="com.tiptimes.model.Questionnaire">
+        SELECT
+            COUNT(CASE WHEN qn_year = YEAR(NOW()) THEN 1 END) AS 'countYearQuestion'
+        from t_questionnaire
+    </select>
+
     <select id="selectRecordList1" resultType="com.tiptimes.model.Record">
         SELECT
         process_status as 'processStatus',
@@ -1075,7 +1088,7 @@
         create_time as 'createTime',
         questionnaire_uuid as 'questionnaireUuid',
         questionnaire_name as 'questionnaireName',
-        create_id as 'createId'
+        create_id as 'createId',
         from t_record
         <where>
             t_record.process_status = '3'
@@ -1120,7 +1133,6 @@
         </where>
         ORDER BY create_time DESC
     </select>
-
     <!-- 问卷管理-导出基础指标1 众创空间场地情况、是否租赁场地(新)-->
     <select id="selectSiteConditionListTemp" resultType="com.tiptimes.model.exportDTO.SiteCondition">
         SELECT *