|
@@ -1,11 +1,13 @@
|
|
package com.qmth.teachcloud.mark.service.impl;
|
|
package com.qmth.teachcloud.mark.service.impl;
|
|
|
|
|
|
|
|
+import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
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.entity.SysUser;
|
|
import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
|
|
import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
|
|
import com.qmth.teachcloud.common.enums.mark.MarkArbitrateStatus;
|
|
import com.qmth.teachcloud.common.enums.mark.MarkArbitrateStatus;
|
|
@@ -147,7 +149,12 @@ public class MarkArbitrateHistoryServiceImpl extends ServiceImpl<MarkArbitrateHi
|
|
markArbitrateSettingDto.setUserLoginName(sysUser.getLoginName());
|
|
markArbitrateSettingDto.setUserLoginName(sysUser.getLoginName());
|
|
markArbitrateSettingDto.setUserName(sysUser.getRealName());
|
|
markArbitrateSettingDto.setUserName(sysUser.getRealName());
|
|
if (StringUtils.isNotBlank(markPaper.getPaperFilePath())) {
|
|
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())) {
|
|
if (StringUtils.isNotBlank(markPaper.getAnswerFilePath())) {
|
|
markArbitrateSettingDto.setAnswerUrl(fileUploadService.filePreview(markPaper.getAnswerFilePath()));
|
|
markArbitrateSettingDto.setAnswerUrl(fileUploadService.filePreview(markPaper.getAnswerFilePath()));
|