|
@@ -13,7 +13,7 @@ import io.swagger.annotations.ApiParam;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.http.HttpStatus;
|
|
|
import org.springframework.http.ResponseEntity;
|
|
|
-import org.springframework.util.StringUtils;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
import springfox.documentation.annotations.ApiIgnore;
|
|
|
|
|
@@ -99,12 +99,11 @@ public class SydxScoreController extends ControllerSupport {
|
|
|
}
|
|
|
User accessUser = getAccessUser();
|
|
|
//如果考试代码为空,则将考试名称作为考试代码
|
|
|
- final String finalExamCode;
|
|
|
- if (StringUtils.isEmpty(sydxExamScoreDomain.getCourseCode())) {
|
|
|
+ String finalExamCode = sydxExamScoreDomain.getExamCode();
|
|
|
+ if (StringUtils.isNotEmpty(sydxExamScoreDomain.getBatchName())) {
|
|
|
finalExamCode = sydxExamScoreDomain.getBatchName();
|
|
|
- } else {
|
|
|
- finalExamCode = sydxExamScoreDomain.getExamCode();
|
|
|
}
|
|
|
+
|
|
|
List<OutletScore> outletScoreList = outletScoreService.queryExamScoreBy(accessUser.getRootOrgId(),
|
|
|
finalExamCode, sydxExamScoreDomain.getCourseCode(), sydxExamScoreDomain.getStudentCodes());
|
|
|
return new ResponseEntity<List<OutletScore>>(outletScoreList, HttpStatus.OK);
|