3.3.0 fix

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicTemplateServiceImpl.java

@@ -222,7 +222,7 @@ public class BasicTemplateServiceImpl extends ServiceImpl<BasicTemplateMapper, B
     public String preview(Long id) {
         BasicTemplate basicTemplate = basicTemplateMapper.selectById(id);
         String classifyStr = basicTemplate.getClassify().name();
-        List<String> stringList = ClassifyEnum.listTypes().stream().map(EnumResult::getName).collect(Collectors.toList());
+        List<String> stringList = ClassifyEnum.listTypes().stream().map(EnumResult::getCode).collect(Collectors.toList());
         if (!stringList.contains(classifyStr)) {
             throw ExceptionResultEnum.ERROR.exception("模板类型有误");
         }

distributed-print/src/main/java/com/qmth/distributed/print/api/mark/MarkQuestionController.java

@@ -126,6 +126,6 @@ public class MarkQuestionController {
                                    @ApiParam(value = "文件", required = true) @RequestParam MultipartFile file,
                                    @ApiParam(value = "文件md5", required = true) @RequestParam String md5) {
 
-        return ResultUtil.ok(markQuestionService.uploadSubjectiveFile(examId, paperNumber, file, md5));
+        return ResultUtil.ok(markQuestionService.uploadSubjectiveFile(examId, paperNumber, file, md5),"");
     }
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/UserDto.java

@@ -21,6 +21,7 @@ public class UserDto {
     private String orgId;
     private String orgName;
     private String code;
+    private Boolean allowManualCard;
 
     private List<SysRole> roles;
 
@@ -122,4 +123,11 @@ public class UserDto {
         return code;
     }
 
+    public Boolean getAllowManualCard() {
+        return allowManualCard;
+    }
+
+    public void setAllowManualCard(Boolean allowManualCard) {
+        this.allowManualCard = allowManualCard;
+    }
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/ClassifyEnum.java

@@ -10,7 +10,7 @@ import java.util.List;
  */
 public enum ClassifyEnum {
 
-    CARD("通卡"),
+//    CARD("通卡"),
     SIGN("签到表"),
     PACKAGE("卷袋贴"),
     CHECK_IN("登记表");

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/TeachcloudCommonServiceImpl.java

@@ -918,9 +918,9 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
             FilePathVo filePathVo = JSON.parseObject(path, FilePathVo.class);
             String pathVoPath = filePathVo.getPath();
             if (SystemConstant.LOCAL.equals(filePathVo.getType())) {
-                result.add(!pathVoPath.startsWith("/") ? "/" + pathVoPath : pathVoPath);
+                result.add(!pathVoPath.startsWith(SystemConstant.ORG_SPLIT) ? SystemConstant.ORG_SPLIT + pathVoPath : pathVoPath);
             } else {
-                result.add(this.filePreview(pathVoPath));
+                result.add(this.filePreview(path));
             }
         }
         return result;

teachcloud-common/src/main/resources/mapper/SysUserMapper.xml

@@ -48,7 +48,8 @@
             a.code code,
             c.marker_status as markerStatus,
             c.marker_leader_status as markerLeaderStatus,
-            b.name orgName
+            b.name orgName,
+            a.allow_manual_card allowManualCard
         FROM
             sys_user a
                 left join

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/bean/archivescore/ArchiveStudentVo.java

@@ -2,9 +2,12 @@ package com.qmth.teachcloud.mark.bean.archivescore;
 
 import java.util.List;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.teachcloud.common.annotation.ExcelProperty;
 
 public class ArchiveStudentVo {
+	@JsonSerialize(using = ToStringSerializer.class)
 	private Long studentId;
 
 	@ExcelProperty(name = "学生姓名", width = 20, index = 1)

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/MarkGroupStudent.java

@@ -30,7 +30,7 @@ public class MarkGroupStudent implements Serializable {
     @ApiModelProperty(value = "考生ID")
     private Long studentId;
 
-    @MppMultiId(value = "student_id")
+    @MppMultiId(value = "group_number")
     @ApiModelProperty(value = "分组ID")
     private Integer groupNumber;
 

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/MarkStudent.java

@@ -38,7 +38,7 @@ import io.swagger.annotations.ApiModelProperty;
 public class MarkStudent implements Serializable {
 
     public static final String SPLIT = ";";
-    
+
     public static final String ANSWER_SPLIT = ",";
 
     public static final int SECRET_NUMBER_START = 10000000;
@@ -580,13 +580,16 @@ public class MarkStudent implements Serializable {
         }
         return list;
     }
-    
+
     public List<String> getSheetPathList() {
-    	List<String> list = new ArrayList<String>();
-        List<FilePathVo> vos = JSON.parseArray(StringUtils.trimToNull(sheetPath),FilePathVo.class);
-        for (FilePathVo filePathVo : vos) {
-        	list.add(JSON.toJSONString(filePathVo));
-		}
+        List<String> list = new ArrayList<String>();
+        String trimSheetPath = StringUtils.trimToNull(sheetPath);
+        if (StringUtils.isNotBlank(trimSheetPath)) {
+            List<FilePathVo> vos = JSON.parseArray(trimSheetPath, FilePathVo.class);
+            for (FilePathVo filePathVo : vos) {
+                list.add(JSON.toJSONString(filePathVo));
+            }
+        }
         return list;
     }
 
@@ -616,20 +619,20 @@ public class MarkStudent implements Serializable {
         return scoreList;
     }
 
-    public List<ScoreItem> getScoreList(boolean objective,List<MarkQuestion> questionList) {
+    public List<ScoreItem> getScoreList(boolean objective, List<MarkQuestion> questionList) {
         List<ScoreItem> scoreList = new LinkedList<ScoreItem>();
         try {
             String[] values = StringUtils.split(objective ? objectiveScoreList : subjectiveScoreList, SPLIT);
             int i = 0;
             for (String value : values) {
-            	i++;
-            	if (questionList.size() < i) {
-            		break;
-            	}
-            	MarkQuestion question = questionList.get(i - 1);
-            	if (question.getTotalScore() == null || question.getTotalScore() == 0) {
-            		continue;
-            	}
+                i++;
+                if (questionList.size() < i) {
+                    break;
+                }
+                MarkQuestion question = questionList.get(i - 1);
+                if (question.getTotalScore() == null || question.getTotalScore() == 0) {
+                    continue;
+                }
                 ScoreItem item = ScoreItem.parse(value, objective);
                 item.setObjective(objective);
                 item.setMainNumber(question.getMainNumber());
@@ -697,5 +700,5 @@ public class MarkStudent implements Serializable {
                 ", coursePaperId=" + coursePaperId +
                 "}";
     }
-    
+
 }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkProblemHistoryServiceImpl.java

@@ -67,7 +67,7 @@ public class MarkProblemHistoryServiceImpl extends ServiceImpl<MarkProblemHistor
 			problemDto.setProblemTypeName(problemDto.getType().getDesc());
 			problemDto.setStatusName(problemDto.getStatus().getName());
 			problemDto.setGroupQuestions(markQuestionService
-					.assembleGroupQuestionsByExamIdAndPaperNumberAndNumber(examId, paperNumber, groupNumber));
+					.assembleGroupQuestionsByExamIdAndPaperNumberAndNumber(examId, paperNumber, problemDto.getGroupNumber()));
 			if (problemDto.getUserId() != null) {
 				SysUser sysUser = sysUserService.getById(problemDto.getUserId());
 				if (sysUser != null) {

teachcloud-task/src/main/java/com/qmth/teachcloud/task/start/StartRunning.java

@@ -85,7 +85,7 @@ public class StartRunning implements CommandLineRunner {
         Map reunifyJobMap = new HashMap();
         reunifyJobMap.computeIfAbsent("name", v -> SubjectCalculateJob.class.getName());
         quartzService.deleteJob(JobEnum.SYNC_REUNIFY_JOB.name(), JobEnum.SYNC_REUNIFY_JOB_GROUP.name());
-        quartzService.addJob(SubjectCalculateJob.class, JobEnum.SYNC_REUNIFY_JOB.name(), JobEnum.SYNC_REUNIFY_JOB_GROUP.name(), "0 0 0/2 * * ?", reunifyJobMap);
+//        quartzService.addJob(SubjectCalculateJob.class, JobEnum.SYNC_REUNIFY_JOB.name(), JobEnum.SYNC_REUNIFY_JOB_GROUP.name(), "0 0 0/2 * * ?", reunifyJobMap);
         log.info("增加自动统分定时任务 end");
 
         // 每1分钟一次