线下版本-新需求、bug-20201016

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/api/WorkApi.java

@@ -84,7 +84,7 @@ public class WorkApi {
     public void create(@RequestBody Work work) {
         workService.save(work);
         //生成随机数
-        randomUtil.getRandom(work.getId(), false);
+//        randomUtil.getRandom(work.getId(), false);
     }
 
     /**
@@ -166,6 +166,10 @@ public class WorkApi {
      */
     @RequestMapping(value = "{work}/overview", method = RequestMethod.GET)
     public WorkOverview overview(@PathVariable Work work) {
+        //生成随机数，已生成的工作，直接跳过
+        if(randomUtil.getRandomMap().get(work.getId()) == null) {
+            randomUtil.getRandom(work.getId(), false);
+        }
         return workOverviewAssembler.toDTO(work);
     }
 

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/dto/ChangeLevelExpDTO.java

@@ -0,0 +1,63 @@
+package cn.com.qmth.stmms.ms.admin.dto;
+
+import cn.com.qmth.stmms.ms.commons.utils.excel.ExcelProperty;
+
+/**
+ * Created by xf on 2020/09/23.
+ */
+public class ChangeLevelExpDTO {
+    @ExcelProperty(name = "科目", index = 0, type = 1)
+    private String subject;
+
+    @ExcelProperty(name = "序号", index = 1, type = 1)
+    private Integer seqNo;
+
+    @ExcelProperty(name = "考号", index = 2, type = 1)
+    private String examNumber;
+
+    @ExcelProperty(name = "原档位", index = 3, type = 1)
+    private String originLevel;
+
+    @ExcelProperty(name = "复审后档位", index = 4, type = 1)
+    private String level;
+
+    public String getSubject() {
+        return subject;
+    }
+
+    public void setSubject(String subject) {
+        this.subject = subject;
+    }
+
+    public Integer getSeqNo() {
+        return seqNo;
+    }
+
+    public void setSeqNo(Integer seqNo) {
+        this.seqNo = seqNo;
+    }
+
+    public String getExamNumber() {
+        return examNumber;
+    }
+
+    public void setExamNumber(String examNumber) {
+        this.examNumber = examNumber;
+    }
+
+    public String getOriginLevel() {
+        return originLevel;
+    }
+
+    public void setOriginLevel(String originLevel) {
+        this.originLevel = originLevel;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
+}

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/exporter/PaperExporter.java

@@ -1,11 +1,9 @@
 package cn.com.qmth.stmms.ms.admin.exporter;
 
-import cn.com.qmth.stmms.ms.admin.dto.OneClickExpDTO;
-import cn.com.qmth.stmms.ms.admin.dto.PaperExpDTO;
-import cn.com.qmth.stmms.ms.admin.dto.SampleExpDTO;
-import cn.com.qmth.stmms.ms.admin.dto.ScoreDTO;
+import cn.com.qmth.stmms.ms.admin.dto.*;
 import cn.com.qmth.stmms.ms.commons.utils.excel.ExportUtils;
 import cn.com.qmth.stmms.ms.core.domain.*;
+import cn.com.qmth.stmms.ms.core.repository.ChangeLevelRepo;
 import cn.com.qmth.stmms.ms.core.repository.MarkLogRepo;
 import cn.com.qmth.stmms.ms.core.repository.MarkSubjectRepo;
 import cn.com.qmth.stmms.ms.core.repository.PaperRepo;
@@ -37,6 +35,9 @@ public class PaperExporter {
     @Autowired
     private MarkSubjectRepo markSubjectRepo;
 
+    @Autowired
+    private ChangeLevelRepo changeLevelRepo;
+
     @Value("${sys.config.imageDir}")
     private String imagesFolder;
 
@@ -111,4 +112,32 @@ public class PaperExporter {
             ExportUtils.exportEXCEL("专家复评导出", OneClickExpDTO.class, oneClickExpDTOS, response);
         }
     }
+
+    /**
+     * 改档信息导出
+     *
+     * @param workId
+     * @param subject
+     * @param response
+     */
+    @GetMapping("{workId}/{subject}/changeLevel")
+    public void exportChangeLevel(@PathVariable Long workId, @PathVariable Subject subject, HttpServletResponse response) {
+        MarkSubject markSubject = markSubjectRepo.findOne(workId + "-" + subject.name());
+        //科目名称
+        String subjectName = Objects.isNull(markSubject) ? subject.name() : markSubject.getName();
+        List<ChangeLevelExpDTO> changeLevelExpDTOS = new ArrayList<>();
+        List<ChangeLevel> changeLevels = changeLevelRepo.findByWorkIdAndSubjectAndAuditStatus(workId, subject.name());
+        for (int i = 0; i < changeLevels.size(); i++) {
+            ChangeLevel changeLevel = changeLevels.get(i);
+            ChangeLevelExpDTO changeLevelExpDTO = new ChangeLevelExpDTO();
+            changeLevelExpDTO.setSubject(subjectName);
+            changeLevelExpDTO.setSeqNo(i + 1);
+            Paper paper = paperRepo.findOne(changeLevel.getPaperId());
+            changeLevelExpDTO.setExamNumber(paper.getExamNumber());
+            changeLevelExpDTO.setOriginLevel(changeLevel.getOriginalLevel());
+            changeLevelExpDTO.setLevel(changeLevel.getSuggestLevel());
+            changeLevelExpDTOS.add(changeLevelExpDTO);
+        }
+        ExportUtils.exportEXCEL("改档信息导出", ChangeLevelExpDTO.class, changeLevelExpDTOS, response);
+    }
 }

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

@@ -14,4 +14,7 @@ import java.util.List;
 @Repository
 public interface ChangeLevelRepo extends JpaRepository<ChangeLevel, Long>, JpaSpecificationExecutor {
     ChangeLevel findByWorkIdAndSubjectAndPaperId(Long workId, String subject, Long paperId);
+
+    @Query("select s from ChangeLevel s where s.workId = ?1 and s.subject = ?2 and s.auditStatus = 1")
+    List<ChangeLevel> findByWorkIdAndSubjectAndAuditStatus(Long workId, String name);
 }

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

@@ -39,4 +39,7 @@ public interface ExamQuestionRepo extends JpaRepository<ExamQuestion, Long> {
     List<Object[]> findByWorkId(Long workId);
 
     List<ExamQuestion> findByWorkIdAndSubjectAndTestNot(Long workId, Subject subject, int id);
+
+    @Query(value = "select id, area_name areaName, name from exam_question eq where eq.id in (select question_id from paper p where p.work_id = ? and p.subject = ? and p.is_sample = 1 and p.is_missing = 0)", nativeQuery = true)
+    List<Object[]> listByWorkIdAndSubject(Long workId, String subject);
 }

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

@@ -8,7 +8,6 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * Created by zhengmin on 2016/9/23.
@@ -106,9 +105,9 @@ public interface MarkTaskRepo extends JpaRepository<MarkTask, Long>, JpaSpecific
      * @param batchNo
      * @return
      */
-    @Query(value = "SELECT q.`id`,t.`marker_id` markerId,t.`marker_name` markerName,q.`name`,SUM(IF(t.`result` IS NULL,1,0)) leftCount,COUNT(t.question_id) totalCount, SUM(t.is_rejected) rejectedCount, q.area_code areaCode " +
-            "FROM mark_task t LEFT OUTER JOIN exam_question q ON t.`question_id` = q.`id` LEFT  JOIN paper p ON t.paper_id = p.id WHERE " +
-            "t.work_id = ? and t.subject = ? and t.stage = ? and p.is_missing = false and p.is_test = ? and p.batch_no = ? GROUP BY t.marker_id, t.`marker_name` ORDER BY q.`id`,t.marker_id", nativeQuery = true)
+    @Query(value = "SELECT q.`id`,t.`marker_id` markerId,mu.login_name loginName,t.`marker_name` markerName,q.`name`,SUM(IF(t.`result` IS NULL,1,0)) leftCount,COUNT(t.question_id) totalCount, SUM(t.is_rejected) rejectedCount, q.area_code areaCode " +
+            "FROM mark_task t LEFT JOIN mark_user mu on t.marker_id = mu.id LEFT OUTER JOIN exam_question q ON t.`question_id` = q.`id` LEFT  JOIN paper p ON t.paper_id = p.id WHERE " +
+            "t.work_id = ? and t.subject = ? and t.stage = ? and p.is_missing = false and p.is_test = ? and p.batch_no = ? GROUP BY t.marker_id,mu.login_name, t.`marker_name` ORDER BY q.`id`,t.marker_id", nativeQuery = true)
     List<Object[]> listGroupByQuestionAndMarkerAndBatchNo(Long workId, String name, Integer stageId, int test, Long batchNo);
 
     /**
@@ -151,9 +150,9 @@ public interface MarkTaskRepo extends JpaRepository<MarkTask, Long>, JpaSpecific
      *
      * @return
      */
-    @Query(value = "SELECT q.`id`,t.`marker_id` markerId,t.`marker_name` markerName,q.`name`,SUM(IF(t.`result` IS NULL,1,0)) leftCount,COUNT(t.question_id) totalCount,SUM(t.is_rejected) rejectedCount, q.area_code areaCode " +
-            "FROM mark_task t LEFT OUTER JOIN exam_question q ON t.`question_id` = q.`id` LEFT  JOIN paper p ON t.paper_id = p.id WHERE " +
-            "t.work_id = ? and t.subject = ? and t.stage = ? and p.score_batch_no = ? and p.is_missing = false GROUP BY t.marker_id, t.`marker_name` ORDER BY q.`id`, t.`marker_id`", nativeQuery = true)
+    @Query(value = "SELECT q.`id`,t.`marker_id` markerId,mu.login_name loginName,t.`marker_name` markerName,q.`name`,SUM(IF(t.`result` IS NULL,1,0)) leftCount,COUNT(t.question_id) totalCount,SUM(t.is_rejected) rejectedCount, q.area_code areaCode " +
+            "FROM mark_task t LEFT JOIN mark_user mu on t.marker_id = mu.id LEFT OUTER JOIN exam_question q ON t.`question_id` = q.`id` LEFT  JOIN paper p ON t.paper_id = p.id WHERE " +
+            "t.work_id = ? and t.subject = ? and t.stage = ? and p.score_batch_no = ? and p.is_missing = false GROUP BY t.marker_id,mu.login_name, t.`marker_name` ORDER BY q.`id`, t.`marker_id`", nativeQuery = true)
     List<Object[]> listGroupByQuestionAndMarkerAndScoreBatchNo(Long workId, String name, Integer stageId, Long batchNo);
 
     /**
@@ -211,4 +210,6 @@ public interface MarkTaskRepo extends JpaRepository<MarkTask, Long>, JpaSpecific
     int countByQuestionIdAndMarkerIdAndStageAndIsRejectedTrueAndIsMissing(Long questionId, Long markerId, int ordinal,boolean isMissing);
 
     List<MarkTask> findByWorkIdAndSubjectAndMarkerIdAndStage(Long workId, Subject subject, Long valueOf, MarkStage stage);
+
+    int countByWorkIdAndSubjectAndStage(Long workId, Subject subject, MarkStage stage);
 }

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

@@ -3,6 +3,8 @@ package cn.com.qmth.stmms.ms.core.repository;
 import cn.com.qmth.stmms.ms.core.domain.Work;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+
 /**
  * Created by zhengmin on 2016/10/9.
  */
@@ -11,4 +13,6 @@ public interface WorkRepo extends JpaRepository<Work,Long>{
     Work findByActiveTrue();
 
     Work findByName(String name);
+
+    List<Work> findAllByActiveTrue();
 }

stmms-ms-main/src/main/java/cn/com/qmth/stmms/ms/StartRunning.java

@@ -44,8 +44,8 @@ public class StartRunning implements CommandLineRunner {
         } else {
             randomUtil.getRandom(work.getId(), false);
         }*/
-        //对所有工作都生成随机数
-        List<Work> works = workRepo.findAll();
+        //对所有当前工作都生成随机数
+        List<Work> works = workRepo.findAllByActiveTrue();
         for (Work work : works) {
             randomUtil.getRandom(work.getId(), false);
         }

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

@@ -93,7 +93,7 @@ score.level.taskSort=paper
 #score.level.taskSort=paper
 
 #\u524D\u7AEF\u9759\u6001\u8D44\u6E90\u76EE\u5F55
-web.upload-path=D:\\company\\qmth\\bat-pro\\msyj-202008\\static\\
+web.upload-path=D:\\company\\qmth\\bat-pro\\msyj-202008-v1.0\\static\\
 spring.mvc.static-path-pattern=/**
 spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${sys.config.localhostPath},file:${web.upload-path}
 

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

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -47,4 +48,26 @@ public class ExamQuestionApi {
             return examQuestionRepo.findByWorkIdAndSubjectAndTest(workId, Subject.CUSTOM, TrialEnum.DEFAULT.getId());
         }
     }
+
+    /**
+     * 标准卷对应的考区
+     * @param workId
+     * @param subject
+     * @return
+     */
+    @RequestMapping(value = "/sampleQuestions", method = RequestMethod.GET)
+    public List<ExamQuestion> sampleQuestions(@RequestParam Long workId, @RequestParam Subject subject) {
+        List<Object[]> list =  examQuestionRepo.listByWorkIdAndSubject(workId, subject.name());
+        List<ExamQuestion> questionList = new ArrayList<>();
+        if (list != null && list.size() > 0){
+            for (Object[] objects : list) {
+                ExamQuestion examQuestion = new ExamQuestion();
+                examQuestion.setId(Long.valueOf(objects[0].toString()));
+                examQuestion.setAreaName((String) objects[1]);
+                examQuestion.setName((String) objects[2]);
+                questionList.add(examQuestion);
+            }
+        }
+        return questionList;
+    }
 }

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

@@ -459,6 +459,7 @@ public class MakrerApi {
         int arbitrate = paperRepo.countByWorkIdAndSubjectAndIsArbitratedTrue(workId, subject);
         if (markUser != null && markUser.size() > 0) {
             Map map = new HashMap();
+            map.put("loginName", markUser.get(0).getLoginName());
             map.put("name", markUser.get(0).getName());
             map.put("arbitrated", arbitrate);
             objectMap.put("kzz", map);

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

@@ -59,6 +59,9 @@ public class MarkSubjectApi {
     @Autowired
     private TaskPublishSettingRepo taskPublishSettingRepo;
 
+    @Autowired
+    MarkTaskRepo markTaskRepo;
+
     /**
      * 查询所有科目状态
      *
@@ -239,6 +242,13 @@ public class MarkSubjectApi {
         if (markerGroup.getMarkers().size() == 0) {
             throw new RuntimeException("不可创建空分组");
         }
+        if (MarkStage.LEVEL == markSubject.getStage() || MarkStage.SCORE == markSubject.getStage()) {
+            int count = markTaskRepo.countByWorkIdAndSubjectAndStage(markSubject.getWorkId(), markSubject.getSubject(), markSubject.getStage());
+            if(count > 0){
+                throw new RuntimeException("当前阶段已发布任务，不能编辑分组");
+            }
+        }
+
         markerGroup.setWorkId(markSubject.getWorkId());
         markerGroup.setSubject(markSubject.getSubject());
         return markerGroupRepo.save(markerGroup);
@@ -265,6 +275,13 @@ public class MarkSubjectApi {
      */
     @RequestMapping(value = "{markSubject}/markergroups/{domain}", method = RequestMethod.DELETE)
     public void removeMarkerGroup(@PathVariable MarkSubject markSubject, @PathVariable MarkerGroup domain) {
+        int count = 0;
+        if (MarkStage.LEVEL == markSubject.getStage() || MarkStage.SCORE == markSubject.getStage()) {
+            count = markTaskRepo.countByWorkIdAndSubjectAndStage(markSubject.getWorkId(), markSubject.getSubject(), markSubject.getStage());
+        }
+        if(count > 0){
+            throw new RuntimeException("当前阶段已发布任务，不能删除分组");
+        }
         markerGroupRepo.delete(domain);
     }
 

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

@@ -335,6 +335,30 @@ public class PaperApi {
         return null;
     }
 
+    /**
+     * 批量取消标准卷
+     *
+     * @param body 试卷信息
+     * @return
+     */
+    @RequestMapping(value = "batch/cancelSample", method = RequestMethod.PATCH)
+    @Transactional
+    public ResponseEntity cancelSample(@RequestBody HashMap<String, String> body) {
+        String paperIds = body.get("paperIds");
+        if (paperIds.length() > 0) {
+            String[] ids = paperIds.split(",");
+            for (String id : ids) {
+                Paper paper = paperRepo.findOne(Long.valueOf(id));
+                paper.determineLevel(null);
+                paper.setMarkByLeader(false);
+                paper.setSample(false);
+                paperRepo.save(paper);
+            }
+            return new ResponseEntity(true, HttpStatus.OK);
+        }
+        return null;
+    }
+
     /**
      * 标记试卷
      *

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/assembler/PaperAssembler.java

@@ -119,12 +119,16 @@ public class PaperAssembler {
             paperDTO.setRejectedCount(rejectedCount);
             //计算levelValue和（试评阶段不用）
             if(markSubject.getTest() == 0 && Objects.nonNull(paper.getLevel())) {
-                List<Level> levels = levelRepo.findByWorkId(paper.getWorkId());
-                if(!levels.isEmpty() && levels.size() > 0){
-                    Map<String, Integer> map = levels.stream().collect(Collectors.toMap(Level::getCode, Level::getLevelValue));
-                    List<MarkTask> markTaskList = markTaskRepo.findByPaperIdAndStage(paper.getId(), MarkStage.LEVEL);
-                    int sum = markTaskList.stream().mapToInt(m-> map.get(m.getResult()) == null ? 0 : map.get(m.getResult())).sum();
-                    paperDTO.setSortSum(sum);
+                if(paper.isSample()){
+                    paperDTO.setSortSum(0);
+                } else {
+                    List<Level> levels = levelRepo.findByWorkId(paper.getWorkId());
+                    if (!levels.isEmpty() && levels.size() > 0) {
+                        Map<String, Integer> map = levels.stream().collect(Collectors.toMap(Level::getCode, Level::getLevelValue));
+                        List<MarkTask> markTaskList = markTaskRepo.findByPaperIdAndStage(paper.getId(), MarkStage.LEVEL);
+                        int sum = markTaskList.stream().mapToInt(m -> map.get(m.getResult()) == null ? 0 : map.get(m.getResult())).sum();
+                        paperDTO.setSortSum(sum);
+                    }
                 }
             }
         }

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/assembler/QuestionStatAssembler.java

@@ -85,14 +85,15 @@ public class QuestionStatAssembler {
         if (qStats != null) {
             qpDTO = new MarkQuestionStatDTO();
             qpDTO.setId(qStats[0]);
-            qpDTO.setMarkerName(qStats[2]);
-            qpDTO.setName(qStats[3]);
-            qpDTO.setLeftCount(qStats[4]);
-            qpDTO.setTotalCount(qStats[5]);
+            qpDTO.setLoginName(qStats[2]);
+            qpDTO.setMarkerName(qStats[3]);
+            qpDTO.setName(qStats[4]);
+            qpDTO.setLeftCount(qStats[5]);
+            qpDTO.setTotalCount(qStats[6]);
             qpDTO.setRejectedCount(rejectCount);
             qpDTO.setShiftCount(shift);
             qpDTO.setShiftScoreCount(shiftScore);
-            qpDTO.setAreaCode(qStats[7]);
+            qpDTO.setAreaCode(qStats[8]);
         }
         return qpDTO;
     }

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/dto/MarkQuestionStatDTO.java

@@ -8,6 +8,7 @@ public class MarkQuestionStatDTO implements Serializable {
     private static final long serialVersionUID = 1607982936551079429L;
 
     private Object id;
+    private Object loginName;
     private Object markerName;
     private Object name;
     private Object leftCount;
@@ -25,6 +26,14 @@ public class MarkQuestionStatDTO implements Serializable {
         this.id = id;
     }
 
+    public Object getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(Object loginName) {
+        this.loginName = loginName;
+    }
+
     public Object getMarkerName() {
         return markerName;
     }

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

@@ -213,10 +213,7 @@ public class AssignTaskService {
     }
 
     @Transactional
-    public void assignForGroupingScore(List<MarkerGroup> markerGroups, MarkSubject markSubject) {
-        markerGroups = markerGroups.stream().filter(m -> m.getMarkers().size() > 0).collect(Collectors.toList());
-        int sum = markerGroups.stream().mapToInt(m -> m.getMarkers().size()).sum();
-        List<MarkTask> markTasks = markTaskRepo.findByWorkId(markSubject.getWorkId());
+    public void assignForGroupingScore(MarkSubject markSubject) {
         if (markSubject.getTest() != 1) {
             //更新subject表formal为正试评卷
             markSubject.setFormal(true);
@@ -224,13 +221,6 @@ public class AssignTaskService {
         }
         //只有全部任务投放完成，才能删除分组
         int count = paperRepo.countByWorkIdAndSubjectAndIsMissingFalseAndActiveFalseAndBatchNoIsNullAndTest(markSubject.getWorkId(), markSubject.getSubject(), 0);
-        //进入分档阶段后，清空当前分组，以便打分阶段前重新分组
-        if (MarkStage.LEVEL.equals(markSubject.getStage()) && count == 0) {
-            for (MarkerGroup markerGroup : markerGroups) {
-                markerGroup.setMarkers(null);
-            }
-            markerGroupRepo.delete(markerGroups);
-        }
         if (MarkStage.SCORE.equals(markSubject.getStage()) && count == 0) {
             //初始化打分任务数据
             initTaskPublishData(markSubject);

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

@@ -339,13 +339,13 @@ public class StageControlService {
             throw new RuntimeException("没有分档完成");
         }
         this.isPtFull(workId, markSubject);
-        List<MarkerGroup> markerGroups = markerGroupRepo.findByWorkIdAndSubject(workId, subject);
+        /*List<MarkerGroup> markerGroups = markerGroupRepo.findByWorkIdAndSubject(workId, subject);
         if (markerGroups.size() == 0) {
             statusMap.put(markSubject.getId(), false);
             throw new RuntimeException("评卷员没有进行分组");
-        }
+        }*/
         markSubject.setAllLevel(true);
-        assignTaskService.assignForGroupingScore(markerGroups, markSubject);
+        assignTaskService.assignForGroupingScore(markSubject);
     }
 
     @Transactional