科目数据

src/main/java/cn/com/qmth/markingaudit/bean/QuestionDataQuery.java

@@ -0,0 +1,39 @@
+package cn.com.qmth.markingaudit.bean;
+
+import javax.validation.constraints.NotNull;
+
+public class QuestionDataQuery {
+
+    private String schoolCode;
+
+    @NotNull(message = "考试ID不能为空")
+    private Integer examId;
+
+    @NotNull(message = "科目代码不能为空")
+    private String subjectCode;
+
+    public Integer getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Integer examId) {
+        this.examId = examId;
+    }
+
+    public String getSubjectCode() {
+        return subjectCode;
+    }
+
+    public void setSubjectCode(String subjectCode) {
+        this.subjectCode = subjectCode;
+    }
+
+    public String getSchoolCode() {
+        return schoolCode;
+    }
+
+    public void setSchoolCode(String schoolCode) {
+        this.schoolCode = schoolCode;
+    }
+
+}

src/main/java/cn/com/qmth/markingaudit/bean/QuestionDataVo.java

@@ -0,0 +1,60 @@
+package cn.com.qmth.markingaudit.bean;
+
+public class QuestionDataVo {
+
+    // 科目名称
+    private String name;
+
+    // 大题名
+    private String majorName;
+
+    // 大题号
+    private String majorNo;
+
+    // 小题号
+    private String minorNo;
+
+    // 小题分
+    private Integer minorScore;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getMajorName() {
+        return majorName;
+    }
+
+    public void setMajorName(String majorName) {
+        this.majorName = majorName;
+    }
+
+    public String getMajorNo() {
+        return majorNo;
+    }
+
+    public void setMajorNo(String majorNo) {
+        this.majorNo = majorNo;
+    }
+
+    public String getMinorNo() {
+        return minorNo;
+    }
+
+    public void setMinorNo(String minorNo) {
+        this.minorNo = minorNo;
+    }
+
+    public Integer getMinorScore() {
+        return minorScore;
+    }
+
+    public void setMinorScore(Integer minorScore) {
+        this.minorScore = minorScore;
+    }
+
+}

src/main/java/cn/com/qmth/markingaudit/bean/SubjectDataQuery.java

@@ -0,0 +1,20 @@
+package cn.com.qmth.markingaudit.bean;
+
+import javax.validation.constraints.NotNull;
+
+import cn.com.qmth.markingaudit.support.PagerQuery;
+
+public class SubjectDataQuery extends PagerQuery {
+
+    @NotNull(message = "考试ID不能为空")
+    private Integer examId;
+
+    public Integer getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Integer examId) {
+        this.examId = examId;
+    }
+
+}

src/main/java/cn/com/qmth/markingaudit/bean/SubjectDataVo.java

@@ -0,0 +1,26 @@
+package cn.com.qmth.markingaudit.bean;
+
+public class SubjectDataVo {
+
+    private String subjectCode;
+
+    // 姓名
+    private String name;
+
+    public String getSubjectCode() {
+        return subjectCode;
+    }
+
+    public void setSubjectCode(String subjectCode) {
+        this.subjectCode = subjectCode;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+}

src/main/java/cn/com/qmth/markingaudit/controller/MonitorController.java

@@ -12,8 +12,12 @@ import com.qmth.boot.api.annotation.Aac;
 
 import cn.com.qmth.markingaudit.bean.ExamDataQuery;
 import cn.com.qmth.markingaudit.bean.ExamDataVo;
+import cn.com.qmth.markingaudit.bean.QuestionDataQuery;
+import cn.com.qmth.markingaudit.bean.QuestionDataVo;
 import cn.com.qmth.markingaudit.bean.StudentDataQuery;
 import cn.com.qmth.markingaudit.bean.StudentDataVo;
+import cn.com.qmth.markingaudit.bean.SubjectDataQuery;
+import cn.com.qmth.markingaudit.bean.SubjectDataVo;
 import cn.com.qmth.markingaudit.service.MonitorService;
 import cn.com.qmth.markingaudit.support.AccessInfo;
 import cn.com.qmth.markingaudit.support.CustConstants;
@@ -43,4 +47,20 @@ public class MonitorController {
         req.setSchoolCode(ai.getSchoolCode());
         return monitorService.studentData(req);
     }
+
+    @ApiOperation(value = "科目详情数据(大题信息)")
+    @PostMapping("subjectInfoDataSync")
+    public List<QuestionDataVo> questionData(@Validated QuestionDataQuery req) {
+        AccessInfo ai = ServletUtil.getAccessInfo();
+        req.setSchoolCode(ai.getSchoolCode());
+        return monitorService.questionData(req);
+    }
+
+    @ApiOperation(value = "科目数据")
+    @PostMapping("subjectDataSync")
+    public List<SubjectDataVo> subjectData(@Validated SubjectDataQuery req) {
+        AccessInfo ai = ServletUtil.getAccessInfo();
+        req.setSchoolCode(ai.getSchoolCode());
+        return monitorService.subjectData(req);
+    }
 }

src/main/java/cn/com/qmth/markingaudit/dao/MonitorDao.java

@@ -6,8 +6,12 @@ import org.apache.ibatis.annotations.Param;
 
 import cn.com.qmth.markingaudit.bean.ExamDataQuery;
 import cn.com.qmth.markingaudit.bean.ExamDataVo;
+import cn.com.qmth.markingaudit.bean.QuestionDataQuery;
+import cn.com.qmth.markingaudit.bean.QuestionDataVo;
 import cn.com.qmth.markingaudit.bean.StudentDataQuery;
 import cn.com.qmth.markingaudit.bean.StudentDataVo;
+import cn.com.qmth.markingaudit.bean.SubjectDataQuery;
+import cn.com.qmth.markingaudit.bean.SubjectDataVo;
 
 public interface MonitorDao {
 
@@ -17,4 +21,8 @@ public interface MonitorDao {
 
     Integer getExamIdByIdAndSchoolCode(@Param("examId") Integer examId, @Param("schoolCode") String schoolCode);
 
+    List<QuestionDataVo> questionData(@Param("req") QuestionDataQuery req);
+
+    List<SubjectDataVo> subjectData(@Param("req") SubjectDataQuery req);
+
 }

src/main/java/cn/com/qmth/markingaudit/service/MonitorService.java

@@ -4,8 +4,12 @@ import java.util.List;
 
 import cn.com.qmth.markingaudit.bean.ExamDataQuery;
 import cn.com.qmth.markingaudit.bean.ExamDataVo;
+import cn.com.qmth.markingaudit.bean.QuestionDataQuery;
+import cn.com.qmth.markingaudit.bean.QuestionDataVo;
 import cn.com.qmth.markingaudit.bean.StudentDataQuery;
 import cn.com.qmth.markingaudit.bean.StudentDataVo;
+import cn.com.qmth.markingaudit.bean.SubjectDataQuery;
+import cn.com.qmth.markingaudit.bean.SubjectDataVo;
 
 /**
  * 类注释
@@ -16,4 +20,8 @@ public interface MonitorService {
 
     List<StudentDataVo> studentData(StudentDataQuery req);
 
+    List<SubjectDataVo> subjectData(SubjectDataQuery req);
+
+    List<QuestionDataVo> questionData(QuestionDataQuery req);
+
 }

src/main/java/cn/com/qmth/markingaudit/service/impl/MonitorServiceImpl.java

@@ -12,8 +12,12 @@ import com.qmth.boot.core.exception.StatusException;
 
 import cn.com.qmth.markingaudit.bean.ExamDataQuery;
 import cn.com.qmth.markingaudit.bean.ExamDataVo;
+import cn.com.qmth.markingaudit.bean.QuestionDataQuery;
+import cn.com.qmth.markingaudit.bean.QuestionDataVo;
 import cn.com.qmth.markingaudit.bean.StudentDataQuery;
 import cn.com.qmth.markingaudit.bean.StudentDataVo;
+import cn.com.qmth.markingaudit.bean.SubjectDataQuery;
+import cn.com.qmth.markingaudit.bean.SubjectDataVo;
 import cn.com.qmth.markingaudit.dao.MonitorDao;
 import cn.com.qmth.markingaudit.service.MonitorService;
 
@@ -46,8 +50,7 @@ public class MonitorServiceImpl implements MonitorService {
     @Override
     public List<StudentDataVo> studentData(StudentDataQuery req) {
         checkExamIdValid(req.getExamId(), req.getSchoolCode());
-        List<StudentDataVo> ret = monitorDao.studentData(req);
-        return ret;
+        return monitorDao.studentData(req);
     }
 
     private void checkExamIdValid(Integer examId, String schoolCode) {
@@ -57,4 +60,16 @@ public class MonitorServiceImpl implements MonitorService {
         }
     }
 
+    @Override
+    public List<SubjectDataVo> subjectData(SubjectDataQuery req) {
+        checkExamIdValid(req.getExamId(), req.getSchoolCode());
+        return monitorDao.subjectData(req);
+    }
+
+    @Override
+    public List<QuestionDataVo> questionData(QuestionDataQuery req) {
+        checkExamIdValid(req.getExamId(), req.getSchoolCode());
+        return monitorDao.questionData(req);
+    }
+
 }

src/main/java/cn/com/qmth/markingaudit/support/PagerQuery.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty;
 
 public class PagerQuery {
 
+    private String schoolCode;
+
     @ApiModelProperty(value = "第几页(从1开始)")
     protected Integer pageNumber;
 
@@ -36,4 +38,12 @@ public class PagerQuery {
         this.pageSize = pageSize;
     }
 
+    public String getSchoolCode() {
+        return schoolCode;
+    }
+
+    public void setSchoolCode(String schoolCode) {
+        this.schoolCode = schoolCode;
+    }
+
 }

src/main/resources/mapper/MonitorMapper.xml

@@ -28,4 +28,20 @@
 		limit #{req.pageSize}
 	</select>
 	
+	<select id="questionData" resultType="cn.com.qmth.markingaudit.bean.QuestionDataVo">
+		select s.name,t.main_title majorName,t.main_number majorNo,t.sub_number minorNo,t.total_score minorScore
+		from eb_exam_question t 
+		left join eb_exam_subject s on t.exam_id=s.exam_id and t.subject_code=s.code
+		where t.exam_id=#{req.examId}
+		and t.subject_code=#{req.subjectCode}
+		order by t.main_number,t.sub_number
+	</select>
+	
+	<select id="subjectData" resultType="cn.com.qmth.markingaudit.bean.SubjectDataVo">
+		select t.name,t.code subjectCode
+		from eb_exam_subject t
+		where t.exam_id=#{req.examId}
+		order by t.code
+		 limit ${(req.pageNumber-1)*req.pageSize},#{req.pageSize}
+	</select>
 </mapper>