毕业管理page接口

src/main/java/com/xjrsoft/module/student/controller/BaseStudentGraduateController.java

@@ -47,7 +47,6 @@ public class BaseStudentGraduateController {
     @ApiOperation(value="学生毕业管理列表(分页)")
     @SaCheckPermission("basestudentgraduate:detail")
     public RT<PageOutput<BaseStudentGraduatePageVo>> page(@Valid BaseStudentGraduatePageDto dto){
-
         Page<BaseStudentGraduatePageVo> page = baseStudentGraduateService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
         PageOutput<BaseStudentGraduatePageVo> pageOutput = ConventPage.getPageOutput(page, BaseStudentGraduatePageVo.class);
         return RT.ok(pageOutput);

src/main/java/com/xjrsoft/module/student/dto/BaseStudentGraduatePageDto.java

@@ -1,5 +1,7 @@
 package com.xjrsoft.module.student.dto;
 
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
 import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -19,21 +21,19 @@ public class BaseStudentGraduatePageDto extends PageInput {
     @ApiModelProperty("学籍状态")
     public String archivesStatus;
 
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("就读方式")
+    @ApiModelProperty("就读方式")
+    private String stduyStatus;
+
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学籍形式")
+    @ApiModelProperty("学籍形式")
+    private String rollModality;
+
     @ApiModelProperty("姓名")
     public String name;
 
-    @ApiModelProperty("学号")
-    public String studentId;
-
     @ApiModelProperty("是否发放毕业证(0:未发放 1:已发放)")
     public Integer status;
-
-    @ApiModelProperty("证书编号")
-    public String certificateNumber;
-
-    @ApiModelProperty("年级id")
-    public Long gradeId;
-
-    @ApiModelProperty("班级id")
-    public Long classId;
 }

src/main/java/com/xjrsoft/module/student/vo/BaseStudentGraduatePageVo.java

@@ -46,6 +46,13 @@ public class BaseStudentGraduatePageVo {
     @ExcelProperty("学生姓名")
     @ApiModelProperty("学生姓名")
     private String name;
+    /**
+     * 联系方式
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("联系方式")
+    @ApiModelProperty("联系方式")
+    private String phone;
     /**
     * 专业
     */
@@ -59,7 +66,42 @@ public class BaseStudentGraduatePageVo {
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("就读方式")
     @ApiModelProperty("就读方式")
+    private String stduyStatus;
+    /**
+     * 修改时间
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("就读方式")
+    @ApiModelProperty("就读方式")
     private String stduyStatusCn;
+    /**
+     * 学籍状态
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学籍状态")
+    @ApiModelProperty("学籍状态")
+    private String archivesStatus;
+    /**
+     * 学籍状态
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学籍状态")
+    @ApiModelProperty("学籍状态")
+    private String archivesStatusCn;
+    /**
+     * 学籍形式
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学籍形式")
+    @ApiModelProperty("学籍形式")
+    private String rollModality;
+    /**
+     * 学籍形式
+     */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学籍形式")
+    @ApiModelProperty("学籍形式")
+    private String rollModalityCn;
     /**
     * 删除标记
     */

src/main/resources/mapper/student/BaseStudentGraduateMapper.xml

@@ -4,39 +4,57 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xjrsoft.module.student.mapper.BaseStudentGraduateMapper">
     <select id="getPage" parameterType="com.xjrsoft.module.student.dto.BaseStudentGraduatePageDto" resultType="com.xjrsoft.module.student.vo.BaseStudentGraduatePageVo">
-        SELECT t5.id,t1.user_id,t1.student_id,t2.name,t4.name AS major_name,t6.name AS stduy_status_cn,
-        IFNULL(t5.status,0) AS status,t5.certificate_number,t5.certificate_date,t7.name AS class_name,t8.name AS grade_name,t5.appendix_id FROM base_student t1
+        SELECT t5.id,
+        t1.user_id,
+        t1.student_id,
+        t2.name,
+        t2.gender,
+        t9.name as genderCn,
+        t2.mobile as phone,
+        t4.name              AS major_name,
+        t3.stduy_status,
+        t6.name              AS stduy_status_cn,
+        t3.archives_status,
+        t10.name              AS archives_status_cn,
+        t3.roll_modality,
+        t12.name              AS roll_modality_cn,
+        IFNULL(t5.status, 0) AS status,
+        t5.certificate_number,
+        t5.certificate_date,
+        t7.name              AS class_name,
+        t8.name              AS grade_name,
+        t5.appendix_id
+        FROM base_student t1
         LEFT JOIN xjr_user t2 ON t1.user_id = t2.id
         LEFT JOIN base_student_school_roll t3 ON t1.user_id = t3.user_id
         LEFT JOIN base_major_set t4 ON t3.major_set_id = t4.id
         LEFT JOIN base_student_graduate t5 ON t1.user_id = t5.user_id
-        LEFT JOIN xjr_dictionary_detail t6 ON t3.stduy_status = t6.code AND t6.item_id = 2023000000000000030
+        LEFT JOIN xjr_dictionary_detail t6 ON t3.stduy_status = t6.code
         LEFT JOIN base_class t7 ON t7.id = t3.class_id
         LEFT JOIN base_grade t8 ON t8.id = t3.grade_id
-        WHERE t1.delete_mark = 0 AND t2.delete_mark = 0
+        LEFT JOIN xjr_dictionary_detail t9 on t9.code = t2.gender
+        LEFT JOIN xjr_dictionary_detail t10 on t10.code = t3.archives_status
+        LEFT JOIN xjr_dictionary_detail t12 on t12.code = t3.roll_modality
+        WHERE t1.delete_mark = 0
+        AND t2.delete_mark = 0
         AND t3.delete_mark = 0
-        <if test="dto.gradeId != null and dto.gradeId > 0">
-            and t3.grade_id = #{dto.gradeId}
-        </if>
-        <if test="dto.classId != null and dto.classId > 0">
-            and t3.class_id = #{dto.classId}
-        </if>
         <if test="dto.archivesStatus != null and dto.archivesStatus != ''">
             and t3.archives_status = #{dto.archivesStatus}
         </if>
+        <if test="dto.stduyStatus != null and dto.stduyStatus != ''">
+            and t3.stduy_status = #{dto.stduyStatus}
+        </if>
+        <if test="dto.rollModality != null and dto.rollModality != ''">
+            and t3.roll_modality = #{dto.rollModality}
+        </if>
         <if test="dto.name != null and dto.name != ''">
             and t2.name like concat('%',#{dto.name}, '%')
         </if>
-        <if test="dto.studentId != null and dto.studentId > 0">
-            and t1.student_id = #{dto.studentId}
-        </if>
         <if test="dto.status != null">
             and t5.status = #{dto.status}
         </if>
-        <if test="dto.certificateNumber != null and dto.certificateNumber != ''">
-            and t5.certificate_number = #{dto.certificateNumber}
-        </if>
     </select>
+
     <select id="getInfoById" resultType="com.xjrsoft.module.student.vo.BaseStudentGraduateVo">
         SELECT t5.id,t1.user_id,t1.student_id,t2.name,t4.name AS major_name,t6.name AS stduy_status_cn,
         IFNULL(t5.status,0) AS status,t5.certificate_number,t5.certificate_date,t7.name AS class_name,t8.name AS grade_name,t5.folder_id FROM base_student t1