xiatian 11 月之前
父节点
当前提交
a72cb9bec2

+ 4 - 3
src/main/java/cn/com/qmth/am/controller/AdminController.java

@@ -54,7 +54,8 @@ public class AdminController {
 
 	@ApiOperation(value = "分析数据")
 	@RequestMapping(value = "fenxi", method = RequestMethod.GET)
-	public void fenxi(HttpServletResponse response, @RequestParam Long examId) {
+	public void fenxi(HttpServletResponse response, @RequestParam Long examId,
+			@RequestParam(required = false) Boolean exZero) {
 		StringBuilder sb = new StringBuilder();
 		List<QuestionEntity> qs = questionService.findByExamId(examId);
 		if (CollectionUtils.isEmpty(qs)) {
@@ -65,7 +66,7 @@ public class AdminController {
 		sb.append("试题数:" + qs.size() + "\r\n");
 		for (QuestionEntity q : qs) {
 			List<StudentScoreEntity> scores = studentScoreService.findBy(examId, q.getSubjectCode(), q.getMainNumber(),
-					q.getSubNumber());
+					q.getSubNumber(), exZero);
 			if (CollectionUtils.isEmpty(scores)) {
 				sb.append(q.getSubjectCode() + "|" + q.getMainNumber() + "|" + q.getSubNumber() + "| 相关系数:- \r\n");
 			} else {
@@ -85,7 +86,7 @@ public class AdminController {
 					double avg2 = new BigDecimal(Calculator.mean(b)).setScale(2, BigDecimal.ROUND_HALF_UP)
 							.doubleValue();
 					sb.append(q.getSubjectCode() + "|" + q.getMainNumber() + "|" + q.getSubNumber() + "| 相关系数:" + ret
-							+ "| 人评均分:" + avg2 + "| 机评均分:" + avg1 + " \r\n");
+							+ "| 人评均分:" + avg2 + "| 机评均分:" + avg1 +"| 题数:"+scores.size()+ " \r\n");
 				} catch (Exception e) {
 					sb.append(q.getSubjectCode() + "|" + q.getMainNumber() + "|" + q.getSubNumber() + "| 相关系数:- \r\n");
 				}

+ 1 - 1
src/main/java/cn/com/qmth/am/service/StudentScoreService.java

@@ -43,6 +43,6 @@ public interface StudentScoreService  extends IService<StudentScoreEntity> {
 
 	void removeBy(Long examId, String subjectCode);
 
-	List<StudentScoreEntity> findBy(Long examId, String subjectCode, Integer mainNumber, String subNumber);
+	List<StudentScoreEntity> findBy(Long examId, String subjectCode, Integer mainNumber, String subNumber,Boolean exZero);
 
 }

+ 10 - 3
src/main/java/cn/com/qmth/am/service/impl/StudentScoreServiceImpl.java

@@ -493,8 +493,8 @@ public class StudentScoreServiceImpl extends ServiceImpl<StudentScoreDao, Studen
 	}
 
 	public static void main(String[] args) {
-		String s = "https://file.markingcloud.com/"
-				+ getMarkingCloudPath(1342, getSuffix("2020302191191"), "2020302191191", 1, "jpg");
+		String code = "2022301052070";
+		String s = "https://file.markingcloud.com/" + getMarkingCloudPath(1342, getSuffix(code), code, 1, "jpg");
 		System.out.println(s);
 	}
 
@@ -740,13 +740,20 @@ public class StudentScoreServiceImpl extends ServiceImpl<StudentScoreDao, Studen
 	}
 
 	@Override
-	public List<StudentScoreEntity> findBy(Long examId, String subjectCode, Integer mainNumber, String subNumber) {
+	public List<StudentScoreEntity> findBy(Long examId, String subjectCode, Integer mainNumber, String subNumber,
+			Boolean exZero) {
 		QueryWrapper<StudentScoreEntity> wrapper = new QueryWrapper<>();
 		LambdaQueryWrapper<StudentScoreEntity> lw = wrapper.lambda();
 		lw.eq(StudentScoreEntity::getExamId, examId);
 		lw.eq(StudentScoreEntity::getSubjectCode, subjectCode);
 		lw.eq(StudentScoreEntity::getMainNumber, mainNumber);
 		lw.eq(StudentScoreEntity::getSubNumber, subNumber);
+		if(exZero!=null&&exZero) {
+			lw.and(wq -> {
+                wq.or(wq1 -> wq1.ne(StudentScoreEntity::getAiScore, 0));
+	            wq.or(wq2 -> wq2.eq(StudentScoreEntity::getMarkingScore, 0));
+	        });
+		}
 		return this.list(wrapper);
 	}
 }