Merge remote-tracking branch 'origin/dev_v3.4.0' into dev_v3.4.0

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

@@ -28,6 +28,7 @@ import com.qmth.teachcloud.mark.service.MarkStudentService;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * <p>
@@ -77,8 +78,8 @@ public class MarkArchiveController {
 
     @ApiOperation(value = "成绩报告导出")
     @RequestMapping(value = "/score/report/download", method = RequestMethod.POST)
-    public void scoreReportDownload(@RequestBody JSONObject jsonObject, HttpServletResponse response) {
-        markStudentService.scoreReportDownload(jsonObject, response);
+    public void scoreReportDownload(MultipartFile file, HttpServletResponse response) {
+        markStudentService.scoreReportDownload(file, response);
     }
 
     @ApiOperation(value = "成绩报告")

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/MarkStudentService.java

@@ -35,6 +35,8 @@ import com.qmth.teachcloud.mark.entity.MarkPaper;
 import com.qmth.teachcloud.mark.entity.MarkStudent;
 import com.qmth.teachcloud.mark.entity.ScanStudentPaper;
 import com.qmth.teachcloud.mark.params.MarkHeaderResult;
+import com.sun.org.apache.xpath.internal.operations.Mult;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotNull;
@@ -173,7 +175,7 @@ public interface MarkStudentService extends IService<MarkStudent> {
 
     int countOmrAbsentStudent(Long examId, String paperNumber, String paperType, boolean isOmrAbsentConfirm, String teachClassName);
 
-    void scoreReportDownload(JSONObject jsonObject, HttpServletResponse response);
+    void scoreReportDownload(MultipartFile file, HttpServletResponse response);
 
     void deleteByExamIdAndPaperNumber(Long examId, String paperNumber);
 

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

@@ -76,6 +76,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.FileCopyUtils;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.imageio.ImageIO;
@@ -1332,7 +1333,7 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
     }
 
     @Override
-    public void scoreReportDownload(JSONObject jsonObject, HttpServletResponse response) {
+    public void scoreReportDownload(MultipartFile file, HttpServletResponse response) {
         String rootPath = null;
         File htmlFile;
         File pdfFile;
@@ -1356,7 +1357,7 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
                 htmlFile.createNewFile();
             }
             // 生成html文件
-            FileCopyUtils.copy(jsonObject.getString("htmlContent").getBytes(StandardCharsets.UTF_8), htmlFile);
+            FileCopyUtils.copy(file.getBytes(), htmlFile);
 
             // pdf文件
             String cardPdfPath = rootPath + File.separator + System.currentTimeMillis() + File.separator + "temp"