[业务模块]新增了查询task接口

dev-library/src/main/java/com/tykj/dev/device/library/subject/Dto/DeviceLogDto.java

@@ -94,6 +94,7 @@ public class DeviceLogDto {
         deviceLog.setType(this.type);
         deviceLog.setDeviceId(this.deviceId);
         deviceLog.setRemark(this.remark);
+        deviceLog.setTaskId(this.taskId);
         if (this.createUserId!=null){
             deviceLog.setCreateUserId(createUserId);
         }

dev-task/src/main/java/com/tykj/dev/device/task/controller/TaskController.java

@@ -60,6 +60,7 @@ public class TaskController {
     @Autowired
     private UserRecordDao userRecordDao;
 
+
     @ApiOperation(value = "业务分页查询", notes = "可以通过这个接口分页查询业务")
     @RequestMapping(method = RequestMethod.POST, value = "/manage/summary", produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity getTaskPage(@RequestBody TaskSelectVo taskSelectVo) {
@@ -291,4 +292,11 @@ public class TaskController {
     public ResponseEntity selectAllLogs(@RequestBody TaskLogSelectVo taskLogSelectVo){
         return ResponseEntity.ok( PageUtil.getPerPage(taskLogSelectVo.getPage(), taskLogSelectVo.getSize(), taskLogService.getAllByTime(taskLogSelectVo), taskLogSelectVo.getPageable()));
     }
+
+    @ApiOperation(value = "任务对象", notes = "根据任务id查询任务对象")
+    @GetMapping("/task/id")
+    public ResponseEntity getTask(Integer taskId){
+        return ResponseEntity.ok(taskService.findByTaskId(taskId).toVo());
+    }
+
 }

dev-task/src/main/java/com/tykj/dev/device/task/service/TaskService.java

@@ -208,5 +208,7 @@ public interface TaskService {
      */
     TaskBto findBillTypeAndFatherId(Integer billType,Integer fatherId);
 
+    TaskBto findByTaskId(Integer taskId);
+
 
 }

dev-task/src/main/java/com/tykj/dev/device/task/service/impl/TaskServiceImpl.java

@@ -585,9 +585,8 @@ public class TaskServiceImpl implements TaskService {
                         .collect(Collectors.toList());
             }
             taskUserVos = taskUserVos.stream()
-                    .filter(taskUserVo -> businesses.contains(taskUserVo.getBusinessType()))
-                    .filter(taskUserVo -> taskUserVo.getParentTaskId() == null || taskUserVo.getParentTaskId() == 0).collect(Collectors.toList());
-                //如果存在集合中
+                    .filter(taskUserVo -> !businesses.contains(taskUserVo.getBusinessType()) || (taskUserVo.getParentTaskId() == null || taskUserVo.getParentTaskId() == 0)).collect(Collectors.toList());
+            //如果存在集合中
 //                if (businesses.contains(taskUserVo.getBusinessType())){
 //                    if (taskUserVo.getParentTaskId() != null && taskUserVo.getParentTaskId() !=0 ){
 //                        return false;
@@ -865,6 +864,11 @@ public class TaskServiceImpl implements TaskService {
         return taskDao.findByParentTaskIdAndBusinessType(fatherId,billType).parse2Bto();
     }
 
+    @Override
+    public TaskBto findByTaskId(Integer taskId) {
+        return taskDao.findById(taskId).get().parse2Bto();
+    }
+
     @Override
     public void moveAllSonNodeToEnd(Integer taaskId) {
         List<Task> tasks = taskDao.findAllByParentTaskId(taaskId);

dev-task/src/main/java/com/tykj/dev/device/task/subject/bto/TaskBto.java

@@ -51,7 +51,6 @@ public class TaskBto {
     @ApiModelProperty(value = "所属单位")
     private Integer ownUnit;
 
-
     @ApiModelProperty(value = "数字类型，用于代表指针目前的下标")
     private Integer currentPoint;