加入开课课程考试总览-列表接口

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/result/TAExamCourseResult.java

@@ -2,10 +2,12 @@ package com.qmth.teachcloud.report.business.bean.result;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.qmth.teachcloud.report.business.entity.TAExamCourse;
+import com.qmth.teachcloud.report.business.enums.PublishStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * @Description: TAExamCourseResult
@@ -41,6 +43,32 @@ public class TAExamCourseResult extends TAExamCourse implements Serializable {
     @ApiModelProperty(value = "应届不及格率-赋分后")
     private BigDecimal currentNotPassRateAfter;
 
+    @ApiModelProperty(value = "发布状态（UN_COMPUTE：未计算、UN_PUBLISH：未发布、PUBLISH：已发布）")
+    private PublishStatusEnum status;
+
+    @ApiModelProperty(value = "发布状态（UN_COMPUTE：未计算、UN_PUBLISH：未发布、PUBLISH：已发布）")
+    private String publishStatus;
+
+    public PublishStatusEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(PublishStatusEnum status) {
+        this.status = status;
+    }
+
+    public String getPublishStatus() {
+        if (Objects.nonNull(status)) {
+            return status.getTitle();
+        } else {
+            return publishStatus;
+        }
+    }
+
+    public void setPublishStatus(String publishStatus) {
+        this.publishStatus = publishStatus;
+    }
+
     public BigDecimal getAvgScoreBefore() {
         return avgScoreBefore;
     }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/mapper/TAExamCourseMapper.java

@@ -1,6 +1,7 @@
 package com.qmth.teachcloud.report.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.primitives.Longs;
 import com.qmth.teachcloud.report.business.bean.result.TAExamCourseResult;
 import com.qmth.teachcloud.report.business.entity.TAExamCourse;
@@ -8,6 +9,7 @@ import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -22,10 +24,11 @@ public interface TAExamCourseMapper extends BaseMapper<TAExamCourse> {
     /**
      * 开课课程考试总览列表接口
      *
+     * @param iPage
      * @param examId
      * @param semester
      * @param schoolId
      * @return
      */
-    List<TAExamCourseResult> surveyTeacherList(@Param("examId") Long examId, @Param("semester") String semester, @Param("schoolId") Long schoolId);
+    IPage<TAExamCourseResult> surveyTeacherList(IPage<Map> iPage, @Param("examId") Long examId, @Param("semester") String semester, @Param("schoolId") Long schoolId);
 }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/TAExamCourseService.java

@@ -1,11 +1,13 @@
 package com.qmth.teachcloud.report.business.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.teachcloud.report.business.bean.result.TAExamCourseResult;
 import com.qmth.teachcloud.report.business.entity.TAExamCourse;
 import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -20,10 +22,11 @@ public interface TAExamCourseService extends IService<TAExamCourse> {
     /**
      * 开课课程考试总览列表接口
      *
+     * @param iPage
      * @param examId
      * @param semester
      * @param schoolId
      * @return
      */
-    List<TAExamCourseResult> surveyTeacherList(Long examId, SemesterEnum semester, Long schoolId);
+    IPage<TAExamCourseResult> surveyTeacherList(IPage<Map> iPage, Long examId, SemesterEnum semester, Long schoolId);
 }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/TAExamCourseServiceImpl.java

@@ -1,5 +1,6 @@
 package com.qmth.teachcloud.report.business.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.teachcloud.report.business.bean.result.TAExamCourseResult;
 import com.qmth.teachcloud.report.business.entity.TAExamCourse;
@@ -10,6 +11,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -28,13 +30,14 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
     /**
      * 开课课程考试总览列表接口
      *
+     * @param iPage
      * @param examId
      * @param semester
      * @param schoolId
      * @return
      */
     @Override
-    public List<TAExamCourseResult> surveyTeacherList(Long examId, SemesterEnum semester, Long schoolId) {
-        return taExamCourseMapper.surveyTeacherList(examId, semester.name(), schoolId);
+    public IPage<TAExamCourseResult> surveyTeacherList(IPage<Map> iPage, Long examId, SemesterEnum semester, Long schoolId) {
+        return taExamCourseMapper.surveyTeacherList(iPage, examId, semester.name(), schoolId);
     }
 }

teachcloud-report-business/src/main/resources/mapper/TAExamCourseMapper.xml

@@ -4,6 +4,7 @@
 
     <select id="surveyTeacherList" resultType="com.qmth.teachcloud.report.business.bean.result.TAExamCourseResult">
         select
+            taec.id,
             taec.course_code as courseCode,
             taec.course_name as courseName,
             taec.teach_college_id as teachCollegeId,

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/CourseController.java

@@ -1,10 +1,12 @@
 package com.qmth.teachcloud.report.api;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.report.business.entity.TAExamCourse;
+import com.qmth.teachcloud.report.business.enums.PublishStatusEnum;
 import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import com.qmth.teachcloud.report.business.service.TAExamCourseService;
 import io.swagger.annotations.*;
@@ -25,10 +27,25 @@ public class CourseController {
 
     @ApiOperation(value = "开课课程考试总览列表接口")
     @RequestMapping(value = "/survey_teacher/list", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "考生信息", response = TAExamCourse.class)})
+    @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = TAExamCourse.class)})
     public Result surveyTeacherList(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
                                     @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
-                                    @ApiParam(value = "学校id", required = true) @RequestParam String schoolId) {
-        return ResultUtil.ok(taExamCourseService.surveyTeacherList(SystemConstant.convertIdToLong(examId), semester, SystemConstant.convertIdToLong(schoolId)));
+                                    @ApiParam(value = "学校id", required = true) @RequestParam String schoolId,
+                                    @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
+                                    @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
+        return ResultUtil.ok(taExamCourseService.surveyTeacherList(new Page<>(pageNumber, pageSize), SystemConstant.convertIdToLong(examId), semester, SystemConstant.convertIdToLong(schoolId)));
+    }
+
+    @ApiOperation(value = "赋分管理列表接口")
+    @RequestMapping(value = "/survey_aspoints/list", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = TAExamCourse.class)})
+    public Result surveyAspointsList(@ApiParam(value = "学校id", required = true) @RequestParam String schoolId,
+                                     @ApiParam(value = "考试id", required = true) @RequestParam String examId,
+                                     @ApiParam(value = "学院id", required = true) @RequestParam String collegeId,
+                                     @ApiParam(value = "科目编码", required = false) @RequestParam(required = false) String courseCode,
+                                     @ApiParam(value = "发布状态", required = false) @RequestParam(required = false) PublishStatusEnum publishStatus,
+                                     @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
+                                     @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
+        return ResultUtil.ok();
     }
 }