Merge branch 'dev_v2.2.0' into release_v2.2.0

merge

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

@@ -1759,8 +1759,20 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         if (Objects.isNull(third)){
             throw ExceptionResultEnum.ERROR.exception("未找到院长级审核记录");
         }
-        second.setRemark("通过，" + second.getRemark());
-        third.setRemark("通过，" + third.getRemark());
+        String secondRemark = second.getRemark();
+        if (SystemConstant.strNotNull(secondRemark)){
+            secondRemark = "通过，" + secondRemark;
+        }else {
+            secondRemark = "通过";
+        }
+        String thirdRemark = third.getRemark();
+        if (SystemConstant.strNotNull(thirdRemark)){
+            thirdRemark = "通过，" + thirdRemark;
+        }else {
+            thirdRemark = "通过";
+        }
+        second.setRemark(secondRemark);
+        third.setRemark(thirdRemark);
         approvalInfoList.add(second);
         approvalInfoList.add(third);
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/export/AsyncExportTaskTemplete.java

@@ -24,6 +24,7 @@ import org.springframework.scheduling.annotation.Async;
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.text.MessageFormat;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.Map;
 import java.util.Objects;
@@ -69,7 +70,16 @@ public abstract class AsyncExportTaskTemplete {
         try {
             JSONObject jsonObject = JSONObject.parseObject(tbTask.getResultFilePath());
             if (Objects.isNull(jsonObject)) {
-                throw ExceptionResultEnum.ERROR.exception("未能获取文件路径，文件上传失败");
+                jsonObject = new JSONObject();
+                LocalDateTime nowTime = LocalDateTime.now();
+                StringJoiner stringJoiner = new StringJoiner("");
+                stringJoiner.add(UploadFileEnum.FILE.getTitle()).add(File.separator);
+                stringJoiner.add(String.valueOf(nowTime.getYear())).add(File.separator)
+                        .add(String.format("%02d", nowTime.getMonthValue())).add(File.separator)
+                        .add(String.format("%02d", nowTime.getDayOfMonth()))
+                        .add(File.separator).add(SystemConstant.getUuid()).add(TXT_PREFIX);
+                jsonObject.put(SystemConstant.TYPE, SystemConstant.OSS);
+                jsonObject.put(SystemConstant.PATH, stringJoiner.toString());
             }
             String path = (String) jsonObject.get(SystemConstant.PATH);
             String type = (String) jsonObject.get(SystemConstant.TYPE);