辅导员分宿舍
This commit is contained in:
@@ -843,6 +843,13 @@ public class ISrsDormitoryStudentServiceImpl extends ServiceImpl<SrsDormitoryStu
|
|||||||
public AjaxResult assignDormitoryByTeacher(String teacherEmployeeId) {
|
public AjaxResult assignDormitoryByTeacher(String teacherEmployeeId) {
|
||||||
try {
|
try {
|
||||||
List<SrsStuReg> stuList = srsDormitoryStudentMapper.listSmokeEarly(teacherEmployeeId);
|
List<SrsStuReg> stuList = srsDormitoryStudentMapper.listSmokeEarly(teacherEmployeeId);
|
||||||
|
|
||||||
|
List<String> kshList = stuList.stream().map(SrsStuReg::getKSH).collect(Collectors.toList());
|
||||||
|
|
||||||
|
QueryWrapper<DmsNewReg> queryWrapper = new QueryWrapper<>();
|
||||||
|
queryWrapper.in("ksh",kshList);
|
||||||
|
_newRegMapper.delete(queryWrapper);
|
||||||
|
|
||||||
List<DmsDormitoryClass> dormList = srsDormitoryStudentMapper.listFdyCanDorm(teacherEmployeeId);
|
List<DmsDormitoryClass> dormList = srsDormitoryStudentMapper.listFdyCanDorm(teacherEmployeeId);
|
||||||
|
|
||||||
// 查询所有已分配的ksh,避免重复插入
|
// 查询所有已分配的ksh,避免重复插入
|
||||||
|
@@ -108,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<if test="dormitoryId != null">and a.dormitory_id = #{dormitoryId}</if>
|
<if test="dormitoryId != null">and a.dormitory_id = #{dormitoryId}</if>
|
||||||
<if test="classCode != null">and b.BJDM = #{classCode}</if>
|
<if test="classCode != null">and b.BJDM = #{classCode}</if>
|
||||||
</where>
|
</where>
|
||||||
|
order by a.ksh asc
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getStuDorm" resultType="DomInfo" parameterType="DmsSearch">
|
<select id="getStuDorm" resultType="DomInfo" parameterType="DmsSearch">
|
||||||
|
@@ -62,7 +62,7 @@ public class DmsDormitoryClassController extends BaseController {
|
|||||||
|
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private ISrsDormitoryStudentService iDormitoryStudentService;
|
private ISrsDormitoryStudentService iDormitoryStudentService;
|
||||||
|
|
||||||
|
|
||||||
@ApiOperation("自动分配宿舍")
|
@ApiOperation("自动分配宿舍")
|
||||||
|
@@ -156,6 +156,7 @@ public class SrsStuRegServiceImpl extends ServiceImpl<SrsStuRegMapper, SrsStuReg
|
|||||||
SrsStuReg stu = new SrsStuReg();
|
SrsStuReg stu = new SrsStuReg();
|
||||||
stu.setId(srsStuReg.getId());
|
stu.setId(srsStuReg.getId());
|
||||||
stu.setBJDM(temp.教务系统班级编号);
|
stu.setBJDM(temp.教务系统班级编号);
|
||||||
|
stu.setBJ(temp.班级名称);
|
||||||
needUpdateList.add(stu);
|
needUpdateList.add(stu);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -745,7 +745,6 @@
|
|||||||
left join srs_class cl on a.bjdm=class_code
|
left join srs_class cl on a.bjdm=class_code
|
||||||
left join cph_teacher t on cl.teacher_id=t.teacher_id
|
left join cph_teacher t on cl.teacher_id=t.teacher_id
|
||||||
<where>
|
<where>
|
||||||
a.reg_status in (1,3,4)
|
|
||||||
<if test="BJDM != null">and a.BJDM = #{BJDM}</if>
|
<if test="BJDM != null">and a.BJDM = #{BJDM}</if>
|
||||||
<if test="params.tNo != null">and t.employee_id = #{params.tNo}</if>
|
<if test="params.tNo != null">and t.employee_id = #{params.tNo}</if>
|
||||||
<if test="MZ != null">and a.MZ like concat('%', #{MZ},'%')</if>
|
<if test="MZ != null">and a.MZ like concat('%', #{MZ},'%')</if>
|
||||||
|
Reference in New Issue
Block a user