bug修改

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

@@ -21,6 +21,7 @@ public class ExamTaskDto {
     private String status;
     private Boolean enable;
     private String createId;
+    private String createName;
     private Long createTime;
     private String auditStatus;
     private String reviewStatus;
@@ -139,6 +140,14 @@ public class ExamTaskDto {
         this.createId = createId;
     }
 
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
+
     public Long getCreateTime() {
         return createTime;
     }

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

@@ -32,7 +32,7 @@ public interface ExamTaskMapper extends BaseMapper<ExamTask> {
 
     IPage<ExamTaskDto> listTaskReviewAudited(Page<ExamTaskDto> page, @Param("schoolId") Long schoolId, @Param("reviewStatus") String reviewStatus, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber, @Param("userId") Long userId, @Param("cardRuleId") Long cardRuleId, @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("orgIds") Set<Long> orgIds);
 
-    IPage<ExamTaskDetailDto> listTaskPaper(Page<ExamTaskDetailDto> page, @Param("schoolId") Long schoolId, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber, @Param("startTime") Long startTime, @Param("endTime") Long endTime, Set<Long> orgIds);
+    IPage<ExamTaskDetailDto> listTaskPaper(Page<ExamTaskDetailDto> page, @Param("schoolId") Long schoolId, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber, @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("orgIds") Set<Long> orgIds);
 
     List<RelatePaperDto> listPaperNumbers(@Param("schoolId") Long schoolId, @Param("courseCode") String courseCode);
 

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

@@ -132,7 +132,7 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
                 Map<String, Object> printMap = new HashMap<>();
                 printMap.put("id", String.valueOf(templatePrintInfoResult.getTemplateId()));
                 printMap.put("name", templatePrintInfoResult.getTemplateName());
-                printMap.put("attachmentId", templatePrintInfoResult.getAttachmentId());
+                printMap.put("attachmentId", templatePrintInfoResult.getAttachmentId().toString());
                 templateList.add(printMap);
             }
             if (templateList.size() > 0){
@@ -155,7 +155,7 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
                 Map<String, Object> printMap = new HashMap<>();
                 printMap.put("id", String.valueOf(templatePrintInfoResult.getTemplateId()));
                 printMap.put("name", templatePrintInfoResult.getTemplateName());
-                printMap.put("attachmentId", templatePrintInfoResult.getAttachmentId());
+                printMap.put("attachmentId", templatePrintInfoResult.getAttachmentId().toString());
                 templateList.add(printMap);
             }
             if (templateList.size() > 0){

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

@@ -41,6 +41,7 @@
             case a.card_rule_id when -1 then '全部通卡' else b.name end cardRuleName,
             a.user_id userId,
             c.real_name userName,
+            d.real_name createName,
             a.start_time startTime,
             a.end_time endTime,
             a.status,
@@ -187,6 +188,7 @@
             b.name cardRuleName,
             a.user_id userId,
             c.real_name userName,
+            d.real_name createName,
             a.start_time startTime,
             a.end_time endTime,
             a.enable,
@@ -253,6 +255,7 @@
             b.name cardRuleName,
             a.user_id userId,
             c.real_name userName,
+            d.real_name createName,
             a.start_time startTime,
             a.end_time endTime,
             a.review_status reviewStatus,
@@ -321,6 +324,7 @@
             a.paper_number paperNumber,
             a.user_id userId,
             c.real_name userName,
+            d.real_name createName,
             a.start_time startTime,
             a.end_time endTime,
             a.create_id createId,

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

@@ -356,14 +356,12 @@ public class ExamTaskController {
     /**
      * 批量审核
      *
-     * @param request
      * @param taskReviewLog
      * @return
      */
     @ApiOperation(value = "批量审核")
     @RequestMapping(value = "/review_save_batch", method = RequestMethod.POST)
-    public Result taskReviewSaveBatch(HttpServletRequest request,
-                                      @RequestBody ExamTaskReviewLog taskReviewLog) {
+    public Result taskReviewSaveBatch(@RequestBody ExamTaskReviewLog taskReviewLog) {
         boolean isSuccess = examTaskService.taskReviewSaveBatch(taskReviewLog);
         return ResultUtil.ok(isSuccess);
     }

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

@@ -63,7 +63,7 @@ public class WorkController {
     public Result examTaskNew(@RequestParam(value = "pageNumber", required = true) Integer pageNumber,
                               @RequestParam(value = "pageSize", required = true) Integer pageSize) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        return ResultUtil.ok(examTaskService.queryByMyWork(new Page<>(pageNumber, pageSize), null, sysUser.getSchoolId(), ExamStatusEnum.NEW.name()));
+        return ResultUtil.ok(examTaskService.queryByMyWork(new Page<>(pageNumber, pageSize), sysUser.getId(), sysUser.getSchoolId(), ExamStatusEnum.NEW.name()));
     }
 
     @ApiOperation(value = "命题分配待办计数接口")
@@ -71,7 +71,7 @@ public class WorkController {
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = WorkResult.class)})
     public Result examTaskNewCount() {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        return ResultUtil.ok(examTaskService.queryByMyWork(new Page<>(SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE), null, sysUser.getSchoolId(), ExamStatusEnum.NEW.name()).getRecords().size());
+        return ResultUtil.ok(examTaskService.queryByMyWork(new Page<>(SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE), sysUser.getId(), sysUser.getSchoolId(), ExamStatusEnum.NEW.name()).getRecords().size());
     }
 
     @ApiOperation(value = "审核待办接口")