Merge branch 'dev' of http://git.qmth.com.cn/wangliang/distributed-print-service into dev

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

@@ -13,11 +13,11 @@ import java.util.List;
 public class ExaminationImportDto {
 
     @ApiModelProperty(value = "学号")
-    @ExcelDBFieldDesc(name = "学号",length = 10)
+    @ExcelDBFieldDesc(name = "学号",length = 20)
     private String studentCode;
 
     @ApiModelProperty(value = "考号")
-    @ExcelDBFieldDesc(name = "考号",length = 15)
+    @ExcelDBFieldDesc(name = "考号",length = 20)
     private String ticketNumber;
 
     @ApiModelProperty(value = "座位号")

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

@@ -257,7 +257,7 @@ public class ConvertUtil {
             throw ExceptionResultEnum.ERROR.exception(name + "不能为空");
         }
         if (str.length() > length){
-            throw ExceptionResultEnum.ERROR.exception("内容'" + str + "' 超过长度限制 : " + length);
+            throw ExceptionResultEnum.ERROR.exception("[" + name + ":" + str + "]' 超过长度限制 : " + length);
         }
     }
 }

distributed-print-business/src/main/resources/db/init-table.sql

@@ -300,6 +300,7 @@ CREATE TABLE `exam_detail_course`  (
   `create_time` bigint(20) NULL DEFAULT NULL,
   `update_id` bigint(20) NULL DEFAULT NULL,
   `update_time` bigint(20) NULL DEFAULT NULL,
+  `paper_type` varchar(30) DEFAULT NULL COMMENT '当前试卷类型',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '考务数据（考场关联科目）' ROW_FORMAT = Dynamic;
 

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

@@ -54,7 +54,7 @@
         FROM
             exam_detail a
             LEFT JOIN exam_detail_course b ON a.id = b.exam_detail_id
-        GROUP BY a.school_id , a.print_plan_id , a.print_plan_name , b.paper_number , b.course_code , b.course_name) a
+        GROUP BY a.school_id , a.print_plan_id , a.print_plan_name , b.paper_number , b.course_code , b.course_name , b.paper_type) a
             LEFT JOIN
         exam_task c ON a.school_id = c.school_id
             AND a.course_code = c.course_code