导出任务加创建人

examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/controller/ExportTaskController.java

@@ -30,7 +30,7 @@ public class ExportTaskController extends ControllerSupport {
         User user = getAccessUser();
         req.setRootOrgId(user.getRootOrgId());
 
-        return exportTaskService.getExportTaskList(req);
+        return exportTaskService.getExportTaskList(req,user.getUserId());
     }
 
     @PostMapping("/delete")

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExportTaskEntity.java

@@ -60,6 +60,12 @@ public class ExportTaskEntity extends JpaEntity {
      */
     @Column
     private String filePath;
+    
+    /**
+     * 创建人
+     */
+    @Column
+    private Long creator;
 
     public Long getId() {
         return id;
@@ -116,4 +122,14 @@ public class ExportTaskEntity extends JpaEntity {
     public void setFilePath(String filePath) {
         this.filePath = filePath;
     }
+
+	public Long getCreator() {
+		return creator;
+	}
+
+	public void setCreator(Long creator) {
+		this.creator = creator;
+	}
+    
+    
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/ExportTaskService.java

@@ -27,6 +27,6 @@ public interface ExportTaskService {
 
     boolean existUnFinishTask(ExportTaskType type, Long rootOrgId, Long examId);
 
-    Page<ExportTaskListResp> getExportTaskList(ExportTaskListReq req);
+    Page<ExportTaskListResp> getExportTaskList(ExportTaskListReq req,Long userId);
 
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examrecord/ExamRecordQuery.java

@@ -82,6 +82,9 @@ public class ExamRecordQuery implements JsonSerializable {
     private String submitStartTime;
     @ApiModelProperty("交卷截止时间")
     private String submitEndTime;
+    
+    @ApiModelProperty("创建人ID")
+    private Long creator;
 
     public ExamRecordQuery addRecordStatus(String recordStatus) {
         if (recordStatuses == null) {
@@ -323,4 +326,14 @@ public class ExamRecordQuery implements JsonSerializable {
     public void setSubmitEndTime(String submitEndTime) {
         this.submitEndTime = submitEndTime;
     }
+
+	public Long getCreator() {
+		return creator;
+	}
+
+	public void setCreator(Long creator) {
+		this.creator = creator;
+	}
+    
+    
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examscore/ExamScoreQuery.java

@@ -51,6 +51,9 @@ public class ExamScoreQuery implements JsonSerializable {
 
     private Integer endLimit;
 
+    @ApiModelProperty("创建人ID")
+    private Long creator;
+    
     public Long getRootOrgId() {
         return rootOrgId;
     }
@@ -162,4 +165,14 @@ public class ExamScoreQuery implements JsonSerializable {
     public void setExamStageId(Long examStageId) {
         this.examStageId = examStageId;
     }
+
+	public Long getCreator() {
+		return creator;
+	}
+
+	public void setCreator(Long creator) {
+		this.creator = creator;
+	}
+    
+    
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/exporttask/ExportTaskInfo.java

@@ -34,6 +34,9 @@ public class ExportTaskInfo implements JsonSerializable {
 
     @ApiModelProperty("文件路径")
     private String filePath;
+    
+    @ApiModelProperty("创建人ID")
+    private Long creator;
 
     public Long getId() {
         return id;
@@ -90,4 +93,14 @@ public class ExportTaskInfo implements JsonSerializable {
     public void setFilePath(String filePath) {
         this.filePath = filePath;
     }
+
+	public Long getCreator() {
+		return creator;
+	}
+
+	public void setCreator(Long creator) {
+		this.creator = creator;
+	}
+    
+    
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/AsyncExportServiceImpl.java

@@ -69,6 +69,7 @@ public class AsyncExportServiceImpl implements AsyncExportService {
         Check.isNull(req, "请求参数不能为空！");
         Check.isNull(req.getRootOrgId(), "学校ID不能为空！");
         Check.isNull(req.getExamId(), "考试ID不能为空！");
+        Check.isNull(req.getCreator(), "创建人ID不能为空！");
 
         boolean existTask = exportTaskService.existUnFinishTask(ExportTaskType.EXAM_DETAIL, req.getRootOrgId(), req.getExamId());
         if (existTask) {
@@ -82,6 +83,7 @@ public class AsyncExportServiceImpl implements AsyncExportService {
         task.setExamId(req.getExamId());
         task.setType(ExportTaskType.EXAM_DETAIL);
         task.setStatus(ExportTaskStatus.EXPORTING);
+        task.setCreator(req.getCreator());
         Long taskId = exportTaskService.addExportTask(task);
 
         this.asyncExportExamRecordDetails(taskId, req);
@@ -153,6 +155,7 @@ public class AsyncExportServiceImpl implements AsyncExportService {
         Check.isNull(req, "请求参数不能为空！");
         Check.isNull(req.getRootOrgId(), "学校ID不能为空！");
         Check.isNull(req.getExamId(), "考试ID不能为空！");
+        Check.isNull(req.getCreator(), "创建人ID不能为空！");
 
         boolean existTask = exportTaskService.existUnFinishTask(ExportTaskType.SCORE_STATISTIC, req.getRootOrgId(), req.getExamId());
         if (existTask) {
@@ -166,6 +169,7 @@ public class AsyncExportServiceImpl implements AsyncExportService {
         task.setExamId(req.getExamId());
         task.setType(ExportTaskType.SCORE_STATISTIC);
         task.setStatus(ExportTaskStatus.EXPORTING);
+        task.setCreator(req.getCreator());
         Long taskId = exportTaskService.addExportTask(task);
 
         this.asyncExportExamScoreStatistics(taskId, req);

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExportTaskServiceImpl.java

@@ -60,6 +60,7 @@ public class ExportTaskServiceImpl implements ExportTaskService {
         entity.setRootOrgId(info.getRootOrgId());
         entity.setExamId(info.getExamId());
         entity.setFilePath(info.getFilePath());
+        entity.setCreator(info.getCreator());
 
         exportTaskRepo.save(entity);
         return entity.getId();
@@ -142,7 +143,7 @@ public class ExportTaskServiceImpl implements ExportTaskService {
     }
 
     @Override
-    public Page<ExportTaskListResp> getExportTaskList(ExportTaskListReq req) {
+    public Page<ExportTaskListResp> getExportTaskList(ExportTaskListReq req,Long userId) {
         Check.isNull(req.getRootOrgId(), "学校ID不能为空！");
 
         if (req.getPageNo() == null || req.getPageNo() < 1) {
@@ -156,7 +157,8 @@ public class ExportTaskServiceImpl implements ExportTaskService {
         Specification<ExportTaskEntity> spec = (root, query, cb) -> {
             List<Predicate> predicates = new ArrayList<>();
             predicates.add(cb.equal(root.get("rootOrgId"), req.getRootOrgId()));
-
+            predicates.add(cb.equal(root.get("creator"), userId));
+            
             if (req.getExamId() != null) {
                 predicates.add(cb.equal(root.get("examId"), req.getExamId()));
             }