美术阅卷11月新增需求-加入正评设置标准卷

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

@@ -41,7 +41,8 @@ public interface PaperRepo extends JpaRepository<Paper, Long>, JpaSpecificationE
 
     Page<Paper> findByQuestionId(Long questionId, Pageable pageable);
 
-    List<Paper> findByLevelAndIsSampleAndIsMissingAndSubjectAndTestAndAreaCodeAndWorkIdOrderByUpdatedOnDesc(String level, boolean isSample, boolean isMissing, Subject subject, int test, String areaCode, Long workId);
+    @Query(value = "select * from paper p where p.`level` = ?1 and p.is_sample = ?2 and p.is_missing = ?3 and p.subject = ?4 and (p.is_test = ?5 or p.is_test = ?6) and p.area_code = ?7 and p.work_id = ?8 order by p.updated_on desc", nativeQuery = true)
+    List<Paper> findSample(String level, boolean isSample, boolean isMissing, String subject, int test, int test1, String areaCode, Long workId);
 
     /**
      * 统计各省各科试卷数量[areaCode,areaName,questionName,count]

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/api/MarkTaskApi.java

@@ -13,7 +13,6 @@ import cn.com.qmth.stmms.ms.core.repository.*;
 import cn.com.qmth.stmms.ms.marking.assembler.MarkTaskAssembler;
 import cn.com.qmth.stmms.ms.marking.dto.MarkTaskDTO;
 import cn.com.qmth.stmms.ms.marking.service.MarkingService;
-import com.google.gson.Gson;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -113,15 +112,10 @@ public class MarkTaskApi {
             if (Objects.nonNull(isSample) && isSample) {
                 ExamQuestion examQuestion = examQuestionRepo.findOne(questionId);
                 if (examQuestion.getTest() == TrialEnum.DEFAULT.getId()) {
-                    String sql = "select p.id, p.work_id as workId, p.secret_number as secretNumber, p.idx, p.student_name as studentName, p.exam_number as examNumber, p.subject, p.question_id as questionId, p.area_code as areaCode, p.question_name as questionName, p.level, p.redo_level as redoLevel, p.score, p.inspect_score as inspectScore, p.inspect_level as inspectLevel, p.inspector, p.is_arbitrated as isArbitrated, p.is_rejected as isRejected, p.mark_by_leader as markByLeader, p.marked_logic as markedLogic, p.updated_on as updatedOn, p.is_manual as isManual, p.uploaded_on as uploadedOn, p.uploaded_count as uploadedCount, p.is_tagged as isTagged, p.is_sample as isSample, p.inspect_range as inspectRange, p.source_name as sourceName, p.sheet_md5 as sheetMD5, p.slice_md5 as sliceMD5, p.is_missing as isMissing, p.random_seq as randomSeq, p.exam_room as examRoom, p.is_test as test, p.is_active as active, p.batch_no as batchNo from paper p where p.`level` = ? and p.`is_sample` = ? and p.`is_missing` = ? and p.`subject` = ? and (p.`is_test` = ? or p.`is_test` = ?) and p.`area_code` = ? and p.`work_id` = ? order by p.`updated_on` desc";
-                    sql = sqlUtil.sqlPrint(sql, "'" + level + "'", isSample, false, "'" + examQuestion.getSubject() + "'", TrialEnum.DEFAULT.getId(), TrialEnum.START_FORMAL.getId(), "'" + examQuestion.getAreaCode() + "'", examQuestion.getWorkId());
-                    List paperList = sqlUtil.execSqlForMap(sql);
+                    List<Paper> paperList = paperRepo.findSample(level, isSample, false, examQuestion.getSubject().name(), TrialEnum.DEFAULT.getId(), TrialEnum.START_FORMAL.getId(), examQuestion.getAreaCode(), examQuestion.getWorkId());
                     if (Objects.nonNull(paperList) && paperList.size() > 0) {
                         MarkUser markUser = markUserRepo.findOne(markerId);
-                        Gson gson = new Gson();
-                        for (int i = 0; i < paperList.size(); i++) {
-                            Map map = (Map) paperList.get(i);
-                            Paper p = gson.fromJson(gson.toJson(map), Paper.class);
+                        for (Paper p : paperList) {
                             MarkTask markTask = new MarkTask(markUser, p, stage, 1L);
                             markTaskDTOs.add(markTaskAssembler.toDTO(markTask));
                         }