|
|
@@ -23,6 +23,7 @@ import com.keao.edu.user.page.ExamReviewQueryInfo;
|
|
|
import com.keao.edu.user.page.ExamReviewRecordQueryInfo;
|
|
|
import com.keao.edu.user.service.ExamReviewService;
|
|
|
import com.keao.edu.user.service.ExamRoomStudentRelationService;
|
|
|
+import com.keao.edu.user.service.OrganizationService;
|
|
|
import com.keao.edu.util.collection.MapUtil;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
@@ -49,6 +50,8 @@ public class ExamReviewServiceImpl extends BaseServiceImpl<Long, ExamReview> imp
|
|
|
private ExamRoomStudentRelationService examRoomStudentRelationService;
|
|
|
@Autowired
|
|
|
private SysUserDao sysUserDao;
|
|
|
+ @Autowired
|
|
|
+ private OrganizationService organizationService;
|
|
|
|
|
|
@Override
|
|
|
public BaseDAO<Long, ExamReview> getDAO() {
|
|
|
@@ -61,8 +64,8 @@ public class ExamReviewServiceImpl extends BaseServiceImpl<Long, ExamReview> imp
|
|
|
Map<String, Object> params = new HashMap<String, Object>();
|
|
|
MapUtil.populateMap(params, queryInfo);
|
|
|
|
|
|
-// List<Integer> nextLevelOrganIds = organizationService.getChildOrganIds(queryInfo.getOrganId(), true);
|
|
|
-// params.put("organIds", nextLevelOrganIds);
|
|
|
+ List<Integer> nextLevelOrganIds = organizationService.getChildOrganIds(queryInfo.getOrganId(), true);
|
|
|
+ params.put("organIds", nextLevelOrganIds);
|
|
|
|
|
|
List<ExamReviewDto> dataList = null;
|
|
|
int count = examReviewDao.countExamResult(params);
|
Joburgess