|
|
@@ -1,6 +1,7 @@
|
|
|
package com.xjrsoft.module.student.service.impl;
|
|
|
|
|
|
import cn.dev33.satoken.secure.BCrypt;
|
|
|
+import cn.dev33.satoken.stp.StpUtil;
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.util.IdUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
@@ -533,6 +534,7 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
|
|
|
contact.setDeleteMark(DeleteMark.NODELETE.getCode());
|
|
|
}else{
|
|
|
user = new BaseStudentUser();
|
|
|
+ user.setId(userId);
|
|
|
user.setCredentialNumber(credentialNumber);
|
|
|
user.setCreateUserId(createUserId);
|
|
|
user.setCreateDate(LocalDateTime.now());
|
|
|
@@ -736,7 +738,7 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
|
|
|
schoolRoll.setArchivesStatus(dictionary.get("archives_status" + dataMaps.get(56).toString()));//学籍状态
|
|
|
}
|
|
|
if(dataMaps.get(57) != null && !"".equals(dataMaps.get(57).toString())){
|
|
|
- schoolRoll.setLearnStatus(dictionary.get("learn_status" + dataMaps.get(57).toString()));//学习形式
|
|
|
+ schoolRoll.setLearnStatus(dictionary.get("roll_modality" + dataMaps.get(57).toString()));//学习形式
|
|
|
}
|
|
|
if(dataMaps.get(58) != null && !"".equals(dataMaps.get(58).toString())){
|
|
|
schoolRoll.setStduyStatus(dictionary.get("stduy_status" + dataMaps.get(58).toString()));//就读方式
|
|
|
@@ -893,7 +895,7 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
|
|
|
codeList.add("house_hold_type");codeList.add("residence_type");
|
|
|
codeList.add("enrollment_type");codeList.add("enroll_type");
|
|
|
codeList.add("student_type");codeList.add("archives_status");
|
|
|
- codeList.add("learn_status");codeList.add("stduy_status");
|
|
|
+ codeList.add("roll_modality");codeList.add("stduy_status");
|
|
|
codeList.add("choose_status");codeList.add("foster_type");
|
|
|
codeList.add("recruit_type");codeList.add("recruit_target");
|
|
|
codeList.add("education");codeList.add("recruit_target");
|