diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java b/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java index 454c57d73..6be387284 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java +++ b/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java @@ -42,7 +42,7 @@ public class DeviceRepairOrderDetailController { } @GetMapping("/udiwms/inv/device/repairDetail/order/filterByorderIdFk") public BaseResponse filterByorderIdFk(String orderIdFk) { - DeviceRepairOrderDetailEntity detailEntity = deviceRepairOrderDetailService.filterByorderIdFk(orderIdFk); + List detailEntity = deviceRepairOrderDetailService.filterByorderIdFk(orderIdFk); return ResultVOUtils.success(detailEntity); } diff --git a/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java b/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java index 2f027dac4..f76cd62c1 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java @@ -11,7 +11,7 @@ public interface DeviceRepairOrderDetailService extends IService filterList(FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest); - DeviceRepairOrderDetailEntity filterByorderIdFk(String orderIdFk); + List filterByorderIdFk(String orderIdFk); diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java index b997b1701..3bce47c36 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java @@ -31,8 +31,8 @@ public class DeviceRepairOrderDetailServiceImpl extends ServiceImpl().eq("orderIdFk", orderIdFk)); + public List filterByorderIdFk(String orderIdFk) { + return deviceRepairOrderDetailMapper.selectList(new QueryWrapper().eq("orderIdFk", orderIdFk)); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java index c21866001..4261ad0d1 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java @@ -82,7 +82,7 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService { deviceRepairOrderEntity.setPlanTime(addDeviceRepairOrderRequest.getPlanTime()); deviceRepairOrderEntity.setUploadImage(addDeviceRepairOrderRequest.getUploadImage()); deviceRepairOrderDao.insert(deviceRepairOrderEntity); - return ResultVOUtils.success(); + return ResultVOUtils.success(deviceRepairOrderEntity); } @Override @@ -91,7 +91,7 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService { BeanUtil.copyProperties(deviceRepairOrderEntity, repairOrderEntity, "id", "createTime", "createUser"); repairOrderEntity.setUpdateTime(new Date()); deviceRepairOrderDao.updateById(repairOrderEntity); - return ResultVOUtils.success(); + return ResultVOUtils.success(repairOrderEntity); } @Override