feat(维修模块,退回模块): 修改clearTaskVo中的设备状态

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

@@ -775,7 +775,7 @@ public class BackController {
                     ids.add(id);
                     //改变装备状态
                     DeviceLibrary deviceLibraryEntity = deviceLibraryService.getOne(id);
-                    deviceLibraryEntity.setLifeStatus(3);
+                    deviceLibraryEntity.setLifeStatus(2);
                     deviceLibraryEntity.setManageStatus(0);
                     deviceLibraryEntity.setOwnUnit(allotBackBill.getReceiveUnit());
                     deviceLibraryEntity.setLocationUnit(allotBackBill.getReceiveUnit());

dev-repair/src/main/java/com/tykj/dev/device/repair/service/impl/RepairDetailServiceImpl.java

@@ -173,7 +173,6 @@ public class RepairDetailServiceImpl implements RepairDetailService {
                     List<Task> tasks = taskList.stream().filter(task -> task.getParentTaskId() == null).collect(Collectors.toList());
                     ClearTaskVo clearTaskVo = new ClearTaskVo();
                     clearTaskVo.setTaskId(tasks.get(0).getId());
-                    billVo.setBillStatus(tasks.get(0).getBillStatus());
                     billVos.add(billVo);
                     clearTaskVo.setBillVos(billVos);
                     clearTaskVos.add(clearTaskVo);

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

@@ -37,6 +37,6 @@ public class BillVo {
     @ApiModelProperty(value = "可见范围")
     private String invisibleRangeName;
 
-    @ApiModelProperty(value = "业务状态")
-    private Integer billStatus;
+    @ApiModelProperty(value = "设备状态描述")
+    private String repairStatus;
 }