修改了部门任务接口

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

@@ -7,6 +7,7 @@ import com.zjty.tynotes.job.basic.entity.request.WorkRo;
 import com.zjty.tynotes.job.basic.entity.response.JobResponse;
 import com.zjty.tynotes.job.basic.entity.response.WorkIsNotCommit;
 import com.zjty.tynotes.job.basic.entity.response.WorkVo;
+import com.zjty.tynotes.job.basic.entity.response.WorkVoMapping;
 import com.zjty.tynotes.job.basic.repository.WorkRepository;
 import com.zjty.tynotes.job.basic.service.ConversionService;
 import com.zjty.tynotes.job.basic.service.WorkService;
@@ -190,9 +191,10 @@ public class WorkController {
 
     @GetMapping(value = "/select/work/{userId}")
     @ApiOperation(value = "根据用户id查看其部门所有的任务", notes = "部门所有的任务")
-    public ResponseEntity<List<WorkVo>> selectWorkUserId(@PathVariable("userId") String userId) {
+    public ResponseEntity<WorkVoMapping> selectWorkUserId(@PathVariable("userId") String userId) {
 
         return ok(workService.selectUserIdsWork(userId));
     }
 
+
 }

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

+package com.zjty.tynotes.job.basic.entity.response;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "任务导图信息", description = "任务导图对象")
+public class WorkMpping {
+    private String wordId;
+
+    private String title;
+
+    private String status;
+
+    private List<WorkMpping> workMppings;
+}

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

+package com.zjty.tynotes.job.basic.entity.response;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "查看部门任务信息和思维导图详情", description = "部门任务信息和思维导图对象")
+public class WorkVoMapping {
+    /**
+     * 主任务列表
+     */
+    private List<WorkVo> workVos;
+    /**
+     * 主任务思维导图列表
+     */
+    private List<WorkMpping> workMppings;
+}

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

@@ -3,6 +3,7 @@ package com.zjty.tynotes.job.basic.service;
 import com.zjty.tynotes.job.basic.entity.database.Work;
 import com.zjty.tynotes.job.basic.entity.response.WorkIsNotCommit;
 import com.zjty.tynotes.job.basic.entity.response.WorkVo;
+import com.zjty.tynotes.job.basic.entity.response.WorkVoMapping;
 import com.zjty.tynotes.job.basic.service.impl.WorkServiceImpl;
 import org.springframework.stereotype.Service;
 
@@ -128,5 +129,6 @@ public interface WorkService {
 //     */
 //    List<Work> selectTimeWork();
 
-     List<WorkVo> selectUserIdsWork(String userId);
+     WorkVoMapping selectUserIdsWork(String userId);
+
 }

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

@@ -5,7 +5,9 @@ import com.zjty.tynotes.job.basic.entity.database.ScoreCoefficient;
 import com.zjty.tynotes.job.basic.entity.database.Work;
 import com.zjty.tynotes.job.basic.entity.database.WorkTime;
 import com.zjty.tynotes.job.basic.entity.response.WorkIsNotCommit;
+import com.zjty.tynotes.job.basic.entity.response.WorkMpping;
 import com.zjty.tynotes.job.basic.entity.response.WorkVo;
+import com.zjty.tynotes.job.basic.entity.response.WorkVoMapping;
 import com.zjty.tynotes.job.basic.repository.WorkRepository;
 import com.zjty.tynotes.job.basic.service.ConversionService;
 import com.zjty.tynotes.job.basic.service.ScoreCoefficientService;
@@ -299,15 +301,47 @@ return 0.0f;
     }
 
     @Override
-    public List<WorkVo> selectUserIdsWork(String userId) {
+    public WorkVoMapping selectUserIdsWork(String userId) {
+       List<Work> works= workRepository.findAllByExecutorIn(iUserService.findUsers(userId));
+       List<WorkVo> workVos=new ArrayList<>();
+        List<WorkMpping> workMppings=new ArrayList<>();
+        for (Work work:works){
+             if (work.getSuperiorId()==null || work.getSuperiorId().equals("")){
+                 workVos.add(conversionService.workToVo(work));
+                 workMppings.add(new WorkMpping(work.getId(),work.getTitle(),work.getStatus(),workMppingList(work,works)));
+             }else {
+                 boolean falg=true;
+                 for (Work work1:works) {
+                     if (work.getSuperiorId().equals(work1.getId())){
+                         falg=false;
+                     }
+                 }
+                 if (falg){
+                     workVos.add(conversionService.workToVo(work));
+                     workMppings.add(new WorkMpping(work.getId(),work.getTitle(),work.getStatus(),workMppingList(work,works)));
+                 }
+             }
+        }
+        return  new WorkVoMapping(workVos,workMppings);
+    }
 
 
-        return workRepository.findAllByExecutorIn(iUserService.findUsers(userId))
-                .stream()
-                .map(conversionService::workToVo)
-                .collect(Collectors.toList());
+    private List<WorkMpping> workMppingList(Work work,List<Work> workList){
+        List<WorkMpping> workMppings=new ArrayList<>();
+       List<Work> works=new ArrayList<>();
+       for (Work wo:workList){
+           if (wo.getSuperiorId()!=null && wo.getSuperiorId().equals(work.getId())){
+               works.add(wo);
+           }
+       }
+       if ( works.size()==0){
+           return workMppings;
+       }
+       for (Work work1:works){
+            workMppings.add(new WorkMpping(work1.getId(),work1.getTitle(),work1.getStatus(),workMppingList(work1,workList)));
+       }
+       return workMppings;
     }
-
 //    @Override
 //    public List<Work> selectTimeWork() {
 ////        LocalDateTime minTime = LocalDateTime.now().with(LocalTime.MIN).atZone(ZoneOffset.ofHours(8)).ge;

notes-union/src/main/java/com/zjty/tynotes/union/UnionApplication.java

@@ -34,7 +34,7 @@ public class UnionApplication {
     tomcat.addAdditionalTomcatConnectors(createHTTPConnector());
     return tomcat;
     }
-//
+
  private Connector createHTTPConnector() {
  Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
  //同时启用http（8080）、https（8443）两个端口

notes-union/src/main/resources/application.properties

@@ -4,7 +4,7 @@ spring.application.name=workbook
 
 ## https端口号.
 server.port=8289
-# 证书的路径.
+## 证书的路径.
 server.ssl.key-store=classpath:2586377_workbook.zjtys.com.cn.pfx
 # 证书密码，请修改为您自己证书的密码.
 server.ssl.key-store-password=bMEPW9BG