Merge remote-tracking branch 'origin/master'

yn147

2022-11-24 138ccc9fe4798e5335c49a6407e8cdc70e1ff122

 src/main/java/com/qxueyou/scc/teach/student/service/impl/StudentService.java

@@ -1,11 +1,14 @@
package com.qxueyou.scc.teach.student.service.impl;

import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import cn.hutool.core.date.LocalDateTimeUtil;
import cn.hutool.core.util.RandomUtil;
import com.qxueyou.scc.admin.classes.model.ClsClass;
import com.qxueyou.scc.exam.model.ExamResultV;
import org.apache.commons.lang3.StringUtils;
@@ -74,6 +77,8 @@

        return new Result(true, "success", CollectionUtils.newStringMap("studentId", student.getStudentId(), "password", user.getPassword()));
    }


    @Override
    public Result insertStudent(String classId, String name, String studentNo, boolean sex, String phoneNo, String orgId,String comName) {

@@ -236,6 +241,11 @@
        }

        TraceUtils.setUpdateTrace(student);
        String currentTime = LocalDateTimeUtil.format(LocalDateTime.now(), "yyMMddHHmmssSSS");

        String examCardNo = currentTime.concat(RandomUtil.randomNumbers(1));

        student.setStudentNumber(examCardNo);
        student.setStatus(status);
        save(student);