代码提交

srs-survey/src/main/java/com/srs/survey/domain/dto/LeaveExport.java

@@ -0,0 +1,20 @@
+package com.srs.survey.domain.dto;
+
+import com.srs.common.annotation.Excel;
+import lombok.Data;
+
+@Data
+public class LeaveExport {
+    @Excel(name = "主题")
+    public String surveyName;
+    @Excel(name = "班级")
+    public String className;
+    @Excel(name = "学号")
+    public String stuNo;
+    @Excel(name = "姓名")
+    public String name;
+    @Excel(name = "学生状态")
+    public String status;
+    @Excel(name = "是否填写")
+    public String editStatus;
+}

srs-survey/src/main/resources/mapper/survey/SurItineraryMapper.xml

@@ -60,7 +60,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="surveyId != null "> and survey_id = #{surveyId}</if>
         </where>
     </select>
-
     <select id="selectSurItineraryByReturnSchoolId" parameterType="Long" resultMap="SurItineraryResult">
         <include refid="selectSurItineraryVo"/>
         where return_school_id = #{returnSchoolId}