From d6756ab112d8863e761a666d37367d135c96ba65 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Tue, 26 Nov 2024 14:55:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/mipsdl/client/scpwxyy/ScpwxyyClient.java | 14 ++++++++------ .../glxp/mipsdl/service/scpwxyy/A004Service.java | 14 ++++++-------- .../glxp/mipsdl/thirddao/scpwxyy/A004Mapper.java | 6 +++++- .../mybatis/mapper/other/scpwxyy/A004Mapper.xml | 8 ++++---- 4 files changed, 23 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/glxp/mipsdl/client/scpwxyy/ScpwxyyClient.java b/src/main/java/com/glxp/mipsdl/client/scpwxyy/ScpwxyyClient.java index 926fab1..3799ee7 100644 --- a/src/main/java/com/glxp/mipsdl/client/scpwxyy/ScpwxyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/scpwxyy/ScpwxyyClient.java @@ -414,7 +414,7 @@ public class ScpwxyyClient extends CommonHttpClient { .like(StrUtil.isNotBlank(getSickRequest.getIdNum()),A008::getIdnum,getSickRequest.getIdNum()) .like(StrUtil.isNotBlank(getSickRequest.getPhone()),A008::getPhone,getSickRequest.getPhone()) ); - log.info("解析四川武平县医院返回患者信息，返回结果：{}", list); +// log.info("解析四川武平县医院返回患者信息，返回结果：{}", list); PageInfo pageInfo = new PageInfo<>(list); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); @@ -436,7 +436,7 @@ public class ScpwxyyClient extends CommonHttpClient { .like(StrUtil.isNotBlank(getSickPrescribeRequest.getSickName()), A014::getPsnName, getSickPrescribeRequest.getSickName()) .like(StrUtil.isNotBlank(getSickPrescribeRequest.getIdNum()), A014::getCertno, getSickPrescribeRequest.getIdNum()) ); - log.info("解析四川武平县医院返回患者处方退费信息，返回结果：{}", list); +// log.info("解析四川武平县医院返回患者处方退费信息，返回结果：{}", list); PageInfo pageInfo = new PageInfo<>(list); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); @@ -449,7 +449,7 @@ public class ScpwxyyClient extends CommonHttpClient { .like(StrUtil.isNotBlank(getSickPrescribeRequest.getSickName()), A013::getPsnName, getSickPrescribeRequest.getSickName()) .like(StrUtil.isNotBlank(getSickPrescribeRequest.getIdNum()), A013::getCertno, getSickPrescribeRequest.getIdNum()) ); - log.info("解析四川武平县医院返回患者处方信息，返回结果：{}", list); +// log.info("解析四川武平县医院返回患者处方信息，返回结果：{}", list); PageInfo pageInfo = new PageInfo<>(list); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); @@ -1072,9 +1072,11 @@ public class ScpwxyyClient extends CommonHttpClient { @Override public BaseResponse getWarehouse(UdiwmsWarehouseRequest udiwmsWarehouseRequest) { udiwmsWarehouseRequest.setDatabaseProductName(getDataSourceType()); - List list = a004Service.filterList(udiwmsWarehouseRequest); - log.info("解析四川武平县医院返回仓库信息，返回结果：{}", list); - return ResultVOUtils.success(list); + IPage a004IPage = a004Service.filterList(udiwmsWarehouseRequest); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(a004IPage.getTotal()); + pageSimpleResponse.setList(a004IPage.getRecords()); + return ResultVOUtils.success(pageSimpleResponse); } @Override diff --git a/src/main/java/com/glxp/mipsdl/service/scpwxyy/A004Service.java b/src/main/java/com/glxp/mipsdl/service/scpwxyy/A004Service.java index 6a48737..3b9bf13 100644 --- a/src/main/java/com/glxp/mipsdl/service/scpwxyy/A004Service.java +++ b/src/main/java/com/glxp/mipsdl/service/scpwxyy/A004Service.java @@ -1,7 +1,10 @@ package com.glxp.mipsdl.service.scpwxyy; +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.github.pagehelper.PageHelper; +import com.glxp.mipsdl.entity.ctqyy.VYpzsPresInfo; import com.glxp.mipsdl.entity.scpwxyy.A001; import com.glxp.mipsdl.entity.scpwxyy.A004; import com.glxp.mipsdl.req.base.UdiwmsUnitRequest; @@ -18,14 +21,9 @@ public class A004Service extends ServiceImpl { @Resource private A004Mapper a004Mapper; - public List filterList(UdiwmsWarehouseRequest udiwmsWarehouseRequest) { - if (null == udiwmsWarehouseRequest) { - return Collections.emptyList(); - } - if (null != udiwmsWarehouseRequest.getPage() && null != udiwmsWarehouseRequest.getLimit()) { - PageHelper.offsetPage((udiwmsWarehouseRequest.getPage() - 1) * udiwmsWarehouseRequest.getLimit(), udiwmsWarehouseRequest.getLimit()); - } - return this.baseMapper.filterList(udiwmsWarehouseRequest); + public IPage filterList(UdiwmsWarehouseRequest udiwmsWarehouseRequest) { + IPage a004IPage = this.baseMapper.filterList(new Page(udiwmsWarehouseRequest.getPage(), udiwmsWarehouseRequest.getLimit()), udiwmsWarehouseRequest); + return a004IPage; } diff --git a/src/main/java/com/glxp/mipsdl/thirddao/scpwxyy/A004Mapper.java b/src/main/java/com/glxp/mipsdl/thirddao/scpwxyy/A004Mapper.java index e4f959f..88afff5 100644 --- a/src/main/java/com/glxp/mipsdl/thirddao/scpwxyy/A004Mapper.java +++ b/src/main/java/com/glxp/mipsdl/thirddao/scpwxyy/A004Mapper.java @@ -2,14 +2,18 @@ package com.glxp.mipsdl.thirddao.scpwxyy; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.glxp.mipsdl.entity.ctqyy.VYpzsPresInfo; import com.glxp.mipsdl.entity.scpwxyy.A004; import com.glxp.mipsdl.req.base.UdiwmsWarehouseRequest; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper @DS("scpwxyySql") public interface A004Mapper extends BaseMapper { - List filterList(UdiwmsWarehouseRequest udiwmsWarehouseRequest); + IPage filterList(Page page,@Param("udiwmsWarehouseRequest") UdiwmsWarehouseRequest udiwmsWarehouseRequest); } \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/other/scpwxyy/A004Mapper.xml b/src/main/resources/mybatis/mapper/other/scpwxyy/A004Mapper.xml index 1194d40..b45ef42 100644 --- a/src/main/resources/mybatis/mapper/other/scpwxyy/A004Mapper.xml +++ b/src/main/resources/mybatis/mapper/other/scpwxyy/A004Mapper.xml @@ -18,14 +18,14 @@ select * from a004 - + AND ( - CODE like concat('%', #{inventoryCode}, '%') + CODE like concat('%', #{udiwmsWarehouseRequest.inventoryCode}, '%') ) - + AND ( - CODE LIKE '%' || #{inventoryCode} || '%' + CODE LIKE '%' || #{udiwmsWarehouseRequest.inventoryCode} || '%' )