|
@@ -1,20 +1,24 @@
|
|
package com.qmth.teachcloud.report.api;
|
|
package com.qmth.teachcloud.report.api;
|
|
|
|
|
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.qmth.boot.api.constant.ApiConstant;
|
|
import com.qmth.boot.api.constant.ApiConstant;
|
|
import com.qmth.teachcloud.common.contant.SystemConstant;
|
|
import com.qmth.teachcloud.common.contant.SystemConstant;
|
|
import com.qmth.teachcloud.common.entity.SysUser;
|
|
import com.qmth.teachcloud.common.entity.SysUser;
|
|
import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
|
|
import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
|
|
|
|
+import com.qmth.teachcloud.common.enums.TaskTypeEnum;
|
|
|
|
+import com.qmth.teachcloud.common.service.TBTaskService;
|
|
import com.qmth.teachcloud.common.util.Result;
|
|
import com.qmth.teachcloud.common.util.Result;
|
|
import com.qmth.teachcloud.common.util.ResultUtil;
|
|
import com.qmth.teachcloud.common.util.ResultUtil;
|
|
import com.qmth.teachcloud.common.util.ServletUtil;
|
|
import com.qmth.teachcloud.common.util.ServletUtil;
|
|
import com.qmth.teachcloud.report.business.bean.result.*;
|
|
import com.qmth.teachcloud.report.business.bean.result.*;
|
|
import com.qmth.teachcloud.report.business.bean.result.inspectCourseExamTotal.InspectCourseTotalReportResult;
|
|
import com.qmth.teachcloud.report.business.bean.result.inspectCourseExamTotal.InspectCourseTotalReportResult;
|
|
|
|
+import com.qmth.teachcloud.report.business.entity.TBExamCourse;
|
|
|
|
+import com.qmth.teachcloud.report.business.entity.TBPaper;
|
|
import com.qmth.teachcloud.report.business.enums.PublishStatusEnum;
|
|
import com.qmth.teachcloud.report.business.enums.PublishStatusEnum;
|
|
import com.qmth.teachcloud.report.business.enums.SemesterEnum;
|
|
import com.qmth.teachcloud.report.business.enums.SemesterEnum;
|
|
-import com.qmth.teachcloud.report.business.service.AnalyzeForReportService;
|
|
|
|
-import com.qmth.teachcloud.report.business.service.CourseReportService;
|
|
|
|
-import com.qmth.teachcloud.report.business.service.TAExamCourseService;
|
|
|
|
|
|
+import com.qmth.teachcloud.report.business.service.*;
|
|
|
|
+import com.qmth.teachcloud.report.business.templete.execute.AsyncDataCalculateTempleteService;
|
|
import io.swagger.annotations.*;
|
|
import io.swagger.annotations.*;
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
@@ -23,6 +27,8 @@ import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
|
|
+import java.util.List;
|
|
|
|
+import java.util.Map;
|
|
import java.util.Objects;
|
|
import java.util.Objects;
|
|
|
|
|
|
@Api(tags = "课程Controller")
|
|
@Api(tags = "课程Controller")
|
|
@@ -39,6 +45,18 @@ public class CourseController {
|
|
@Resource
|
|
@Resource
|
|
AnalyzeForReportService analyzeForReportService;
|
|
AnalyzeForReportService analyzeForReportService;
|
|
|
|
|
|
|
|
+ @Resource
|
|
|
|
+ TBTaskService tbTaskService;
|
|
|
|
+
|
|
|
|
+ @Resource
|
|
|
|
+ AsyncDataCalculateTempleteService asyncDataCalculateTempleteService;
|
|
|
|
+
|
|
|
|
+ @Resource
|
|
|
|
+ TBExamCourseService tbExamCourseService;
|
|
|
|
+
|
|
|
|
+ @Resource
|
|
|
|
+ TBPaperService tbPaperService;
|
|
|
|
+
|
|
@ApiOperation(value = "开课课程考试总览列表接口")
|
|
@ApiOperation(value = "开课课程考试总览列表接口")
|
|
@RequestMapping(value = "/survey_teacher/list", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/survey_teacher/list", method = RequestMethod.POST)
|
|
@ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = TAExamCourseResult.class)})
|
|
@ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = TAExamCourseResult.class)})
|
|
@@ -122,7 +140,7 @@ public class CourseController {
|
|
@ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
|
|
@ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
|
|
@ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
|
|
@ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
|
|
@ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId) {
|
|
@ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId) {
|
|
- return ResultUtil.ok(taExamCourseService.surveyInspectAnalyseView(Objects.isNull(schoolId) ? (Long) ServletUtil.getRequestHeaderSchoolId() : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode));
|
|
|
|
|
|
+ return ResultUtil.ok(taExamCourseService.surveyInspectAnalyseView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode));
|
|
}
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "赋分管理列表接口")
|
|
@ApiOperation(value = "赋分管理列表接口")
|
|
@@ -135,7 +153,7 @@ public class CourseController {
|
|
@ApiParam(value = "发布状态", required = false) @RequestParam(required = false) PublishStatusEnum publishStatus,
|
|
@ApiParam(value = "发布状态", required = false) @RequestParam(required = false) PublishStatusEnum publishStatus,
|
|
@ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
|
|
@ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
|
|
@ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
|
|
@ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
|
|
- return ResultUtil.ok(taExamCourseService.surveyAspointsList(new Page<>(pageNumber, pageSize), Objects.isNull(schoolId) ? (Long) ServletUtil.getRequestHeaderSchoolId() : SystemConstant.convertIdToLong(schoolId), SystemConstant.convertIdToLong(examId), courseCode, publishStatus, semester));
|
|
|
|
|
|
+ return ResultUtil.ok(taExamCourseService.surveyAspointsList(new Page<>(pageNumber, pageSize), Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), SystemConstant.convertIdToLong(examId), courseCode, publishStatus, semester));
|
|
}
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "赋分试算接口")
|
|
@ApiOperation(value = "赋分试算接口")
|
|
@@ -160,4 +178,28 @@ public class CourseController {
|
|
return ResultUtil.ok();
|
|
return ResultUtil.ok();
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @ApiOperation(value = "赋分管理-保存")
|
|
|
|
+ @RequestMapping(value = "/survey_aspoints/save", method = RequestMethod.POST)
|
|
|
|
+ @ApiResponses({@ApiResponse(code = 200, message = "赋分管理-保存", response = Result.class)})
|
|
|
|
+ public Result surveyAspointsSave(
|
|
|
|
+ @ApiParam(value = "考试id", required = true) @RequestParam String examId,
|
|
|
|
+ @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
|
|
|
|
+ @ApiParam(value = "赋分系数", required = true) @RequestParam BigDecimal coefficient) {
|
|
|
|
+ if (coefficient.compareTo(BigDecimal.ZERO) != 0){
|
|
|
|
+ List<TBPaper> tbPaperList = tbPaperService.list(new QueryWrapper<TBPaper>().lambda()
|
|
|
|
+ .eq(TBPaper::getExamId,examId).eq(TBPaper::getCourseCode,courseCode));
|
|
|
|
+
|
|
|
|
+ for (TBPaper tbPaper : tbPaperList) {
|
|
|
|
+ tbPaper.setCoefficient(coefficient);
|
|
|
|
+ }
|
|
|
|
+ tbPaperService.updateBatchById(tbPaperList);
|
|
|
|
+
|
|
|
|
+ Map<String, Object> map = tbTaskService.saveTask(TaskTypeEnum.DATA_CALCULATE);
|
|
|
|
+ map.put("examId",examId);
|
|
|
|
+ map.put("courseCode",courseCode);
|
|
|
|
+ asyncDataCalculateTempleteService.calculateTask(map);
|
|
|
|
+ }
|
|
|
|
+ return ResultUtil.ok();
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|