1、增加学生模块

2、人才信息兼容学生信息

menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/ErrorCodeConstants.java

@@ -639,4 +639,7 @@ public interface ErrorCodeConstants {
 
     // ========== 新任命 1_100_064_000 ==========
     ErrorCode NEW_APPOINTMENTS_NOT_EXISTS = new ErrorCode(1_100_064_001, "新任命不存在");
+
+    // ========== 学生信息 1_100_065_000 ==========
+    ErrorCode STUDENT_NOT_EXISTS = new ErrorCode(1_100_065_001, "学生信息不存在");
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/fair/AppFairController.java

@@ -10,6 +10,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -34,6 +35,11 @@ public class AppFairController {
     public CommonResult<List<JobFairRespVO>> list() {
         return success(BeanUtils.toBean(fairService.list(), JobFairRespVO.class));
     }
+    @GetMapping("/get")
+    @Operation(summary = "获得招聘会")
+    public CommonResult<JobFairRespVO> get(@RequestParam("id")  Long id) {
+        return success(BeanUtils.toBean(fairService.getJobFair(id), JobFairRespVO.class));
+    }
 
 
     @GetMapping("/enterprise/page")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/person/info/PersonInfoPageReqVO.java

@@ -18,6 +18,10 @@ import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DA
 @ToString(callSuper = true)
 public class PersonInfoPageReqVO extends PageParam {
 
+
+    @Schema(description = "类型（0求职者 1学生）", example = "18804")
+    private String type;
+
     @Schema(description = "用户id", example = "18804")
     private Long userId;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/person/info/PersonInfoRespVO.java

@@ -18,6 +18,10 @@ public class PersonInfoRespVO {
     @ExcelProperty("id")
     private Long id;
 
+    @Schema(description = "类型（0求职者 1学生）", example = "18804")
+    @ExcelProperty("类型")
+    private String type;
+
     @Schema(description = "用户id", example = "18804")
     @ExcelProperty("用户id")
     private Long userId;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/person/info/PersonInfoSaveReqVO.java

@@ -16,6 +16,9 @@ public class PersonInfoSaveReqVO {
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "25036")
     private Long id;
 
+    @Schema(description = "类型（0求职者 1学生）", example = "18804")
+    private String type;
+
     @Schema(description = "用户id", example = "18804")
     private Long userId;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/person/info/PersonSimpleRespVO.java

@@ -13,6 +13,9 @@ public class PersonSimpleRespVO {
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "25036")
     private Long id;
 
+    @Schema(description = "类型（0求职者 1学生）", example = "18804")
+    private String type;
+
     @Schema(description = "用户id")
     private Long userId;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/person/student/StudentPageReqVO.java

@@ -0,0 +1,82 @@
+package com.citu.module.menduner.system.controller.base.person.student;
+
+
+import com.citu.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 学生信息分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class StudentPageReqVO extends PageParam {
+
+    @Schema(description = "用户id", example = "29180")
+    private Long userId;
+
+    @Schema(description = "人才id", example = "18403")
+    private Long personId;
+
+    @Schema(description = "学生毕业状态 0.未毕业 1.毕业", example = "1")
+    private String graduationStatus;
+
+    @Schema(description = "0.待就业 1.就业", example = "1")
+    private Integer status;
+
+    @Schema(description = "学生就业企业id", example = "12769")
+    private Long enterpriseId;
+
+    @Schema(description = "学号")
+    private String studentNo;
+
+    @Schema(description = "身份证真实姓名", example = "赵六")
+    private String idCardName;
+
+    @Schema(description = "身份证编码")
+    private String idCardNo;
+
+    @Schema(description = "学生认证状态 0.未认证 1.已认证 ", example = "1")
+    private String authStatus;
+
+    @Schema(description = "学校id", example = "23869")
+    private Long schoolId;
+
+    @Schema(description = "学校名称", example = "李四")
+    private String schoolName;
+
+    @Schema(description = "学生班级", example = "19418")
+    private Long schoolClassId;
+
+    @Schema(description = "院系名称", example = "张三")
+    private String schoolDepartmentName;
+
+    @Schema(description = "学生班级", example = "王五")
+    private String schoolClassName;
+
+    @Schema(description = "学生专业", example = "19527")
+    private Long majorId;
+
+    @Schema(description = "学生专业", example = "张三")
+    private String majorName;
+
+    @Schema(description = "专业代码")
+    private String majorCode;
+
+    @Schema(description = "紧急联系人姓名", example = "王五")
+    private String emergencyContactName;
+
+    @Schema(description = "紧急联系人手机号")
+    private String emergencyContactPhone;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/person/student/StudentRespVO.java

@@ -0,0 +1,108 @@
+package com.citu.module.menduner.system.controller.base.person.student;
+
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 学生信息 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class StudentRespVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "58")
+    @ExcelProperty("id")
+    private Long id;
+
+    @Schema(description = "用户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "29180")
+    @ExcelProperty("用户id")
+    private Long userId;
+
+    @Schema(description = "人才id", requiredMode = Schema.RequiredMode.REQUIRED, example = "18403")
+    @ExcelProperty("人才id")
+    private Long personId;
+
+    @Schema(description = "学生毕业状态 0.未毕业 1.毕业", example = "1")
+    @ExcelProperty("学生毕业状态 0.未毕业 1.毕业")
+    private String graduationStatus;
+
+    @Schema(description = "0.待就业 1.就业", example = "1")
+    @ExcelProperty("0.待就业 1.就业")
+    private Integer status;
+
+    @Schema(description = "学生就业企业id", example = "12769")
+    @ExcelProperty("学生就业企业id")
+    private Long enterpriseId;
+
+    @Schema(description = "学号")
+    @ExcelProperty("学号")
+    private String studentNo;
+
+    @Schema(description = "身份证真实姓名", example = "赵六")
+    @ExcelProperty("身份证真实姓名")
+    private String idCardName;
+
+    @Schema(description = "身份证编码")
+    @ExcelProperty("身份证编码")
+    private String idCardNo;
+
+    @Schema(description = "身份证正面")
+    @ExcelProperty("身份证正面")
+    private String idCardImg1;
+
+    @Schema(description = "身份证反面")
+    @ExcelProperty("身份证反面")
+    private String idCardImg2;
+
+    @Schema(description = "学生认证状态 0.未认证 1.已认证 ", example = "1")
+    @ExcelProperty("学生认证状态 0.未认证 1.已认证 ")
+    private String authStatus;
+
+    @Schema(description = "学校id", example = "23869")
+    @ExcelProperty("学校id")
+    private Long schoolId;
+
+    @Schema(description = "学校名称", example = "李四")
+    @ExcelProperty("学校名称")
+    private String schoolName;
+
+    @Schema(description = "学生班级", example = "19418")
+    @ExcelProperty("学生班级")
+    private Long schoolClassId;
+
+    @Schema(description = "院系名称", example = "张三")
+    @ExcelProperty("院系名称")
+    private String schoolDepartmentName;
+
+    @Schema(description = "学生班级", example = "王五")
+    @ExcelProperty("学生班级")
+    private String schoolClassName;
+
+    @Schema(description = "学生专业", example = "19527")
+    @ExcelProperty("学生专业")
+    private Long majorId;
+
+    @Schema(description = "学生专业", example = "张三")
+    @ExcelProperty("学生专业")
+    private String majorName;
+
+    @Schema(description = "专业代码")
+    @ExcelProperty("专业代码")
+    private String majorCode;
+
+    @Schema(description = "紧急联系人姓名", example = "王五")
+    @ExcelProperty("紧急联系人姓名")
+    private String emergencyContactName;
+
+    @Schema(description = "紧急联系人手机号")
+    @ExcelProperty("紧急联系人手机号")
+    private String emergencyContactPhone;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/person/student/StudentSaveReqVO.java

@@ -0,0 +1,81 @@
+package com.citu.module.menduner.system.controller.base.person.student;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+
+@Schema(description = "管理后台 - 学生信息新增/修改 Request VO")
+@Data
+public class StudentSaveReqVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "58")
+    private Long id;
+
+    @Schema(description = "用户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "29180")
+    @NotNull(message = "用户id不能为空")
+    private Long userId;
+
+    @Schema(description = "人才id", requiredMode = Schema.RequiredMode.REQUIRED, example = "18403")
+    @NotNull(message = "人才id不能为空")
+    private Long personId;
+
+    @Schema(description = "学生毕业状态 0.未毕业 1.毕业", example = "1")
+    private String graduationStatus;
+
+    @Schema(description = "0.待就业 1.就业", example = "1")
+    private Integer status;
+
+    @Schema(description = "学生就业企业id", example = "12769")
+    private Long enterpriseId;
+
+    @Schema(description = "学号")
+    private String studentNo;
+
+    @Schema(description = "身份证真实姓名", example = "赵六")
+    private String idCardName;
+
+    @Schema(description = "身份证编码")
+    private String idCardNo;
+
+    @Schema(description = "身份证正面")
+    private String idCardImg1;
+
+    @Schema(description = "身份证反面")
+    private String idCardImg2;
+
+    @Schema(description = "学生认证状态 0.未认证 1.已认证 ", example = "1")
+    private String authStatus;
+
+    @Schema(description = "学校id", example = "23869")
+    private Long schoolId;
+
+    @Schema(description = "学校名称", example = "李四")
+    private String schoolName;
+
+    @Schema(description = "学生班级", example = "19418")
+    private Long schoolClassId;
+
+    @Schema(description = "院系名称", example = "张三")
+    private String schoolDepartmentName;
+
+    @Schema(description = "学生班级", example = "王五")
+    private String schoolClassName;
+
+    @Schema(description = "学生专业", example = "19527")
+    private Long majorId;
+
+    @Schema(description = "学生专业", example = "张三")
+    private String majorName;
+
+    @Schema(description = "专业代码")
+    private String majorCode;
+
+    @Schema(description = "紧急联系人姓名", example = "王五")
+    private String emergencyContactName;
+
+    @Schema(description = "紧急联系人手机号")
+    private String emergencyContactPhone;
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/person/PersonInfoDO.java

@@ -28,6 +28,10 @@ public class PersonInfoDO extends TenantBaseDO {
      */
     @TableId
     private Long id;
+    /**
+     * 类型（0求职者 1学生）
+     */
+    private String type;
     /**
      * 用户id
      */

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/person/StudentDO.java

@@ -0,0 +1,114 @@
+package com.citu.module.menduner.system.dal.dataobject.person;
+
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
+import lombok.*;
+
+/**
+ * 学生信息 DO
+ *
+ * @author Rayson
+ */
+@TableName(value = "mde_student", autoResultMap = true)
+@KeySequence("mde_student_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class StudentDO extends TenantBaseDO {
+
+    /**
+     * id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 用户id
+     */
+    private Long userId;
+    /**
+     * 人才id
+     */
+    private Long personId;
+    /**
+     * 学生毕业状态 0.未毕业 1.毕业
+     */
+    private String graduationStatus;
+    /**
+     * 0.待就业 1.就业
+     */
+    private Integer status;
+    /**
+     * 学生就业企业id
+     */
+    private Long enterpriseId;
+    /**
+     * 学号
+     */
+    private String studentNo;
+    /**
+     * 身份证真实姓名
+     */
+    private String idCardName;
+    /**
+     * 身份证编码
+     */
+    private String idCardNo;
+    /**
+     * 身份证正面
+     */
+    private String idCardImg1;
+    /**
+     * 身份证反面
+     */
+    private String idCardImg2;
+    /**
+     * 学生认证状态 0.未认证 1.已认证
+     */
+    private String authStatus;
+    /**
+     * 学校id
+     */
+    private Long schoolId;
+    /**
+     * 学校名称
+     */
+    private String schoolName;
+    /**
+     * 学生班级
+     */
+    private Long schoolClassId;
+    /**
+     * 院系名称
+     */
+    private String schoolDepartmentName;
+    /**
+     * 学生班级
+     */
+    private String schoolClassName;
+    /**
+     * 学生专业
+     */
+    private Long majorId;
+    /**
+     * 学生专业
+     */
+    private String majorName;
+    /**
+     * 专业代码
+     */
+    private String majorCode;
+    /**
+     * 紧急联系人姓名
+     */
+    private String emergencyContactName;
+    /**
+     * 紧急联系人手机号
+     */
+    private String emergencyContactPhone;
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/job/JobAdvertisedMapper.java

@@ -436,7 +436,7 @@ public interface JobAdvertisedMapper extends BaseMapperX<JobAdvertisedDO> {
         query.inIfPresent(JobAdvertisedDO::getUserId, reqVO.getUserId());
         query.eqIfPresent(JobAdvertisedDO::getId, reqVO.getJobId());
         query.eqIfPresent(JobAdvertisedDO::getStatus, reqVO.getJobStatus());
-
+        query.isNotNull(JobAdvertisedDO::getRefreshTime);
         query.betweenIfPresent(JobAdvertisedDO::getRefreshTime, startTime, endTime);
 
         query.orderByDesc(JobAdvertisedDO::getRefreshTime);

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/person/StudentMapper.java

@@ -0,0 +1,45 @@
+package com.citu.module.menduner.system.dal.mysql.person;
+
+
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.framework.mybatis.core.mapper.BaseMapperX;
+import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.citu.module.menduner.system.controller.base.person.student.StudentPageReqVO;
+import com.citu.module.menduner.system.dal.dataobject.person.StudentDO;
+import org.apache.ibatis.annotations.Mapper;
+
+
+/**
+ * 学生信息 Mapper
+ *
+ * @author Rayson
+ */
+@Mapper
+public interface StudentMapper extends BaseMapperX<StudentDO> {
+
+    default PageResult<StudentDO> selectPage(StudentPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<StudentDO>()
+                .eqIfPresent(StudentDO::getUserId, reqVO.getUserId())
+                .eqIfPresent(StudentDO::getPersonId, reqVO.getPersonId())
+                .eqIfPresent(StudentDO::getGraduationStatus, reqVO.getGraduationStatus())
+                .eqIfPresent(StudentDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(StudentDO::getEnterpriseId, reqVO.getEnterpriseId())
+                .eqIfPresent(StudentDO::getStudentNo, reqVO.getStudentNo())
+                .likeIfPresent(StudentDO::getIdCardName, reqVO.getIdCardName())
+                .eqIfPresent(StudentDO::getIdCardNo, reqVO.getIdCardNo())
+                .eqIfPresent(StudentDO::getAuthStatus, reqVO.getAuthStatus())
+                .eqIfPresent(StudentDO::getSchoolId, reqVO.getSchoolId())
+                .likeIfPresent(StudentDO::getSchoolName, reqVO.getSchoolName())
+                .eqIfPresent(StudentDO::getSchoolClassId, reqVO.getSchoolClassId())
+                .likeIfPresent(StudentDO::getSchoolDepartmentName, reqVO.getSchoolDepartmentName())
+                .likeIfPresent(StudentDO::getSchoolClassName, reqVO.getSchoolClassName())
+                .eqIfPresent(StudentDO::getMajorId, reqVO.getMajorId())
+                .likeIfPresent(StudentDO::getMajorName, reqVO.getMajorName())
+                .eqIfPresent(StudentDO::getMajorCode, reqVO.getMajorCode())
+                .likeIfPresent(StudentDO::getEmergencyContactName, reqVO.getEmergencyContactName())
+                .eqIfPresent(StudentDO::getEmergencyContactPhone, reqVO.getEmergencyContactPhone())
+                .betweenIfPresent(StudentDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(StudentDO::getId));
+    }
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/student/StudentService.java

@@ -0,0 +1,56 @@
+package com.citu.module.menduner.system.service.person.student;
+
+
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.module.menduner.system.controller.base.person.student.StudentPageReqVO;
+import com.citu.module.menduner.system.controller.base.person.student.StudentSaveReqVO;
+import com.citu.module.menduner.system.dal.dataobject.person.StudentDO;
+
+import javax.validation.Valid;
+
+/**
+ * 学生信息 Service 接口
+ *
+ * @author Rayson
+ */
+public interface StudentService {
+
+    /**
+     * 创建学生信息
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createStudent(@Valid StudentSaveReqVO createReqVO);
+
+    /**
+     * 更新学生信息
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateStudent(@Valid StudentSaveReqVO updateReqVO);
+
+    /**
+     * 删除学生信息
+     *
+     * @param id 编号
+     */
+    void deleteStudent(Long id);
+
+    /**
+     * 获得学生信息
+     *
+     * @param id 编号
+     * @return 学生信息
+     */
+    StudentDO getStudent(Long id);
+
+    /**
+     * 获得学生信息分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 学生信息分页
+     */
+    PageResult<StudentDO> getStudentPage(StudentPageReqVO pageReqVO);
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/student/StudentServiceImpl.java

@@ -0,0 +1,72 @@
+package com.citu.module.menduner.system.service.person.student;
+
+
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.framework.common.util.object.BeanUtils;
+import com.citu.module.menduner.system.controller.base.person.student.StudentPageReqVO;
+import com.citu.module.menduner.system.controller.base.person.student.StudentSaveReqVO;
+import com.citu.module.menduner.system.dal.dataobject.person.StudentDO;
+import com.citu.module.menduner.system.dal.mysql.person.StudentMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+
+import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.STUDENT_NOT_EXISTS;
+
+/**
+ * 学生信息 Service 实现类
+ *
+ * @author Rayson
+ */
+@Service
+@Validated
+public class StudentServiceImpl implements StudentService {
+
+    @Resource
+    private StudentMapper studentMapper;
+
+    @Override
+    public Long createStudent(StudentSaveReqVO createReqVO) {
+        // 插入
+        StudentDO student = BeanUtils.toBean(createReqVO, StudentDO.class);
+        studentMapper.insert(student);
+        // 返回
+        return student.getId();
+    }
+
+    @Override
+    public void updateStudent(StudentSaveReqVO updateReqVO) {
+        // 校验存在
+        validateStudentExists(updateReqVO.getId());
+        // 更新
+        StudentDO updateObj = BeanUtils.toBean(updateReqVO, StudentDO.class);
+        studentMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteStudent(Long id) {
+        // 校验存在
+        validateStudentExists(id);
+        // 删除
+        studentMapper.deleteById(id);
+    }
+
+    private void validateStudentExists(Long id) {
+        if (studentMapper.selectById(id) == null) {
+            throw exception(STUDENT_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public StudentDO getStudent(Long id) {
+        return studentMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<StudentDO> getStudentPage(StudentPageReqVO pageReqVO) {
+        return studentMapper.selectPage(pageReqVO);
+    }
+
+}