|
|
@@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.lang.func.VoidFunc0;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.zhongzheng.common.utils.DateUtils;
|
|
|
-import com.zhongzheng.modules.exam.bo.ExamArrangementTimeAddBo;
|
|
|
+import com.zhongzheng.modules.exam.bo.*;
|
|
|
import com.zhongzheng.modules.exam.domain.ExamArrangementTime;
|
|
|
import com.zhongzheng.modules.exam.service.IExamArrangementStudentService;
|
|
|
import com.zhongzheng.modules.exam.service.IExamArrangementTimeService;
|
|
|
@@ -19,9 +19,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.github.pagehelper.Page;
|
|
|
-import com.zhongzheng.modules.exam.bo.ExamArrangementAddBo;
|
|
|
-import com.zhongzheng.modules.exam.bo.ExamArrangementQueryBo;
|
|
|
-import com.zhongzheng.modules.exam.bo.ExamArrangementEditBo;
|
|
|
import com.zhongzheng.modules.exam.domain.ExamArrangement;
|
|
|
import com.zhongzheng.modules.exam.mapper.ExamArrangementMapper;
|
|
|
import com.zhongzheng.modules.exam.vo.ExamArrangementVo;
|
|
|
@@ -84,7 +81,14 @@ public class ExamArrangementServiceImpl extends ServiceImpl<ExamArrangementMappe
|
|
|
@Override
|
|
|
public List<ExamArrangementVo> queryList(ExamArrangementQueryBo bo) {
|
|
|
List<ExamArrangementVo> examArrangementVos1 = baseMapper.selectExamgement(bo);
|
|
|
+
|
|
|
List<ExamArrangementVo> examArrangementVos = entity2Vo(examArrangementVos1);
|
|
|
+ examArrangementVos.stream().forEach(e -> {
|
|
|
+ ExamArrangementTimeQueryBo examArrangementTimeQueryBo = new ExamArrangementTimeQueryBo();
|
|
|
+ examArrangementTimeQueryBo.setArrangement_id(e.getId());
|
|
|
+ e.setExamArrangementTimeVo(examArrangementTimeService.queryList(examArrangementTimeQueryBo));
|
|
|
+ }
|
|
|
+ );
|
|
|
return examArrangementVos;
|
|
|
}
|
|
|
|
