川音需求版本1

stmms-ms-core/src/main/java/cn/com/qmth/stmms/ms/core/repository/InspectTaskRepo.java

@@ -26,6 +26,8 @@ public interface InspectTaskRepo extends CrudRepository<InspectTask, Long>, JpaS
 
     List<InspectTask> findByPaperId(Long paperId);
 
+    List<InspectTask> findByPaperIdAndInspectRangeId(Long paperId, Long inspectRangeId);
+
     @Query(value = "select t.paper_id from inspect_task t where t.inspect_range_id = ?1 group by t.paper_id", nativeQuery = true)
     List<BigInteger> findPaperIdsByInspectRangeId(Long inspectRangeId);
 }

stmms-ms-core/src/main/java/cn/com/qmth/stmms/ms/core/repository/PaperRepo.java

@@ -122,7 +122,8 @@ public interface PaperRepo extends JpaRepository<Paper, Long>, JpaSpecificationE
     @Query(value = "select p from Paper p where p.score >= ?1 or p.score <= ?2")
     List<Paper> findByScoreRange(Double highScore, Double lowScore);
 
-    @Query(value = "SELECT p.`exam_number`,p.`student_name`,p.question_id,GROUP_CONCAT(score  ORDER BY p.`subject`) FROM paper p WHERE p.`work_id` = ? GROUP BY p.exam_number,p.`student_name`", nativeQuery = true)
+    //@Query(value = "SELECT p.`exam_number`,p.`student_name`,p.question_id,GROUP_CONCAT(score  ORDER BY p.`subject`) FROM paper p WHERE p.`work_id` = ? GROUP BY p.exam_number,p.`student_name`", nativeQuery = true)
+    @Query(value = "SELECT p.`exam_number`,p.`student_name`,p.question_id,GROUP_CONCAT(if(isnull(p.inspect_score),p.score,p.inspect_score)  ORDER BY p.`subject`) FROM paper p WHERE p.`work_id` = ? GROUP BY p.exam_number,p.`student_name`", nativeQuery = true)
     List<Object[]> findScores(Long workId);
 
     List<Paper> findByWorkId(Long workId);

stmms-ms-main/src/main/resources/application-dev.properties

@@ -13,7 +13,6 @@ spring.datasource.test-on-borrow=true
 #redis
 #spring.redis.host=192.168.199.102
 #spring.redis.port=32768
-server.address=localhost
 server.port=9000
 server.compression.enabled=true
 server.compression.mime-types: application/json,application/xml,text/html,text/xml,text/plain,text/css,application/javascript

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/service/InspectService.java

@@ -35,7 +35,7 @@ public class InspectService {
 
         Paper paper = inspectTask.getPaper();
 
-        List<InspectTask> inspectTasks = inspectTaskRepo.findByPaperId(paper.getId());
+        List<InspectTask> inspectTasks = inspectTaskRepo.findByPaperIdAndInspectRangeId(paper.getId(), inspectTask.getInspectRangeId());
         int unScoreCount = 0;
         double sum = 0;
         for (InspectTask task : inspectTasks) {
@@ -51,6 +51,7 @@ public class InspectService {
             double avg = sum / inspectTasks.size();
             //计算平均分所在的档位
             Paper p = paperRepo.getOne(paper.getId());
+            p.setInspectRange(inspectTask.getInspectRangeId());//也记录一下是哪一次的复评范围决定的最终分
             p.setInspectScore((double) Math.round(avg));
             p.setInspectLevel(getLevel(paper.getWorkId(), p.getInspectScore()));
             paperRepo.save(p);