3

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

@@ -4,6 +4,7 @@ import com.zjty.tynotes.job.basic.entity.database.Work;
 import com.zjty.tynotes.job.basic.entity.request.UpdateCrew;
 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.service.ConversionService;
 import com.zjty.tynotes.job.basic.service.WorkService;
@@ -181,6 +182,18 @@ public class WorkController {
     }
 
 
+    @PutMapping(value = "/select/subtasks/{workId}")
+    @ApiOperation(value = "根据任务id是否可以提交任务", notes = "查看是否可以提交.")
+    public ResponseEntity<WorkIsNotCommit> selectSubtasks(@PathVariable("workId") String workId) {
 
+        return ok(workService.findBySuperoirId(workId));
+    }
+
+    @PutMapping(value = "/select/workload/{workId}")
+    @ApiOperation(value = "根据任务id查看剩余工作量", notes = "查看任务工作量.")
+    public ResponseEntity selectCount(@PathVariable("workId") String workId) {
+
+        return ok(workService.findBySuperoirIdCount(workId));
+    }
 
 }

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

+package com.zjty.tynotes.job.basic.entity.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "判断是否可以提交任务的对象", description = "提交任务的对象")
+public class WorkIsNotCommit {
+
+    @ApiModelProperty(value = "是否可以提交任务", example = "isNotCommit", notes = "1 是可以提交,0 不能提交")
+    private String isNotCommit;
+
+    @ApiModelProperty(value = "子任务未完成的id集合", example = "notWorkIds", notes = "不能提交才有数据")
+
+    private List<String> notWorkIds;
+}

notes-job/src/main/java/com/zjty/tynotes/job/basic/repository/WorkRepository.java

@@ -4,6 +4,8 @@ import com.zjty.tynotes.job.basic.entity.database.Work;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * <p>Description : note
  * <p>Date : 2019/4/23 9:45
@@ -11,5 +13,6 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface WorkRepository extends MongoRepository<Work, String> {
+    List<Work> findBySuperiorId(String superiorId);
 
 }

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

 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.service.impl.WorkServiceImpl;
 import org.springframework.stereotype.Service;
 
@@ -111,6 +112,16 @@ public interface WorkService {
      */
     void updateWorkload(String taskId, int workload, int workCoefficient);
 
+
+    /**
+     * 根据任务id 查看任务是否有无子任务，子任务是否有未完成
+     */
+    WorkIsNotCommit findBySuperoirId(String SuperoirId);
+
+    /**
+     * 根据任务id 查看任务剩余工作量
+     */
+    int findBySuperoirIdCount(String SuperoirId);
 //    /**
 //     * 查看正在进行中的任务
 //     */

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

@@ -2,14 +2,17 @@ package com.zjty.tynotes.job.basic.service.impl;
 
 import com.google.common.collect.Lists;
 import com.zjty.tynotes.job.basic.entity.database.Work;
+import com.zjty.tynotes.job.basic.entity.response.WorkIsNotCommit;
 import com.zjty.tynotes.job.basic.repository.WorkRepository;
 import com.zjty.tynotes.job.basic.service.WorkService;
+import com.zjty.tynotes.job.common.constant.WorkStatus;
 import com.zjty.tynotes.job.common.exception.BadRequestException;
 import com.zjty.tynotes.job.common.exception.NotFoundException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
@@ -135,6 +138,39 @@ public class WorkServiceImpl implements WorkService {
         workRepository.save(ob);
     }
 
+    @Override
+    public WorkIsNotCommit findBySuperoirId(String SuperoirId) {
+       List<Work> works= workRepository.findBySuperiorId(SuperoirId);
+       List<String> list=new ArrayList<>();
+       String isNotCommit="1";
+       if (works!=null && works.size()!=0){
+           for (Work work:works){
+               if (!WorkStatus.FINISHED.equals(work.getStatus())){
+                   isNotCommit="0";
+                   list.add(work.getId());
+               }
+           }
+           return new WorkIsNotCommit(isNotCommit,list);
+       }else {
+           return new WorkIsNotCommit(isNotCommit,list);
+       }
+    }
+
+    @Override
+    public int findBySuperoirIdCount(String SuperoirId) {
+        List<Work> works= workRepository.findBySuperiorId(SuperoirId);
+        int count= workRepository.findById(SuperoirId).get().getWorkload();
+        if (works!=null && works.size()!=0){
+            for (Work work:works){
+                count=count-work.getWorkload();
+            }
+            return count;
+        }else {
+            return count;
+        }
+
+    }
+
 //    @Override
 //    public List<Work> selectTimeWork() {
 ////        LocalDateTime minTime = LocalDateTime.now().with(LocalTime.MIN).atZone(ZoneOffset.ofHours(8)).ge;

notes-job/src/main/java/com/zjty/tynotes/job/status/entity/EsListSum.java

@@ -13,7 +13,6 @@ import java.util.List;
  * @author zjm
  */
 @ApiModel(value = "EsListSum对象",description="提供数据列表和总数")
-@AutoDocument
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

notes-job/src/main/java/com/zjty/tynotes/job/status/entity/RoleSum.java

@@ -13,7 +13,6 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@AutoDocument
 @ApiModel(value = "webSocket对象")
 public class RoleSum {
 

notes-job/src/main/java/com/zjty/tynotes/job/status/entity/RoleSum1.java

@@ -13,7 +13,6 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@AutoDocument
 @ApiModel(value = "webSocket对象")
 public class RoleSum1 {