分班bug调整

src/main/java/com/xjrsoft/module/banding/vo/BandingTaskClassPageVo.java

@@ -65,4 +65,7 @@ public class BandingTaskClassPageVo {
     @ApiModelProperty("教室名称")
     private String classroomName;
 
+    @ApiModelProperty("班级类型")
+    private String classType;
+
 }

src/main/java/com/xjrsoft/module/base/controller/WhitelistManagementController.java

@@ -33,8 +33,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 

src/main/java/com/xjrsoft/module/base/dto/AddWhitelistManagementDto.java

@@ -43,6 +43,6 @@ public class AddWhitelistManagementDto implements Serializable {
     * 手机号
     */
     @ApiModelProperty("手机号")
-    private Long phone;
+    private String phone;
 
 }

src/main/java/com/xjrsoft/module/base/entity/WhitelistManagement.java

@@ -80,7 +80,7 @@ public class WhitelistManagement implements Serializable {
     * 手机号
     */
     @ApiModelProperty("手机号")
-    private Long phone;
+    private String phone;
 
 
 }

src/main/java/com/xjrsoft/module/base/mapper/WhitelistManagementMapper.java

@@ -30,7 +30,7 @@ public interface WhitelistManagementMapper extends MPJBaseMapper<WhitelistManage
 
     String getCredentialNumber(String credentialNumber);
 
-    Long getPhone(long phone);
+    String getPhone(String phone);
 
     Long getUserId(String credentialNumber);
 

src/main/java/com/xjrsoft/module/base/service/IWhitelistManagementService.java

@@ -23,7 +23,7 @@ public interface IWhitelistManagementService extends MPJBaseService<WhitelistMan
 
     String GetCredentialNumber(String credentialNumber);
 
-    Long GetPhone(long l);
+    String GetPhone(String l);
 
     Long getUserId(String credentialNumber);
 

src/main/java/com/xjrsoft/module/base/service/impl/WhitelistManagementServiceImpl.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.exception.MyException;
-import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.RedisUtil;
 import com.xjrsoft.module.base.dto.WhitelistManagementPageDto;
 import com.xjrsoft.module.base.entity.TreeNode;
@@ -57,7 +56,7 @@ public class WhitelistManagementServiceImpl extends MPJBaseServiceImpl<Whitelist
     }
 
     @Override
-    public Long GetPhone(long phone) {
+    public String GetPhone(String phone) {
         return whitelistManagementMapper.getPhone(phone);
     }
 
@@ -119,12 +118,12 @@ public class WhitelistManagementServiceImpl extends MPJBaseServiceImpl<Whitelist
             try {
                 if (this.checkExist(vo.getCredentialNumber())) continue;
 
-                String name = this.GetName(vo.getName()).toString();
-                String credentialNumber = this.GetCredentialNumber(vo.getCredentialNumber()).toString();
+                String name = this.GetName(vo.getName());
+                String credentialNumber = this.GetCredentialNumber(vo.getCredentialNumber());
                 Long userId = this.getUserId(credentialNumber);
-                Long phone = this.GetPhone(Long.parseLong(vo.getPhone().toString()));
+                String phone = this.GetPhone(vo.getPhone().toString());
 
-                if (!name.isEmpty() && !credentialNumber.isEmpty() && !phone.toString().isEmpty()) {
+                if (!name.isEmpty() && !credentialNumber.isEmpty() && !phone.isEmpty()) {
                     WhitelistManagement whitelistManagement = new WhitelistManagement();
                     whitelistManagement.setCreateDate(new Date());
                     whitelistManagement.setDeleteMark(0);

src/main/java/com/xjrsoft/module/student/controller/BaseNewStudentController.java

@@ -1,12 +1,16 @@
 package com.xjrsoft.module.student.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xjrsoft.common.enums.EnabledMark;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.module.base.entity.WhitelistManagement;
+import com.xjrsoft.module.base.service.IWhitelistManagementService;
 import com.xjrsoft.module.organization.entity.User;
 import com.xjrsoft.module.organization.service.IUserService;
 import com.xjrsoft.module.student.dto.ActiveAccountDto;
@@ -14,7 +18,9 @@ import com.xjrsoft.module.student.dto.AddBaseNewStudentDto;
 import com.xjrsoft.module.student.dto.BaseNewStudentPageDto;
 import com.xjrsoft.module.student.dto.UpdateBaseNewStudentDto;
 import com.xjrsoft.module.student.entity.BaseNewStudent;
+import com.xjrsoft.module.student.entity.BaseStudentFamilyMember;
 import com.xjrsoft.module.student.service.IBaseNewStudentService;
+import com.xjrsoft.module.student.service.IBaseStudentFamilyMemberService;
 import com.xjrsoft.module.student.vo.BaseNewStudentPageVo;
 import com.xjrsoft.module.student.vo.BaseNewStudentScoreExcelVo;
 import com.xjrsoft.module.student.vo.BaseNewStudentTreeVo;
@@ -57,6 +63,8 @@ public class BaseNewStudentController {
 
     private final IUserService userService;
     private final IBaseNewStudentService baseNewStudentService;
+    private final IBaseStudentFamilyMemberService familyMemberService;
+    private final IWhitelistManagementService whitelistManagementService;
 
     @GetMapping(value = "/page")
     @ApiOperation(value="新生维护信息列表(分页)")
@@ -196,6 +204,43 @@ public class BaseNewStudentController {
         User user = userService.getById(dto.getId());
         user.setEnabledMark(EnabledMark.ENABLED.getCode());
         user.setModifyDate(LocalDateTime.now());
+        userService.updateById(user);
+        // 新增家庭成员信息
+        List<BaseStudentFamilyMember> list = familyMemberService.list(
+                new QueryWrapper<BaseStudentFamilyMember>().lambda()
+                        .eq(BaseStudentFamilyMember::getName, dto.getParentName())
+                        .eq(BaseStudentFamilyMember::getUserId, dto.getId())
+                        .eq(BaseStudentFamilyMember::getMobile, dto.getParentMobile())
+        );
+
+        if(list.isEmpty()){
+            BaseStudentFamilyMember member = new BaseStudentFamilyMember();
+            member.setUserId(user.getId());
+            member.setName(dto.getParentName());
+            member.setMobile(dto.getParentMobile());
+            member.setCreateDate(LocalDateTime.now());
+            member.setCreateUserId(StpUtil.getLoginIdAsLong());
+            familyMemberService.save(member);
+        }
+
+
+
+        //新增白名单信息
+        List<WhitelistManagement> managementList = whitelistManagementService.list(
+                new QueryWrapper<WhitelistManagement>().lambda()
+                        .eq(WhitelistManagement::getUserId, dto)
+        );
+        if(!managementList.isEmpty()){
+            WhitelistManagement whitelistManagement = new WhitelistManagement() {{
+                setName(user.getName());
+                setUserId(user.getId());
+                setCreateDate(new Date());
+                setCredentialNumber(user.getCredentialNumber());
+                setPhone(user.getMobile());
+            }};
+            whitelistManagementService.save(whitelistManagement);
+        }
+
         return RT.ok(true);
     }
 

src/main/resources/mapper/banding/BandingTaskClassMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xjrsoft.module.banding.mapper.BandingTaskClassMapper">
     <select id="getList" parameterType="com.xjrsoft.module.banding.dto.BandingTaskClassPageDto" resultType="com.xjrsoft.module.banding.vo.BandingTaskClassPageVo">
-        SELECT t1.id, t1.major_set_id,t2.name AS major_set_name, t1.name, t1.number,t1.sort_code,t1.is_order_class,
+        SELECT t1.id, t1.major_set_id,t2.name AS major_set_name, t1.name, t1.number,t1.sort_code,t1.is_order_class,t1.class_type,
         (SELECT COUNT(*) FROM base_new_student a1
         INNER JOIN enrollment_plan a2 ON a1.enrollment_plan_id = a2.id
         WHERE a1.delete_mark = 0 AND a1.first_ambition_id = t1.major_set_id

src/main/resources/mapper/base/WhitelistManagement.xml

@@ -52,7 +52,7 @@
         </if>
     </select>
 
-    <select id="getPhone" resultType="java.lang.Long">
+    <select id="getPhone" resultType="java.lang.String">
         select mobile
         from xjr_user
         where delete_mark = 0

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, t1.enabled_mark, t1.credential_number, t4.name AS class_name FROM xjr_user t1
+        SELECT t1.id, t1.name as student_name, t1.enabled_mark, t1.credential_number, t4.name AS class_name FROM xjr_user t1
         INNER JOIN base_student t2 ON t1.id = t2.user_id
         INNER JOIN base_student_school_roll t3 ON t1.id = t3.user_id
         INNER JOIN base_class t4 ON t4.id = t3.class_id