fix:印刷任务管理和A4 -> A3，前端联调

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

@@ -31,13 +31,13 @@ public class PrintTaskDto {
 
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "印刷室id")
-    private Long printingHouseId;
+    private Long printHouseId;
 
     @ApiModelProperty(value = "印刷室编号")
-    private String printingHouseCode;
+    private String printHouseCode;
 
     @ApiModelProperty(value = "印刷室名称")
-    private String printingHouseName;
+    private String printHouseName;
 
     public String getExamDetailId() {
         return examDetailId;
@@ -191,27 +191,27 @@ public class PrintTaskDto {
         this.normal = normal;
     }
 
-    public Long getPrintingHouseId() {
-        return printingHouseId;
+    public Long getPrintHouseId() {
+        return printHouseId;
     }
 
-    public void setPrintingHouseId(Long printingHouseId) {
-        this.printingHouseId = printingHouseId;
+    public void setPrintHouseId(Long printHouseId) {
+        this.printHouseId = printHouseId;
     }
 
-    public String getPrintingHouseCode() {
-        return printingHouseCode;
+    public String getPrintHouseCode() {
+        return printHouseCode;
     }
 
-    public void setPrintingHouseCode(String printingHouseCode) {
-        this.printingHouseCode = printingHouseCode;
+    public void setPrintHouseCode(String printHouseCode) {
+        this.printHouseCode = printHouseCode;
     }
 
-    public String getPrintingHouseName() {
-        return printingHouseName;
+    public String getPrintHouseName() {
+        return printHouseName;
     }
 
-    public void setPrintingHouseName(String printingHouseName) {
-        this.printingHouseName = printingHouseName;
+    public void setPrintHouseName(String printHouseName) {
+        this.printHouseName = printHouseName;
     }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamTaskDetail.java

@@ -39,24 +39,6 @@ public class ExamTaskDetail extends BaseEntity implements Serializable {
 
     @TableField("draw_count")
     private Integer drawCount;
-
-    /**
-     * [
-     * {
-     * "type": "A",
-     * "attachmentId": 12,
-     * "totalPages": 3
-     * },
-     * {
-     * "type": "B",
-     * "attachmentId": 13,
-     * "totalPages": 2
-     * }
-     * ]
-     */
-    @ApiModelProperty(value = "原试卷附件")
-    @TableField("paper_original_attachment_ids")
-    private String paperOriginalAttachmentIds;
     /**
      * [
      * {
@@ -236,12 +218,4 @@ public class ExamTaskDetail extends BaseEntity implements Serializable {
     public void setOperateType(String operateType) {
         this.operateType = operateType;
     }
-
-    public String getPaperOriginalAttachmentIds() {
-        return paperOriginalAttachmentIds;
-    }
-
-    public void setPaperOriginalAttachmentIds(String paperOriginalAttachmentIds) {
-        this.paperOriginalAttachmentIds = paperOriginalAttachmentIds;
-    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ExamDetailMapper.java

@@ -35,7 +35,7 @@ public interface ExamDetailMapper extends BaseMapper<ExamDetail> {
                                       @Param("examEndTime") Long examEndTime,
                                       @Param("printStartTime") Long printStartTime,
                                       @Param("printEndTime") Long printEndTime,
-                                      @Param("printingHouseId") Long printingHouseId,
+                                      @Param("printHouseId") Long printHouseId,
                                       @Param("orgIds") Set<Long> orgIds);
 
     IPage<ExaminationResult> findBriefPage(@Param("page") Page<ExaminationResult> page,
@@ -76,7 +76,7 @@ public interface ExamDetailMapper extends BaseMapper<ExamDetail> {
                                     @Param("examEndTime") Long examEndTime,
                                     @Param("printStartTime") Long printStartTime,
                                     @Param("printEndTime") Long printEndTime,
-                                    @Param("printingHouseId") Long printingHouseId,
+                                    @Param("printHouseId") Long printHouseId,
                                     @Param("orgIds") Set<Long> orgIds);
 
     IPage<ClientExamStudentDto> listClientExamStudentPage(Page<ClientExamStudentDto> page, @Param("schoolId") Long schoolId, @Param("examDetailId") Long examDetailId, @Param("ticketNumber") String ticketNumber, @Param("studentName") String studentName, @Param("courseCode") String courseCode);
@@ -92,7 +92,7 @@ public interface ExamDetailMapper extends BaseMapper<ExamDetail> {
                              @Param("examRoom") String examRoom,
                              @Param("examStartTime") Long examStartTime,
                              @Param("examEndTime") Long examEndTime,
-                             @Param("printingHouseId") Long printingHouseId,
+                             @Param("printHouseId") Long printHouseId,
                              @Param("orgIds") Set<Long> orgIds);
 
     List<ExamDetailCourse> listSyncPaperNumberByPrintPlanId(Long printPlanId);

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

@@ -42,9 +42,9 @@ public interface ExamDetailService extends IService<ExamDetail> {
      */
     double calculateTotalPackages(Long printPlanId);
 
-    IPage<PrintTaskDto> listPrintTask(Long printPlanId, String status, String courseCode, String paperNumber, String examPlace, String examRoom, Long examStartTime, Long examEndTime, Long printStartTime, Long printEndTime,Long printingHouseId, Integer pageNumber, Integer pageSize);
+    IPage<PrintTaskDto> listPrintTask(Long printPlanId, String status, String courseCode, String paperNumber, String examPlace, String examRoom, Long examStartTime, Long examEndTime, Long printStartTime, Long printEndTime,Long printHouseId, Integer pageNumber, Integer pageSize);
 
-    PrintTaskTotalDto taskTotalData(Long printPlanId, String status, String courseCode, String paperNumber, String examPlace, String examRoom, Long examStartTime, Long examEndTime, Long printStartTime, Long printEndTime,Long printingHouseId);
+    PrintTaskTotalDto taskTotalData(Long printPlanId, String status, String courseCode, String paperNumber, String examPlace, String examRoom, Long examStartTime, Long examEndTime, Long printStartTime, Long printEndTime,Long printHouseId);
 
     List<JSONObject> taskViewPDF(Long examDetailId);
 

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

@@ -125,23 +125,23 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
     }
 
     @Override
-    public IPage<PrintTaskDto> listPrintTask(Long printPlanId, String status, String courseCode, String paperNumber, String examPlace, String examRoom, Long examStartTime, Long examEndTime, Long printStartTime, Long printEndTime,Long printingHouseId, Integer pageNumber, Integer pageSize) {
+    public IPage<PrintTaskDto> listPrintTask(Long printPlanId, String status, String courseCode, String paperNumber, String examPlace, String examRoom, Long examStartTime, Long examEndTime, Long printStartTime, Long printEndTime,Long printHouseId, Integer pageNumber, Integer pageSize) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Set<Long> orgIds = teachcloudCommonService.listSubOrgIds(null);
         Page<PrintTaskDto> page = new Page<>(pageNumber, pageSize);
-        IPage<PrintTaskDto> pirntTaskDtoIPage = this.baseMapper.listPrintTask(page, schoolId, printPlanId, status, courseCode, paperNumber, examPlace, examRoom, examStartTime, examEndTime,printStartTime, printEndTime,printingHouseId,  orgIds);
+        IPage<PrintTaskDto> pirntTaskDtoIPage = this.baseMapper.listPrintTask(page, schoolId, printPlanId, status, courseCode, paperNumber, examPlace, examRoom, examStartTime, examEndTime,printStartTime, printEndTime,printHouseId,  orgIds);
         return pirntTaskDtoIPage;
     }
 
     @Override
-    public PrintTaskTotalDto taskTotalData(Long printPlanId, String status, String courseCode, String paperNumber, String examPlace, String examRoom, Long examStartTime, Long examEndTime, Long printStartTime, Long printEndTime,Long printingHouseId) {
+    public PrintTaskTotalDto taskTotalData(Long printPlanId, String status, String courseCode, String paperNumber, String examPlace, String examRoom, Long examStartTime, Long examEndTime, Long printStartTime, Long printEndTime,Long printHouseId) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Set<Long> orgIds = teachcloudCommonService.listSubOrgIds(null);
-        PrintTaskTotalDto printTaskTotalDto = this.baseMapper.taskTotalData(schoolId, printPlanId, status, courseCode, paperNumber, examPlace, examRoom, examStartTime, examEndTime, printStartTime, printEndTime,printingHouseId, orgIds);
+        PrintTaskTotalDto printTaskTotalDto = this.baseMapper.taskTotalData(schoolId, printPlanId, status, courseCode, paperNumber, examPlace, examRoom, examStartTime, examEndTime, printStartTime, printEndTime,printHouseId, orgIds);
 
         if (printTaskTotalDto != null) {
             // 试卷总计
-            Integer paperCount = this.baseMapper.selectPaperCount(schoolId, printPlanId, status, courseCode, paperNumber, examPlace, examRoom, examStartTime, examEndTime,printingHouseId, orgIds);
+            Integer paperCount = this.baseMapper.selectPaperCount(schoolId, printPlanId, status, courseCode, paperNumber, examPlace, examRoom, examStartTime, examEndTime,printHouseId, orgIds);
             printTaskTotalDto.setPaperCount(paperCount == null ? 0 : paperCount.intValue());
         }
         return printTaskTotalDto;

distributed-print-business/src/main/resources/mapper/ExamDetailMapper.xml

@@ -46,9 +46,9 @@
             b.print_start_time printStartTime,
             b.print_end_time printEndTime,
             b.normal,
-            b.print_house_id as printingHouseId,
-            e.name as printingHouseName,
-            e.code as printingHouseCode
+            b.print_house_id as printHouseId,
+            e.name as printHouseName,
+            e.code as printHouseCode
         FROM
             exam_print_plan a
                  JOIN
@@ -102,8 +102,8 @@
                 <if test="printEndTime != null and printEndTime != ''">
                     and b.print_start_time &lt; #{printEndTime}
                 </if>
-                <if test="printingHouseId != null and printingHouseId != ''">
-                    and b.print_house_id = #{printingHouseId}
+                <if test="printHouseId != null and printHouseId != ''">
+                    and b.print_house_id = #{printHouseId}
                 </if>
                 <if test="orgIds != null">
                     AND d.org_id IN
@@ -333,8 +333,8 @@
             <if test="printEndTime != null and printEndTime != ''">
                 and b.print_start_time &lt; #{printEndTime}
             </if>
-            <if test="printingHouseId != null and printingHouseId != ''">
-                and b.print_house_id = #{printingHouseId}
+            <if test="printHouseId != null and printHouseId != ''">
+                and b.print_house_id = #{printHouseId}
             </if>
             <if test="orgIds != null">
                 AND d.org_id IN
@@ -433,8 +433,8 @@
             <if test="examEndTime != null and examEndTime != ''">
                 and b.exam_end_time &lt; #{examEndTime}
             </if>
-            <if test="printingHouseId != null and printingHouseId != ''">
-                and b.print_house_id = #{printingHouseId}
+            <if test="printHouseId != null and printHouseId != ''">
+                and b.print_house_id = #{printHouseId}
             </if>
             <if test="orgIds != null">
                 AND d.org_id IN

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

@@ -200,7 +200,7 @@ public class ExamPrintPlanController {
      * @param examPlace
      * @param examStartTime
      * @param examEndTime
-     * @param printingHouseId 印刷室id
+     * @param printHouseId 印刷室id
      * @param pageNumber
      * @param pageSize
      * @return
@@ -217,10 +217,10 @@ public class ExamPrintPlanController {
                            @RequestParam(value = "examEndTime", required = false) Long examEndTime,
                            @RequestParam(value = "printStartTime", required = false) Long printStartTime,
                            @RequestParam(value = "printEndTime", required = false) Long printEndTime,
-                           @RequestParam(value = "printingHouseId", required = false) String printingHouseId,
+                           @RequestParam(value = "printHouseId", required = false) String printHouseId,
                            @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                            @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        IPage<PrintTaskDto> examTasks = examDetailService.listPrintTask(printPlanId, status, courseCode, paperNumber, examPlace, examRoom, examStartTime, examEndTime, printStartTime, printEndTime,SystemConstant.convertIdToLong(printingHouseId), pageNumber, pageSize);
+        IPage<PrintTaskDto> examTasks = examDetailService.listPrintTask(printPlanId, status, courseCode, paperNumber, examPlace, examRoom, examStartTime, examEndTime, printStartTime, printEndTime,SystemConstant.convertIdToLong(printHouseId), pageNumber, pageSize);
         return ResultUtil.ok(examTasks);
     }
 
@@ -289,8 +289,8 @@ public class ExamPrintPlanController {
                                 @RequestParam(value = "examEndTime", required = false) Long examEndTime,
                                 @RequestParam(value = "printStartTime", required = false) Long printStartTime,
                                 @RequestParam(value = "printEndTime", required = false) Long printEndTime,
-                                @RequestParam(value = "printingHouseId", required = false) String printingHouseId) {
-        PrintTaskTotalDto printTaskTotalDto = examDetailService.taskTotalData(printPlanId, status, courseCode, paperNumber, examPlace, examRoom, examStartTime, examEndTime, printStartTime, printEndTime,SystemConstant.convertIdToLong(printingHouseId));
+                                @RequestParam(value = "printHouseId", required = false) String printHouseId) {
+        PrintTaskTotalDto printTaskTotalDto = examDetailService.taskTotalData(printPlanId, status, courseCode, paperNumber, examPlace, examRoom, examStartTime, examEndTime, printStartTime, printEndTime,SystemConstant.convertIdToLong(printHouseId));
         return ResultUtil.ok(printTaskTotalDto);
     }