Merge branch 'master' of 192.168.100.249:zjm3/jy-equip-refactoring

dev-device/device-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBillSelectController.java

@@ -75,8 +75,8 @@ public class AllotBillSelectController {
         allotBillDetailVo.setAllotBill(allotBillEntity);
         List<DeviceLibrary> libraryEntities = new ArrayList<>();
         //如果接收装备详情不为空，分隔装备id并添加
-        if (allotBillEntity.getReceiveCheckDetail()!=null){
-            for (Integer deviceId: StringSplitUtil.split(allotBillEntity.getReceiveCheckDetail())) {
+        if (allotBillEntity.getAllotCheckDetail()!=null){
+            for (Integer deviceId: StringSplitUtil.split(allotBillEntity.getAllotCheckDetail())) {
                 libraryEntities.add(deviceLibraryService.getOne(deviceId));
             }
         }

dev-device/device-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java

@@ -900,4 +900,21 @@ public class RepairController {
         }
         return ResultUtil.success("换新成功");
     }
+//
+//    @ApiOperation(value = "查询维修详情",notes = "可以通过这个接口查询维修详情")
+//    @PostMapping(value = "/detail/{id}")
+//    public ResponseEntity<RepairBillDetailVo> getDetail(@PathVariable("billId") int id){
+//        //获取task
+//        TaskBto taskBto = taskService.get(id);
+//        //判断维修业务类型
+//        switch (taskBto.getBusinessType()){
+//            case BusinessEnum.REPAIR_SEND.id:
+//            default:break;
+//        }
+//        return null;
+//    }
+
+//    @ApiOperation(value = "查询维修装备状态",notes = "可以通过这个接口查询维修装备状态")
+//    @PostMapping(value = "/select/status/")
+//    public ResponseEntity<List<RepairDetail>> getRepairDeatail()
 }

dev-device/device-repair/src/main/java/com/tykj/dev/device/repair/subject/vo/RepairBillDetailVo.java

+package com.tykj.dev.device.repair.subject.vo;
+
+import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
+import com.tykj.dev.device.repair.subject.domin.RepairBill;
+import com.tykj.dev.device.repair.subject.domin.RepairDetail;
+import com.tykj.dev.device.task.subject.vo.TaskLogUserVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author dengdiyi
+ */
+@Data
+@ApiModel("维修单详情返回类")
+public class RepairBillDetailVo {
+
+    @ApiModelProperty(name = "维修单")
+    private RepairBill repairBill;
+
+    @ApiModelProperty(name = "装备信息")
+    private List<DeviceLibrary> deviceLibraries;
+
+    @ApiModelProperty(name = "装备维修状态列表")
+    private List<RepairDetail> repairDetails;
+
+    @ApiModelProperty(name = "业务日志")
+    private List<TaskLogUserVo> taskLogUserVos;
+}

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

@@ -436,7 +436,7 @@ public class TaskServiceImpl implements TaskService {
         if (taskSelectVo.getSelectNum() == 2) {
             //当前指针对应userId是当前用户或者为0且所属单位为当前单位
             List<TaskBto> taskBtoList = taskBtos.stream()
-                    .filter(taskBto -> userId.equals(taskBto.getInvolveUserIdList().get(taskBto.getCurrentPoint())) || (taskBto.getInvolveUserIdList().get(taskBto.getCurrentPoint()) == 0 && taskBto.getOwnUnit().equals(userUtils.getCurrentUnitId())))
+                    .filter(taskBto -> taskBto.getInvolveUserIdList().size()>0&&(userId.equals(taskBto.getInvolveUserIdList().get(taskBto.getCurrentPoint())) || (taskBto.getInvolveUserIdList().get(taskBto.getCurrentPoint()) == 0 && taskBto.getOwnUnit().equals(userUtils.getCurrentUnitId()))))
                     .collect(Collectors.toList());
             //查询所有的业务
             if (bussinessType == null) {