修改运力

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

@@ -24,6 +24,6 @@ public interface RmsCapacityMapper extends IBaseMapper<RmsCapacity, BigDecimal>
    //承运商下拉框
     List<Map<String, Object>> getCarrierId();
     //通过车牌号查询是否存在重复值
-    int selectBycapacityNumber(String number);
+    Integer selectBycapacityNumber(String number);
 
 }

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

@@ -28,4 +28,7 @@ public interface RmsCarrierMapper extends IBaseMapper<RmsCarrier, BigDecimal> {
     BigDecimal getMaxCarrierId();
 
     Map<String,Object> getCarrierNameById(BigDecimal id);
+
+    //通过承运商SSO主键查询承运商ID
+    BigDecimal getCarrierIdByCarrierSSOId(String carrierSSOId);
 }

src/main/java/com/steerinfo/dil/service/impl/RmsCapacityServiceImpl.java

@@ -1,9 +1,11 @@
 package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.mapper.RmsCapacityMapper;
+import com.steerinfo.dil.mapper.RmsCarrierMapper;
 import com.steerinfo.dil.model.RmsCapacity;
 import com.steerinfo.dil.service.IRmsCapacityService;
 import com.steerinfo.dil.util.DataChange;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -23,6 +25,8 @@ public class RmsCapacityServiceImpl implements IRmsCapacityService {
     @Autowired
     RmsCapacityMapper rmsCapacityMapper;
 
+    @Autowired
+    RmsCarrierMapper rmsCarrierMapper;
     /*
     * 获取运力信息
     * */
@@ -36,37 +40,37 @@ public class RmsCapacityServiceImpl implements IRmsCapacityService {
     * */
     @Override
     public int insertCapacity(Map<String,Object> mapValue) {
-        BigDecimal carrierId= DataChange.dataToBigDecimal(mapValue.get("carrierIds"));
-        BigDecimal capacityTypeId =DataChange.dataToBigDecimal(mapValue.get("capacityTypeId")) ;
+        RmsCapacity rmsCapacity = new RmsCapacity();
+        BigDecimal carrierId = DataChange.dataToBigDecimal(mapValue.get("carrierIds"));
+        BigDecimal capacityTypeId = DataChange.dataToBigDecimal(mapValue.get("capacityTypeId"));
+        //通过承运商SSO主键查询承运商ID
+        String carrierUserId = (String) mapValue.get("carrierUserId");
+        rmsCapacity.setCarrierId(rmsCarrierMapper.getCarrierIdByCarrierSSOId(carrierUserId));
         String number=(String) mapValue.get("capacityNumber");
-        String capacityCorlor=(String) mapValue.get("capacityCorlor");
-        String  capacityOwneris=(String)mapValue.get("capacityOwneris");
-        String  capacityVip=(String)mapValue.get("capacityVip");
-        String  capacityBlacklist=(String)mapValue.get("capacityBlacklist");
-        String ssoId=(String) mapValue.get("ssoId");
-        int i=0;
+        String capacityCorlor = (String) mapValue.get("capacityCorlor");
+        String capacityOwneris = (String)mapValue.get("capacityOwneris");
+        String capacityVip = (String)mapValue.get("capacityVip");
+        String capacityBlacklist = (String)mapValue.get("capacityBlacklist");
+        String ssoId = (String) mapValue.get("ssoId");
         //返回没有逻辑删除，且存在该车牌号的数量
-        int isrmsCapacitie = rmsCapacityMapper.selectBycapacityNumber(number);
-        RmsCapacity rmsCapacity=new RmsCapacity();
-        if(isrmsCapacitie==0){
-            rmsCapacity.setCarrierId(carrierId);
-            rmsCapacity.setCapacityTypeId(capacityTypeId);
-            rmsCapacity.setCapacityNumber(number);
-            rmsCapacity.setCapacityCorlor(capacityCorlor);
-            rmsCapacity.setCapacityOwneris(capacityOwneris);
-            rmsCapacity.setCapacityVip(capacityVip);
-            rmsCapacity.setCapacityBlacklist(capacityBlacklist);
-            rmsCapacity.setCapacitySsoId(ssoId);
-            rmsCapacity.setCapacityStatus(new BigDecimal(0));
-            rmsCapacity.setDeleted(new BigDecimal(0));
-            rmsCapacity.setInsertTime(new Date());
-            rmsCapacity.setInsertUsername("admin");
-            rmsCapacity.setCapacityId(rmsCapacityMapper.selectCapacityId());
-            i+= rmsCapacityMapper.insertSelective(rmsCapacity);
-        }else {
-            return -1;
+        Integer isrmsCapacitie = rmsCapacityMapper.selectBycapacityNumber(number);
+        if(isrmsCapacitie != null){
+            return 0;
         }
-        return i;
+        rmsCapacity.setCarrierId(carrierId);
+        rmsCapacity.setCapacityTypeId(capacityTypeId);
+        rmsCapacity.setCapacityNumber(number);
+        rmsCapacity.setCapacityCorlor(capacityCorlor);
+        rmsCapacity.setCapacityOwneris(capacityOwneris);
+        rmsCapacity.setCapacityVip(capacityVip);
+        rmsCapacity.setCapacityBlacklist(capacityBlacklist);
+        rmsCapacity.setCapacitySsoId(ssoId);
+        rmsCapacity.setCapacityStatus(new BigDecimal(0));
+        rmsCapacity.setDeleted(new BigDecimal(0));
+        rmsCapacity.setInsertTime(new Date());
+        rmsCapacity.setInsertUsername("admin");
+        rmsCapacity.setCapacityId(rmsCapacityMapper.selectCapacityId());
+        return rmsCapacityMapper.insertSelective(rmsCapacity);
     }
 
     /*

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

@@ -826,7 +826,8 @@
   </select>
 
   <select id="selectBycapacityNumber" parameterType="java.lang.String" resultType="int">
-    select count(*) from RMS_CAPACITY RC where RC.CAPACITY_NUMBER=#{number}
-                                           and RC.DELETED=0
+    select RC.CAPACITY_ID
+    from RMS_CAPACITY RC
+    where RC.CAPACITY_NUMBER=#{number} and RC.DELETED = 0
   </select>
 </mapper>

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

@@ -1330,4 +1330,10 @@
     on RC.CARRIER_ID=RCA.CARRIER_ID
     where RCA.CAPACITY_ID=#{id}
   </select>
+
+<!-- 通过承运商SSO主键查询承运商ID -->
+  <select id="getCarrierIdByCarrierSSOId" parameterType="string" resultType="java.math.BigDecimal">
+    select RC.CARRIER_ID from RMS_CARRIER RC
+    where RC.CARRIER_SSO_ID = #{carrierSSOId}
+  </select>
 </mapper>