|
@@ -447,11 +447,13 @@ public class RealExamCollectionService extends Ele6RYBaseService {
|
|
*/
|
|
*/
|
|
public RealExamCollection selectRealExamCollectionOpenedNotSelfExercise() {
|
|
public RealExamCollection selectRealExamCollectionOpenedNotSelfExercise() {
|
|
RealExamCollection q = selectRealExamCollectionOpened();
|
|
RealExamCollection q = selectRealExamCollectionOpened();
|
|
|
|
+ if (q == null) {
|
|
|
|
+ return null;
|
|
|
|
+ }
|
|
if (StringUtils.equals(q.getExamCollectionType(), RealExamCollection.Type.SELF_EXERCISE)) {
|
|
if (StringUtils.equals(q.getExamCollectionType(), RealExamCollection.Type.SELF_EXERCISE)) {
|
|
return null;
|
|
return null;
|
|
- } else {
|
|
|
|
- return q;
|
|
|
|
}
|
|
}
|
|
|
|
+ return q;
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -549,11 +551,12 @@ public class RealExamCollectionService extends Ele6RYBaseService {
|
|
return AjaxResult.success(count.intValue());
|
|
return AjaxResult.success(count.intValue());
|
|
}
|
|
}
|
|
|
|
|
|
- public void deleteRef(Long id) {
|
|
|
|
|
|
+ public AjaxResult deleteRef(Long id) {
|
|
// delete ref exam data.
|
|
// delete ref exam data.
|
|
realExamService.deleteRefByExamCollectionId(id);
|
|
realExamService.deleteRefByExamCollectionId(id);
|
|
//
|
|
//
|
|
- deleteRealExamCollectionByExamCollectionId(id);
|
|
|
|
|
|
+ int count = deleteRealExamCollectionByExamCollectionId(id);
|
|
|
|
+ return AjaxResult.success(count);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|