Browse Source

3.4.2 update-1226仲裁获取试卷url报错

xiaofei 5 months ago
parent
commit
44592f930e

+ 5 - 3
teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/manage/MarkArbitrateSettingDto.java

@@ -1,12 +1,14 @@
 package com.qmth.teachcloud.mark.dto.mark.manage;
 
+import java.util.List;
+
 public class MarkArbitrateSettingDto {
 
     private String markMode;
     private String courseCode;
     private String courseName;
     private String paperNumber;
-    private String paperUrl;
+    private List<String> paperUrl;
     private String answerUrl;
     private String userLoginName;
     private String userName;
@@ -43,11 +45,11 @@ public class MarkArbitrateSettingDto {
         this.paperNumber = paperNumber;
     }
 
-    public String getPaperUrl() {
+    public List<String> getPaperUrl() {
         return paperUrl;
     }
 
-    public void setPaperUrl(String paperUrl) {
+    public void setPaperUrl(List<String> paperUrl) {
         this.paperUrl = paperUrl;
     }
 

+ 8 - 1
teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkArbitrateHistoryServiceImpl.java

@@ -1,11 +1,13 @@
 package com.qmth.teachcloud.mark.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.teachcloud.common.bean.vo.FilePathVo;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.mark.MarkArbitrateStatus;
@@ -147,7 +149,12 @@ public class MarkArbitrateHistoryServiceImpl extends ServiceImpl<MarkArbitrateHi
             markArbitrateSettingDto.setUserLoginName(sysUser.getLoginName());
             markArbitrateSettingDto.setUserName(sysUser.getRealName());
             if (StringUtils.isNotBlank(markPaper.getPaperFilePath())) {
-                markArbitrateSettingDto.setPaperUrl(fileUploadService.filePreview(markPaper.getPaperFilePath()));
+                List<FilePathVo> filePathVoList = JSON.parseArray(markPaper.getPaperFilePath(), FilePathVo.class);
+                List<String> filePaths = new ArrayList<>();
+                for (FilePathVo filePathVo : filePathVoList) {
+                    filePaths.add(fileUploadService.filePreview(JSON.toJSONString(filePathVo)));
+                }
+                markArbitrateSettingDto.setPaperUrl(filePaths);
             }
             if (StringUtils.isNotBlank(markPaper.getAnswerFilePath())) {
                 markArbitrateSettingDto.setAnswerUrl(fileUploadService.filePreview(markPaper.getAnswerFilePath()));