xiatian 8 ヶ月 前
コミット
d168375b9c

+ 41 - 0
src/main/java/cn/com/qmth/markingaudit/bean/RejectDataQuery.java

@@ -0,0 +1,41 @@
+package cn.com.qmth.markingaudit.bean;
+
+import javax.validation.constraints.NotNull;
+
+import cn.com.qmth.markingaudit.support.IdPagerQuery;
+
+public class RejectDataQuery extends IdPagerQuery {
+
+    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;
+    }
+
+}

+ 70 - 0
src/main/java/cn/com/qmth/markingaudit/bean/RejectDataVo.java

@@ -0,0 +1,70 @@
+package cn.com.qmth.markingaudit.bean;
+
+public class RejectDataVo {
+
+    private Integer dataId;
+
+    // 准考证号
+    private String cardNo;
+
+    // 打回时间
+    private String createTime;
+
+    // 登录名
+    private String id;
+
+    // 姓名
+    private String longName;
+
+    // 打回原因
+    private String reason;
+
+    public Integer getDataId() {
+        return dataId;
+    }
+
+    public void setDataId(Integer dataId) {
+        this.dataId = dataId;
+    }
+
+    public String getCardNo() {
+        return cardNo;
+    }
+
+    public void setCardNo(String cardNo) {
+        this.cardNo = cardNo;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getLongName() {
+        return longName;
+    }
+
+    public void setLongName(String longName) {
+        this.longName = longName;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+}

+ 10 - 0
src/main/java/cn/com/qmth/markingaudit/controller/MonitorController.java

@@ -18,6 +18,8 @@ import cn.com.qmth.markingaudit.bean.MarkingScoreDataQuery;
 import cn.com.qmth.markingaudit.bean.MarkingScoreDataVo;
 import cn.com.qmth.markingaudit.bean.QuestionDataQuery;
 import cn.com.qmth.markingaudit.bean.QuestionDataVo;
+import cn.com.qmth.markingaudit.bean.RejectDataQuery;
+import cn.com.qmth.markingaudit.bean.RejectDataVo;
 import cn.com.qmth.markingaudit.bean.StudentDataQuery;
 import cn.com.qmth.markingaudit.bean.StudentDataVo;
 import cn.com.qmth.markingaudit.bean.SubjectDataQuery;
@@ -83,4 +85,12 @@ public class MonitorController {
         req.setSchoolCode(ai.getSchoolCode());
         return monitorService.inspectData(req);
     }
+
+    @ApiOperation(value = "打回数据")
+    @PostMapping("rejectDataSync")
+    public List<RejectDataVo> rejectData(@Validated RejectDataQuery req) {
+        AccessInfo ai = ServletUtil.getAccessInfo();
+        req.setSchoolCode(ai.getSchoolCode());
+        return monitorService.rejectData(req);
+    }
 }

+ 4 - 0
src/main/java/cn/com/qmth/markingaudit/dao/MonitorDao.java

@@ -15,6 +15,8 @@ import cn.com.qmth.markingaudit.bean.MarkingScoreInfo;
 import cn.com.qmth.markingaudit.bean.MarkingScoreOperateInfo;
 import cn.com.qmth.markingaudit.bean.QuestionDataQuery;
 import cn.com.qmth.markingaudit.bean.QuestionDataVo;
+import cn.com.qmth.markingaudit.bean.RejectDataQuery;
+import cn.com.qmth.markingaudit.bean.RejectDataVo;
 import cn.com.qmth.markingaudit.bean.StudentDataQuery;
 import cn.com.qmth.markingaudit.bean.StudentDataVo;
 import cn.com.qmth.markingaudit.bean.SubjectDataQuery;
@@ -42,4 +44,6 @@ public interface MonitorDao {
 
     List<InspectDataInfo> inspectDataInfo(@Param("ids") List<Integer> ids);
 
+    List<RejectDataVo> rejectData(@Param("req") RejectDataQuery req);
+
 }

+ 4 - 0
src/main/java/cn/com/qmth/markingaudit/service/MonitorService.java

@@ -10,6 +10,8 @@ import cn.com.qmth.markingaudit.bean.MarkingScoreDataQuery;
 import cn.com.qmth.markingaudit.bean.MarkingScoreDataVo;
 import cn.com.qmth.markingaudit.bean.QuestionDataQuery;
 import cn.com.qmth.markingaudit.bean.QuestionDataVo;
+import cn.com.qmth.markingaudit.bean.RejectDataQuery;
+import cn.com.qmth.markingaudit.bean.RejectDataVo;
 import cn.com.qmth.markingaudit.bean.StudentDataQuery;
 import cn.com.qmth.markingaudit.bean.StudentDataVo;
 import cn.com.qmth.markingaudit.bean.SubjectDataQuery;
@@ -32,4 +34,6 @@ public interface MonitorService {
 
     List<InspectDataVo> inspectData(InspectDataQuery req);
 
+    List<RejectDataVo> rejectData(RejectDataQuery req);
+
 }

+ 8 - 0
src/main/java/cn/com/qmth/markingaudit/service/impl/MonitorServiceImpl.java

@@ -25,6 +25,8 @@ import cn.com.qmth.markingaudit.bean.MarkingScoreInfo;
 import cn.com.qmth.markingaudit.bean.MarkingScoreOperateInfo;
 import cn.com.qmth.markingaudit.bean.QuestionDataQuery;
 import cn.com.qmth.markingaudit.bean.QuestionDataVo;
+import cn.com.qmth.markingaudit.bean.RejectDataQuery;
+import cn.com.qmth.markingaudit.bean.RejectDataVo;
 import cn.com.qmth.markingaudit.bean.StudentDataQuery;
 import cn.com.qmth.markingaudit.bean.StudentDataVo;
 import cn.com.qmth.markingaudit.bean.SubjectDataQuery;
@@ -176,4 +178,10 @@ public class MonitorServiceImpl implements MonitorService {
         return ret;
     }
 
+    @Override
+    public List<RejectDataVo> rejectData(RejectDataQuery req) {
+        checkExamIdValid(req.getExamId(), req.getSchoolCode());
+        return monitorDao.rejectData(req);
+    }
+
 }

+ 11 - 0
src/main/resources/mapper/MonitorMapper.xml

@@ -107,4 +107,15 @@
 		</foreach>
 		order by t.inspect_round
 	</select>
+	<select id="rejectData" resultType="cn.com.qmth.markingaudit.bean.RejectDataVo">
+		select s.exam_number cardNo,t.id dataId,t.reason,t.create_time,u.login_name id,u.name loginName
+		from m_reject_history t
+		inner join eb_exam_student s on t.student_id=s.id
+		inner join b_user u on t.user_id=u.id
+		where t.exam_id=#{req.examId}
+		and t.subject_code=#{req.subjectCode}
+		and t.id&gt;=#{req.startId}
+		order by t.id
+		limit #{req.pageSize}
+	</select>
 </mapper>