学生信息，来源

web/src/main/java/com/ibeetl/jlw/entity/Student.java

@@ -78,6 +78,11 @@ public class Student extends BaseEntity implements AbstractToken {
     //添加时间
 
     private Date addTime ;
+
+    /**
+     * 账号来源
+     */
+    private String codeFrom;
 	
     //组织机构ID
 
@@ -92,7 +97,7 @@ public class Student extends BaseEntity implements AbstractToken {
     @InsertIgnore
     @DictDeep
     private SchoolClass schoolClass;
-	
+
     public Student(){
     }
 
@@ -294,4 +299,12 @@ public class Student extends BaseEntity implements AbstractToken {
     public void setStudentQq(String studentQq) {
         this.studentQq = studentQq;
     }
+
+    public String getCodeFrom() {
+        return codeFrom;
+    }
+
+    public void setCodeFrom(String codeFrom) {
+        this.codeFrom = codeFrom;
+    }
 }

web/src/main/java/com/ibeetl/jlw/service/StudentService.java

@@ -4,7 +4,6 @@ package com.ibeetl.jlw.service;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.util.ReUtil;
 import cn.jlw.util.ToolUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -591,8 +590,9 @@ public class StudentService extends CoreBaseService<Student>{
 
                             String schoolClassId = "";
                             // 通过名字查询院校信息，如果查询不到就告诉前台需要先去添加院校
+                            String[] classSplit = className.split("_");
                             List<SchoolClass> schoolClass = schoolClassDao.createLambdaQuery()
-                                    .andEq(SchoolClass::getClassName, className)
+                                    .andEq(SchoolClass::getClassName, classSplit[0])
                                     .andEq(SchoolClass::getClassStatus, 1)
                                     .select();
 
@@ -601,7 +601,7 @@ public class StudentService extends CoreBaseService<Student>{
                             // 通过名字没查询到院校的时候
                             if(ObjectUtil.isEmpty(schoolClass)) {
                                 // 正则取院校ID
-                                schoolClassId = ReUtil.get("\\d+", className, 0);
+                                schoolClassId = classSplit[1];
                                 Assert.notBlank(schoolClassId, "请先添加班级信息：{}！", className);
                             }
 
@@ -618,6 +618,7 @@ public class StudentService extends CoreBaseService<Student>{
                             pojo.setStudentStatus(1);
                             pojo.setStudentPassword("123qwe");
                             pojo.setAddTime(date);
+                            pojo.setCodeFrom("导入");
                             save(pojo);
 
                             String code = pojo.createCode();//TODO 可改规则

web/src/main/java/com/ibeetl/jlw/web/query/StudentQuery.java

@@ -8,6 +8,7 @@ import com.ibeetl.jlw.enums.GenderEnum;
 import java.util.Date;
 import java.util.List;
 
+import static cn.hutool.core.util.ObjectUtil.defaultIfBlank;
 import static cn.hutool.core.util.ObjectUtil.defaultIfNull;
 import static com.ibeetl.jlw.enums.GenderEnum.UN_KNOW;
 
@@ -49,6 +50,13 @@ public class StudentQuery extends PageParam {
     @Query(name = "QQ", display = false)
     private String studentQq;
 
+    /**
+     * 账号来源
+     * 注册
+     * 导入
+     */
+    private String codeFrom;
+
     private String studentStatuses;
     
     // 学生编号或者姓名
@@ -243,6 +251,15 @@ public class StudentQuery extends PageParam {
         this.endTime = endTime;
     }
 
+    public String getCodeFrom() {
+        return codeFrom;
+    }
+
+    public void setCodeFrom(String codeFrom) {
+        this.codeFrom = codeFrom;
+    }
+
+
     public static class StudentTemp{ //临时学生类
 
         private Long studentsId;
@@ -367,6 +384,7 @@ public class StudentQuery extends PageParam {
         pojo.setHeadImg(this.getHeadImg());
         pojo.setStudentWeixinInfo(this.getStudentWeixinInfo());
         pojo.setStudentQq(this.getStudentQq());
+        pojo.setCodeFrom(defaultIfBlank(this.getCodeFrom(), "注册"));
         return pojo;
      }
 

web/src/main/resources/sql/jlw/student.md

@@ -17,6 +17,7 @@ queryByCondition
         t.add_time,
         t.org_id,
         t.user_id,
+        t.code_from,
         a.class_name,b.universities_colleges_name,
           @if(!isEmpty(log)){
             d.resources_application_id,

web/src/main/resources/static/js/jlw/student/index.js

@@ -73,7 +73,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                 },
                     {
 
-                        field : 'undefinedYD',
+                        field : 'codeFrom',
                         title : '账号来源',align: "center"
                     },
                 {