1、调课顶课流程调整

2、班级列表查询调整
3、新生账号激活调整

src/main/java/com/xjrsoft/module/courseTable/service/impl/CourseTableServiceImpl.java

@@ -345,42 +345,54 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
     }
 
     @Override
-    public Boolean adjustCourse(WfCourseAdjust courseAdjust) throws Exception {
+    public Boolean adjustCourse(WfCourseAdjust courseAdjust){
         if (CourseAdjustTypeEnum.courseExchange.getCode().equals(courseAdjust.getAdjustType())) {
-            //调课，将双方课程的日期（schedule_date）、时段（time_period）、节次（time_number）、周（week）、星期几(1-7)（weeks）、星期中文（weeks_cn）对调
-            CourseTable courseTable = courseTableMapper.selectById(courseAdjust.getCourseId());
-            CourseTable swapCourseTable = courseTableMapper.selectById(courseAdjust.getExchangeCourseId());
-
-            CourseTable courseTableBak = BeanUtil.toBean(courseTable, CourseTable.class);
-            CourseTable swapCourseTableBak = BeanUtil.toBean(swapCourseTable, CourseTable.class);
-
-            courseTable.setScheduleDate(swapCourseTableBak.getScheduleDate());
-            courseTable.setTimePeriod(swapCourseTableBak.getTimePeriod());
-            courseTable.setTimeNumber(swapCourseTableBak.getTimeNumber());
-            courseTable.setWeek(swapCourseTableBak.getWeek());
-            courseTable.setWeeks(swapCourseTableBak.getWeeks());
-            courseTable.setWeeksCn(swapCourseTableBak.getWeeksCn());
-            courseTable.setAdjustType(courseAdjust.getAdjustType());
-            courseTableMapper.updateById(courseTable);
-
-            swapCourseTable.setScheduleDate(courseTableBak.getScheduleDate());
-            swapCourseTable.setTimePeriod(courseTableBak.getTimePeriod());
-            swapCourseTable.setTimeNumber(courseTableBak.getTimeNumber());
-            swapCourseTable.setWeek(courseTableBak.getWeek());
-            swapCourseTable.setWeeks(courseTableBak.getWeeks());
-            swapCourseTable.setWeeksCn(courseTableBak.getWeeksCn());
-            swapCourseTable.setAdjustType(courseAdjust.getAdjustType());
-            courseTableMapper.updateById(swapCourseTable);
+            String[] courseIds = courseAdjust.getCourseId().split(",");
+            String[] exchangeCourseIds = courseAdjust.getExchangeCourseId().split(",");
+            for (int i = 0; i < courseIds.length; i ++){
+                String courseId = courseIds[i];
+                String exchangeCourseId = exchangeCourseIds[i];
+
+                //调课，将双方课程的日期（schedule_date）、时段（time_period）、节次（time_number）、周（week）、星期几(1-7)（weeks）、星期中文（weeks_cn）对调
+                CourseTable courseTable = courseTableMapper.selectById(courseId);
+                CourseTable swapCourseTable = courseTableMapper.selectById(exchangeCourseId);
+
+                CourseTable courseTableBak = BeanUtil.toBean(courseTable, CourseTable.class);
+                CourseTable swapCourseTableBak = BeanUtil.toBean(swapCourseTable, CourseTable.class);
+
+                courseTable.setScheduleDate(swapCourseTableBak.getScheduleDate());
+                courseTable.setTimePeriod(swapCourseTableBak.getTimePeriod());
+                courseTable.setTimeNumber(swapCourseTableBak.getTimeNumber());
+                courseTable.setWeek(swapCourseTableBak.getWeek());
+                courseTable.setWeeks(swapCourseTableBak.getWeeks());
+                courseTable.setWeeksCn(swapCourseTableBak.getWeeksCn());
+                courseTable.setAdjustType(courseAdjust.getAdjustType());
+                courseTableMapper.updateById(courseTable);
+
+                swapCourseTable.setScheduleDate(courseTableBak.getScheduleDate());
+                swapCourseTable.setTimePeriod(courseTableBak.getTimePeriod());
+                swapCourseTable.setTimeNumber(courseTableBak.getTimeNumber());
+                swapCourseTable.setWeek(courseTableBak.getWeek());
+                swapCourseTable.setWeeks(courseTableBak.getWeeks());
+                swapCourseTable.setWeeksCn(courseTableBak.getWeeksCn());
+                swapCourseTable.setAdjustType(courseAdjust.getAdjustType());
+                courseTableMapper.updateById(swapCourseTable);
+            }
+
             //提交调课接口
-            sendExchange(courseTableBak, swapCourseTableBak, courseAdjust);
+            //sendExchange(courseTableBak, swapCourseTableBak, courseAdjust);
 
         } else if (CourseAdjustTypeEnum.courseSubstitute.getCode().equals(courseAdjust.getAdjustType())) {
-            CourseTable courseTable = courseTableMapper.selectById(courseAdjust.getCourseId());
-            courseTable.setAdjustType(courseAdjust.getAdjustType());
-            courseTable.setTeacherId(courseAdjust.getExchangeTeacherId());
-            courseTableMapper.updateById(courseTable);
+            String[] courseIds = courseAdjust.getCourseId().split(",");
+            for (String courseId : courseIds) {
+                CourseTable courseTable = courseTableMapper.selectById(courseId);
+                courseTable.setAdjustType(courseAdjust.getAdjustType());
+                courseTable.setTeacherId(courseAdjust.getExchangeTeacherId());
+                courseTableMapper.updateById(courseTable);
+            }
+
             //提交顶课接口
-            sendSubstitute(courseTable, courseAdjust);
+            //sendSubstitute(courseTable, courseAdjust);
         }
         return Boolean.TRUE;
     }

src/main/java/com/xjrsoft/module/schedule/entity/WfCourseAdjust.java

@@ -66,7 +66,7 @@ public class WfCourseAdjust implements Serializable {
     private String remark;
 
     @ApiModelProperty("课程id(base_course_subject)")
-    private Long courseId;
+    private String courseId;
 
     @ApiModelProperty("对调日期")
     private String exchangeDate;
@@ -75,7 +75,7 @@ public class WfCourseAdjust implements Serializable {
     private Long exchangeTeacherId;
 
     @ApiModelProperty("对调课程id(base_course_subject)")
-    private Long exchangeCourseId;
+    private String exchangeCourseId;
 
     @ApiModelProperty("状态（0:未通过 1:已通过）")
     private Integer status;

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

@@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.secure.BCrypt;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -263,67 +264,70 @@ public class BaseNewStudentController {
         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())
-        );
-        BaseStudentFamilyMember member;
-        if(list.isEmpty()){
-            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);
-        }else{
-            member = list.get(0);
-        }
-        List<User> parents = userService.list(
-                new QueryWrapper<User>().lambda()
-                        .eq(User::getUserName, dto.getParentMobile())
-                        .or()
-                        .eq(User::getMobile, dto.getParentMobile())
-        );
-        if(parents.isEmpty()){
-            User parentUser = new User() {{
-                setUserName(dto.getParentMobile());
-                setName(dto.getParentName());
-                setIsChangePassword(1);
-                setDeleteMark(0);
-                setEnabledMark(1);
-                setPassword(BCrypt.hashpw(propertiesConfig.getDefaultPassword(), BCrypt.gensalt()));
-                setMobile(dto.getParentMobile());
-            }};
-            userService.save(parentUser);
-
-            userRoleRelationService.save(new UserRoleRelation(){{
-                setUserId(parentUser.getId());
-                setRoleId(4L);
-            }});
-
-            BaseUserStudent userStudent = new BaseUserStudent();
-            userStudent.setStudentId(user.getId());
-            userStudent.setStudentNane(user.getName());
-            userStudent.setStudentIdentity(user.getCredentialNumber());
-            userStudent.setCreateDate(new Date());
-            userStudent.setUserId(parentUser.getId());
-            userStudent.setStatus(1);
-            userStudentService.save(userStudent);
-        }else{
-            User parentUser = parents.get(0);
-            BaseUserStudent userStudent = new BaseUserStudent();
-            userStudent.setStudentId(user.getId());
-            userStudent.setStudentNane(user.getName());
-            userStudent.setStudentIdentity(user.getCredentialNumber());
-            userStudent.setCreateDate(new Date());
-            userStudent.setUserId(parentUser.getId());
-            userStudent.setStatus(1);
-            userStudentService.save(userStudent);
+        if(StrUtil.isNotEmpty(dto.getParentName()) && StrUtil.isNotEmpty(dto.getParentMobile())){
+            List<BaseStudentFamilyMember> list = familyMemberService.list(
+                    new QueryWrapper<BaseStudentFamilyMember>().lambda()
+                            .eq(BaseStudentFamilyMember::getName, dto.getParentName())
+                            .eq(BaseStudentFamilyMember::getUserId, dto.getId())
+                            .eq(BaseStudentFamilyMember::getMobile, dto.getParentMobile())
+            );
+            BaseStudentFamilyMember member;
+            if(list.isEmpty()){
+                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);
+            }else{
+                member = list.get(0);
+            }
+            List<User> parents = userService.list(
+                    new QueryWrapper<User>().lambda()
+                            .eq(User::getUserName, dto.getParentMobile())
+                            .or()
+                            .eq(User::getMobile, dto.getParentMobile())
+            );
+            if(parents.isEmpty()){
+                User parentUser = new User() {{
+                    setUserName(dto.getParentMobile());
+                    setName(dto.getParentName());
+                    setIsChangePassword(1);
+                    setDeleteMark(0);
+                    setEnabledMark(1);
+                    setPassword(BCrypt.hashpw(propertiesConfig.getDefaultPassword(), BCrypt.gensalt()));
+                    setMobile(dto.getParentMobile());
+                }};
+                userService.save(parentUser);
+
+                userRoleRelationService.save(new UserRoleRelation(){{
+                    setUserId(parentUser.getId());
+                    setRoleId(4L);
+                }});
+
+                BaseUserStudent userStudent = new BaseUserStudent();
+                userStudent.setStudentId(user.getId());
+                userStudent.setStudentNane(user.getName());
+                userStudent.setStudentIdentity(user.getCredentialNumber());
+                userStudent.setCreateDate(new Date());
+                userStudent.setUserId(parentUser.getId());
+                userStudent.setStatus(1);
+                userStudentService.save(userStudent);
+            }else{
+                User parentUser = parents.get(0);
+                BaseUserStudent userStudent = new BaseUserStudent();
+                userStudent.setStudentId(user.getId());
+                userStudent.setStudentNane(user.getName());
+                userStudent.setStudentIdentity(user.getCredentialNumber());
+                userStudent.setCreateDate(new Date());
+                userStudent.setUserId(parentUser.getId());
+                userStudent.setStatus(1);
+                userStudentService.save(userStudent);
+            }
         }
 
+
         //新增白名单信息
         List<WhitelistManagement> managementList = whitelistManagementService.list(
                 new QueryWrapper<WhitelistManagement>().lambda()
@@ -338,6 +342,14 @@ public class BaseNewStudentController {
                 setPhone(user.getMobile());
             }};
             whitelistManagementService.save(whitelistManagement);
+        }else{
+            WhitelistManagement whitelistManagement = managementList.get(0);
+            whitelistManagement.setName(user.getName());
+            whitelistManagement.setUserId(user.getId());
+            whitelistManagement.setModifyDate(new Date());
+            whitelistManagement.setCredentialNumber(user.getCredentialNumber());
+            whitelistManagement.setPhone(user.getMobile());
+            whitelistManagementService.updateById(whitelistManagement);
         }
 
         CompletableFuture.runAsync(() -> {

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

@@ -5,7 +5,7 @@
 <mapper namespace="com.xjrsoft.module.base.mapper.BaseClassMapper">
     <select id="getPage" parameterType="com.xjrsoft.module.base.dto.BaseClassPageDto" resultType="com.xjrsoft.module.base.vo.BaseClassPageVo">
         SELECT t1.id,t1.name,t1.code,t4.name AS grade_name,t2.name AS teacher_name,t3.name AS enroll_type_cn,
-        t5.name AS class_type_cn,t6.name AS classroomName,
+        t5.name AS class_type_cn,t6.name AS classroom_name,
         (SELECT COUNT(DISTINCT(a1.id)) FROM xjr_user a1
         LEFT JOIN base_student_school_roll a2 ON a1.id = a2.user_id
         WHERE a1.delete_mark = 0 AND a2.delete_mark = 0