|
@@ -105,15 +105,15 @@ public class OutletScoreServiceImpl implements OutletScoreService{
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public List<OutletScore> queryExamScoreByIdentityNumbers(List<String> identityNumbers, Long examOrgId) throws Exception {
|
|
|
|
- if(identityNumbers==null||identityNumbers.size()==0||examOrgId == null){
|
|
|
|
|
|
+ public List<OutletScore> queryExamScoreByIdentityNumbers(List<String> identityNumbers, Long rootOrgId) throws Exception {
|
|
|
|
+ if(identityNumbers==null||identityNumbers.size()==0||rootOrgId == null){
|
|
return null;
|
|
return null;
|
|
}
|
|
}
|
|
|
|
|
|
FindExamStudentInfoReq req = new FindExamStudentInfoReq();
|
|
FindExamStudentInfoReq req = new FindExamStudentInfoReq();
|
|
- req.setFindStudentType(FindStudentType.BY_EXAMID_AND_IDENTITYNUMBERS);
|
|
|
|
|
|
+ req.setFindStudentType(FindStudentType.BY_IDENTITYNUMBERS_AND_ROOTORGID);
|
|
FindStudentBean findStudentBean = new FindStudentBean();
|
|
FindStudentBean findStudentBean = new FindStudentBean();
|
|
- findStudentBean.setRootOrgId(examOrgId);
|
|
|
|
|
|
+ findStudentBean.setRootOrgId(rootOrgId);
|
|
findStudentBean.setIdentityNumbers(identityNumbers);
|
|
findStudentBean.setIdentityNumbers(identityNumbers);
|
|
req.setFindStudentBean(findStudentBean);
|
|
req.setFindStudentBean(findStudentBean);
|
|
|
|
|
|
@@ -148,6 +148,9 @@ public class OutletScoreServiceImpl implements OutletScoreService{
|
|
}
|
|
}
|
|
|
|
|
|
private List<OutletScore> getExamStudentsScore(List<OeExamStudentBean> examStudents) throws Exception{
|
|
private List<OutletScore> getExamStudentsScore(List<OeExamStudentBean> examStudents) throws Exception{
|
|
|
|
+ if(examStudents == null){
|
|
|
|
+ return null;
|
|
|
|
+ }
|
|
List<OutletScore> outletScoreList = new ArrayList<OutletScore>();
|
|
List<OutletScore> outletScoreList = new ArrayList<OutletScore>();
|
|
|
|
|
|
for(OeExamStudentBean examStudent:examStudents){
|
|
for(OeExamStudentBean examStudent:examStudents){
|
|
@@ -161,7 +164,7 @@ public class OutletScoreServiceImpl implements OutletScoreService{
|
|
private OutletScore findExamData(OutletScore outletScore,OeExamStudentBean examStudent) throws Exception{
|
|
private OutletScore findExamData(OutletScore outletScore,OeExamStudentBean examStudent) throws Exception{
|
|
QueryExamRecordForSelectScoreReq req = new QueryExamRecordForSelectScoreReq();
|
|
QueryExamRecordForSelectScoreReq req = new QueryExamRecordForSelectScoreReq();
|
|
req.setExamStudentId(examStudent.getExamStudentId());
|
|
req.setExamStudentId(examStudent.getExamStudentId());
|
|
- QueryExamRecordForSelectScoreResp resp = examRecordCloudService.queryExamRecordForSelectScoreByStudentId(req);
|
|
|
|
|
|
+ QueryExamRecordForSelectScoreResp resp = examRecordCloudService.queryExamRecordForSelectScoreByExamStudentId(req);
|
|
List<ExamRecordForSelectScore> examRecordList = resp.getExamRecordForSelectScoreList();
|
|
List<ExamRecordForSelectScore> examRecordList = resp.getExamRecordForSelectScoreList();
|
|
//List<ExamRecord> examRecordList = examRecordDao.findByExamStudentId(examStudent.getId());
|
|
//List<ExamRecord> examRecordList = examRecordDao.findByExamStudentId(examStudent.getId());
|
|
Boolean isFinished = examStudent.getFinished();
|
|
Boolean isFinished = examStudent.getFinished();
|