diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/CeesWaiTeacherController.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/CeesWaiTeacherController.java index 4f95542c..4841d93c 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/CeesWaiTeacherController.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/CeesWaiTeacherController.java @@ -116,8 +116,7 @@ public class CeesWaiTeacherController extends JeecgController account = ceesUserService.createAccount(createAccountDto); - ceesWaiTeacherService.save(ceesWaiTeacher); - return Result.OK("添加成功!"); + return ceesWaiTeacherService.addData(ceesWaiTeacher); } /** diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CeesGroup.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CeesGroup.java index 285cdef3..047576db 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CeesGroup.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/CeesGroup.java @@ -60,4 +60,8 @@ public class CeesGroup implements Serializable { @Excel(name = "专业id", width = 15) @ApiModelProperty(value = "专业id") private Integer majorId; + /**评卷地点*/ + @Excel(name = "评卷地点", width = 15) + @ApiModelProperty(value = "评卷地点") + private String markingLocation; } diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesWaiTeacherService.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesWaiTeacherService.java index 01ef5beb..03fe2772 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesWaiTeacherService.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesWaiTeacherService.java @@ -34,4 +34,6 @@ public interface ICeesWaiTeacherService extends IService { Result getDormitoryName(String dormitoryId); Result batchGroup(Map webData); + + Result addData(CeesWaiTeacher ceesWaiTeacher); } diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesUserServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesUserServiceImpl.java index e055b17a..5fe4b9c9 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesUserServiceImpl.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesUserServiceImpl.java @@ -356,11 +356,7 @@ public class CeesUserServiceImpl extends ServiceImpl i // h5InvitationService.saveBatch(h5Invitations); // } - // 清理资源 - h5Users.clear(); - set.clear(); - userMIDList.clear(); - return Result.ok("生成账号成功!"); + return Result.ok(h5Users); } else { //行政人员账号生成 createAdminAccount(num, groupType); diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesWaiTeacherServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesWaiTeacherServiceImpl.java index 322631dc..f3f82e9e 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesWaiTeacherServiceImpl.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesWaiTeacherServiceImpl.java @@ -16,18 +16,21 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.modules.entity.*; +import org.jeecg.modules.entity.dto.CreateAccountDto; import org.jeecg.modules.entity.dto.UpdateGroupUserDto; import org.jeecg.modules.enums.MajorEnum; import org.jeecg.modules.mapper.CeesDormitoryInfoMapper; import org.jeecg.modules.mapper.CeesGroupMapper; import org.jeecg.modules.mapper.CeesUserMapper; import org.jeecg.modules.mapper.CeesWaiTeacherMapper; +import org.jeecg.modules.service.ICeesUserService; import org.jeecg.modules.service.ICeesWaiTeacherService; import org.jeecg.modules.system.entity.SysRole; import org.jeecg.modules.system.entity.SysUserRole; import org.jeecg.modules.system.mapper.SysRoleMapper; import org.jeecg.modules.system.mapper.SysUserRoleMapper; import org.jeecg.modules.utils.JasyptUtil; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -58,6 +61,8 @@ public class CeesWaiTeacherServiceImpl extends ServiceImpl addData(CeesWaiTeacher ceesWaiTeacher) { + // 生成用户身份码 + CreateAccountDto createAccountDto = new CreateAccountDto(); + createAccountDto.setGroup(4); + createAccountDto.setMajorId(ceesWaiTeacher.getMajorId()); + createAccountDto.setNum(1); + Result result = ceesUserService.createAccount(createAccountDto); + // 补充数据与数据同步 + if (result.isSuccess()) { + List users = (List) result.getResult(); + if (!users.isEmpty()) { + CeesUser user = users.get(0); + ceesWaiTeacher.setUserId(user.getUserId()); + user.setUserName(ceesWaiTeacher.getUserName()); + ceesUserMapper.updateById(user); + this.save(ceesWaiTeacher); + return Result.ok("添加成功"); + } + } + return Result.error("添加失败"); + } }