代码提交

dms-dormitory/src/main/resources/mapper/dormitory/SrsDormitoryStudentMapper.xml

@@ -287,7 +287,7 @@
     <select id="listFdyCanDorm" parameterType="String" resultType="DmsDormitoryClass">
         select a.*
         from dms_dormitory_class as a
-        where a.t_no = 20210110 and is_lock = 1
+        where a.t_no = #{fdyNo} and is_lock = 1
     </select>
 
 </mapper>

srs-admin/src/main/java/com/srs/web/controller/stureg/SrsOrderController.java

@@ -169,6 +169,7 @@ public class SrsOrderController extends BaseController
                     Long teacherId = srsClass.getTeacherId();
                     CphTeacher cphTeacher = cphTeacherMapper.selectCphTeacherByTeacherId(teacherId);
                     String employeeId = cphTeacher.getEmployeeId();
+                    // 自动分配宿舍
                     srsDormitoryStudentService.assignDormitoryByTeacher(employeeId);
 
                     return AjaxResult.success("已缴费");

srs-admin/src/main/java/com/srs/web/controller/survey/SurItineraryController.java

@@ -1,16 +1,17 @@
 package com.srs.web.controller.survey;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 import com.srs.comprehensive.domain.ViewStuInfo;
+import com.srs.survey.domain.dto.LeaveExport;
 import com.srs.survey.domain.dto.LeaveRes;
 import com.srs.survey.domain.dto.ReturnRes;
-import com.srs.survey.domain.dto.SubmitRes;
 import com.srs.survey.domain.vo.SurItineraryStatisticsVo;
+import com.srs.survey.service.ISurSurveyService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.parameters.P;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.*;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -36,6 +37,8 @@ import com.srs.common.core.page.TableDataInfo;
 public class SurItineraryController extends BaseController {
     @Autowired
     private ISurItineraryService surItineraryService;
+    @Autowired
+    private ISurSurveyService surSurveyService;
 
     @GetMapping("/countFdyClassWillLeave/{surveyId}")
     @ApiOperation("统计预计离校")
@@ -286,6 +289,45 @@ public class SurItineraryController extends BaseController {
         ExcelUtil<SurItinerary> util = new ExcelUtil<SurItinerary>(SurItinerary.class);
         util.exportExcel(response, list, "学生假期返校数据");
     }
+    /**
+     * 导出学生假期离校
+     */
+//    @PreAuthorize("@ss.hasPermi('survey:itinerary:LeavExport')")
+    @Log(title = "学生假期离校填写", businessType = BusinessType.EXPORT)
+    @PostMapping("/LeavExport")
+    @ApiOperation("导出学生假期离校填写列表")
+    public void LeavExport(HttpServletResponse response, SurItinerary param)
+    {
+        param.pageSize=100000L;
+        param.tNo=getUsername();
+        param.isLeave="1";
+        Map<String,Object> result=surItineraryService.listFdyStuLeave(param);
+        ExcelUtil<LeaveExport> util = new ExcelUtil<LeaveExport>(LeaveExport.class);
+        List<LeaveExport> listExport=new ArrayList<>();
+        List<ViewStuInfo> rows = (List<ViewStuInfo>) result.get("rows");
+        for (ViewStuInfo student : rows) {
+            LeaveExport entity=new LeaveExport();
+            // 逐条取出每个学生的数据
+            Long surveyId=param.getSurveyId();
+            String surveyName =surveyId==null?"": surSurveyService.selectSurSurveyBySurveyId(surveyId).getSurveyName();
+            String className =student.getClassName();
+            String stuNo =student.getStuNo();
+            String stuName =student.getStuName();
+            String status =student.getStatus();
+            String editStatus =student.getEditStatus();
+            entity.setSurveyName(surveyName);
+            entity.setClassName(className);
+            entity.setStuNo(stuNo);
+            entity.setName(stuName);
+            if(status.equals("01")) {
+                entity.setStatus("在校");
+            }
+            entity.setEditStatus(editStatus);
+            listExport.add(entity);
+        }
+        util.exportExcel(response, listExport, "学生假期离校填写数据");
+    }
+
 
     /**
      * 获取学生假期返校详细信息

srs-comprehensive/src/main/java/com/srs/comprehensive/domain/ViewStuInfo.java

@@ -217,6 +217,7 @@ private static final long serialVersionUID=1L;
 
     @TableField(exist = false)
     public String editStatus;
-
+    @TableField(exist = false)
+    public String surveyName;
 
 }

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}