测试bug修复-0819

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

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -89,6 +90,7 @@ public class WorkApi {
      */
     @RequestMapping(value = "{workId}", method = RequestMethod.PUT)
     public Work update(@PathVariable Long workId, @RequestBody Work work) {
+        work.setCreatedOn(new Date());
         return workRepo.save(work);
     }
 

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/service/DataUploadService.java

@@ -391,7 +391,7 @@ public class DataUploadService {
                     if (Objects.isNull(paper)) {
                         paper = paperRepo.findByWorkIdAndSubjectAndExamNumberAndAreaCodeAndTest(workId, subject, student.getExamNumber(), dto.getAreaCode(), TrialEnum.START_FORMAL.getId());
                     }
-                    if (paper.getIsMissing()) {
+                    if (Objects.isNull(paper) || paper.getIsMissing()) {
                         return null;
                     }
 

stmms-ms-collect/src/main/java/cn/com/qmth/stmms/ms/collect/util/RotateTask.java

@@ -156,14 +156,19 @@ public class RotateTask implements Runnable {
                     thumbFile.delete();
                     imageFile.delete();
                 } else {
+                    String fileName = paper.getExamNumber();
+                    if(ParamCache.paramMap.get(paper.getWorkId()).getNameRule() == 1){
+                        Student student = studentRepo.findByWorkIdAndExamNumberAndTest(paper.getWorkId(), paper.getExamNumber(), "0");
+                        fileName = MD5Util.getImageRuleMd5(paper.getWorkId(), paper.getSubject().ordinal(), student.getAreaCode(), paper.getExamNumber(), student.getId());
+                    }
                     thumbPath = systemConfig.getThumbDir() + File.separator + paper.getWorkId() + File.separator + paper.getSubject().toString()
-                            + File.separator + paper.getAreaCode() + File.separator + paper.getExamNumber() + ".jpg";
+                            + File.separator + paper.getAreaCode() + File.separator + fileName + ".jpg";
                     thumbNew = systemConfig.getThumbDir() + File.separator + paper.getWorkId() + File.separator + paper.getSubject().toString()
-                            + File.separator + paper.getAreaCode() + File.separator + paper.getExamNumber() + "_" + start + ".jpg";
+                            + File.separator + paper.getAreaCode() + File.separator + fileName + "_" + start + ".jpg";
                     imagePath = systemConfig.getImageDir() + File.separator + paper.getWorkId() + File.separator + paper.getSubject().toString()
-                            + File.separator + paper.getAreaCode() + File.separator + paper.getExamNumber() + ".jpg";
+                            + File.separator + paper.getAreaCode() + File.separator + fileName + ".jpg";
                     imageNew = systemConfig.getImageDir() + File.separator + paper.getWorkId() + File.separator + paper.getSubject().toString()
-                            + File.separator + paper.getAreaCode() + File.separator + paper.getExamNumber() + "_" + start + ".jpg";
+                            + File.separator + paper.getAreaCode() + File.separator + fileName + "_" + start + ".jpg";
                     File thumbFile = new File(thumbPath);
                     if (thumbFile.exists()) {
                         thumbFile.renameTo(new File(thumbNew));

stmms-ms-core/src/main/java/cn/com/qmth/stmms/ms/core/domain/Work.java

@@ -1,5 +1,6 @@
 package cn.com.qmth.stmms.ms.core.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.hibernate.annotations.Where;
 
 import javax.persistence.*;
@@ -40,6 +41,7 @@ public class Work implements Serializable{
     private List<MarkSubject> subjects = new ArrayList<>();
 
     @Temporal(value = TemporalType.DATE)
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createdOn;
 
     public Work(String name) {

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

@@ -137,7 +137,7 @@ public class PaperApi {
 
     @RequestMapping(value = "listByQuestion", method = RequestMethod.GET)
     public PageableDTO listByQuerion(@RequestParam Long workId,
-                                     @RequestParam String areaCode,
+                                     @RequestParam(required = false) String areaCode,
                                      @RequestParam Subject subject,
                                      @RequestParam(required = false) Long startNumber,
                                      @RequestParam(required = false) Long endNumber,

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

@@ -450,7 +450,7 @@ public class StageControlService {
                 for (TaskPublishSetting tps : taskList) {
                     if (m.getQuestionId().equals(questionId0) && m.getCode().equals(tps.getCode())) {
                         taskPublishSetting.setSuccessCount(tps.getSuccessCount() + tps.getTaskCount());
-                        taskPublishSetting.setWaitCount(tps.getTotalCount() - tps.getSuccessCount());
+                        taskPublishSetting.setWaitCount(tps.getTotalCount() - taskPublishSetting.getSuccessCount());
                         taskPublishSetting.setSortRule(tps.getSortRule());
                         taskPublishSetting.setDisplayNumber(tps.getDisplayNumber());
                         taskPublishSetting.setTaskCount(0);