From ab3e5a717369cc95fe69acb94635412d112ed5d3 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 22 Nov 2024 14:38:15 +0800 Subject: [PATCH] =?UTF-8?q?11/22=20=E4=B8=B4=E6=97=B6=E7=A0=81=E8=A1=A8?= =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=E5=8E=BB=E6=AD=A3=E5=BC=8F=E7=A0=81?= =?UTF-8?q?=E8=A1=A8=E6=90=9C=E7=B4=A21.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoCodeTempController.java | 8 ++--- .../api/service/inout/IoCodeTempService.java | 34 ++++++++++++++++--- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 49454c754..1c30b8629 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -19,8 +19,7 @@ import com.glxp.api.req.collect.CollectOrderRequest; import com.glxp.api.res.collect.CollectOrderBizResponse; import com.glxp.api.res.collect.IoCollectOrderResponse; import com.glxp.api.res.collect.RelCodeDetailResponse; -import com.glxp.api.res.inout.IoOrderDetailCodeResponse; -import com.glxp.api.res.inout.VailCodeResultResponse; +import com.glxp.api.res.inout.*; import com.glxp.api.service.collect.*; import com.glxp.api.service.collect.RelCodeDetailService; import com.glxp.api.service.inout.impl.IoCodeService; @@ -47,8 +46,6 @@ import com.glxp.api.req.inout.*; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.basic.UdiRlSupResponse; -import com.glxp.api.res.inout.AddCodeResult; -import com.glxp.api.res.inout.IoCodeTempResponse; import com.glxp.api.res.inv.InvPlaceDetailResponse; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.*; @@ -2137,6 +2134,9 @@ public class IoCodeTempController extends BaseController { } } + if (list.size() == 0 || list == null){ + return codeTempService.findCodes(filterCodeRequest); + } PageInfo pageInfo = new PageInfo<>(list); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); diff --git a/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java b/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java index 98d5fa1a9..37890f7a4 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java @@ -6,13 +6,16 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.dao.inout.IoCodeTempDao; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; -import com.glxp.api.entity.collect.RelCodeDetail; import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.req.inout.FilterCodeRequest; +import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.collect.RelCodeDetailResponse; import com.glxp.api.res.inout.IoCodeResponse; @@ -20,9 +23,7 @@ import com.glxp.api.res.inout.IoCodeTempResponse; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.collect.RelCodeDetailService; -import com.glxp.api.service.inout.IoOrderDetailBizService; -import com.glxp.api.service.inout.IoOrderDetailCodeService; -import com.glxp.api.service.inout.IoOrderService; +import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.util.BeanCopyUtils; import com.glxp.api.util.IntUtil; import com.glxp.api.util.page.PageQuery; @@ -30,10 +31,13 @@ import com.glxp.api.util.page.TableDataInfo; import com.glxp.api.util.udi.UdiCalCountUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.beans.BeanUtils; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; @Service @Transactional(rollbackFor = Exception.class) @@ -281,4 +285,26 @@ public class IoCodeTempService { return ret; } + + + @Resource + IoCodeService ioCodeService; + public BaseResponse findCodes(FilterCodeRequest filterCodeRequest) { + List ioCodeResponses = ioCodeService.filterList(filterCodeRequest); + PageInfo pageInfo = new PageInfo<>(ioCodeResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(pageInfo.getList()); +// ArrayList ioCodeTempResponses = new ArrayList<>(); +// ioCodeTempResponses.addAll(ioCodeResponses.stream() +// .map(ioCodeResponse -> convertToIoCodeTempResponse(ioCodeResponse)) +// .collect(Collectors.toList())); + return ResultVOUtils.success(pageSimpleResponse); + } + +// public IoCodeTempResponse convertToIoCodeTempResponse(IoCodeResponse response) { +// IoCodeTempResponse tempResponse = new IoCodeTempResponse(); +// BeanUtils.copyProperties(response,tempResponse); +// return tempResponse; +// } }