|
@@ -14,12 +14,14 @@ import com.qmth.teachcloud.common.entity.BasicSchool;
|
|
import com.qmth.teachcloud.common.entity.SysUser;
|
|
import com.qmth.teachcloud.common.entity.SysUser;
|
|
import com.qmth.teachcloud.common.enums.AppSourceEnum;
|
|
import com.qmth.teachcloud.common.enums.AppSourceEnum;
|
|
import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
|
|
import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
|
|
|
|
+import com.qmth.teachcloud.common.service.BasicSchoolService;
|
|
import com.qmth.teachcloud.common.service.SysUserService;
|
|
import com.qmth.teachcloud.common.service.SysUserService;
|
|
import com.qmth.teachcloud.common.service.TeachcloudCommonService;
|
|
import com.qmth.teachcloud.common.service.TeachcloudCommonService;
|
|
import com.qmth.teachcloud.common.util.*;
|
|
import com.qmth.teachcloud.common.util.*;
|
|
import io.swagger.annotations.*;
|
|
import io.swagger.annotations.*;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
+import org.springframework.util.CollectionUtils;
|
|
import org.springframework.validation.annotation.Validated;
|
|
import org.springframework.validation.annotation.Validated;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
@@ -54,6 +56,9 @@ public class OpenApiController {
|
|
@Resource
|
|
@Resource
|
|
TeachcloudCommonService teachcloudCommonService;
|
|
TeachcloudCommonService teachcloudCommonService;
|
|
|
|
|
|
|
|
+ @Resource
|
|
|
|
+ BasicSchoolService basicSchoolService;
|
|
|
|
+
|
|
@ApiOperation(value = "试卷基础配置查询")
|
|
@ApiOperation(value = "试卷基础配置查询")
|
|
@ApiResponses({@ApiResponse(code = 200, message = "试卷基础配置查询", response = Object.class)})
|
|
@ApiResponses({@ApiResponse(code = 200, message = "试卷基础配置查询", response = Object.class)})
|
|
@PostMapping("/paper_config")
|
|
@PostMapping("/paper_config")
|
|
@@ -196,7 +201,7 @@ public class OpenApiController {
|
|
basicSchoolQueryWrapper.lambda().in(BasicSchool::getCode, schoolCodes);
|
|
basicSchoolQueryWrapper.lambda().in(BasicSchool::getCode, schoolCodes);
|
|
List<BasicSchool> basicSchoolList = basicSchoolService.list(basicSchoolQueryWrapper);
|
|
List<BasicSchool> basicSchoolList = basicSchoolService.list(basicSchoolQueryWrapper);
|
|
if (CollectionUtils.isEmpty(basicSchoolList)) {
|
|
if (CollectionUtils.isEmpty(basicSchoolList)) {
|
|
- throw ExceptionResultEnum.PARAMS_ERROR.exception("未找到西交大学校信息");
|
|
|
|
|
|
+ throw ExceptionResultEnum.ERROR.exception("未找到西交大学校信息");
|
|
}
|
|
}
|
|
List<Long> schoolIds = basicSchoolList.stream().map(s -> s.getId()).collect(Collectors.toList());
|
|
List<Long> schoolIds = basicSchoolList.stream().map(s -> s.getId()).collect(Collectors.toList());
|
|
|
|
|