Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -772,6 +772,12 @@ public class UniversalController extends BaseRESTfulController {
 //       return success(list);
 //    }
 
+    @ApiOperation(value = "收货地址下匹配不到任何承运商")
+    @GetMapping("/getNoListCarrier")
+    public RESTfulResult getNoListCarrier() {
+        return success(universalMapper.getNoListCarrier());
+    }
+
     @ApiOperation(value = "查询承运起止地点下拉框")
     @GetMapping("/getNotReceiveOrderQuantity")
     public Integer getNotReceiveOrderQuantity(@RequestParam("capacityNumber") String capacityNumber){

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

@@ -175,6 +175,7 @@ public interface UniversalMapper {
 
     List<Map<String, Object>> selectOutbound(String orderNumber);
 
+    List<Map<String,Object>> getNoListCarrier();
     //通过车牌号查询未接收的订单数量（用于APP显示未接收小红点）
     Integer getNotReceiveOrderQuantity(String capacityNumber);
 }

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

@@ -917,6 +917,15 @@
         WHERE RC.CONSIGNEE_ID = #{receiveId}
     </select>
 
+    <select id="getNoListCarrier" resultType="java.util.Map" >
+        SELECT RC.CARRIER_ID AS "id",
+               RC.CARRIER_ID AS "value",
+               RC.CARRIER_NAME AS "label"
+        FROM RMS_CARRIER RC
+        WHERE RC.CARRIER_ID &gt;= 3720
+        AND RC.CARRIER_ID &lt;= 3727
+    </select>
+
     <select id="getNotReceiveOrderQuantity" resultType="java.lang.Integer">
         select count(ORDER_ID)
         from OMSTRUCK_ORDER OO