分班调整

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

@@ -26,7 +26,6 @@ import com.xjrsoft.module.banding.service.IBandingTaskClassStudentService;
 import com.xjrsoft.module.banding.service.IBandingTaskService;
 import com.xjrsoft.module.banding.vo.BandingTaskClassPageVo;
 import com.xjrsoft.module.banding.vo.BandingTaskClassReportStatisticsVo;
-import com.xjrsoft.module.base.entity.BaseClass;
 import com.xjrsoft.module.base.entity.BaseGrade;
 import com.xjrsoft.module.base.service.IBaseGradeService;
 import com.xjrsoft.module.base.service.IBaseSemesterService;

src/main/java/com/xjrsoft/module/student/service/impl/StudentReportRecordServiceImpl.java

@@ -381,7 +381,11 @@ public class StudentReportRecordServiceImpl extends MPJBaseServiceImpl<StudentRe
                 baseClass.setGradeId(task.getGradeId());
                 BaseMajorSet majorSet = majorSetMapper.selectById(baseClass.getMajorSetId());
                 baseClass.setOrgId(majorSet.getDepartmentId());
+                baseClass.setId(null);
                 classMapper.insert(baseClass);
+
+                taskClass.setBaseClassId(baseClass.getId());
+                taskClassService.updateById(taskClass);
             }
             //根据身份证号查询这个学生是否存在
             User user = userService.getOne(

src/main/resources/mapper/student/StudentReportRecordMapper.xml

@@ -243,7 +243,7 @@
         LEFT JOIN xjr_dictionary_detail t14 ON t5.class_type = t14.code and t14.delete_mark = 0
         LEFT JOIN xjr_department t15 ON t15.id = t13.department_id
         WHERE t1.delete_mark = 0 AND t1.enabled_mark = 1
-        and t12.status = 1
+        and t12.status in(1,2)
         and t3.enrollment_plan_id = #{dto.enrollmentPlanId}
         <if test="dto.keyword != null and dto.keyword != ''">
             and t1.name like concat('%', #{dto.keyword},'%')
@@ -318,7 +318,7 @@
         LEFT JOIN xjr_dictionary_detail t14 ON t5.class_type = t14.code and t14.delete_mark = 0
         LEFT JOIN xjr_department t15 ON t15.id = t13.department_id
         WHERE t1.delete_mark = 0 AND t1.enabled_mark = 1
-        and t12.status = 1
+        and t12.status in(1,2)
         and t3.enrollment_plan_id = #{dto.enrollmentPlanId}
         <if test="dto.keyword != null and dto.keyword != ''">
             and t1.name like concat('%', #{dto.keyword},'%')