Merge remote-tracking branch 'origin/dev_v2.2.0' into dev_v2.2.0

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

@@ -20,6 +20,9 @@ public class PaperPdfDto implements Serializable {
     @ApiModelProperty(name = "页面大小")
     int pages;
 
+    @ApiModelProperty(name = "卷型")
+    String type;
+
     public PaperPdfDto() {
 
     }
@@ -29,6 +32,12 @@ public class PaperPdfDto implements Serializable {
         this.pages = pages;
     }
 
+    public PaperPdfDto(String type, File file, int pages) {
+        this.type = type;
+        this.file = file;
+        this.pages = pages;
+    }
+
     public File getFile() {
         return file;
     }
@@ -44,4 +53,12 @@ public class PaperPdfDto implements Serializable {
     public void setPages(int pages) {
         this.pages = pages;
     }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
 }

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

@@ -332,11 +332,12 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                             List<String> paperTypes = Arrays.asList(paperType.split(",")).stream().sorted(Comparator.comparing(String::valueOf)).collect(Collectors.toList());
                             int i = 0;
                             for (ExamStudent t : examStudentList) {
+                                int mod = i % examTaskDetail.getDrawCount().intValue();
+                                String stuPaperType = paperTypes.get(mod);
                                 if (Objects.nonNull(pdfDto)) {
-                                    createPdfUtil.getExamStudentPaperPdf(paperPdfDto, paperPdfTempList);
+                                    createPdfUtil.getExamStudentPaperPdf(stuPaperType, paperPdfDto, paperPdfTempList);
                                 }
-                                int mod = i % examTaskDetail.getDrawCount().intValue();
-                                t.setPaperType(paperTypes.get(mod));
+                                t.setPaperType(stuPaperType);
                                 basicAttachmentList.add(createPdfUtil.examStudentHtml(attachmentIds, studentContent, t, examDetail, examDetailCourse, sysUser.getId(), examStudentTempPdfList));
                                 i++;
                             }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/CreatePdfUtil.java

@@ -402,19 +402,23 @@ public class CreatePdfUtil {
     /**
      * 获取试卷pdf
      *
+     *
+     * @param stuPaperType
      * @param paperPdfDto
      * @param pdfList
      * @return
      * @throws IOException
      */
-    public PdfDto getExamStudentPaperPdf(List<PaperPdfDto> paperPdfDto, List<PdfDto> pdfList) throws IOException {
+    public PdfDto getExamStudentPaperPdf(String stuPaperType, List<PaperPdfDto> paperPdfDto, List<PdfDto> pdfList) throws IOException {
         Set<String> pagesList = new HashSet<>();
         if (!CollectionUtils.isEmpty(paperPdfDto)) {
             for (PaperPdfDto dto : paperPdfDto) {
-                int pages = dto.getPages();
-                pagesList.add(String.valueOf(pages));
-                PdfDto pdfDto = PdfUtil.addPdfPage(dto.getFile());
-                pdfList.add(new PdfDto(dto.getFile().getPath(), PageSizeEnum.A3, pdfDto.getPageCount()));
+                if(stuPaperType.equals(dto.getType())){
+                    int pages = dto.getPages();
+                    pagesList.add(String.valueOf(pages));
+                    PdfDto pdfDto = PdfUtil.addPdfPage(dto.getFile());
+                    pdfList.add(new PdfDto(dto.getFile().getPath(), PageSizeEnum.A3, pdfDto.getPageCount()));
+                }
             }
             return new PdfDto(PageSizeEnum.A3, String.join(",", pagesList));
         } else {
@@ -477,7 +481,7 @@ public class CreatePdfUtil {
                     if (Objects.equals(name.toUpperCase(), type.toUpperCase())) {
                         File file = teachcloudCommonService.getFile(basicAttachment.getPath(), false);
                         int pages = (int) object.get("pages");
-                        paperPdfDto = new PaperPdfDto(file, pages);
+                        paperPdfDto = new PaperPdfDto(type, file, pages);
                         paperPdfDtoList.add(paperPdfDto);
                         break;
                     }

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamTaskController.java

@@ -275,7 +275,7 @@ public class ExamTaskController {
     @RequestMapping(value = "/apply_list", method = RequestMethod.POST)
     public Result taskApplyList(@RequestParam(value = "auditStatus", required = false) String auditStatus,
                                 @RequestParam(value = "reviewStatus", required = false) String reviewStatus,
-                                @RequestParam(value = "cardRuleId", required = false) Long cardRuleId,
+                                @RequestParam(value = "cardRuleId", required = false) String cardRuleId,
                                 @RequestParam(value = "courseCode", required = false) String courseCode,
                                 @RequestParam(value = "paperNumber", required = false) String paperNumber,
                                 @RequestParam(value = "startTime", required = false) Long startTime,
@@ -283,7 +283,7 @@ public class ExamTaskController {
                                 @RequestParam(value = "userName", required = false) String userName,
                                 @RequestParam("pageNumber") Integer pageNumber,
                                 @RequestParam("pageSize") Integer pageSize) {
-        return ResultUtil.ok(examTaskService.listTaskApply(auditStatus, reviewStatus, cardRuleId, courseCode, paperNumber, startTime, endTime, userName, pageNumber, pageSize));
+        return ResultUtil.ok(examTaskService.listTaskApply(auditStatus, reviewStatus, SystemConstant.convertIdToLong(cardRuleId), courseCode, paperNumber, startTime, endTime, userName, pageNumber, pageSize));
     }
 
     /**
@@ -364,7 +364,7 @@ public class ExamTaskController {
     public Result taskReviewListUnaudited(@RequestParam(value = "courseCode", required = false) String courseCode,
                                           @RequestParam(value = "paperNumber", required = false) String paperNumber,
                                           @RequestParam(value = "userId", required = false) Long userId,
-                                          @RequestParam(value = "cardRuleId", required = false) Long cardRuleId,
+                                          @RequestParam(value = "cardRuleId", required = false) String cardRuleId,
                                           @RequestParam(value = "startTime", required = false) Long startTime,
                                           @RequestParam(value = "endTime", required = false) Long endTime,
                                           @RequestParam(value = "startCreateTime", required = false) Long startCreateTime,
@@ -372,7 +372,7 @@ public class ExamTaskController {
                                           @RequestParam(value = "createName", required = false) String createName,
                                           @RequestParam("pageNumber") Integer pageNumber,
                                           @RequestParam("pageSize") Integer pageSize) {
-        return ResultUtil.ok(examTaskService.listTaskReviewUnaudited(courseCode, paperNumber, userId, cardRuleId, startTime, endTime, startCreateTime, endCreateTime, createName, pageNumber, pageSize));
+        return ResultUtil.ok(examTaskService.listTaskReviewUnaudited(courseCode, paperNumber, userId, SystemConstant.convertIdToLong(cardRuleId), startTime, endTime, startCreateTime, endCreateTime, createName, pageNumber, pageSize));
     }
 
     /**
@@ -398,7 +398,7 @@ public class ExamTaskController {
                                         @RequestParam(value = "courseCode", required = false) String courseCode,
                                         @RequestParam(value = "paperNumber", required = false) String paperNumber,
                                         @RequestParam(value = "userId", required = false) Long userId,
-                                        @RequestParam(value = "cardRuleId", required = false) Long cardRuleId,
+                                        @RequestParam(value = "cardRuleId", required = false) String cardRuleId,
                                         @RequestParam(value = "startTime", required = false) Long startTime,
                                         @RequestParam(value = "endTime", required = false) Long endTime,
                                         @RequestParam(value = "startCreateTime", required = false) Long startCreateTime,
@@ -406,7 +406,7 @@ public class ExamTaskController {
                                         @RequestParam(value = "createName", required = false) String createName,
                                         @RequestParam("pageNumber") Integer pageNumber,
                                         @RequestParam("pageSize") Integer pageSize) {
-        return ResultUtil.ok(examTaskService.listTaskReviewAudited(reviewStatus, courseCode, paperNumber, userId, cardRuleId, startTime, endTime, startCreateTime, endCreateTime, createName, pageNumber, pageSize));
+        return ResultUtil.ok(examTaskService.listTaskReviewAudited(reviewStatus, courseCode, paperNumber, userId, SystemConstant.convertIdToLong(cardRuleId), startTime, endTime, startCreateTime, endCreateTime, createName, pageNumber, pageSize));
     }
 
     /**
@@ -490,10 +490,10 @@ public class ExamTaskController {
                                 @RequestParam(value = "startTime", required = false) Long startTime,
                                 @RequestParam(value = "endTime", required = false) Long endTime,
                                 @RequestParam(value = "makeMethod", required = false) MakeMethodEnum makeMethod,
-                                @RequestParam(value = "cardRuleId", required = false) Long cardRuleId,
+                                @RequestParam(value = "cardRuleId", required = false) String cardRuleId,
                                 @RequestParam("pageNumber") Integer pageNumber,
                                 @RequestParam("pageSize") Integer pageSize) {
-        return ResultUtil.ok(examTaskService.listTaskPaper(courseCode, paperNumber, startTime, endTime, makeMethod, cardRuleId, pageNumber, pageSize));
+        return ResultUtil.ok(examTaskService.listTaskPaper(courseCode, paperNumber, startTime, endTime, makeMethod, SystemConstant.convertIdToLong(cardRuleId), pageNumber, pageSize));
     }
 
 

distributed-print/src/main/resources/application-dev.properties

@@ -12,9 +12,10 @@ spring.application.name=distributed-print
 #\u6570\u636E\u6E90\u914D\u7F6E
 db.host=localhost
 db.port=3306
-db.name=distributed-v2.2.0-test
+db.name=distributed-v2.2.0
+#db.name=distributed-v2.2.0-test
 db.username=root
-db.password=123456789
+db.password=88888888
 
 #redis\u6570\u636E\u6E90\u914D\u7F6E
 com.qmth.redis.host=${db.host}