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

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java

@@ -10,12 +10,14 @@ import com.mhd.common.core.domain.entity.R;
 import com.mhd.common.core.domain.todo.StatisticalMattersDo;
 import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.system.api.domain.UserDTO;
+import com.mhd.system.api.domain.UserShipperQueryDTO;
 import com.mhd.system.api.domain.UserUpdateDTO;
 import com.mhd.system.api.factory.RemoteUserFeignFallbackFactory;
 import com.mhd.system.api.feign.FeignAutoConfiguration;
 import com.mhd.system.api.model.LoginUser;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
@@ -198,17 +200,7 @@ public interface UserServiceFeign {
 
     @ApiOperation("商业合作伙伴-分页查询托运人列表")
     @GetMapping("/userShipperApi/userShipperList")
-    public AjaxResult<?> userShipperList(@RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
-                                  @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
-                                  @RequestParam(value = "userAccount", required = false) String userAccount,
-                                  @RequestParam(value = "shipperEnterpriseName", required = false) String shipperEnterpriseName,
-                                  @RequestParam(value = "organizationId", required = false) Long organizationId,
-                                  @RequestParam(value = "organizationName", required = false) String organizationName,
-                                  @RequestParam(value = "createTimeFrom", required = false) String createTimeFrom,
-                                  @RequestParam(value = "createTimeTo", required = false) String createTimeTo,
-                                  @RequestParam(value = "updateTimeFrom", required = false) String updateTimeFrom,
-                                  @RequestParam(value = "updateTimeTo", required = false) String updateTimeTo,
-                                  @RequestParam(value = "shipperType", required = false) Integer shipperType);
+    public AjaxResult<?> userShipperList(@SpringQueryMap UserShipperQueryDTO userShipperQueryDTO);
 
 
     @PostMapping("/userShipperApi/updatePushStatus")

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/UserShipperQueryDTO.java

@@ -0,0 +1,52 @@
+package com.mhd.system.api.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+public class UserShipperQueryDTO {
+
+    @ApiModelProperty(value = "页码")
+    private Integer pageNum = 1;
+
+    @ApiModelProperty(value = "每页数量")
+    private Integer pageSize = 10;
+
+    @ApiModelProperty(value = "登录账号")
+    private String userAccount;
+
+    @ApiModelProperty(value = "企业名称")
+    private String shipperEnterpriseName;
+
+    @ApiModelProperty(value = "组织ID")
+    private String organizationId;
+
+    @ApiModelProperty(value = "组织名称")
+    private String organizationName;
+
+    @ApiModelProperty(value = "创建时间起")
+    private String createTimeFrom;
+
+    @ApiModelProperty(value = "创建时间止")
+    private String createTimeTo;
+
+    @ApiModelProperty(value = "更新时间起")
+    private String updateTimeFrom;
+
+    @ApiModelProperty(value = "更新时间止")
+    private String updateTimeTo;
+
+    @ApiModelProperty(value = "货主类型")
+    private String shipperType;
+
+    @ApiModelProperty(value = "推送状态")
+    private Integer pushStatus;
+
+    @ApiModelProperty(value = "推送时间起")
+    private String pushTimeFrom;
+
+    @ApiModelProperty(value = "推送时间止")
+    private String pushTimeTo;
+
+}

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteUserFeignFallbackFactory.java

@@ -7,6 +7,7 @@ import com.mhd.common.core.domain.dto.UserDriverDTO;
 import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.system.api.UserServiceFeign;
 import com.mhd.system.api.domain.UserDTO;
+import com.mhd.system.api.domain.UserShipperQueryDTO;
 import com.mhd.system.api.domain.UserUpdateDTO;
 import com.mhd.system.api.model.LoginUser;
 import com.mhd.common.core.domain.entity.R;
@@ -184,10 +185,11 @@ public class RemoteUserFeignFallbackFactory implements FallbackFactory<UserServi
             }
 
             @Override
-            public AjaxResult<?> userShipperList(Integer pageNum, Integer pageSize, String userAccount, String shipperEnterpriseName, Long organizationId, String organizationName, String createTimeFrom, String createTimeTo, String updateTimeFrom, String updateTimeTo, Integer shipperType) {
+            public AjaxResult<?> userShipperList(UserShipperQueryDTO userShipperQueryDTO) {
                 return  AjaxResult.error("查询失败" + throwable.getMessage());
             }
 
+
             @Override
             public AjaxResult<?> updatePushStatus(Long shipperId, Integer pushStatus, String pushTime, Long pushBy) {
                 return  AjaxResult.error("更新失败" + throwable.getMessage());