zhouzh 3 år sedan
förälder
incheckning
552bad2f90

+ 9 - 0
src/main/java/com/steerinfo/dil/controller/RmsCapacityController.java

@@ -174,4 +174,13 @@ public class RmsCapacityController extends BaseRESTfulController {
         PageListAdd data = columnDataUtil.tableColumnData(apiId, listTotal, columnList);
         return success(data);
     }
+
+    //根据carrierSSOId查询承运商
+    @PostMapping("/getCarrierNameBySSOId")
+        public RESTfulResult getCarrierNameBySSOId(@RequestParam("carrierSSOId") String carrierSSOId){
+        Map<String,Object> map=rmsCapacityService.getCarrierNameBySSOId(carrierSSOId);
+        return success(map);
+    }
+
+
 }

+ 2 - 0
src/main/java/com/steerinfo/dil/mapper/RmsCapacityMapper.java

@@ -26,4 +26,6 @@ public interface RmsCapacityMapper extends IBaseMapper<RmsCapacity, BigDecimal>
     //通过车牌号查询是否存在重复值
     Integer selectBycapacityNumber(String number);
 
+   //根据ssoId查询承运商名称
+    Map<String, Object> getCarrierNameBySSOId(String carrierSSOId);
 }

+ 2 - 0
src/main/java/com/steerinfo/dil/service/IRmsCapacityService.java

@@ -35,4 +35,6 @@ public interface IRmsCapacityService{
     List<Map<String,Object>> getCapacityTypeId();
 
     List<Map<String,Object>> getCarrierId();
+
+    Map<String,Object> getCarrierNameBySSOId(String carrierSSOId);
 }

+ 14 - 4
src/main/java/com/steerinfo/dil/service/impl/RmsCapacityServiceImpl.java

@@ -43,17 +43,18 @@ public class RmsCapacityServiceImpl implements IRmsCapacityService {
     public int insertCapacity(Map<String,Object> mapValue) {
         RmsCapacity rmsCapacity = new RmsCapacity();
         String capacityNumber = (String) mapValue.get("capacityNumber");
-        String carrierUserId = (String) mapValue.get("carrierUserId");
-        BigDecimal carrierId = rmsCarrierMapper.getCarrierIdByCarrierSSOId(carrierUserId);
+        BigDecimal carrierIds=DataChange.dataToBigDecimal(mapValue.get("carrierId"));
+       // String carrierUserId = (String) mapValue.get("carrierUserId");
+       // BigDecimal carrierId = rmsCarrierMapper.getCarrierIdByCarrierSSOId(carrierUserId);
         //如果车辆已存在  那就是更改承运商
         Integer capacityId = rmsCapacityMapper.selectBycapacityNumber(capacityNumber);
         if(capacityId != null){
             rmsCapacity.setCarrierId(new BigDecimal(capacityId));
-            rmsCapacity.setCarrierId(carrierId);
+            rmsCapacity.setCarrierId(carrierIds);
             return rmsCapacityMapper.updateByPrimaryKeySelective(rmsCapacity);
         }
         rmsCapacity.setCapacityId(rmsCapacityMapper.selectCapacityId());
-        rmsCapacity.setCarrierId(carrierId);
+        rmsCapacity.setCarrierId(carrierIds);
         rmsCapacity.setCapacityTypeId(DataChange.dataToBigDecimal(mapValue.get("capacityTypeId")));
         rmsCapacity.setCapacityNumber(capacityNumber);
         rmsCapacity.setCapacityCorlor((String) mapValue.get("capacityCorlor"));
@@ -107,6 +108,15 @@ public class RmsCapacityServiceImpl implements IRmsCapacityService {
         return rmsCapacityMapper.getCapacityTypeId();
     }
 
+    /*
+    * 查询carrierSSOId是否在承运商表中存在
+    * */
+    @Override
+    public Map<String,Object> getCarrierNameBySSOId(String carrierSSOId) {
+        Map<String,Object> map= rmsCapacityMapper.getCarrierNameBySSOId(carrierSSOId);
+        return map;
+    }
+
     @Override
     public List<Map<String, Object>> getCarrierId() {
         return rmsCapacityMapper.getCarrierId();

+ 9 - 0
src/main/resources/com/steerinfo/dil/mapper/RmsCapacityMapper.xml

@@ -830,4 +830,13 @@
     from RMS_CAPACITY RC
     where RC.CAPACITY_NUMBER=#{number} and RC.DELETED = 0
   </select>
+
+
+  <select id="getCarrierNameBySSOId" parameterType="java.lang.String" resultType="java.util.Map">
+       select
+        RC.CARRIER_ID as "carrierId",
+        RC.CARRIER_NAME as "carrierName"
+       from RMS_CARRIER RC
+      where RC.CARRIER_SSO_ID=#{carrierSSOId}
+  </select>
 </mapper>