From b8ddd0d8d6aa36db754a36c3ca3dcf1e7b4f67a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 12 Feb 2025 15:39:20 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=80=E4=BA=9B=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobilebroken/common/pojo/vo/DeviceVO.java | 6 ++--- .../repository/mapper/DeviceMapper.java | 6 ++++- .../repository/service/IDeviceService.java | 4 +--- .../service/impl/AppUserServiceImpl.java | 11 ++++++--- .../service/impl/DeviceServiceImpl.java | 23 ++++++++---------- .../main/resources/mapper/DeviceMapper.xml | 24 +++++++++++++++++++ 6 files changed, 50 insertions(+), 24 deletions(-) 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 25ba1515..4f5090e5 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 @@ -1,10 +1,9 @@ package com.nflg.mobilebroken.common.pojo.vo; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.experimental.Accessors; -import java.time.LocalDateTime; +import java.time.LocalDate; @Data @Accessors(chain = true) @@ -23,6 +22,5 @@ public class DeviceVO { private String deviceType; // 销售日期 - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDateTime shipmentDate; + private LocalDate shipmentDate; } 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 d5aecb2b..01c06b9d 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 @@ -1,10 +1,12 @@ package com.nflg.mobilebroken.repository.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery; +import com.nflg.mobilebroken.common.pojo.request.SearchDeviceRequest; import com.nflg.mobilebroken.common.pojo.vo.DeviceInfoVO; +import com.nflg.mobilebroken.common.pojo.vo.DeviceVO; import com.nflg.mobilebroken.repository.entity.Device; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -30,4 +32,6 @@ public interface DeviceMapper extends BaseMapper { Page getList(@Param("page") Page page, PageBaseQuery query); void batchDelByIds(@Param("ids")List ids); + + Page searchDevice(SearchDeviceRequest request, List companyIds, Page page); } 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 d59c6bf1..de0e391c 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 @@ -2,7 +2,6 @@ package com.nflg.mobilebroken.repository.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.nflg.mobilebroken.common.pojo.PageData; import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery; import com.nflg.mobilebroken.common.pojo.request.SearchDeviceRequest; import com.nflg.mobilebroken.common.pojo.vo.DeviceInfoVO; @@ -10,7 +9,6 @@ import com.nflg.mobilebroken.common.pojo.vo.DeviceVO; import com.nflg.mobilebroken.repository.entity.Device; import org.apache.ibatis.annotations.Param; -import javax.validation.Valid; import java.util.List; /** @@ -29,5 +27,5 @@ public interface IDeviceService extends IService { void batchDelByIds(@Param("ids") List ids); - PageData searchDevice(@Valid SearchDeviceRequest request); + Page searchDevice(SearchDeviceRequest request); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java index 4f09c309..aae3f51f 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java @@ -295,9 +295,14 @@ public class AppUserServiceImpl extends ServiceImpl impl .setState(d.getExpireTime().isAfter(ChronoLocalDate.from(LocalDateTime.now())) ? 1 : 2) .setLastLoginTime(d.getLastLoginTime()); }).collect(Collectors.toList()); - List applyforList = appUserApplyforService.lambdaQuery() - .eq(AppUserApplyfor::getState, AppUserApplyForState.PENDINGAPPROVAL.getState().byteValue()) - .list(); + LambdaQueryWrapper queryApplyforListWrapper = new LambdaQueryWrapper<>(); + queryApplyforListWrapper.eq(AppUserApplyfor::getState, AppUserApplyForState.PENDINGAPPROVAL.getState().byteValue()); + queryApplyforListWrapper.and(wrapper -> { + for (String companyId : companyIds) { + wrapper.or().eq(AppUserApplyfor::getCompanyId, Integer.parseInt(companyId)); + } + }); + List applyforList = appUserApplyforService.getBaseMapper().selectList(queryApplyforListWrapper); vos.addAll(applyforList.stream().map(d -> { AppArea area = appAreaService.getById(d.getAreaId()); TBaseCustomer company = customerService.getById(d.getCompanyId()); 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 fe1b18b3..fc3fd890 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 @@ -1,16 +1,12 @@ package com.nflg.mobilebroken.repository.service.impl; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nflg.mobilebroken.common.pojo.PageData; import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery; import com.nflg.mobilebroken.common.pojo.request.SearchDeviceRequest; import com.nflg.mobilebroken.common.pojo.vo.DeviceInfoVO; import com.nflg.mobilebroken.common.pojo.vo.DeviceVO; -import com.nflg.mobilebroken.common.util.PageUtil; +import com.nflg.mobilebroken.common.util.AppUserUtil; import com.nflg.mobilebroken.repository.entity.Device; import com.nflg.mobilebroken.repository.mapper.DeviceMapper; import com.nflg.mobilebroken.repository.service.IDeviceService; @@ -18,7 +14,6 @@ import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; import java.util.List; -import java.util.Objects; /** *

@@ -46,12 +41,14 @@ public class DeviceServiceImpl extends ServiceImpl impleme } @Override - public PageData searchDevice(SearchDeviceRequest request) { - IPage page = lambdaQuery() - .like(StrUtil.isNotBlank(request.getDeviceNo()), Device::getDeviceNo, request.getDeviceNo()) - .like(StrUtil.isNotBlank(request.getModelNo()), Device::getModelNo, request.getModelNo()) - .between(Objects.nonNull(request.getStartTime()), Device::getShipmentDate, request.getStartTime(), request.getEndTime()) - .page(new Page<>(request.getPage(), request.getPageSize())); - return PageUtil.convert(page, d -> Convert.convert(DeviceVO.class, d)); + public Page searchDevice(SearchDeviceRequest request) { +// IPage page = lambdaQuery() +// .like(StrUtil.isNotBlank(request.getDeviceNo()), Device::getDeviceNo, request.getDeviceNo()) +// .like(StrUtil.isNotBlank(request.getModelNo()), Device::getModelNo, request.getModelNo()) +// .between(Objects.nonNull(request.getStartTime()), Device::getShipmentDate, request.getStartTime(), request.getEndTime()) +// .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())); } } diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml index 1c72eefc..230a2aa1 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml @@ -43,4 +43,28 @@ #{item} + +