|
@@ -173,7 +173,7 @@ public class MarkSubjectApi {
|
|
@GetMapping("/{markSubjectId}")
|
|
@GetMapping("/{markSubjectId}")
|
|
public MarkSubject get(@PathVariable String markSubjectId) {
|
|
public MarkSubject get(@PathVariable String markSubjectId) {
|
|
MarkSubject markSubject = markSubjectRepo.findOne(markSubjectId);
|
|
MarkSubject markSubject = markSubjectRepo.findOne(markSubjectId);
|
|
- if (markSubject.getTest() == 0) {
|
|
|
|
|
|
+// if (markSubject.getTest() == 0) {
|
|
int count = 0;
|
|
int count = 0;
|
|
if (MarkStage.ROUGH_LEVEL.equals(markSubject.getStage())) {
|
|
if (MarkStage.ROUGH_LEVEL.equals(markSubject.getStage())) {
|
|
count = markTaskRoughLevelRepo.countByWorkIdAndSubjectAndStage(markSubject.getWorkId(), markSubject.getSubject(), markSubject.getStage());
|
|
count = markTaskRoughLevelRepo.countByWorkIdAndSubjectAndStage(markSubject.getWorkId(), markSubject.getSubject(), markSubject.getStage());
|
|
@@ -182,7 +182,7 @@ public class MarkSubjectApi {
|
|
}
|
|
}
|
|
markSubject.setFormal(count > 0);
|
|
markSubject.setFormal(count > 0);
|
|
markSubject.setRoughLevelEnable(ParamCache.levelConfigMap.get(String.valueOf(markSubject.getWorkId())).getRoughLevelEnable() == 1);
|
|
markSubject.setRoughLevelEnable(ParamCache.levelConfigMap.get(String.valueOf(markSubject.getWorkId())).getRoughLevelEnable() == 1);
|
|
- }
|
|
|
|
|
|
+// }
|
|
return markSubject;
|
|
return markSubject;
|
|
}
|
|
}
|
|
|
|
|