“register”

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

@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -476,6 +477,23 @@ public class UniversalController extends BaseRESTfulController {
         return universalMapper.getAllGatepost();
     }
 
+    //通过承运商id获取userId
+    @PostMapping("/getUserIdByCarrierId")
+    public String getUserIdByCarrierId(@RequestBody Map<String,Object> map){
+        //获取承运商id
+        Integer carrierId =(Integer) map.get("carrierId");
+        return universalMapper.getUserIdbyCarrierId(carrierId);
+    }
+
+
+
+    @ApiModelProperty(value = "已经在sso权限模块承运商下拉框")
+    @GetMapping("/getAllCarrierIdForSso")
+    public List<Map<String,Object>> getAllCarrierIdForSso(){
+        return universalMapper.getAllCarrierIdForSso();
+    }
+
+
     @ApiModelProperty(value = "模糊查询收货单位")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),

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

@@ -71,6 +71,12 @@ public interface UniversalMapper {
     // 查询所有门岗
     List<Map<String, Object>> getAllGatepost();
 
+    //获取承运商下拉框
+    List<Map<String,Object>> getAllCarrierIdForSso();
+
+    //根据承运商id获取userId
+    String getUserIdbyCarrierId(Integer carrierId);
+
     // 模糊查询收货单位
     List<Map<String, Object>> getConsigneeListByLike(Map<String, Object> mapValue);
 

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

@@ -18,9 +18,9 @@
                            on RCON.CONSIGNEE_ID = ASO.RECEIVE_ID
         where OO.ORDER_NUMBER = #{orderNumber}
     </select>
-    <select id="selectHuanPiaoDan">
+<!--    <select id="selectHuanPiaoDan">-->
 
-    </select>
+<!--    </select>-->
 
     <!--  查询订单子表关联的  -->
     <select id="getOOMMes" parameterType="string" resultType="java.util.Map">
@@ -447,6 +447,19 @@
         </where>
         order by "value"
     </select>
+    <!--  获取承运商下拉框,并且判断ssoId是否为空，如果ssoId不为空就展示  -->
+    <select id="getAllCarrierIdForSso" resultType="java.util.LinkedHashMap">
+        select RC.CARRIER_ID "carrierId",
+               RC.CARRIER_NAME "carrierName"
+        from RMS_CARRIER RC
+         where RC.CARRIER_SSO_ID is not null
+    </select>
+   <!--  根据承运商id获取ssoId  -->
+    <select id="getUserIdbyCarrierId" parameterType="java.math.BigDecimal" resultType="java.lang.String">
+     select RC.CARRIER_SSO_ID "carrierSsoId"
+     from RMS_CARRIER RC
+     where RC.CARRIER_ID=#{carrierId}
+    </select>
     <!--  边输边查收货单位 -->
     <select id="getConsigneeByLike" parameterType="string" resultType="java.util.Map">
         select