修改导出文件、修改SQL、修改导出文件头

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

@@ -303,10 +303,10 @@ public interface QuestionnaireDao {
             @Param("qnYear") Integer qnYear,
             @Param("createId") String createId,
             @Param("id77") Integer id77,
-            @Param("id76") Integer id78,
-            @Param("id77") Integer id79,
-            @Param("id76") Integer id80,
-            @Param("id77") Integer id81
+            @Param("id78") Integer id78,
+            @Param("id79") Integer id79,
+            @Param("id80") Integer id80,
+            @Param("id81") Integer id81
     );
 
     List<NationalCompetitionAwards> selectNationalCompetitionAwardsListNew(

src/main/java/com/tiptimes/model/exportDTO/SigningMentors.java

@@ -59,13 +59,13 @@ public class SigningMentors {
     @ExcelProperty({"签约创业导师情况","指导赛道"})
     private String guideTrack;
 
-    @ExcelProperty({"签约创业导师情况","是否发送佐证材料"})
+    @ExcelProperty({"签约创业导师情况","是否发送佐证材料(互联网+)"})
     private String isMaterials;
 
     @ExcelProperty({"签约创业导师情况","教育部入库创业导师"})
     private String mentor;
 
-    @ExcelProperty({"签约创业导师情况","是否发送佐证材料"})
+    @ExcelProperty({"签约创业导师情况","是否发送佐证材料(入库导师)"})
     private String isSupporting;
 
     public Integer getIndex() {

src/main/resources/mapper/Questionnaire.xml

@@ -1298,7 +1298,7 @@
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
         <where>
-            t_record.process_status = 3
+            t_record.process_status = 3 and t_answer.`group`=2
             <if test="createId != null and createId != ''">
                 AND create_id = #{createId}
             </if>
@@ -1329,7 +1329,7 @@
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
         <where>
-            t_record.process_status = 3
+            t_record.process_status = 3 and t_answer.`group`=3
             <if test="createId != null and createId != ''">
                 AND create_id = #{createId}
             </if>
@@ -1360,7 +1360,7 @@
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
         <where>
-            t_record.process_status = 3
+            t_record.process_status = 3 and t_answer.`group`=4
             <if test="createId != null and createId != ''">
                 AND create_id = #{createId}
             </if>
@@ -1390,7 +1390,7 @@
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
         <where>
-            t_record.process_status = 3
+            t_record.process_status = 3 and t_answer.`group`=5
             <if test="createId != null and createId != ''">
                 AND create_id = #{createId}
             </if>
@@ -1426,7 +1426,7 @@
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
         <where>
-            t_record.process_status = 3
+            t_record.process_status = 3 and t_answer.`group`=6
             <if test="createId != null and createId != ''">
                 AND create_id = #{createId}
             </if>
@@ -1454,7 +1454,7 @@
         MAX(IF(options_id = #{id37}, `value`, NULL)) as record,
         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 positions,
+        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,
@@ -1470,7 +1470,7 @@
         LEFT JOIN t_record
         ON t_record.id = t_answer.record_id
         <where>
-            t_record.process_status = 3
+            t_record.process_status = 3 and t_answer.`group`=7
             <if test="createId != null and createId != ''">
                 AND create_id = #{createId}
             </if>
@@ -1501,7 +1501,7 @@
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
         <where>
-            t_record.process_status = 3
+            t_record.process_status = 3 and t_answer.`group`=8
             <if test="createId != null and createId != ''">
                 AND create_id = #{createId}
             </if>
@@ -1530,7 +1530,7 @@
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
         <where>
-            t_record.process_status = 3
+            t_record.process_status = 3 and t_answer.`group`=9
             <if test="createId != null and createId != ''">
                 AND create_id = #{createId}
             </if>
@@ -1557,7 +1557,7 @@
         FROM t_answer
         LEFT JOIN t_record ON t_record.id = t_answer.record_id
         <where>
-            t_record.process_status = 3
+            t_record.process_status = 3 and t_answer.`group`=10
             <if test="createId != null and createId != ''">
                 AND create_id = #{createId}
             </if>