Browse Source

新生账号激活

dzx 1 năm trước cách đây
mục cha
commit
f051f569d6

+ 13 - 0
src/main/java/com/xjrsoft/module/base/mapper/BaseUserStudentMapper.java

@@ -0,0 +1,13 @@
+package com.xjrsoft.module.base.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.base.entity.BaseClass;
+import com.xjrsoft.module.base.entity.BaseUserStudent;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ */
+@Mapper
+public interface BaseUserStudentMapper extends MPJBaseMapper<BaseUserStudent> {
+
+}

+ 7 - 0
src/main/java/com/xjrsoft/module/base/service/IBaseUserStudentService.java

@@ -0,0 +1,7 @@
+package com.xjrsoft.module.base.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.base.entity.BaseUserStudent;
+
+public interface IBaseUserStudentService extends MPJBaseService<BaseUserStudent> {
+}

+ 17 - 0
src/main/java/com/xjrsoft/module/base/service/impl/IBaseUserStudentServiceImpl.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.base.service.impl;
+
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.base.entity.BaseUserStudent;
+import com.xjrsoft.module.base.mapper.BaseUserStudentMapper;
+import com.xjrsoft.module.base.service.IBaseUserStudentService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author dzx
+ * @date 2024/7/15
+ */
+@Service
+@AllArgsConstructor
+public class IBaseUserStudentServiceImpl extends MPJBaseServiceImpl<BaseUserStudentMapper, BaseUserStudent> implements IBaseUserStudentService {
+}

+ 3 - 2
src/main/java/com/xjrsoft/module/student/controller/BaseNewStudentController.java

@@ -14,9 +14,9 @@ import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.RedisUtil;
 import com.xjrsoft.module.base.entity.BaseUserStudent;
 import com.xjrsoft.module.base.entity.WhitelistManagement;
+import com.xjrsoft.module.base.service.IBaseUserStudentService;
 import com.xjrsoft.module.base.service.IWhitelistManagementService;
 import com.xjrsoft.module.organization.entity.User;
-import com.xjrsoft.module.organization.entity.UserDeptRelation;
 import com.xjrsoft.module.organization.entity.UserRoleRelation;
 import com.xjrsoft.module.organization.service.IUserRoleRelationService;
 import com.xjrsoft.module.organization.service.IUserService;
@@ -75,6 +75,7 @@ public class BaseNewStudentController {
     private final IWhitelistManagementService whitelistManagementService;
     private final IUserRoleRelationService userRoleRelationService;
     private final RedisUtil redisUtil;
+    private final IBaseUserStudentService userStudentService;
     @GetMapping(value = "/page")
     @ApiOperation(value="新生维护信息列表(分页)")
     @SaCheckPermission("basenewstudent:detail")
@@ -260,7 +261,7 @@ public class BaseNewStudentController {
             userStudent.setStudentIdentity(user.getCredentialNumber());
             userStudent.setCreateDate(new Date());
             userStudent.setUserId(parentUser.getId());
-            familyMemberService.save(member);
+            userStudentService.save(userStudent);
         }
 
         //新增白名单信息

+ 1 - 1
src/main/resources/mapper/organization/UserMapper.xml

@@ -16,7 +16,7 @@
         </if>
     </select>
     <select id="getInfosByParam" parameterType="com.xjrsoft.module.student.dto.BaseStudentSimpleInfoDto" resultType="com.xjrsoft.module.student.vo.BaseStudentSompleInfoVo">
-        SELECT t1.id, t1.name as student_name, t1.enabled_mark, t1.credential_number, t4.name AS class_name,
+        SELECT t1.id, t1.name as student_name, t1.enabled_mark, t1.credential_number, t4.name AS class_name,t1.mobile,
         (SELECT name FROM base_student_family_member WHERE delete_mark = 0 AND user_id = t1.id ORDER BY create_date ASC LIMIT 0,1) as parent_name,
         (SELECT mobile FROM base_student_family_member WHERE delete_mark = 0 AND user_id = t1.id ORDER BY create_date ASC LIMIT 0,1) as parent_mobile,
         t1.gender,t4.id as class_id, t4.teacher_id