提交 e2051d39 authored 作者: zjm's avatar zjm

fix(培训模块): 修改了培训试卷查询不出的bug

修改了培训试卷查询不出的bug
上级 0b70a385
......@@ -18,4 +18,7 @@ public interface TrainThemeDao extends JpaRepository<TrainTheme, Integer>, JpaSp
List<TrainTheme> findAllByTrainStatus(Integer status);
List<TrainTheme> findAllByUnitsIdAndIsNotExamines(Integer unitId,Integer isNotExamines);
List<TrainTheme> findAllByUnitsId(Integer unitId);
}
......@@ -48,6 +48,7 @@ public interface TrainThemeService {
List<TrainTheme> findByUnitIdAndisNotExamines(Integer isNotExamines,Integer unitId);
List<TrainTheme> findByUnitId(Integer unitId);
WaitExaminesVo findWaitExaminesVo(Integer trainId);
}
......@@ -187,17 +187,14 @@ public class TestPaperServiceImpl implements TestPaperService {
@Override
public List<TestPaperManagementListVo> TEST_PAPER_MANAGEMENT_LIST_VOS(Integer unitId,Integer status) {
Integer trainStatus;
Integer testPaperStatus;
int testPaperStatus;
if (status==0){
trainStatus=0;
testPaperStatus=0;
}else {
trainStatus=2;
testPaperStatus=1;
}
List<TestPaperManagementListVo> testPaperManagementListVos=new ArrayList<>();
trainThemeService.findByUnitIdAndisNotExamines(trainStatus,unitId).forEach(
trainThemeService.findByUnitId(unitId).forEach(
trainTheme -> {
TestPaperManagementListVo testPaperManagementListVo=new TestPaperManagementListVo();
testPaperManagementListVo.setTrainId(trainTheme.getTrainId());
......@@ -206,7 +203,8 @@ public class TestPaperServiceImpl implements TestPaperService {
testPaperManagementListVos.add(testPaperManagementListVo);
}
);
return testPaperManagementListVos;
return testPaperManagementListVos.stream().filter(testPaperManagementListVo -> testPaperManagementListVo.getCount()!=0).collect(Collectors.toList());
}
@Override
......
......@@ -328,6 +328,11 @@ public class TrainThemeServiceImpl implements TrainThemeService {
return trainThemeDao.findAllByUnitsIdAndIsNotExamines(unitId,isNotExamines);
}
@Override
public List<TrainTheme> findByUnitId(Integer unitId) {
return trainThemeDao.findAllByUnitsId(unitId);
}
@Override
public WaitExaminesVo findWaitExaminesVo(Integer trainId) {
TrainTheme trainTheme = trainThemeDao.findById(trainId).get();
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论