3.3.0 update

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

@@ -699,7 +699,8 @@
             edc.course_name courseName,
             edc.paper_number paperNumber,
             edc.course_paper_id coursePaperId,
-            edc.paper_type paperType
+            edc.paper_type paperType,
+            edc.create_id createId
         FROM
             exam_detail ed
                 LEFT JOIN

distributed-print/install/mysql/upgrade/3.3.0.sql

@@ -25,7 +25,7 @@ INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('897', '评卷设置', 'MarkSetting', 'MENU', '486', '2', 'AUTH', '1', '0', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('898', '列表', 'List', 'LIST', '897', '1', 'AUTH', '900', '1', '0', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('899', '查询', 'Select', 'BUTTON', '897', '2', 'AUTH', '900', '1', '0', '1');
-INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('900', '查询', '/api/admin/mark/setting/summary', 'URL', '897', '1', 'AUTH', '1', '1', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('900', '查询', '/api/admin/mark/setting/list', 'URL', '897', '1', 'AUTH', '1', '1', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('901', '评卷参数设置', 'MarkParamSetting', 'LINK', '897', '3', 'AUTH', '672,902,903,904,905,906,907,908,909,910,911,912,913,962,963', '1', '0', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('902', '结构查询', '/api/admin/mark/question/list', 'URL', '897', '1', 'AUTH', '1', '1', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('903', '结构提交', '/api/admin/mark/question/save', 'URL', '897', '2', 'AUTH', '1', '1', '1');
@@ -39,7 +39,7 @@ INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('911', '客观题标答提交', '/api/admin/mark/question/objective/save', 'URL', '897', '10', 'AUTH', '1', '1', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('912', '主观题标答查询', '/api/admin/mark/question/subjective/get', 'URL', '897', '11', 'AUTH', '1', '1', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('913', '主观题标答提交', '/api/admin/mark/question/subjective/upload', 'URL', '897', '12', 'AUTH', '1', '1', '1');
-INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('914', '评卷设置', 'MarkConfig', 'LINK', '897', '4', 'AUTH', '915,916', '1', '1', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('914', '评卷设置', 'MarkConfig', 'LINK', '897', '4', 'AUTH', '915,916', '1', '0', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('915', '数据获取', '/api/admin/mark/setting/paper/get', 'URL', '897', '13', 'AUTH', '1', '1', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('916', '数据保存', '/api/admin/mark/setting/paper/save', 'URL', '897', '14', 'AUTH', '1', '1', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('917', '评卷管理', 'MarkManage', 'MENU', '486', '3', 'AUTH', '1', '0', '1');
@@ -71,7 +71,7 @@ INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('943', '仲裁-保存任务', '/api/admin/mark/arbitrate/saveTask', 'URL', '917', '19', 'AUTH', '1', '1', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('944', '查看详情', 'Detail', 'LINK', '917', '6', 'AUTH', '928,929,930,931,932,933,934,935,936,937,938,939,940,941,942,943,964,965,966,967', '1', '0', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('945', '结束评卷', 'Finish', 'LINK', '917', '7', 'AUTH', '927', '1', '0', '1');
-INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('946', '成绩检查', 'CheckScore', 'MENU', '486', '4', 'AUTH', '1', '0', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('946', '成绩检查', 'ScoreCheck', 'MENU', '486', '4', 'AUTH', '1', '0', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('947', '列表', 'List', 'LIST', '946', '1', 'AUTH', '952', '1', '0', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('948', '查询条件', 'Condition', 'CONDITION', '946', '2', 'AUTH', '1', '0', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('949', '查询', 'Select', 'BUTTON', '946', '3', 'AUTH', '952', '1', '0', '1');
@@ -150,5 +150,22 @@ ALTER TABLE `exam_student` ADD COLUMN `required_fields` MEDIUMTEXT NULL COMMENT
 
 INSERT INTO `sys_config` (`id`, `config_key`, `config_name`, `config_value`, `enable`, `sort`, `create_id`) VALUES ('41', 'package.barcode.position', '签到表条码坐标', '[0,0,0.5,0.5]', '1', '17', '1');
 UPDATE `sys_privilege` SET `url` = '/api/admin/exam/card/find_jpg_file' WHERE (`id` = '672');
-
-
+UPDATE `sys_privilege` SET `url` = 'MarkEntrance' WHERE (`id` = '491');
+DELETE FROM `sys_privilege` WHERE (`id` = '488');
+DELETE FROM `sys_privilege` WHERE (`id` = '489');
+DELETE FROM `sys_privilege` WHERE (`id` = '490');
+DELETE FROM `sys_privilege` WHERE (`id` = '494');
+DELETE FROM `sys_privilege` WHERE (`id` = '540');
+DELETE FROM `sys_privilege` WHERE (`id` = '667');
+DELETE FROM `sys_privilege` WHERE (`id` = '669');
+DELETE FROM `sys_privilege` WHERE (`id` = '670');
+DELETE FROM `sys_privilege` WHERE (`id` = '671');
+DELETE FROM `sys_privilege` WHERE (`id` = '673');
+DELETE FROM `sys_privilege` WHERE (`id` = '674');
+DELETE FROM `sys_privilege` WHERE (`id` = '754');
+DELETE FROM `sys_privilege` WHERE (`id` = '855');
+DELETE FROM `sys_privilege` WHERE (`id` = '857');
+DELETE FROM `sys_privilege` WHERE (`id` = '858');
+DELETE FROM `sys_privilege` WHERE (`id` = '859');
+DELETE FROM `sys_privilege` WHERE (`id` = '882');
+DELETE FROM `sys_privilege` WHERE (`id` = '883');

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

@@ -1,28 +1,17 @@
 package com.qmth.distributed.print.api.mark;
 
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
-import com.qmth.teachcloud.mark.dto.mark.mark.MarkGroupDto;
-import com.qmth.teachcloud.mark.dto.mark.mark.MarkSettingDto;
-import com.qmth.teachcloud.mark.dto.mark.mark.MarkStatusDto;
-import com.qmth.teachcloud.mark.dto.mark.mark.MarkTaskDto;
 import com.qmth.teachcloud.mark.params.MarkResult;
 import com.qmth.teachcloud.mark.service.MarkService;
-
 import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * <p>
@@ -37,60 +26,62 @@ import io.swagger.annotations.Api;
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/mark")
 public class MarkController {
 
-	@Autowired
-	private MarkService markService;
+    @Autowired
+    private MarkService markService;
 
-	@RequestMapping(value = "/getSetting", method = RequestMethod.POST)
-	public MarkSettingDto getSetting(@RequestParam Long examId, @RequestParam String paperNumber,
-			@RequestParam Integer groupNumber) {
-		SysUser user = (SysUser) ServletUtil.getRequestUser();
-		return markService.getSetting(user.getId(), examId, paperNumber, groupNumber);
-	}
+    @RequestMapping(value = "/getSetting", method = RequestMethod.POST)
+    public Result getSetting(@RequestParam Long examId, @RequestParam String paperNumber,
+                             @RequestParam Integer groupNumber) {
+        SysUser user = (SysUser) ServletUtil.getRequestUser();
+        return ResultUtil.ok(markService.getSetting(user.getId(), examId, paperNumber, groupNumber));
+    }
 
-	@RequestMapping(value = "/getStatus", method = RequestMethod.POST)
-	public MarkStatusDto status(@RequestParam Long examId, @RequestParam String paperNumber,
-			@RequestParam Integer groupNumber) {
-		SysUser user = (SysUser) ServletUtil.getRequestUser();
-		return markService.getStatus(user.getId(), examId, paperNumber, groupNumber);
-	}
+    @RequestMapping(value = "/getStatus", method = RequestMethod.POST)
+    public Result status(@RequestParam Long examId, @RequestParam String paperNumber,
+                         @RequestParam Integer groupNumber) {
+        SysUser user = (SysUser) ServletUtil.getRequestUser();
+        return ResultUtil.ok(markService.getStatus(user.getId(), examId, paperNumber, groupNumber));
+    }
 
-	@RequestMapping(value = "/getGroup", method = RequestMethod.POST)
-	@ResponseBody
-	public List<MarkGroupDto> getGroup(@RequestParam Long examId, @RequestParam String paperNumber) {
-		SysUser user = (SysUser) ServletUtil.getRequestUser();
-		return markService.getGroup(user.getId(), examId, paperNumber);
-	}
+    @RequestMapping(value = "/getGroup", method = RequestMethod.POST)
+    @ResponseBody
+    public Result getGroup(@RequestParam Long examId, @RequestParam String paperNumber) {
+        SysUser user = (SysUser) ServletUtil.getRequestUser();
+        return ResultUtil.ok(markService.getGroup(user.getId(), examId, paperNumber));
+    }
 
-	@RequestMapping(value = "/getTask", method = RequestMethod.POST)
-	public MarkTaskDto getTask(@RequestParam Long examId, @RequestParam String paperNumber,
-			@RequestParam Integer groupNumber) {
-		SysUser user = (SysUser) ServletUtil.getRequestUser();
-		return markService.getTask(user.getId(), examId, paperNumber);
-	}
+    @RequestMapping(value = "/getTask", method = RequestMethod.POST)
+    public Result getTask(@RequestParam Long examId, @RequestParam String paperNumber,
+                          @RequestParam Integer groupNumber) {
+        SysUser user = (SysUser) ServletUtil.getRequestUser();
+        return ResultUtil.ok(markService.getTask(user.getId(), examId, paperNumber));
+    }
 
-	@RequestMapping(value = "/saveTask")
-	public void saveTask(HttpServletRequest request, @RequestBody MarkResult markResult) {
-		SysUser user = (SysUser) ServletUtil.getRequestUser();
-	}
+    @RequestMapping(value = "/saveTask")
+    public Result saveTask(HttpServletRequest request, @RequestBody MarkResult markResult) {
+        SysUser user = (SysUser) ServletUtil.getRequestUser();
+        return ResultUtil.ok(true);
+    }
 
-	@RequestMapping(value = "/getHistory", method = RequestMethod.POST)
-	public List<MarkTaskDto> getHistory(HttpServletRequest request, @RequestParam int pageNumber,
-			@RequestParam int pageSize, @RequestParam String order, @RequestParam String sort,
-			@RequestParam(required = false) String secretNumber, @RequestParam(required = false) Double markerScore)
-			throws Exception {
-		SysUser user = (SysUser) ServletUtil.getRequestUser();
-		return markService.getHistory(user.getId());
-	}
+    @RequestMapping(value = "/getHistory", method = RequestMethod.POST)
+    public Result getHistory(HttpServletRequest request, @RequestParam int pageNumber,
+                             @RequestParam int pageSize, @RequestParam String order, @RequestParam String sort,
+                             @RequestParam(required = false) String secretNumber, @RequestParam(required = false) Double markerScore) {
+        SysUser user = (SysUser) ServletUtil.getRequestUser();
+        return ResultUtil.ok(markService.getHistory(user.getId()));
+    }
 
-	@RequestMapping(value = "/updateSetting", method = RequestMethod.POST)
-	public void updateSetting(HttpServletRequest request, @RequestParam(required = false) String uiSetting,
-			@RequestParam(required = false) String mode) {
-		SysUser user = (SysUser) ServletUtil.getRequestUser();
-	}
+    @RequestMapping(value = "/updateSetting", method = RequestMethod.POST)
+    public Result updateSetting(HttpServletRequest request, @RequestParam(required = false) String uiSetting,
+                                @RequestParam(required = false) String mode) {
+        SysUser user = (SysUser) ServletUtil.getRequestUser();
+        return ResultUtil.ok(true);
+    }
 
-	@RequestMapping("/clear")
-	public void clear(HttpServletRequest request) {
-		SysUser user = (SysUser) ServletUtil.getRequestUser();
-		markService.clear(user.getId());
-	}
+    @RequestMapping("/clear")
+    public Result clear(HttpServletRequest request) {
+        SysUser user = (SysUser) ServletUtil.getRequestUser();
+        markService.clear(user.getId());
+        return ResultUtil.ok(true);
+    }
 }

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

@@ -1,29 +1,25 @@
 package com.qmth.distributed.print.api.mark;
 
-import javax.annotation.Resource;
-
-import com.qmth.teachcloud.common.util.Result;
-import com.qmth.teachcloud.common.util.ResultUtil;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.service.BasicExamService;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicExam;
 import com.qmth.teachcloud.common.util.RedisUtil;
-import com.qmth.teachcloud.mark.bean.scanexaminfo.ScanExamCheckInfoVo;
-import com.qmth.teachcloud.mark.bean.scanexaminfo.ScanExamInfoVo;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.mark.service.MarkStudentService;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
 
 @Api(tags = "扫描汇总接口")
 @RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_SCAN+"/exam")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_SCAN + "/exam")
 public class ScanExamController {
     @Resource
     private MarkStudentService markStudentService;
@@ -31,18 +27,18 @@ public class ScanExamController {
     private BasicExamService basicExamService;
     @Resource
     private RedisUtil redisUtil;
-    
+
     @ApiOperation(value = "扫描汇总-答题卡扫描、签到表扫描")
     @RequestMapping(value = "card/info", method = RequestMethod.POST)
     public Result cardInfo(@RequestParam Long examId) {
-    	BasicExam exam=basicExamService.getById(examId);
+        BasicExam exam = basicExamService.getById(examId);
         return ResultUtil.ok(markStudentService.getScanExamInfo(exam));
     }
-    
+
     @ApiOperation(value = "扫描汇总-数据校对")
     @RequestMapping(value = "check/info", method = RequestMethod.POST)
     public Result checkInfo(@RequestParam Long examId) {
-    	BasicExam exam=basicExamService.getById(examId);
+        BasicExam exam = basicExamService.getById(examId);
         return ResultUtil.ok(markStudentService.checkInfo(exam));
     }
 }

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

@@ -1,27 +1,20 @@
 package com.qmth.distributed.print.api.mark;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
-import com.qmth.teachcloud.mark.dto.ScanOmrTaskDto;
 import com.qmth.teachcloud.mark.dto.ScanOmrTaskResultDto;
-import com.qmth.teachcloud.mark.dto.ScanOmrTaskSaveDto;
-import com.qmth.teachcloud.mark.dto.ScanOmrTaskStatusDto;
 import com.qmth.teachcloud.mark.service.ScanOmrTaskService;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -35,44 +28,45 @@ import io.swagger.annotations.ApiOperation;
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_SCAN + "/task/omr")
 public class ScanOmrTaskController {
-	protected static final Logger log = LoggerFactory.getLogger(ScanOmrTaskController.class);
+    protected static final Logger log = LoggerFactory.getLogger(ScanOmrTaskController.class);
 
-	@Autowired
-	private ScanOmrTaskService omrTaskService;
+    @Autowired
+    private ScanOmrTaskService omrTaskService;
 
-	@ApiOperation(value = "识别对照任务获取")
-	@RequestMapping(value = "/get", method = RequestMethod.POST)
-	public ScanOmrTaskDto get(@RequestParam Long examId) {
-		SysUser user = (SysUser) ServletUtil.getRequestUser();
-		return omrTaskService.getTask(examId, user.getId());
-	}
+    @ApiOperation(value = "识别对照任务获取")
+    @RequestMapping(value = "/get", method = RequestMethod.POST)
+    public Result get(@RequestParam Long examId) {
+        SysUser user = (SysUser) ServletUtil.getRequestUser();
+        return ResultUtil.ok(omrTaskService.getTask(examId, user.getId()));
+    }
 
-	@ApiOperation(value = "识别对照任务提交")
-	@RequestMapping(value = "/save", method = RequestMethod.POST)
-	public ScanOmrTaskSaveDto save(@Validated @RequestBody ScanOmrTaskResultDto result) {
-		SysUser user = (SysUser) ServletUtil.getRequestUser();
-		return omrTaskService.submitTask(result, user);
-	}
+    @ApiOperation(value = "识别对照任务提交")
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    public Result save(@Validated @RequestBody ScanOmrTaskResultDto result) {
+        SysUser user = (SysUser) ServletUtil.getRequestUser();
+        return ResultUtil.ok(omrTaskService.submitTask(result, user));
+    }
 
-	@ApiOperation(value = "识别对照任务状态")
-	@RequestMapping(value = "/status", method = RequestMethod.POST)
-	public ScanOmrTaskStatusDto status(@RequestParam Long examId) {
-		SysUser user = (SysUser) ServletUtil.getRequestUser();
-		return omrTaskService.getStatus(examId, user.getId());
-	}
+    @ApiOperation(value = "识别对照任务状态")
+    @RequestMapping(value = "/status", method = RequestMethod.POST)
+    public Result status(@RequestParam Long examId) {
+        SysUser user = (SysUser) ServletUtil.getRequestUser();
+        return ResultUtil.ok(omrTaskService.getStatus(examId, user.getId()));
+    }
 
-	@ApiOperation(value = "识别对照任务状态")
-	@RequestMapping(value = "/release", method = RequestMethod.POST)
-	public void release(@RequestParam Long examId) {
-		SysUser user = (SysUser) ServletUtil.getRequestUser();
-		omrTaskService.releaseByUser(examId, user.getId());
-	}
+    @ApiOperation(value = "识别对照任务状态")
+    @RequestMapping(value = "/release", method = RequestMethod.POST)
+    public Result release(@RequestParam Long examId) {
+        SysUser user = (SysUser) ServletUtil.getRequestUser();
+        omrTaskService.releaseByUser(examId, user.getId());
+        return ResultUtil.ok(true);
+    }
 
-	@ApiOperation(value = "识别对照任务历史")
-	@RequestMapping(value = "/history", method = RequestMethod.POST)
-	public ScanOmrTaskDto history(@RequestParam Long examId, @RequestParam(required = false) Long id,
-			@RequestParam(required = false) Boolean next) {
-		SysUser user = (SysUser) ServletUtil.getRequestUser();
-		return omrTaskService.history(examId, id, user.getId(), next);
-	}
+    @ApiOperation(value = "识别对照任务历史")
+    @RequestMapping(value = "/history", method = RequestMethod.POST)
+    public Result history(@RequestParam Long examId, @RequestParam(required = false) Long id,
+                          @RequestParam(required = false) Boolean next) {
+        SysUser user = (SysUser) ServletUtil.getRequestUser();
+        return ResultUtil.ok(omrTaskService.history(examId, id, user.getId(), next));
+    }
 }

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

@@ -1,29 +1,23 @@
 package com.qmth.distributed.print.api.mark;
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
 import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysConfig;
 import com.qmth.teachcloud.common.service.CommonCacheService;
-import com.qmth.teachcloud.mark.bean.scananswer.SheetUploadVo;
-import com.qmth.teachcloud.mark.bean.scanpackage.ScanPackageFindVo;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.mark.bean.scanpackage.ScanPackageQuery;
-import com.qmth.teachcloud.mark.bean.scanpackage.ScanPackageVo;
 import com.qmth.teachcloud.mark.service.ScanPackageService;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * <p>
@@ -37,43 +31,43 @@ import io.swagger.annotations.ApiOperation;
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_SCAN + "/package")
 public class ScanPackageController {
-	@Autowired
-	private CommonCacheService commonCacheService;
-	@Autowired
-	private ScanPackageService scanPackageService;
+    @Autowired
+    private CommonCacheService commonCacheService;
+    @Autowired
+    private ScanPackageService scanPackageService;
 
-	@ApiOperation(value = "签到表条码识别坐标获取")
-	@RequestMapping(value = "position/get", method = RequestMethod.POST)
-	public JSONArray positionGet() {
-		SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.PACKAGE_BARCODE_POSITION);
-		String value = sysConfig.getConfigValue();
-		JSONArray ja = JSONArray.parseArray(value);
-		return ja;
-	}
+    @ApiOperation(value = "签到表条码识别坐标获取")
+    @RequestMapping(value = "position/get", method = RequestMethod.POST)
+    public Result positionGet() {
+        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.PACKAGE_BARCODE_POSITION);
+        String value = sysConfig.getConfigValue();
+        JSONArray ja = JSONArray.parseArray(value);
+        return ResultUtil.ok(ja);
+    }
 
-	@ApiOperation(value = "签到表扫描图片上传")
-	@RequestMapping(value = "image/upload", method = RequestMethod.POST)
-	public SheetUploadVo imageUpload(@RequestParam Long examId, @RequestParam String packageCode,
-			@RequestParam Integer packageNo, @RequestParam MultipartFile file, @RequestParam String md5) {
-		return scanPackageService.imageUpload(examId, packageCode, packageNo, file, md5);
-	}
+    @ApiOperation(value = "签到表扫描图片上传")
+    @RequestMapping(value = "image/upload", method = RequestMethod.POST)
+    public Result imageUpload(@RequestParam Long examId, @RequestParam String packageCode,
+                              @RequestParam Integer packageNo, @RequestParam MultipartFile file, @RequestParam String md5) {
+        return ResultUtil.ok(scanPackageService.imageUpload(examId, packageCode, packageNo, file, md5));
+    }
 
-	@ApiOperation(value = "签到表扫描结果列表")
-	@RequestMapping(value = "image/list", method = RequestMethod.POST)
-	public IPage<ScanPackageVo> imagePage(@Validated ScanPackageQuery query) {
-		return scanPackageService.imagePage(query);
-	}
+    @ApiOperation(value = "签到表扫描结果列表")
+    @RequestMapping(value = "image/list", method = RequestMethod.POST)
+    public Result imagePage(@Validated ScanPackageQuery query) {
+        return ResultUtil.ok(scanPackageService.imagePage(query));
+    }
 
-	@ApiOperation(value = "签到表编号查询")
-	@RequestMapping(value = "find", method = RequestMethod.POST)
-	public ScanPackageFindVo find(@RequestParam Long examId, @RequestParam String packageCode) {
-		return scanPackageService.find(examId, packageCode);
-	}
+    @ApiOperation(value = "签到表编号查询")
+    @RequestMapping(value = "find", method = RequestMethod.POST)
+    public Result find(@RequestParam Long examId, @RequestParam String packageCode) {
+        return ResultUtil.ok(scanPackageService.find(examId, packageCode));
+    }
 
-	@ApiOperation(value = "签到表详情")
-	@RequestMapping(value = "image/get", method = RequestMethod.POST)
-	public List<String> imageGet(@RequestParam Long examId, @RequestParam String coursePaperId,
-			@RequestParam String packageCode) {
-		return scanPackageService.imageGet(examId,coursePaperId, packageCode);
-	}
+    @ApiOperation(value = "签到表详情")
+    @RequestMapping(value = "image/get", method = RequestMethod.POST)
+    public Result imageGet(@RequestParam Long examId, @RequestParam String coursePaperId,
+                           @RequestParam String packageCode) {
+        return ResultUtil.ok(scanPackageService.imageGet(examId, coursePaperId, packageCode));
+    }
 }

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

@@ -1,20 +1,19 @@
 package com.qmth.distributed.print.api.mark;
 
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.mark.bean.student.StudentQuery;
-import com.qmth.teachcloud.mark.bean.student.StudentVo;
 import com.qmth.teachcloud.mark.service.MarkStudentService;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -28,12 +27,12 @@ import io.swagger.annotations.ApiOperation;
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_SCAN + "/student")
 public class ScanStudentController {
-	@Autowired
-	private MarkStudentService markStudentService;
+    @Autowired
+    private MarkStudentService markStudentService;
 
     @ApiOperation(value = "考生查询")
     @RequestMapping(value = "find", method = RequestMethod.POST)
-    public StudentVo student(@Validated StudentQuery query) {
-        return markStudentService.findOne(query);
+    public Result student(@Validated StudentQuery query) {
+        return ResultUtil.ok(markStudentService.findOne(query));
     }
 }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/MarkPaper.java

@@ -110,15 +110,21 @@ public class MarkPaper implements Serializable {
     @ApiModelProperty(value = "命题老师ID")
     private Long userId;
 
+    @ApiModelProperty(value = "命题老师ID")
+    private String paperType;
+
     public MarkPaper() {
     }
 
-    public MarkPaper(Long examId, String courseCode, String courseName, String paperNumber, String packageCode) {
+    public MarkPaper(Long examId, String courseCode, String courseName, String paperNumber, String packageCode, Long userId, String paperType) {
         this.examId = examId;
         this.courseCode = courseCode;
         this.courseName = courseName;
         this.paperNumber = paperNumber;
         this.packageCode = packageCode;
+        this.userId = userId;
+        this.paperType = paperType;
+        this.markMode = MarkMode.TRACK;
         this.objectiveScore = 0D;
         this.subjectiveScore = 0D;
         this.totalScore =0D;
@@ -353,6 +359,14 @@ public class MarkPaper implements Serializable {
         this.userId = userId;
     }
 
+    public String getPaperType() {
+        return paperType;
+    }
+
+    public void setPaperType(String paperType) {
+        this.paperType = paperType;
+    }
+
     @Override
     public String toString() {
         return "MarkPaper{" +

teachcloud-mark/src/main/resources/mapper/MarkPaperMapper.xml

@@ -35,7 +35,8 @@
             mp.course_name courseName,
             mp.paper_number paperNumber,
             mp.mark_mode markMode,
-            mp.group_status groupStatus
+            mp.group_status groupStatus,
+            mp.paper_type paperType
         FROM
             mark_paper mp
                 LEFT JOIN
@@ -47,8 +48,8 @@
             <if test="courseCode != null and courseCode != ''">
                 and mp.course_code = #{courseCode}
             </if>
-            <if test="courseName != null and courseName != ''">
-                and mp.course_name = #{courseName}
+            <if test="paperNumber != null and paperNumber != ''">
+                and mp.paper_number = #{paperNumber}
             </if>
             <if test="groupStatus != null">
                 and mp.group_status = #{groupStatus}

teachcloud-task/src/main/java/com/qmth/teachcloud/task/job/service/impl/JobServiceImpl.java

@@ -152,7 +152,7 @@ public class JobServiceImpl implements JobService {
         long startTime = DateDisposeUtils.parseDate("2023-10-01 00:00:00").getTime();
         List<ExamDetailCourseInitMarkDto> examDetailCourseInitMarkDtoList = examDetailService.listPrintFinishExamDetailCourse(ExamDetailStatusEnum.FINISH.name(), startTime, MarkPaperStatus.FINISH.name());
         for (ExamDetailCourseInitMarkDto dto : examDetailCourseInitMarkDtoList) {
-            printFinishService.insertMarkPaper(dto.getExamId(), dto.getCourseCode(), dto.getCourseName(), dto.getPaperNumber(), dto.getPackageCode());
+            printFinishService.insertMarkPaper(dto.getExamId(), dto.getCourseCode(), dto.getCourseName(), dto.getPaperNumber(), dto.getPackageCode(), dto.getCreateId(), dto.getPaperType());
             printFinishService.insertMarkStudent(dto);
             printFinishService.insertScanAnswerCard(dto);
         }

teachcloud-task/src/main/java/com/qmth/teachcloud/task/service/PrintFinishService.java

@@ -7,7 +7,7 @@ import com.qmth.distributed.print.business.bean.dto.initMarkData.ExamDetailCours
  */
 public interface PrintFinishService {
 
-    void insertMarkPaper(Long examId, String courseCode, String courseName, String paperNumber, String packageCode);
+    void insertMarkPaper(Long examId, String courseCode, String courseName, String paperNumber, String packageCode, Long userId, String paperType);
 
     void insertMarkStudent(ExamDetailCourseInitMarkDto examDetail);
 

teachcloud-task/src/main/java/com/qmth/teachcloud/task/service/impl/PrintFinishServiceImpl.java

@@ -75,12 +75,12 @@ public class PrintFinishServiceImpl implements PrintFinishService {
      * @param packageCode
      */
     @Override
-    public void insertMarkPaper(Long examId, String courseCode, String courseName, String paperNumber, String packageCode) {
+    public void insertMarkPaper(Long examId, String courseCode, String courseName, String paperNumber, String packageCode, Long userId, String paperType) {
         MarkPaper markPaper = markPaperService.getByExamIdAndPaperNumber(examId, paperNumber);
         if (markPaper != null) {
             return;
         }
-        MarkPaper insertMarkPaper = new MarkPaper(examId, courseCode, courseName, paperNumber, packageCode);
+        MarkPaper insertMarkPaper = new MarkPaper(examId, courseCode, courseName, paperNumber, packageCode, userId, paperType);
         markPaperService.save(insertMarkPaper);
     }