修改返回的workvo

notes-job/src/main/java/com/zjty/tynotes/job/basic/controller/WorkController.java

@@ -140,7 +140,7 @@ public class WorkController {
             @ApiImplicitParam(name="status",value="状态",dataType="String", paramType = "query",required = true),
             @ApiImplicitParam(name="msg",value="消息",dataType="String", paramType = "query",required = true)
     })
-    public ResponseEntity alterTaskStatus(@RequestParam String workId,
+    public ResponseEntity<JobResponse> alterTaskStatus(@RequestParam String workId,
                                           @RequestParam String userId,
                                           @RequestParam String status,
                                           @RequestParam String msg) {
@@ -177,7 +177,7 @@ public class WorkController {
                 log.warn("[job] 修改任务状态传入的参数有误，传入值为：{}", status);
                 break;
         }
-        return ok("success");
+        return ok(new JobResponse(workId));
     }
 
 

notes-job/src/main/java/com/zjty/tynotes/job/basic/entity/database/Work.java

@@ -12,6 +12,7 @@ import org.springframework.data.annotation.Id;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -102,7 +103,7 @@ public class Work {
      */
     @NotNull
     @ApiModelProperty(value = "附件的id集合.", example = "[\"id\",\"id\"]")
-    private List<String> attachment;
+    private List<String> attachment=new ArrayList<>();
 
 
     /*工作内容*/

notes-job/src/main/java/com/zjty/tynotes/job/basic/entity/response/WorkVo.java

 package com.zjty.tynotes.job.basic.entity.response;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zjty.tynotes.job.basic.entity.database.Attachment;
 import com.zjty.tynotes.pas.entity.User;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -81,13 +82,13 @@ public class WorkVo {
      * 组员id集合
      */
     @ApiModelProperty(value = "组原id集合.", example = "[\"id\",\"id\"]")
-    private List<String> crewList;
+    private List<User> crewList;
 
     /**
      * 附件id
      */
     @ApiModelProperty(value = "附件的id集合.", example = "[\"id\",\"id\"]")
-    private List<String> attachment;
+    private List<Attachment> attachment;
 
 
     /*工作内容*/

notes-job/src/main/java/com/zjty/tynotes/job/basic/service/AttachmentService.java

@@ -45,6 +45,14 @@ public interface AttachmentService {
      */
     String modify(Attachment attachment);
 
+    /**
+     * 查找指定id的Work
+     *
+     * @param workId 指定id
+     * @return Work对象
+     */
+    Attachment findById(String attachmentId);
+
     /**
      * 查询所有
      *

notes-job/src/main/java/com/zjty/tynotes/job/basic/service/impl/AttachmentServiceImpl.java

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 
 import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;
@@ -110,6 +111,12 @@ public class AttachmentServiceImpl implements AttachmentService {
         }
     }
 
+    @Override
+    public Attachment findById(String attachmentId) {
+        Optional<Attachment> workOptional = attachmentRepository.findById(attachmentId);
+        return workOptional.orElseThrow(() -> new BadRequestException(String.format("[job] id为 %s 的数据不存在.", attachmentId)));
+    }
+
     @Override
     public List<Attachment> findAll() {
         return attachmentRepository.findAll();

notes-job/src/main/java/com/zjty/tynotes/job/basic/service/impl/ConversionServiceImpl.java

 package com.zjty.tynotes.job.basic.service.impl;
 
+import com.zjty.tynotes.job.basic.entity.database.Attachment;
 import com.zjty.tynotes.job.basic.entity.database.Work;
 import com.zjty.tynotes.job.basic.entity.response.WorkVo;
+import com.zjty.tynotes.job.basic.service.AttachmentService;
 import com.zjty.tynotes.job.basic.service.ConversionService;
 import com.zjty.tynotes.pas.entity.User;
 import com.zjty.tynotes.pas.service.IUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Service
 public class ConversionServiceImpl implements ConversionService {
     @Autowired
     IUserService iUserService;
+
+    @Autowired
+    AttachmentService attachmentService;
+
     @Override
     public WorkVo workToVo(Work work) {
         User pUser=iUserService.findUserById(work.getPublisher());
 
         User eUser=iUserService.findUserById(work.getExecutor());
+        List<User> users=new ArrayList<>();
+        List<String> uid=work.getCrewList();
+        List<Attachment> attachments=new ArrayList<>();
+        List<String> attachIds=work.getAttachment();
+
+        if (uid!=null && uid.size()!=0){
+            for (String id:uid){
+                users.add(iUserService.findUserById(id));
+            }
+        }
+
+        if (attachIds!=null && attachIds.size()!=0){
+            for (String id:attachIds){
+                attachments.add(attachmentService.findById(id));
+            }
+        }
         return new WorkVo(
                 work.getId(),
         work.getSuperiorId(),
@@ -28,8 +53,8 @@ public class ConversionServiceImpl implements ConversionService {
         work.getUpdateTime(),
         pUser,
         eUser,
-        work.getCrewList(),
-        work.getAttachment(),
+        users,
+        attachments,
         work.getContent(),
         work.getWorkload(),
         work.getStatus(),