修改bug

src/main/java/com/steerinfo/dil/controller/OMSController.java

@@ -46,9 +46,9 @@ public class OMSController {
                                           Integer orderStatus,
                                           Integer planId,
                                           Integer orderType,
-                                          Integer fuelOrder, String con) {
+                                          Integer fuelOrder,String carrierSSOId,String con) {
         return omsFeign.getAllTruckOrder(mapValue == null? new HashMap<>() : mapValue, apiId, pageNum, pageSize,
-                orderStatus, planId, orderType, fuelOrder, con);
+                orderStatus, planId, orderType, fuelOrder,carrierSSOId, con);
     }
 
     @ApiOperation(value = "不适用表头返回数据")
@@ -218,9 +218,9 @@ public class OMSController {
                                               Integer pageNum,
                                               Integer pageSize,
                                               Integer orderType,
-                                              Integer orderStatus, Integer fuelOrder,String con){
+                                              Integer orderStatus, Integer fuelOrder,String carrierSSOId,String con){
         return omsFeign.getTransportDispatch(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,
-                 orderType, orderStatus, fuelOrder, con);
+                 orderType, orderStatus, fuelOrder,carrierSSOId,con);
     }
 
     /**

src/main/java/com/steerinfo/dil/controller/UniversalController.java

@@ -122,6 +122,7 @@ public class UniversalController extends BaseRESTfulController {
                                         Integer apiId,
                                         Integer pageNum,
                                         Integer pageSize,
+                                        String carrierSSOId,
                                         String index
     ){
         if(mapValue == null){
@@ -130,6 +131,11 @@ public class UniversalController extends BaseRESTfulController {
         if(index != null){
             mapValue.put("index", index + "%");
         }
+        if(carrierSSOId != null){
+            if(!"null".equals(carrierSSOId)){
+                mapValue.put("carrierSSOId", carrierSSOId);
+            }
+        }
         //不分页筛选数据
         List<Map<String, Object>> allCapacity = universalMapper.getAllCapacityByCarrierLike(mapValue);
         PageHelper.startPage(pageNum,pageSize);
@@ -365,18 +371,10 @@ public class UniversalController extends BaseRESTfulController {
         return universalService.sha1DigestUtils(text);
     }
 
-    @ApiModelProperty(value = "边输边查装货卸货点")
+    @ApiModelProperty(value = "查装货卸货点")
     @PostMapping("/selectUnloadingPoint")
-    public RESTfulResult selectUnloadingPoint(@RequestParam("index") String index) {
-        if(index != null){
-            if(index.length() == 0){
-                index = null;
-            }else {
-                index += "%";
-            }
-        }
-        List<Map<String, Object>> list = universalMapper.selectUnloadingPoint(index);
-        return success(list);
+    public List<Map<String, Object>> selectUnloadingPoint() {
+        return universalMapper.selectUnloadingPoint();
     }
 
     @ApiModelProperty(value = "模糊查询承运商")
@@ -410,4 +408,9 @@ public class UniversalController extends BaseRESTfulController {
         return success(data);
     }
 
+    @ApiModelProperty(value = "所有门岗下拉框")
+    @GetMapping("/getAllGatepost")
+    public List<Map<String,Object>> getAllGatepost(){
+        return universalMapper.getAllGatepost();
+    }
 }

src/main/java/com/steerinfo/dil/feign/OmsFeign.java

@@ -31,6 +31,7 @@ public interface OmsFeign {
                                           @RequestParam("planId") Integer planId,
                                           @RequestParam("orderType") Integer orderType,
                                           @RequestParam("fuelOrder") Integer fuelOrder,
+                                          @RequestParam("carrierSSOId")String carrierSSOId,
                                           @RequestParam("con")String con);
 
     @PostMapping("api/v1/oms/omstruckorders/getAllTruckOrderReturnListMap")
@@ -98,6 +99,7 @@ public interface OmsFeign {
                                               @RequestParam("orderType") Integer orderType,
                                               @RequestParam("orderStatus") Integer orderStatus,
                                               @RequestParam("fuelOrder") Integer fuelOrder,
+                                              @RequestParam("carrierSSOId") String carrierSSOId,
                                               @RequestParam("con")      String con);
     /**
      * 展示承运商接收销售公司已接受的销售订单

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -60,5 +60,8 @@ public interface UniversalMapper {
     List<Map<String, Object>> getCarrierListByLike(Map<String, Object> mapValue);
 
     //边输边查卸货点
-    List<Map<String, Object>> selectUnloadingPoint(String index);
+    List<Map<String, Object>> selectUnloadingPoint();
+
+    // 查询所有门岗
+    List<Map<String, Object>> getAllGatepost();
 }

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -149,6 +149,7 @@
                         RC.CAPACITY_ID        "capacityId",
                         RC.CAPACITY_NUMBER     "capacityNumber",
                         RCA.CARRIER_NAME       "carrierName"
+
                  FROM RMS_CAPACITY RC
                           JOIN RMS_CARRIER RCA
                                 ON RCA.CARRIER_ID = RC.CARRIER_ID
@@ -156,6 +157,9 @@
                    <if test="index != null">
                        and RCA.CARRIER_NAME LIKE #{index}
                    </if>
+                   <if test="carrierSSOId != null">
+                       and RCA.CARRIER_SSO_ID = #{carrierSSOId}
+                   </if>
              )
     </select>
 
@@ -480,13 +484,13 @@
         select Rw.WAREHOUSE_NAME "warehouseName",
                RW.WAREHOUSE_ID "warehouseId"
         from RMS_WAREHOUSE RW
-        where
-              <if test="index != null">
-                  RW.WAREHOUSE_NAME like #{index}
-              </if>
-              <if test="index == null">
-                  rownum &lt; 10
-              </if>
         order by "warehouseName"
     </select>
+
+    <select id="getAllGatepost" resultType="java.util.Map" >
+        SELECT
+            RG.GATEPOST_ID AS "gatepostId",
+            RG.GATEPOST_NAME AS "gatepostName"
+        FROM RMS_GATEPOST RG
+    </select>
 </mapper>