Merge branch 'master' of http://49.232.152.146:6688/qangqi/dd_school

ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/ViolationDiscipline/index.vue

@@ -372,6 +372,7 @@ export default {
     dicts: ['violate_type', 'violate_num', 'punish_result', 'sys_user_sex', 'semester', 'audit_state', 'semester_jsdzda', 'exam_typeda', 'grade_da', 'class_type_wj', 'yearda', 'rankwj', 'appointment_situation', 'appointment_positions', 'class_num', 'audit_states'],
     data() {
         return {
+            baseUrl: [process.env.VUE_APP_BASE_API],
             queryForm: {
                 pageNum: 1,
                 pageSize: 10,
@@ -727,7 +728,7 @@ export default {
 }
 </script>
 
-<style scoped lang="scss" >
+<style scoped lang="scss">
 .mask {
     position: fixed;
     top: 0;

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/recruit/SchoolRecruitRelation.java

@@ -3,74 +3,111 @@ package yangtz.cs.liu.campus.domain.recruit;
 import com.core.domain.OurBaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
-import lombok.Data;
-
 import java.util.Date;
+import lombok.Data;
 
 @Data
 public class SchoolRecruitRelation extends OurBaseEntity {
-    /** 考试id */
-    @Excel(name = "考试id")
-    private Long examId;
-
-    /** 学生id */
-    @Excel(name = "学生id")
-    private Long studentId;
-
-    /** 审核状态（只存在教育局信息时该字段没有值，0=驳回，1=通过，2 =退回修改,3=待审核） */
-    @Excel(name = "审核状态", readConverterExp = "只=存在教育局信息时该字段没有值，0=驳回，1=通过，2,==退回修改,3=待审核")
-    private String auditStatus;
-
-    /** 匹配状态（0=不匹配，1= 匹配，2=无教育局信息，3=未报名） */
-    @Excel(name = "匹配状态", readConverterExp = "0==不匹配，1=,匹=配，2=无教育局信息，3=未报名")
-    private String matchStatus;
-
-    /** 身份证号码 */
-    @Excel(name = "身份证号码")
-    private String infoIdCard;
-
-    /** 初中学校id */
-    @Excel(name = "初中学校id")
-    private Long juniorId;
-
-    /** 测试项目id */
-    @Excel(name = "测试项目id")
-    private Long testId;
-
-    /** 提交状态(0=未提交，1=已提交) */
-    @Excel(name = "提交状态(0=未提交，1=已提交)")
-    private String submit;
-
-    /** 准考证号 */
-    @Excel(name = "准考证号")
-    private String examNumber;
-
-    /** 分组 */
-    @Excel(name = "分组")
-    private String inGroup;
-
-    /** 考试日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "考试日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date examDate;
-
-    /** 考试时间 */
-    @Excel(name = "考试时间")
-    private String examTime;
-
-    /** 考试地点 */
-    @Excel(name = "考试地点")
-    private String examAddress;
-
-    /** 成绩 */
-    @Excel(name = "成绩")
-    private String score;
-
-    /** 结果 */
-    @Excel(name = "结果")
-    private String result;
-
-    /** 资格线 */
-    @Excel(name = "资格线")
-    private String passScore;
+
+  /**
+   * 考试id
+   */
+  @Excel(name = "考试id")
+  private Long examId;
+
+  /**
+   * 学生id
+   */
+  @Excel(name = "学生id")
+  private Long studentId;
+
+  /**
+   * 审核状态（只存在教育局信息时该字段没有值，0=驳回，1=通过，2 =退回修改,3=待审核）
+   */
+  @Excel(name = "审核状态", readConverterExp = "只=存在教育局信息时该字段没有值，0=驳回，1=通过，2,==退回修改,3=待审核")
+  private String auditStatus;
+
+  /**
+   * 匹配状态（0=不匹配，1= 匹配，2=无教育局信息，3=未报名）
+   */
+  @Excel(name = "匹配状态", readConverterExp = "0==不匹配，1=,匹=配，2=无教育局信息，3=未报名")
+  private String matchStatus;
+
+  /**
+   * 身份证号码
+   */
+  @Excel(name = "身份证号码")
+  private String infoIdCard;
+
+  /**
+   * 初中学校id
+   */
+  @Excel(name = "初中学校id")
+  private Long juniorId;
+
+  /**
+   * 测试项目id
+   */
+  @Excel(name = "测试项目id")
+  private Long testId;
+
+  /**
+   * 提交状态(0=未提交，1=已提交)
+   */
+  @Excel(name = "提交状态(0=未提交，1=已提交)")
+  private String submit;
+
+  /**
+   * 准考证号
+   */
+  @Excel(name = "准考证号")
+  private String examNumber;
+
+  /**
+   * 分组
+   */
+  @Excel(name = "分组")
+  private String inGroup;
+
+  /**
+   * 考试日期
+   */
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  @Excel(name = "考试日期", width = 30, dateFormat = "yyyy-MM-dd")
+  private Date examDate;
+
+  /**
+   * 考试时间
+   */
+  @Excel(name = "考试时间")
+  private String examTime;
+
+  /**
+   * 考试地点
+   */
+  @Excel(name = "考试地点")
+  private String examAddress;
+
+  /**
+   * 成绩
+   */
+  @Excel(name = "成绩")
+  private String score;
+
+  /**
+   * 结果
+   */
+  @Excel(name = "结果")
+  private String result;
+
+  /**
+   * 资格线
+   */
+  @Excel(name = "资格线")
+  private String passScore;
+
+  /**
+   * 驳回意见
+   */
+  private String backMessage;
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/recruit/SchoolRecruitStudentServiceImpl.java

@@ -525,6 +525,7 @@ public class SchoolRecruitStudentServiceImpl extends
     relation.setTestId(student.getTestId());
     relation.setSubmit(RecruitExamConstant.SUBMIT);
     relation.setAuditStatus(RecruitExamConstant.CHECK);
+    relation.setBackMessage("");
     relation.setUpdateTime(DateUtils.getNowDate());
     return recruitRelationMapper.updateById(relation);
   }
@@ -893,7 +894,7 @@ public class SchoolRecruitStudentServiceImpl extends
   }
 
   @Override
-  public int backOne(Long examId, Long studentId) {
+  public int backOne(Long examId, Long studentId, String backMessage) {
     //查询出studentId对应的学生考试信息
     LambdaQueryWrapper<SchoolRecruitRelation> lqw = new LambdaQueryWrapper<>();
     lqw.eq(SchoolRecruitRelation::getExamId, examId)
@@ -911,6 +912,7 @@ public class SchoolRecruitStudentServiceImpl extends
           + "的学生信息已退回修改，没有再次提交申请，无法再次退回修改");
     } else {
       relation.setAuditStatus(RecruitExamConstant.EDIT);
+      relation.setBackMessage(backMessage);
       return recruitRelationMapper.updateById(relation);
     }
   }

smart-campus/src/main/java/yangtz/cs/liu/campus/service/recruit/ISchoolRecruitStudentService.java

@@ -2,17 +2,16 @@ package yangtz.cs.liu.campus.service.recruit;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.core.domain.model.WebLoginBody;
+import java.util.List;
 import yangtz.cs.liu.campus.domain.recruit.SchoolRecruitStudent;
 import yangtz.cs.liu.campus.vo.recruit.RecruitAndEduStudentVo;
 import yangtz.cs.liu.campus.vo.recruit.RecruitEduStudentVo;
 import yangtz.cs.liu.campus.vo.recruit.SchoolRecruitStudentVo;
 import yangtz.cs.liu.webpage.domain.WebRegisterBody;
-import yangtz.cs.liu.webpage.vo.RecruitAdmissionTicketVo;
 import yangtz.cs.liu.webpage.vo.QueryScoreVo;
+import yangtz.cs.liu.webpage.vo.RecruitAdmissionTicketVo;
 import yangtz.cs.liu.webpage.vo.WebSchoolRecruitStudentVo;
 
-import java.util.List;
-
 /**
  * @author xuten
  */
@@ -75,7 +74,7 @@ public interface ISchoolRecruitStudentService extends IService<SchoolRecruitStud
     String back(Long examId, List<Long> studentIds);
 
     /** 教务管理-考试管理-单个退回修改 */
-    int backOne(Long examId, Long studentId);
+    int backOne(Long examId, Long studentId, String backMessage);
 
     /** 教务管理-考试管理-驳回 */
     String reject(Long examId, List<Long> studentIds);

smart-campus/src/main/java/yangtz/cs/liu/campus/vo/recruit/RecruitExamBackVo.java

+package yangtz.cs.liu.campus.vo.recruit;
+
+import lombok.Data;
+
+/**
+ * 报名驳回
+ */
+@Data
+public class RecruitExamBackVo {
+
+  private String message;
+}

smart-campus/src/main/java/yangtz/cs/liu/webpage/vo/WebSchoolRecruitStudentVo.java

@@ -2,13 +2,12 @@ package yangtz.cs.liu.webpage.vo;
 
 import com.core.domain.OurBaseEntity;
 import com.ruoyi.common.annotation.Excel;
+import java.util.List;
 import lombok.Data;
 import yangtz.cs.liu.campus.domain.recruit.SchoolRecruitStudentFamily;
 import yangtz.cs.liu.campus.domain.recruit.SchoolRecruitStudentFjb;
 import yangtz.cs.liu.campus.domain.recruit.SchoolRecruitStudentJl;
 
-import java.util.List;
-
 /**
  * @author xuten
  */
@@ -73,6 +72,7 @@ public class WebSchoolRecruitStudentVo extends OurBaseEntity {
     private String password;
 
     private String auditStatus;
+    private String backMessage;
 
     private List<SchoolRecruitStudentJl> resumeData;
     private List<SchoolRecruitStudentFamily> remeberData;

smart-campus/src/main/resources/mapper/recruit/SchoolRecruitRelationMapper.xml

@@ -33,6 +33,7 @@
            exam_id,
            student_id,
            audit_status,
+           back_message,
            match_status,
            junior_id,
            test_id,

smart-campus/src/main/resources/mapper/recruit/SchoolRecruitStudentMapper.xml

@@ -145,6 +145,7 @@
            sas.phone_number,
            sas.password,
            sar.audit_status,
+           sar.back_message,
            sas.mz,
            sas.zzmm,
            sas.csrq,