1.修复查询医院客户关联关系异常问题

2.调整上传单据接口
master
x_z 2 years ago
parent c645edfe25
commit 838d5bdf54

@ -329,6 +329,8 @@ public class OrderController {
PostUdimsOrderRequest.OrderBean orderBean = new PostUdimsOrderRequest.OrderBean(); PostUdimsOrderRequest.OrderBean orderBean = new PostUdimsOrderRequest.OrderBean();
BeanUtils.copyProperties(orderEntity, orderBean); BeanUtils.copyProperties(orderEntity, orderBean);
orderBean.setAction(unitMaintainEntity.getTargetAction()); orderBean.setAction(unitMaintainEntity.getTargetAction());
orderBean.setInvStorageCode(unitMaintainEntity.getInvCode());
orderBean.setInvWarehouseCode(unitMaintainEntity.getInvSubCode());
WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest(); WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest();
warehouseQueryRequest.setOrderId(orderEntity.getOrderId()); warehouseQueryRequest.setOrderId(orderEntity.getOrderId());
List<WarehouseEntity> warehouseEntities = warehouseService.filterWarehouse(warehouseQueryRequest); List<WarehouseEntity> warehouseEntities = warehouseService.filterWarehouse(warehouseQueryRequest);

@ -1,7 +1,6 @@
package com.glxp.udi.admin.dao.info; package com.glxp.udi.admin.dao.info;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.glxp.udi.admin.entity.info.PlatformEntity; import com.glxp.udi.admin.entity.info.PlatformEntity;
import com.glxp.udi.admin.res.info.PlatformLinkResponse; import com.glxp.udi.admin.res.info.PlatformLinkResponse;
@ -28,7 +27,7 @@ public interface PlatformDao extends BaseMapper<PlatformEntity> {
* @param platformLinkRequest * @param platformLinkRequest
* @return * @return
*/ */
IPage<PlatformLinkResponse> getLinkPlatformList(IPage<PlatformLinkResponse> page, String customerId, String key); List<PlatformLinkResponse> getLinkPlatformList(@Param("customerId") String customerId, @Param("key") String key);
/** /**
* 访 * 访

@ -22,6 +22,8 @@ public class PostUdimsOrderRequest {
private String fromCorpId; private String fromCorpId;
private String fromCorp; private String fromCorp;
private String remark; private String remark;
private String invStorageCode;
private String invWarehouseCode;
private List<PostUdimsOrderDetailRequest> orderDetails; private List<PostUdimsOrderDetailRequest> orderDetails;
private List<CodeBean> codes; private List<CodeBean> codes;

@ -108,8 +108,11 @@ public class PlatformService {
return new Page<>(); return new Page<>();
} }
IPage<PlatformLinkResponse> page = new Page<>(platformLinkRequest.getPage(), platformLinkRequest.getLimit()); IPage<PlatformLinkResponse> page = new Page<>();
return platformDao.getLinkPlatformList(page, platformLinkRequest.getCustomerId(), platformLinkRequest.getKey()); List<PlatformLinkResponse> list = platformDao.getLinkPlatformList(platformLinkRequest.getCustomerId(), platformLinkRequest.getKey());
page.setRecords(list);
page.setTotal(list.size());
return page;
} }
/** /**

@ -2,7 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.udi.admin.dao.info.PlatformDao"> <mapper namespace="com.glxp.udi.admin.dao.info.PlatformDao">
<insert id="batchSave" parameterType="java.util.List"> <insert id="batchSave" parameterType="java.util.List">
replace into auth_platform replace into auth_platform
(id, name, host) (id, name, host)

Loading…
Cancel
Save