UDI
/
udi-wms-third-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修复

Browse Source
scpwxyy
chenhc 11 months ago
parent 7096a4af4b
commit d6756ab112
4 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File

14
src/main/java/com/glxp/mipsdl/client/scpwxyy/ScpwxyyClient.java
Unescape Escape View File

@ -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<A008> pageInfo = new PageInfo<>(list);
PageSimpleResponse<A008> 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<A014> pageInfo = new PageInfo<>(list);
PageSimpleResponse<A014> 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<A013> pageInfo = new PageInfo<>(list);
PageSimpleResponse<A013> 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<A004> list = a004Service.filterList(udiwmsWarehouseRequest);
log.info("解析四川武平县医院返回仓库信息，返回结果：{}", list);
return ResultVOUtils.success(list);
IPage<A004> a004IPage = a004Service.filterList(udiwmsWarehouseRequest);
PageSimpleResponse<A004> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(a004IPage.getTotal());
pageSimpleResponse.setList(a004IPage.getRecords());
return ResultVOUtils.success(pageSimpleResponse);
}
@Override

14
src/main/java/com/glxp/mipsdl/service/scpwxyy/A004Service.java
Unescape Escape View File

@ -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<A004Mapper, A004> {
@Resource
private A004Mapper a004Mapper;
public List<A004> 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<A004> filterList(UdiwmsWarehouseRequest udiwmsWarehouseRequest) {
IPage<A004> a004IPage = this.baseMapper.filterList(new Page<A004>(udiwmsWarehouseRequest.getPage(), udiwmsWarehouseRequest.getLimit()), udiwmsWarehouseRequest);
return a004IPage;
}

6
src/main/java/com/glxp/mipsdl/thirddao/scpwxyy/A004Mapper.java
Unescape Escape View File

@ -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<A004> {
List<A004> filterList(UdiwmsWarehouseRequest udiwmsWarehouseRequest);
IPage<A004> filterList(Page<A004> page,@Param("udiwmsWarehouseRequest") UdiwmsWarehouseRequest udiwmsWarehouseRequest);
}

8
src/main/resources/mybatis/mapper/other/scpwxyy/A004Mapper.xml
Unescape Escape View File

@ -18,14 +18,14 @@
select *
from a004
<where>
<if test="inventoryCode != null and inventoryCode != '' and databaseProductName == 'MySQL'">
<if test="udiwmsWarehouseRequest.inventoryCode != null and udiwmsWarehouseRequest.inventoryCode != '' and udiwmsWarehouseRequest.databaseProductName == 'MySQL'">
AND (
CODE like concat('%', #{inventoryCode}, '%')
CODE like concat('%', #{udiwmsWarehouseRequest.inventoryCode}, '%')
)
</if>
<if test="inventoryCode != null and inventoryCode != '' and databaseProductName == 'Oracle'">
<if test="udiwmsWarehouseRequest.inventoryCode != null and udiwmsWarehouseRequest.inventoryCode != '' and udiwmsWarehouseRequest.databaseProductName == 'Oracle'">
AND (
CODE LIKE '%' || #{inventoryCode} || '%'
CODE LIKE '%' || #{udiwmsWarehouseRequest.inventoryCode} || '%'
)
</if>
</where>

Write Preview
Loading…
Cancel
Save