新增评卷地点字段，优化教师账号添加逻辑

jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/CeesWaiTeacherController.java

@@ -116,8 +116,7 @@ public class CeesWaiTeacherController extends JeecgController<CeesWaiTeacher, IC
        createAccountDto.setMajorId(ceesWaiTeacher.getMajorId());
        createAccountDto.setNum(1);
        Result<?> account = ceesUserService.createAccount(createAccountDto);
-       ceesWaiTeacherService.save(ceesWaiTeacher);
-       return Result.OK("添加成功！");
+       return ceesWaiTeacherService.addData(ceesWaiTeacher);
    }
 
    /**

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;
 }

jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesWaiTeacherService.java

@@ -34,4 +34,6 @@ public interface ICeesWaiTeacherService extends IService<CeesWaiTeacher> {
     Result<?> getDormitoryName(String dormitoryId);
 
     Result<?> batchGroup(Map<String, Object> webData);
+
+    Result<String> addData(CeesWaiTeacher ceesWaiTeacher);
 }

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<CeesUserMapper, CeesUser> i
 //            h5InvitationService.saveBatch(h5Invitations);
 //        }
 
-            // 清理资源
-            h5Users.clear();
-            set.clear();
-            userMIDList.clear();
-            return Result.ok("生成账号成功！");
+            return Result.ok(h5Users);
         } else {
             //行政人员账号生成
             createAdminAccount(num, groupType);

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<CeesWaiTeacherMapper,
     SysRoleMapper sysRoleMapper;
     @Resource
     SysUserRoleMapper sysUserRoleMapper;
+    @Autowired
+    ICeesUserService ceesUserService;
 
     @Value("${jasypt.encryptor.password}")
     private String passWord;
@@ -314,4 +319,27 @@ public class CeesWaiTeacherServiceImpl extends ServiceImpl<CeesWaiTeacherMapper,
         resultJson.put("user", userJson);
         return Result.ok(resultJson);
     }
+
+    @Override
+    public Result<String> 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<CeesUser> users = (List<CeesUser>) 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("添加失败");
+    }
 }