From 767e25a13e4cda506108e3b37e8199664e4d3bca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 9 May 2025 17:44:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E3=80=90bug-182=E3=80=91=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E5=B7=A5=E5=8D=95=E6=97=B6=EF=BC=8C=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BC=96=E5=8F=B7=E7=9A=84=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E5=B1=95=E7=A4=BA=E7=9A=84=E8=AE=BE=E5=A4=87=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=AD=97=E6=AE=B5=E6=B2=A1=E6=9C=89=E7=BF=BB=E8=AF=91?= =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E4=BC=98=E5=8C=96=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E8=AE=BE=E5=A4=87=E8=B4=A8=E4=BF=9D=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/mobilebroken/cfs/controller/TiketController.java | 2 +- .../java/com/nflg/mobilebroken/common/pojo/vo/DeviceVO.java | 3 +++ .../nflg/mobilebroken/repository/mapper/DeviceMapper.java | 2 +- .../nflg/mobilebroken/repository/service/IDeviceService.java | 2 +- .../repository/service/impl/DeviceServiceImpl.java | 4 ++-- .../src/main/resources/mapper/DeviceMapper.xml | 5 ++++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java index 36eaaf72..27b54e86 100644 --- a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java +++ b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java @@ -96,7 +96,7 @@ public class TiketController extends ControllerBase { **/ @PostMapping("searchDevice") public ApiResult> searchDevice(@Valid @RequestBody SearchDeviceRequest request) { - return ApiResult.success(deviceService.searchDevice(request)); + return ApiResult.success(deviceService.searchDevice(request,MultilingualUtil.getLanguage())); } /** diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DeviceVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DeviceVO.java index 4f5090e5..52f3a6e7 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DeviceVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DeviceVO.java @@ -18,6 +18,9 @@ public class DeviceVO { // 设备型号 private String modelNo; + //质保状态 + private String warrantyState; + // 设备类型 private String deviceType; diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DeviceMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DeviceMapper.java index 8a9595d0..fb640ab8 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DeviceMapper.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DeviceMapper.java @@ -35,7 +35,7 @@ public interface DeviceMapper extends BaseMapper { void batchDelByIds(@Param("ids")List ids); - Page searchDevice(SearchDeviceRequest request, List companyIds, Page page); + Page searchDevice(SearchDeviceRequest request, List companyIds,String language, Page page); void taskWarrantyStateNotStarted(); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDeviceService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDeviceService.java index 774178c7..4eb4cfed 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDeviceService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDeviceService.java @@ -28,7 +28,7 @@ public interface IDeviceService extends IService { void batchDelByIds(@Param("ids") List ids); - Page searchDevice(SearchDeviceRequest request); + Page searchDevice(SearchDeviceRequest request,String language); void taskWarrantyStateNotStarted(); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceServiceImpl.java index 7e592fea..fa14b7a9 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceServiceImpl.java @@ -49,7 +49,7 @@ public class DeviceServiceImpl extends ServiceImpl impleme } @Override - public Page searchDevice(SearchDeviceRequest request) { + public Page searchDevice(SearchDeviceRequest request,String language) { // IPage page = lambdaQuery() // .like(StrUtil.isNotBlank(request.getDeviceNo()), Device::getDeviceNo, request.getDeviceNo()) // .like(StrUtil.isNotBlank(request.getModelNo()), Device::getModelNo, request.getModelNo()) @@ -57,7 +57,7 @@ public class DeviceServiceImpl extends ServiceImpl impleme // .page(new Page<>(request.getPage(), request.getPageSize())); // return PageUtil.convert(page, d -> Convert.convert(DeviceVO.class, d)); List companyIds = AppUserUtil.getCompanyIds(); - return baseMapper.searchDevice(request, companyIds, new Page<>(request.getPage(), request.getPageSize())); + return baseMapper.searchDevice(request, companyIds,language ,new Page<>(request.getPage(), request.getPageSize())); } public void taskWarrantyStateNotStarted(){ diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml index b6b5bf62..730cc4ab 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml @@ -60,10 +60,13 @@