3.4.1 联调bug修复

distributed-print-business/src/main/resources/db/log/xf.sql

@@ -55,3 +55,7 @@ ALTER TABLE `exam_task` ADD COLUMN `exam_task_content` MEDIUMTEXT NULL COMMENT '
 
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('1187', '打回-查询轨迹图', '/api/admin/mark/task/get_mark_track', 'URL', '917', '27', 'AUTH', '1', '1', '1');
 UPDATE `sys_privilege` SET `related` = '1185,1187' WHERE (`id` = '1184');
+
+UPDATE `sys_privilege` SET `related` = '74,417,420,421,427,441,442,477,417,640,641,642' WHERE (`id` = '292');
+UPDATE `sys_privilege` SET `related` = '74,477,417,420,421,427,441,442,640,641,642' WHERE (`id` = '296');
+UPDATE `sys_privilege` SET `enable` = '0', `front_display` = '0' WHERE (`id` = '275');

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

@@ -100,9 +100,9 @@ public class MarkInspectedController extends BaseController{
      */
     @ApiOperation(value = "主观题检查任务保存")
     @RequestMapping(value = "/subjective/confirmTask", method = RequestMethod.POST)
-    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE, detail = "确认主观题检查任务操作，考生ID：{{markResult.studentId}}")
-    public Result confirmSubjectiveInspectedTask(@RequestBody MarkHeaderResult markResult) {
-        markStudentService.confirmSubjectiveInspectedTask(markResult);
+    @OperationLogDetail(operationType = OperationTypeEnum.UPDATE, detail = "确认主观题检查任务操作，考生ID：{{studentId}}")
+    public Result confirmSubjectiveInspectedTask(@ApiParam(value = "考生ID", required = true) @RequestParam Long studentId) {
+        markStudentService.confirmSubjectiveInspectedTask(studentId);
         return ResultUtil.ok(true);
     }
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/OutputFileTypeEnum.java

@@ -9,8 +9,8 @@ import java.util.List;
 public enum OutputFileTypeEnum {
 
     PAPER("试卷文件", "试卷"),
-    ALL_CARD("全部题卡", "全部题卡"),
-    CUSTOM_CARD("仅专卡", "仅专卡"),
+    GENERIC_CARD("通卡", "仅通卡"),
+    CUSTOM_CARD("专卡", "仅专卡"),
     PACKAGE("卷袋贴文件", "卷袋贴"),
     SIGN("签到表文件", "签到表"),
     CHECK_IN("登记表文件", "考试情况登记表");

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

@@ -231,5 +231,5 @@ public interface MarkStudentService extends IService<MarkStudent> {
 
     List<MarkStudent> listByBasicStudentIds(List<Long> basicExamStudentIds);
 
-    void confirmSubjectiveInspectedTask(MarkHeaderResult markResult);
+    void confirmSubjectiveInspectedTask(Long studentId);
 }

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

@@ -2077,9 +2077,9 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
     }
 
     @Override
-    public void confirmSubjectiveInspectedTask(MarkHeaderResult markResult) {
+    public void confirmSubjectiveInspectedTask(Long studentId) {
         Long userId = ServletUtil.getRequestUserId();
-        MarkStudent markStudent = this.getById(markResult.getStudentId());
+        MarkStudent markStudent = this.getById(studentId);
         if (markStudent == null) {
             throw ExceptionResultEnum.ERROR.exception("考生不存在");
         }
@@ -2091,12 +2091,12 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
         }
         try {
             lockService.watch(LockType.EXAM_SUBJECT, markStudent.getExamId(), markStudent.getPaperNumber());
-            lockService.waitlock(LockType.STUDENT, markResult.getStudentId());
+            lockService.waitlock(LockType.STUDENT, studentId);
             this.updateCheckInfo(markStudent.getId(), userId);
         } catch (Exception e) {
             throw ExceptionResultEnum.ERROR.exception(e.getMessage());
         } finally {
-            lockService.unlock(LockType.STUDENT, markResult.getStudentId());
+            lockService.unlock(LockType.STUDENT, studentId);
             lockService.unwatch(LockType.EXAM_SUBJECT, markStudent.getExamId(), markStudent.getPaperNumber());
             markService.releaseByStudent(markStudent);
         }