From 21294acab7f4c4a21cff8484625070a8a0f137fc Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 9 Aug 2023 17:02:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inv/DeviceRepairOrderDetailController.java | 9 ++++++++- .../api/service/inv/DeviceRepairOrderDetailService.java | 4 ++++ .../inv/impl/DeviceRepairOrderDetailServiceImpl.java | 7 +++++++ src/main/resources/application-dev.yml | 2 +- 4 files changed, 20 insertions(+), 2 deletions(-) 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 48e5dc856..71e51e39c 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java +++ b/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java @@ -40,6 +40,13 @@ public class DeviceRepairOrderDetailController { PageInfo pageInfo = new PageInfo<>(list); return ResultVOUtils.page(pageInfo); } + @GetMapping("/udiwms/inv/device/repairDetail/order/filterByorderIdFk") + public BaseResponse filterByorderIdFk(String orderIdFk) { + DeviceRepairOrderDetailEntity detailEntity = deviceRepairOrderDetailService.filterByorderIdFk(orderIdFk); + return ResultVOUtils.success(detailEntity); + + } + /** * 添加设备报修单详情 @@ -83,7 +90,7 @@ public class DeviceRepairOrderDetailController { * @param id * @return */ - @PostMapping("/udiwms/inv/device/repair/order/deleteRepairOrderDetail") + @GetMapping("/udiwms/inv/device/repair/order/deleteRepairOrderDetail") public BaseResponse deleteRepairOrderDetail( String id) { deviceRepairOrderDetailService.deleteRepairOrderDetail(id); return ResultVOUtils.success(); 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 5afd31c93..2f027dac4 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java @@ -11,6 +11,10 @@ public interface DeviceRepairOrderDetailService extends IService filterList(FilterDeviceRepairOrderDetailRequest filterDeviceRepairOrderDetailRequest); + DeviceRepairOrderDetailEntity filterByorderIdFk(String orderIdFk); + + + boolean addDeviceRepairOrderDetail(DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity); boolean updateDeviceRepairOrderDetail(DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity); 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 c3723ffc0..b997b1701 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 @@ -1,5 +1,6 @@ package com.glxp.api.service.inv.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inv.DeviceRepairOrderDetailMapper; @@ -29,6 +30,12 @@ public class DeviceRepairOrderDetailServiceImpl extends ServiceImpl().eq("orderIdFk", orderIdFk)); + + } + @Override public boolean addDeviceRepairOrderDetail(DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity) { diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index e043ce625..debdb6ea4 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,7 +4,7 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pzh?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://192.168.0.43:3306/udi_wms_wmd?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 hikari: