Browse Source

创建人

xiatian 4 years ago
parent
commit
18b6537454

+ 12 - 0
examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/exporttask/ExportTaskListResp.java

@@ -48,6 +48,8 @@ public class ExportTaskListResp implements JsonSerializable {
 
 
     @ApiModelProperty("更新时间")
     @ApiModelProperty("更新时间")
     private Date updateTime;
     private Date updateTime;
+    
+    private String createName;
 
 
     public Long getId() {
     public Long getId() {
         return id;
         return id;
@@ -136,4 +138,14 @@ public class ExportTaskListResp implements JsonSerializable {
     public void setUpdateTime(Date updateTime) {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
         this.updateTime = updateTime;
     }
     }
+
+	public String getCreateName() {
+		return createName;
+	}
+
+	public void setCreateName(String createName) {
+		this.createName = createName;
+	}
+    
+    
 }
 }

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

@@ -8,6 +8,9 @@ package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
 import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
 import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
 import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
+import cn.com.qmth.examcloud.core.basic.api.UserCloudService;
+import cn.com.qmth.examcloud.core.basic.api.request.GetUserReq;
+import cn.com.qmth.examcloud.core.basic.api.response.GetUserResp;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.Check;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.Check;
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExportTaskRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExportTaskRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExportTaskEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExportTaskEntity;
@@ -45,6 +48,9 @@ public class ExportTaskServiceImpl implements ExportTaskService {
 
 
     @Autowired
     @Autowired
     private ExamCloudService examCloudService;
     private ExamCloudService examCloudService;
+    
+    @Autowired
+    private UserCloudService userCloudService;
 
 
     @Override
     @Override
     @Transactional
     @Transactional
@@ -192,13 +198,20 @@ public class ExportTaskServiceImpl implements ExportTaskService {
         } else {
         } else {
             examNames = new HashMap<>();
             examNames = new HashMap<>();
         }
         }
+        
+        GetUserReq reqUser=new GetUserReq();
+        reqUser.setRootOrgId(req.getRootOrgId());
+        reqUser.setUserId(userId);
+        GetUserResp namesResp = userCloudService.getUser(reqUser);
+        String createName=namesResp.getUserBean().getName();
+        
 
 
         List<ExportTaskListResp> list = page.getContent()
         List<ExportTaskListResp> list = page.getContent()
-                .stream().map(entity -> ofExportTask(entity, examNames)).collect(Collectors.toList());
+                .stream().map(entity -> ofExportTask(entity, examNames,createName)).collect(Collectors.toList());
         return new PageImpl<>(list, pageable, page.getTotalElements());
         return new PageImpl<>(list, pageable, page.getTotalElements());
     }
     }
 
 
-    private ExportTaskListResp ofExportTask(ExportTaskEntity entity, Map<Long, String> examNames) {
+    private ExportTaskListResp ofExportTask(ExportTaskEntity entity, Map<Long, String> examNames,String createName) {
         ExportTaskListResp info = new ExportTaskListResp();
         ExportTaskListResp info = new ExportTaskListResp();
 
 
         info.setId(entity.getId());
         info.setId(entity.getId());
@@ -214,6 +227,7 @@ public class ExportTaskServiceImpl implements ExportTaskService {
         info.setFilePath(FileStorageUtil.realPath(entity.getFilePath()));
         info.setFilePath(FileStorageUtil.realPath(entity.getFilePath()));
         info.setCreationTime(entity.getCreationTime());
         info.setCreationTime(entity.getCreationTime());
         info.setUpdateTime(entity.getUpdateTime());
         info.setUpdateTime(entity.getUpdateTime());
+        info.setCreateName(createName);
 
 
         return info;
         return info;
     }
     }