1.0.5 update

paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/ExamStudentServiceImpl.java

@@ -290,7 +290,7 @@ public class ExamStudentServiceImpl extends ServiceImpl<ExamStudentMapper, ExamS
                 CellStyle cellStyle1 = writer.createCellStyle();
                 Font font1 = writer.createFont();
                 font1.setBold(true);
-                font1.setFontHeightInPoints((short) 15);
+                font1.setFontHeightInPoints((short) 12);
                 cellStyle1.setFont(font1);
                 cellStyle1.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
                 cellStyle1.setFillPattern(FillPatternType.SOLID_FOREGROUND);
@@ -302,7 +302,7 @@ public class ExamStudentServiceImpl extends ServiceImpl<ExamStudentMapper, ExamS
                 CellStyle cellStyle2 = writer.createCellStyle();
                 Font font2 = writer.createFont();
                 font2.setBold(true);
-                font2.setFontHeightInPoints((short) 15);
+                font2.setFontHeightInPoints((short) 12);
                 font2.setColor(IndexedColors.RED.getIndex());
                 cellStyle2.setFont(font2);
                 cellStyle2.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());

paper-library-business/src/main/java/com/qmth/paper/library/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -858,13 +858,13 @@ public class TaskLogicServiceImpl implements TaskLogicService {
 
             List<BasicField> basicFieldList = basicFieldService.listBySchoolId(schoolId);
             // 必填字段
-            Map<String, BasicField> requiredMap = basicFieldList.stream().filter(m -> m.getBasicField()).collect(Collectors.toMap(BasicField::getName, e -> e));
+            Map<String, BasicField> requiredMap = basicFieldList.stream().filter(m -> m.getBasicField() && m.getEnable()).collect(Collectors.toMap(BasicField::getName, e -> e));
             // 扩展字段
             Map<String, BasicField> extendMap = basicFieldList.stream().filter(m -> !m.getBasicField() && m.getEnable()).collect(Collectors.toMap(BasicField::getName, e -> e));
 
             // 通用规则表头
             List<String> actualTitleList = Stream.concat(requiredMap.keySet().stream(), extendMap.keySet().stream()).collect(Collectors.toList());
-            if (!org.apache.commons.collections4.CollectionUtils.isEqualCollection(Arrays.asList(columnNames), actualTitleList)) {
+            if (!CollectionUtils.isEqualCollection(Arrays.asList(columnNames), actualTitleList)) {
                 throw ExceptionResultEnum.ERROR.exception("表头名称错误，正确表头为【" + String.join(",", actualTitleList) + "】");
             }
 

paper-library-business/src/main/resources/mapper/DocManageMapper.xml

@@ -110,7 +110,7 @@
             <if test="maxBindCount != null">
                 and es.bind_count &lt;= #{maxBindCount}
             </if>
-            <if test="pictureSymbol != null and pictureSymbol !='' and pictureCount != null and pictureCount !='' ">
+            <if test="pictureSymbol != null and pictureSymbol !='' and pictureCount != null">
                 <if test="pictureSymbol == 'GREAT_THEN'">
                     and es.bind_count > #{pictureCount}
                 </if>

paper-library-business/src/main/resources/mapper/ExamStudentMapper.xml

@@ -20,7 +20,9 @@
         <result column="source" property="source"/>
         <result column="score" property="score"/>
         <result column="remark" property="remark"/>
+        <result column="extend_fields" property="extendFields"/>
         <result column="enable" property="enable"/>
+        <result column="bind_count" property="bindCount"/>
         <result column="create_id" property="createId"/>
         <result column="create_time" property="createTime"/>
         <result column="update_id" property="updateId"/>
@@ -30,7 +32,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         select id, school_id, semester_id, exam_id, course_code, course_name, student_code, student_name, college_name, major_name, class_name, teacher,teach_class,
-               exam_room, `source`, score,remark,enable, create_id, create_time, update_id, update_time from exam_student
+               exam_room, `source`, score,remark,extend_fields, enable, bind_count, create_id, create_time, update_id, update_time from exam_student
     </sql>
 
     <select id="findStudentPage"

paper-library-business/src/main/resources/mapper/PictureManageMapper.xml

@@ -58,7 +58,7 @@
         <if test="endStudentCode != null and endStudentCode != ''">
             and es.student_code &lt;= #{endStudentCode}
         </if>
-        <if test="pictureSymbol != null and pictureSymbol !='' and pictureCount != null and pictureCount !='' ">
+        <if test="pictureSymbol != null and pictureSymbol !='' and pictureCount != null">
             <if test="pictureSymbol == 'GREAT_THEN'">
                 and es.bind_count > #{pictureCount}
             </if>

paper-library/src/main/java/com/qmth/paper/library/api/ConditionController.java

@@ -85,7 +85,6 @@ public class ConditionController {
                                      @ApiParam(value = "学院名称") @RequestParam(required = false) String collegeName,
                                      @ApiParam(value = "专业名称") @RequestParam(required = false) String majorName,
                                      @ApiParam(value = "查询字典对象", required = true) @RequestParam DictionaryEnum dictionaryEnum) {
-        Long schoolId = SystemConstant.convertIdToLong(ServletUtil.getRequestHeaderSchoolId().toString());
         QueryWrapper<ExamStudent> studentQuery = new QueryWrapper<>();
         studentQuery.lambda().eq(ExamStudent::getExamId, examId);
         if (StringUtils.isNotBlank(collegeName)) {
@@ -97,7 +96,7 @@ public class ConditionController {
         List<DictionaryResult> dictionaryResultList = new ArrayList<>();
         switch (dictionaryEnum) {
             case COLLEGE:
-                dictionaryResultList = basicStudentService.list(studentQuery).stream().map(ExamStudent::getCollegeName).distinct().flatMap(e -> {
+                dictionaryResultList = basicStudentService.list(studentQuery).stream().filter(m -> StringUtils.isNotBlank(m.getCollegeName())).map(ExamStudent::getCollegeName).distinct().flatMap(e -> {
                     DictionaryResult dictionaryResult = new DictionaryResult();
                     dictionaryResult.setCode(e);
                     dictionaryResult.setName(e);
@@ -105,7 +104,7 @@ public class ConditionController {
                 }).collect(Collectors.toList());
                 break;
             case MAJOR:
-                dictionaryResultList = basicStudentService.list(studentQuery).stream().map(ExamStudent::getMajorName).distinct().flatMap(e -> {
+                dictionaryResultList = basicStudentService.list(studentQuery).stream().filter(m -> StringUtils.isNotBlank(m.getMajorName())).map(ExamStudent::getMajorName).distinct().flatMap(e -> {
                     DictionaryResult dictionaryResult = new DictionaryResult();
                     dictionaryResult.setCode(e);
                     dictionaryResult.setName(e);
@@ -113,7 +112,7 @@ public class ConditionController {
                 }).collect(Collectors.toList());
                 break;
             case CLAZZ:
-                dictionaryResultList = basicStudentService.list(studentQuery).stream().map(ExamStudent::getClassName).distinct().flatMap(e -> {
+                dictionaryResultList = basicStudentService.list(studentQuery).stream().filter(m -> StringUtils.isNotBlank(m.getClassName())).map(ExamStudent::getClassName).distinct().flatMap(e -> {
                     DictionaryResult dictionaryResult = new DictionaryResult();
                     dictionaryResult.setCode(e);
                     dictionaryResult.setName(e);

paper-library/src/main/java/com/qmth/paper/library/api/DocManageController.java

@@ -151,7 +151,7 @@ public class DocManageController {
         return ResultUtil.ok(paperLibraryService.deletePicture(paperLibraryId));
     }
 
-    @ApiOperation(value = "保存图片")
+    @ApiOperation(value = "旋转保存图片")
     @PostMapping("/picture/save")
     @ApiResponses({@ApiResponse(code = 200, message = "保存图片成功", response = Result.class)})
     public Result pictureUpload(@ApiParam(value = "图片ID", required = true) @RequestParam Long paperLibraryId,

paper-library/src/main/resources/db-log/hgh_update_log.sql

@@ -53,9 +53,6 @@ INSERT INTO `sys_privilege`(`id`, `name`, `url`, `type`, `parent_id`, `sequence`
 INSERT INTO `sys_privilege`(`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (289, '保存图片', '/api/admin/paper/picture/save', 'URL', 280, 1, 'AUTH', NULL, 1, 1, 1);
 
 
--- 2024-08-05
-INSERT INTO `sys_privilege`(`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (253, '单个考生数据清除接口', '/api/admin/paper/scan_task/clear_single_data', 'URL', 244, 4, 'AUTH', NULL, 1, 0, 1);
-update sys_privilege set related='251,253' where id=248;
 -- pdf图片生成
 INSERT INTO `sys_privilege`(`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES (276, 'pdf图片生成接口', '/api/admin/paper/document/pdf/generate', 'URL', 260, 8, 'AUTH', NULL, 1, 1, 1);
 update sys_privilege set related='267,268,269,270,271,276' where id=264;

paper-library/src/main/resources/db-log/xf.sql

@@ -57,3 +57,5 @@ UPDATE `sys_privilege` SET `related` = '266,278' WHERE (`id` = '263');
 
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('253', '清除学生数据', 'ClearStudentScanData', 'LINK', '244', '6', 'AUTH', '254', '1', '0', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('254', '清除学生数据接口', '/api/admin/paper/scan_task/clear_single_data', 'URL', '244', '4', 'AUTH', '1', '1', '1');
+
+UPDATE `sys_privilege` SET `enable` = '0' WHERE (`id` = '12');