3.3.0 fix

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ExamTaskDetailCardDto.java

@@ -35,7 +35,7 @@ public class ExamTaskDetailCardDto {
     private FlowStatusEnum flowStatus;
     private String flowStatusStr;
     private String printContent;
-
+    private String auditContent;
     private Boolean review;
 
     public FlowStatusEnum getFlowStatus() {
@@ -248,4 +248,12 @@ public class ExamTaskDetailCardDto {
     public void setReview(Boolean review) {
         this.review = review;
     }
+
+    public String getAuditContent() {
+        return auditContent;
+    }
+
+    public void setAuditContent(String auditContent) {
+        this.auditContent = auditContent;
+    }
 }

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

@@ -80,6 +80,13 @@ public class BasicPrintConfigServiceImpl extends ServiceImpl<BasicPrintConfigMap
         basicPrintConfig.setSchoolId(schoolId);
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
 
+        if (basicPrintConfig.getReview()) {
+            String auditContent = basicPrintConfig.getAuditContent();
+            if (StringUtils.isNotBlank(auditContent) && JSON.parseArray(auditContent, String.class).size() == 0) {
+                throw ExceptionResultEnum.ERROR.exception("强制审核内容至少选择一个");
+            }
+        }
+
         // 新增
         if (Objects.isNull(basicPrintConfig.getId())) {
             basicPrintConfig.setId(SystemConstant.getDbUuid());
@@ -130,10 +137,10 @@ public class BasicPrintConfigServiceImpl extends ServiceImpl<BasicPrintConfigMap
         List<BasicPrintConfig> basicPrintConfigList = this.list(queryWrapper);
         for (BasicPrintConfig basicPrintConfig : basicPrintConfigList) {
             String ordinaryContent = basicPrintConfig.getOrdinaryContent();
-            if(StringUtils.isNotBlank(ordinaryContent)){
+            if (StringUtils.isNotBlank(ordinaryContent)) {
                 List<JSONObject> jsonObjectList = JSON.parseArray(ordinaryContent, JSONObject.class);
                 for (JSONObject jsonObject : jsonObjectList) {
-                    if(ClassifyEnum.CHECK_IN.name().equals(jsonObject.getString("type")) && templateId.equals(jsonObject.getLong("templateId"))){
+                    if (ClassifyEnum.CHECK_IN.name().equals(jsonObject.getString("type")) && templateId.equals(jsonObject.getLong("templateId"))) {
                         jsonObject.put("attachmentId", String.valueOf(attachmentId));
                     }
                 }

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

@@ -929,6 +929,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             if (basicPrintConfig != null) {
                 detailCardDto.setPrintContent(basicPrintConfig.getPrintContent());
                 detailCardDto.setReview(basicPrintConfig.getReview());
+                detailCardDto.setAuditContent(basicPrintConfig.getAuditContent());
             }
         }
         return detailCardDto;

distributed-print-business/src/main/resources/mapper/ExamCardMapper.xml

@@ -23,7 +23,6 @@
         <result column="html_content" property="htmlContent"/>
         <result column="backup_attachment" property="backupAttachment"/>
         <result column="jpg_attachment" property="jpgAttachment"/>
-        <result column="sync_status" property="syncStatus"/>
         <result column="enable" property="enable"/>
         <result column="used" property="used"/>
         <result column="remark" property="remark"/>
@@ -32,7 +31,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-       select id, school_id,org_id, course_code, course_name, title, make_method, status, type, create_method, content,html_content, backup_attachment, jpg_attachment,attachment_id, sync_status, enable, used, remark, card_rule_id, create_id, create_time, update_id, update_time from exam_card
+       select id, school_id,org_id, course_code, course_name, title, make_method, status, type, create_method, content,html_content, backup_attachment, jpg_attachment,attachment_id, enable, used, remark, card_rule_id, create_id, create_time, update_id, update_time from exam_card
     </sql>
     <select id="listGenericCard" resultType="com.qmth.distributed.print.business.entity.ExamCard">
         SELECT

distributed-print/install/mysql/upgrade/3.3.0.sql

@@ -190,3 +190,7 @@ ALTER TABLE `sys_user`
 ALTER TABLE `exam_card` DROP COLUMN `sync_status`;
 ALTER TABLE `exam_student` DROP COLUMN `sync_status`;
 ALTER TABLE `exam_print_plan` DROP COLUMN `sync_status`;
+
+ALTER TABLE `basic_print_config`
+    ADD COLUMN `audit_content` VARCHAR(45) NULL COMMENT '[PAPER,CARD]' AFTER `review`;
+

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/bean/FilePathVo.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/vo/FilePathVo.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.mark.bean;
+package com.qmth.teachcloud.common.bean.vo;
 
 import com.qmth.teachcloud.common.enums.UploadFileEnum;
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/BasicPrintConfig.java

@@ -49,6 +49,12 @@ public class BasicPrintConfig extends BaseEntity implements Serializable {
     @TableField("review")
     private Boolean review;
 
+    /**
+     * 审核内容：试卷、题卡
+     */
+    @TableField("audit_content")
+    private String auditContent;
+
     @ApiModelProperty(value = "提交打印方式")
     @TableField("print_method")
     private PrintMethodEnum printMethod;
@@ -137,6 +143,14 @@ public class BasicPrintConfig extends BaseEntity implements Serializable {
         this.review = review;
     }
 
+    public String getAuditContent() {
+        return auditContent;
+    }
+
+    public void setAuditContent(String auditContent) {
+        this.auditContent = auditContent;
+    }
+
     public PrintMethodEnum getPrintMethod() {
         return printMethod;
     }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/TeachcloudCommonService.java

@@ -133,6 +133,13 @@ public interface TeachcloudCommonService {
      */
     public List<String> filePreview(List<String> path);
 
+    /**
+     * 阅卷图片
+     * @param path
+     * @return
+     */
+    public List<String> fileMarkPreview(List<String> path);
+
     public String filePreview(Long attachmentId);
 
     /**

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

@@ -2,6 +2,7 @@ package com.qmth.teachcloud.common.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
@@ -14,6 +15,7 @@ import com.qmth.teachcloud.common.bean.dto.MenuDto;
 import com.qmth.teachcloud.common.bean.dto.MenuPrivilegeDto;
 import com.qmth.teachcloud.common.bean.dto.OrgDto;
 import com.qmth.teachcloud.common.bean.result.*;
+import com.qmth.teachcloud.common.bean.vo.FilePathVo;
 import com.qmth.teachcloud.common.config.DictionaryConfig;
 import com.qmth.teachcloud.common.contant.SpringContextHolder;
 import com.qmth.teachcloud.common.contant.SystemConstant;
@@ -900,12 +902,23 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
         }
     }
 
-	@Override
-	public List<String> filePreview(List<String> paths) {
-		List<String> result = new ArrayList<String>();
-		for (String path : paths) {
-			result.add(this.filePreview(path));
-		}
-		return result;
-	}
+    @Override
+    public List<String> filePreview(List<String> paths) {
+        List<String> result = new ArrayList<String>();
+        for (String path : paths) {
+            result.add(this.filePreview(path));
+        }
+        return result;
+    }
+
+    @Override
+    public List<String> fileMarkPreview(List<String> paths) {
+        List<String> result = new ArrayList<>();
+        for (String path : paths) {
+            FilePathVo filePathVo = JSON.parseObject(path, FilePathVo.class);
+            String pathVoPath = filePathVo.getPath();
+            result.add(!pathVoPath.startsWith("/") ? "/" + pathVoPath : pathVoPath);
+        }
+        return result;
+    }
 }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/bean/scananswer/SheetUploadVo.java

@@ -1,8 +1,5 @@
 package com.qmth.teachcloud.mark.bean.scananswer;
 
-import com.alibaba.fastjson.JSON;
-import com.qmth.teachcloud.mark.bean.FilePathVo;
-
 public class SheetUploadVo {
 
     private String uri;

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

@@ -18,7 +18,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.teachcloud.common.entity.MarkQuestion;
 import com.qmth.teachcloud.common.enums.ScanStatus;
 import com.qmth.teachcloud.common.enums.mark.SubjectiveStatus;
-import com.qmth.teachcloud.mark.bean.FilePathVo;
+import com.qmth.teachcloud.common.bean.vo.FilePathVo;
 import com.qmth.teachcloud.mark.dto.mark.ScoreItem;
 import com.qmth.teachcloud.mark.utils.BigDecimalUtils;
 

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

@@ -21,7 +21,7 @@ import com.qmth.teachcloud.common.enums.scan.ConditionType;
 import com.qmth.teachcloud.common.service.TeachcloudCommonService;
 import com.qmth.teachcloud.common.util.ExcelUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
-import com.qmth.teachcloud.mark.bean.FilePathVo;
+import com.qmth.teachcloud.common.bean.vo.FilePathVo;
 import com.qmth.teachcloud.mark.bean.UpdateTimeVo;
 import com.qmth.teachcloud.mark.bean.archivescore.*;
 import com.qmth.teachcloud.mark.bean.omredit.OmrEditDomain;
@@ -44,7 +44,6 @@ import com.qmth.teachcloud.mark.enums.LockType;
 import com.qmth.teachcloud.mark.enums.OmrTaskStatus;
 import com.qmth.teachcloud.mark.lock.LockService;
 import com.qmth.teachcloud.mark.mapper.MarkStudentMapper;
-import com.qmth.teachcloud.mark.params.MarkHeaderGroupResult;
 import com.qmth.teachcloud.mark.params.MarkHeaderResult;
 import com.qmth.teachcloud.mark.service.*;
 import com.qmth.teachcloud.mark.utils.BatchGetDataUtil;

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

@@ -223,7 +223,8 @@ public class TaskServiceImpl implements TaskService {
         task.setQuestionList(buildMarkStep(t));
         task.setSpecialTagList(getMarkSpecialTagList(t));
         MarkStudent student = markStudentService.getById(t.getStudentId());
-        task.setSheetUrls(teachcloudCommonService.filePreview(student.getSheetPathList()));
+//        task.setSheetUrls(teachcloudCommonService.filePreview(student.getSheetPathList()));
+        task.setSheetUrls(teachcloudCommonService.fileMarkPreview(student.getSheetPathList()));
         MarkGroup group = markGroupService.getByExamIdAndPaperNumberAndGroupNumber(t.getExamId(), t.getPaperNumber(),
                 t.getGroupNumber());
         task.setSliceConfig(group.getPictureConfigList());

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/utils/FileStoreUtils.java

@@ -9,7 +9,7 @@ import com.qmth.teachcloud.common.domain.FssDomain;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.LocalCatalogEnum;
 import com.qmth.teachcloud.common.enums.UploadFileEnum;
-import com.qmth.teachcloud.mark.bean.FilePathVo;
+import com.qmth.teachcloud.common.bean.vo.FilePathVo;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;

teachcloud-mark/src/main/resources/mapper/ScanPackageMapper.xml

@@ -27,7 +27,7 @@
         <if test="req.courseCode != null and req.courseCode != ''">
 			and t.course_code = #{req.courseCode}
 		</if>
-		<if test="req.req.coursePaperId != null and req.req.coursePaperId != ''">
+		<if test="req.coursePaperId != null and req.coursePaperId != ''">
 			and t.course_paper_id= #{req.coursePaperId}
 		</if>
         <if test="req.status != null">