oms-合作伙伴查询参数添加

mhd_oms/src/main/java/com/mhd/oms/application/service/businessPartner/BusinessPartnerApplicationService.java

@@ -3,6 +3,7 @@ package com.mhd.oms.application.service.businessPartner;
 
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.mhd.common.core.utils.bean.BeanUtils;
 import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.common.core.web.page.TableDataInfo;
 import com.mhd.common.security.utils.SecurityUtils;
@@ -10,6 +11,7 @@ import com.mhd.oms.domain.gwLog.entity.GwLog;
 import com.mhd.oms.domain.gwLog.repository.mapper.GwLogMapper;
 import com.mhd.oms.interfaces.dto.businessPartner.BusinessPartnerDTO;
 import com.mhd.system.api.UserServiceFeign;
+import com.mhd.system.api.domain.UserShipperQueryDTO;
 import com.mhd.system.api.model.LoginUser;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -47,19 +49,13 @@ public class BusinessPartnerApplicationService {
 
 
     public TableDataInfo queryShipperPage(BusinessPartnerDTO businessPartnerDTO) {
-        AjaxResult<?> result = userServiceFeign.userShipperList(
-            businessPartnerDTO.getPageNum(),
-            businessPartnerDTO.getPageSize(),
-            businessPartnerDTO.getUserAccount(),
-            businessPartnerDTO.getShipperEnterpriseName(),
-            businessPartnerDTO.getOrganizationId(),
-            businessPartnerDTO.getOrganizationName(),
-            businessPartnerDTO.getCreateTimeFrom(),
-            businessPartnerDTO.getCreateTimeTo(),
-            businessPartnerDTO.getUpdateTimeFrom(),
-            businessPartnerDTO.getUpdateTimeTo(),
-            businessPartnerDTO.getShipperType()
-        );
+        UserShipperQueryDTO userShipperQueryDTO = new UserShipperQueryDTO();
+        BeanUtils.copyProperties(businessPartnerDTO,userShipperQueryDTO);
+        if(businessPartnerDTO.getOrganizationId()!=null){
+            userShipperQueryDTO.setOrganizationId(String.valueOf(businessPartnerDTO.getOrganizationId()));
+        }
+
+        AjaxResult<?> result = userServiceFeign.userShipperList(userShipperQueryDTO);
 
         if ("200".equals((String.valueOf(result.get("code"))))){
             List<?> list = (List<?>) result.get("data");

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessPartner/BusinessPartnerDTO.java

@@ -39,6 +39,9 @@ public class BusinessPartnerDTO {
     @ApiModelProperty(value = "推送时间止")
     private String pushTimeTo;
 
+    @ApiModelProperty(value = "推送状态")
+    private Integer pushStatus;
+
     @ApiModelProperty(value = "货主类型：1-个人，2-企业")
     private Integer shipperType;