'rms提交'

pom.xml

@@ -106,12 +106,12 @@
                 <version>3.0</version>
                 <configuration>
                     <connUrl>jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri</connUrl>
-                    <user>dil</user>
-                    <password>Dil123789</password>
+                    <user>dagang</user>
+                    <password>root123</password>
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>RMS_SUPPLIER</param>
+                        <param>RMS_CARRIER</param>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -78,41 +78,18 @@ public class RmsCarrierController extends BaseRESTfulController {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        //框计算
-        if (con != null) {
-            if (!"undefined".equals(con)) {
-                //设置要查询的索引名称
-                String index = "get_carrierr_list";
-                //获取查询结果
-                return success(esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con));
-            }
-        }
-        //初始化过滤
-        List<Map<String, Object>> listTotal = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if (mapValue.size() == 0) {
-            //将查询结果存入索引中
-            listTotal = rmsCarrierService.getCarrierList(null);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index", "get_carrierr_list");
-            //添加id
-            map.put("indexId", "carrierrId");
-            listTotal.add(map);
-            //新建索引
-            String s = JSON.toJSONString(listTotal);
-            esFeign.insertIndex(listTotal);
-            //删除
-            listTotal.remove(listTotal.size() - 1);
+        if (con != null && (con.equals("") || con.equals("undefined")) ) {
+            con = null;
         }
-        if (listTotal == null) {
-            listTotal = rmsCarrierService.getCarrierList(mapValue);
+        if (con != null && con.length() != 0) {
+            mapValue.put("con","%" + con + "%");
         }
+        //初始化过滤
+        List<Map<String, Object>> listTotal = rmsCarrierService.getCarrierList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = rmsCarrierService.getCarrierList(mapValue);
         PageListAdd data = columnDataUtil.tableColumnData(apiId, listTotal, columnList);
-        System.out.println(data);
         return success(data);
     }
 

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

@@ -203,6 +203,17 @@ public class RmsPersonnelController extends BaseRESTfulController {
         return  success(rmsPersonnelService.getShipperMap(new BigDecimal(shipperId)));
     }
 
+    @PostMapping("/isInHere")
+    public Integer isInHere(@RequestParam String personnelJobNumber) {
+        Integer result = rmsPersonnelService.isInHere(personnelJobNumber);
+        if (result != null && result.toString().length() != 0) {
+            return 0;
+        }
+        else {
+            return -1;
+        }
+    }
+
     /**
      * 新增人员权限
      * @param rmsPersonnel

src/main/java/com/steerinfo/dil/model/RmsCarrier.java

@@ -243,6 +243,12 @@ public class RmsCarrier implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="SSO主键",required=false)
     private String carrierSsoId;
 
+    /**
+     * SSO账号(CARRIER_SSO_CODE,VARCHAR,36)
+     */
+    @ApiModelProperty(value="SSO账号",required=false)
+    private String carrierSsoCode;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -567,6 +573,14 @@ public class RmsCarrier implements IBasePO<BigDecimal> {
         this.carrierSsoId = carrierSsoId == null ? null : carrierSsoId.trim();
     }
 
+    public String getCarrierSsoCode() {
+        return carrierSsoCode;
+    }
+
+    public void setCarrierSsoCode(String carrierSsoCode) {
+        this.carrierSsoCode = carrierSsoCode == null ? null : carrierSsoCode.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -612,6 +626,7 @@ public class RmsCarrier implements IBasePO<BigDecimal> {
         sb.append(", carrierBusinessLicense=").append(carrierBusinessLicense);
         sb.append(", carrierTransportCertificate=").append(carrierTransportCertificate);
         sb.append(", carrierSsoId=").append(carrierSsoId);
+        sb.append(", carrierSsoCode=").append(carrierSsoCode);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.service.impl;
 
+import com.google.inject.internal.cglib.core.$Constants;
 import com.steerinfo.dil.mapper.RmsCapacityMapper;
 import com.steerinfo.dil.mapper.RmsCarrierMapper;
 import com.steerinfo.dil.model.RmsCapacity;
@@ -61,6 +62,11 @@ public class RmsCapacityServiceImpl implements IRmsCapacityService {
         rmsCapacity.setCapacityOwneris((String)mapValue.get("capacityOwneris"));
         rmsCapacity.setCapacityVip((String)mapValue.get("capacityVip"));
         rmsCapacity.setCapacityBlacklist((String)mapValue.get("capacityBlacklist"));
+        Object remark = mapValue.get("remark");
+        if(remark != null && (!remark.toString().equals("null") || !remark.toString().equals("undefined"))){
+            rmsCapacity.setInsertUpdateRemark(remark.toString());
+        }
+        rmsCapacity.setInsertUpdateRemark(((String)mapValue.get("remark")));
         rmsCapacity.setCapacitySsoId((String) mapValue.get("ssoId"));
         rmsCapacity.setCapacityStatus(new BigDecimal(0));
         rmsCapacity.setDeleted(new BigDecimal(0));

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

@@ -134,6 +134,7 @@ public class RmsCarrierServiceImpl implements IRmsCarrierService {
         Map<String, Object> formMap = (Map<String, Object>) map.get("from");
         //获取承运商名称查看是否已存在数据库中
         String carrierName = (String) formMap.get("carrierName");
+        String carrierSsoCode = (String) map.get("carrierSsoCode");
         Integer size = rmsCarrierMapper.selectParameterCarrierName(carrierName);
         if(size != null){
             return 0;
@@ -141,6 +142,7 @@ public class RmsCarrierServiceImpl implements IRmsCarrierService {
         RmsCarrier rmsCarrier = new RmsCarrier();
         rmsCarrier.setId(rmsCarrierMapper.getCarrierId());
         rmsCarrier.setCarrierName(carrierName);
+        rmsCarrier.setCarrierSsoCode(carrierSsoCode);
         rmsCarrier.setCarrierType((String) formMap.get("carrierType"));
         BigDecimal carrierTransportType = DataChange.dataToBigDecimal(formMap.get("carrierTransportType"));
         rmsCarrier.setCarrierTransportType(carrierTransportType.intValue() == 1 ? "危化品" : "其他"); //运输类别

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

@@ -5,6 +5,7 @@ import com.steerinfo.dil.mapper.RmsShipperMapper;
 import com.steerinfo.dil.model.RmsPersonnel;
 import com.steerinfo.dil.model.RmsShipper;
 import com.steerinfo.dil.service.IRmsPersonnelService;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -203,19 +204,25 @@ public class RmsPersonnelServiceImpl implements IRmsPersonnelService {
      */
     @Override
     public int addPersonnel(RmsPersonnel rmsPersonnel) {
-        int result=0;
-        String personnelJobNumber =rmsPersonnel.getPersonnelJobNumber();
-        int size=rmsPersonnelMapper.selectByParametersPersonnelJobNumber(personnelJobNumber);
-        if (size==0){
-            BigDecimal personnelId = rmsPersonnelMapper.getPersonnelId();
-            rmsPersonnel.setPersonnelId(personnelId);
-            rmsPersonnel.setDeleted(new BigDecimal(0));
-            rmsPersonnel.setInsertTime(new Date());
-            rmsPersonnel.setInsertUsername("admin");
-            result += rmsPersonnelMapper.insertSelective(rmsPersonnel);
-        }else{
-            result =-1;
-        }
+        int result = 0;
+        String personnelJobNumber = rmsPersonnel.getPersonnelJobNumber();
+        BigDecimal personnelId = rmsPersonnelMapper.getPersonnelId();
+        rmsPersonnel.setPersonnelId(personnelId);
+        rmsPersonnel.setPersonnelJobNumber(personnelJobNumber);
+        rmsPersonnel.setDeleted(new BigDecimal(0));
+        rmsPersonnel.setInsertTime(new Date());
+        rmsPersonnel.setInsertUsername("admin");
+        result += rmsPersonnelMapper.insertSelective(rmsPersonnel);
+        return result;
+    }
+
+    /**
+     * 工号
+     * @param personnelJobNumber
+     * @return
+     */
+    public Integer isInHere(String personnelJobNumber) {
+        Integer result = rmsPersonnelMapper.selectByParametersPersonnelJobNumber(personnelJobNumber);
         return result;
     }
 

src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ spring:
     #测试环境端口
 openFeign:
     ESFeign:
-      url: ${ESFEIGN_URL:172.16.33.166:8089}
+      url: ${ESFEIGN_URL:172.16.33.162:8011}
     ColumnDataFeign:
       url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
     AmsFeign:

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

@@ -41,6 +41,7 @@
     <result column="CARRIER_BUSINESS_LICENSE" jdbcType="VARCHAR" property="carrierBusinessLicense" />
     <result column="CARRIER_TRANSPORT_CERTIFICATE" jdbcType="VARCHAR" property="carrierTransportCertificate" />
     <result column="CARRIER_SSO_ID" jdbcType="VARCHAR" property="carrierSsoId" />
+    <result column="CARRIER_SSO_CODE" jdbcType="VARCHAR" property="carrierSsoCode" />
   </resultMap>
   <sql id="columns">
     CARRIER_ID, CARRIER_TRANSPORT_TYPE, CARRIER_NAME, CARRIER_ABBREVIATION, CARRIER_ADDRESS, 
@@ -51,7 +52,7 @@
     REGISTER_APTITUDES, CREDENTIAL_DESC, CONTACTS_NAME, INSERT_USERNAME, INSERT_TIME, 
     UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, CARRIER_TYPE, EAS_CARRIER_ID, 
     CARRIER_BUSINESS_ABLELICENSE, CARRIER_BUSINESS_LICENSE, CARRIER_TRANSPORT_CERTIFICATE, 
-    CARRIER_SSO_ID
+    CARRIER_SSO_ID, CARRIER_SSO_CODE
   </sql>
   <sql id="columns_alias">
     t.CARRIER_ID, t.CARRIER_TRANSPORT_TYPE, t.CARRIER_NAME, t.CARRIER_ABBREVIATION, t.CARRIER_ADDRESS, 
@@ -62,7 +63,7 @@
     t.REGISTER_ORGANIZATION, t.REGISTER_APTITUDES, t.CREDENTIAL_DESC, t.CONTACTS_NAME, 
     t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, 
     t.DELETED, t.CARRIER_TYPE, t.EAS_CARRIER_ID, t.CARRIER_BUSINESS_ABLELICENSE, t.CARRIER_BUSINESS_LICENSE, 
-    t.CARRIER_TRANSPORT_CERTIFICATE, t.CARRIER_SSO_ID
+    t.CARRIER_TRANSPORT_CERTIFICATE, t.CARRIER_SSO_ID, t.CARRIER_SSO_CODE
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM RMS_CARRIER
@@ -71,7 +72,7 @@
     SELECT <include refid="columns_alias" /> FROM RMS_CARRIER t
   </sql>
   <sql id="where">
-    <where>
+    <where> 
       <if test="carrierId != null">
         and CARRIER_ID = #{carrierId}
       </if>
@@ -189,10 +190,13 @@
       <if test="carrierSsoId != null and carrierSsoId != ''">
         and CARRIER_SSO_ID = #{carrierSsoId}
       </if>
+      <if test="carrierSsoCode != null and carrierSsoCode != ''">
+        and CARRIER_SSO_CODE = #{carrierSsoCode}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
-    <where>
+    <where> 
       <if test="carrierId != null">
         and CARRIER_ID = #{carrierId}
       </if>
@@ -310,6 +314,9 @@
       <if test="carrierSsoId != null and carrierSsoId != ''">
         and CARRIER_SSO_ID LIKE '%${carrierSsoId}%'
       </if>
+      <if test="carrierSsoCode != null and carrierSsoCode != ''">
+        and CARRIER_SSO_CODE LIKE '%${carrierSsoCode}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
@@ -318,153 +325,156 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from RMS_CARRIER
-    where 1!=1
-    <if test="carrierTransportType != null and carrierTransportType != ''">
-      or CARRIER_TRANSPORT_TYPE = #{carrierTransportType}
-    </if>
-    <if test="carrierName != null and carrierName != ''">
-      or CARRIER_NAME = #{carrierName}
-    </if>
-    <if test="carrierAbbreviation != null and carrierAbbreviation != ''">
-      or CARRIER_ABBREVIATION = #{carrierAbbreviation}
-    </if>
-    <if test="carrierAddress != null and carrierAddress != ''">
-      or CARRIER_ADDRESS = #{carrierAddress}
-    </if>
-    <if test="carrierBidAreaId != null">
-      or CARRIER_BID_AREA_ID = #{carrierBidAreaId}
-    </if>
-    <if test="carrierBidTime != null">
-      or TO_CHAR(CARRIER_BID_TIME,'yyyy-MM-dd') = '#{carrierBidTime}'
-    </if>
-    <if test="carrierLegalRepresentative != null and carrierLegalRepresentative != ''">
-      or CARRIER_LEGAL_REPRESENTATIVE = #{carrierLegalRepresentative}
-    </if>
-    <if test="registerNo != null and registerNo != ''">
-      or REGISTER_NO = #{registerNo}
-    </if>
-    <if test="carrierAgent != null and carrierAgent != ''">
-      or CARRIER_AGENT = #{carrierAgent}
-    </if>
-    <if test="carrierContactNumber != null and carrierContactNumber != ''">
-      or CARRIER_CONTACT_NUMBER = #{carrierContactNumber}
-    </if>
-    <if test="carrierFax != null and carrierFax != ''">
-      or CARRIER_FAX = #{carrierFax}
-    </if>
-    <if test="carrierAccount != null and carrierAccount != ''">
-      or CARRIER_ACCOUNT = #{carrierAccount}
-    </if>
-    <if test="carrierAccountBlank != null and carrierAccountBlank != ''">
-      or CARRIER_ACCOUNT_BLANK = #{carrierAccountBlank}
-    </if>
-    <if test="carrierDutyParagraph != null and carrierDutyParagraph != ''">
-      or CARRIER_DUTY_PARAGRAPH = #{carrierDutyParagraph}
-    </if>
-    <if test="carrierPostalCode != null and carrierPostalCode != ''">
-      or CARRIER_POSTAL_CODE = #{carrierPostalCode}
-    </if>
-    <if test="registerCapital != null and registerCapital != ''">
-      or REGISTER_CAPITAL = #{registerCapital}
-    </if>
-    <if test="businessScope != null and businessScope != ''">
-      or BUSINESS_SCOPE = #{businessScope}
-    </if>
-    <if test="annualDate != null and annualDate != ''">
-      or ANNUAL_DATE = #{annualDate}
-    </if>
-    <if test="companyStatusDesc != null and companyStatusDesc != ''">
-      or COMPANY_STATUS_DESC = #{companyStatusDesc}
-    </if>
-    <if test="companyTypeDesc != null and companyTypeDesc != ''">
-      or COMPANY_TYPE_DESC = #{companyTypeDesc}
-    </if>
-    <if test="operationPeriod != null and operationPeriod != ''">
-      or OPERATION_PERIOD = #{operationPeriod}
-    </if>
-    <if test="registerDate != null">
-      or TO_CHAR(REGISTER_DATE,'yyyy-MM-dd') = '#{registerDate}'
-    </if>
-    <if test="registerOrganization != null and registerOrganization != ''">
-      or REGISTER_ORGANIZATION = #{registerOrganization}
-    </if>
-    <if test="registerAptitudes != null and registerAptitudes != ''">
-      or REGISTER_APTITUDES = #{registerAptitudes}
-    </if>
-    <if test="credentialDesc != null and credentialDesc != ''">
-      or CREDENTIAL_DESC = #{credentialDesc}
-    </if>
-    <if test="contactsName != null and contactsName != ''">
-      or CONTACTS_NAME = #{contactsName}
-    </if>
-    <if test="insertUsername != null and insertUsername != ''">
-      or INSERT_USERNAME = #{insertUsername}
-    </if>
-    <if test="insertTime != null">
-      or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
-    </if>
-    <if test="updateUsername != null and updateUsername != ''">
-      or UPDATE_USERNAME = #{updateUsername}
-    </if>
-    <if test="updateTime != null">
-      or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-    </if>
-    <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-      or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-    </if>
-    <if test="deleted != null">
-      or DELETED = #{deleted}
-    </if>
-    <if test="carrierType != null and carrierType != ''">
-      or CARRIER_TYPE = #{carrierType}
-    </if>
-    <if test="easCarrierId != null and easCarrierId != ''">
-      or EAS_CARRIER_ID = #{easCarrierId}
-    </if>
-    <if test="carrierBusinessAblelicense != null and carrierBusinessAblelicense != ''">
-      or CARRIER_BUSINESS_ABLELICENSE = #{carrierBusinessAblelicense}
-    </if>
-    <if test="carrierBusinessLicense != null and carrierBusinessLicense != ''">
-      or CARRIER_BUSINESS_LICENSE = #{carrierBusinessLicense}
-    </if>
-    <if test="carrierTransportCertificate != null and carrierTransportCertificate != ''">
-      or CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate}
-    </if>
-    <if test="carrierSsoId != null and carrierSsoId != ''">
-      or CARRIER_SSO_ID = #{carrierSsoId}
-    </if>
+    where 1!=1 
+      <if test="carrierTransportType != null and carrierTransportType != ''">
+        or CARRIER_TRANSPORT_TYPE = #{carrierTransportType}
+      </if>
+      <if test="carrierName != null and carrierName != ''">
+        or CARRIER_NAME = #{carrierName}
+      </if>
+      <if test="carrierAbbreviation != null and carrierAbbreviation != ''">
+        or CARRIER_ABBREVIATION = #{carrierAbbreviation}
+      </if>
+      <if test="carrierAddress != null and carrierAddress != ''">
+        or CARRIER_ADDRESS = #{carrierAddress}
+      </if>
+      <if test="carrierBidAreaId != null">
+        or CARRIER_BID_AREA_ID = #{carrierBidAreaId}
+      </if>
+      <if test="carrierBidTime != null">
+        or TO_CHAR(CARRIER_BID_TIME,'yyyy-MM-dd') = '#{carrierBidTime}'
+      </if>
+      <if test="carrierLegalRepresentative != null and carrierLegalRepresentative != ''">
+        or CARRIER_LEGAL_REPRESENTATIVE = #{carrierLegalRepresentative}
+      </if>
+      <if test="registerNo != null and registerNo != ''">
+        or REGISTER_NO = #{registerNo}
+      </if>
+      <if test="carrierAgent != null and carrierAgent != ''">
+        or CARRIER_AGENT = #{carrierAgent}
+      </if>
+      <if test="carrierContactNumber != null and carrierContactNumber != ''">
+        or CARRIER_CONTACT_NUMBER = #{carrierContactNumber}
+      </if>
+      <if test="carrierFax != null and carrierFax != ''">
+        or CARRIER_FAX = #{carrierFax}
+      </if>
+      <if test="carrierAccount != null and carrierAccount != ''">
+        or CARRIER_ACCOUNT = #{carrierAccount}
+      </if>
+      <if test="carrierAccountBlank != null and carrierAccountBlank != ''">
+        or CARRIER_ACCOUNT_BLANK = #{carrierAccountBlank}
+      </if>
+      <if test="carrierDutyParagraph != null and carrierDutyParagraph != ''">
+        or CARRIER_DUTY_PARAGRAPH = #{carrierDutyParagraph}
+      </if>
+      <if test="carrierPostalCode != null and carrierPostalCode != ''">
+        or CARRIER_POSTAL_CODE = #{carrierPostalCode}
+      </if>
+      <if test="registerCapital != null and registerCapital != ''">
+        or REGISTER_CAPITAL = #{registerCapital}
+      </if>
+      <if test="businessScope != null and businessScope != ''">
+        or BUSINESS_SCOPE = #{businessScope}
+      </if>
+      <if test="annualDate != null and annualDate != ''">
+        or ANNUAL_DATE = #{annualDate}
+      </if>
+      <if test="companyStatusDesc != null and companyStatusDesc != ''">
+        or COMPANY_STATUS_DESC = #{companyStatusDesc}
+      </if>
+      <if test="companyTypeDesc != null and companyTypeDesc != ''">
+        or COMPANY_TYPE_DESC = #{companyTypeDesc}
+      </if>
+      <if test="operationPeriod != null and operationPeriod != ''">
+        or OPERATION_PERIOD = #{operationPeriod}
+      </if>
+      <if test="registerDate != null">
+        or TO_CHAR(REGISTER_DATE,'yyyy-MM-dd') = '#{registerDate}'
+      </if>
+      <if test="registerOrganization != null and registerOrganization != ''">
+        or REGISTER_ORGANIZATION = #{registerOrganization}
+      </if>
+      <if test="registerAptitudes != null and registerAptitudes != ''">
+        or REGISTER_APTITUDES = #{registerAptitudes}
+      </if>
+      <if test="credentialDesc != null and credentialDesc != ''">
+        or CREDENTIAL_DESC = #{credentialDesc}
+      </if>
+      <if test="contactsName != null and contactsName != ''">
+        or CONTACTS_NAME = #{contactsName}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        or INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        or UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+      <if test="deleted != null">
+        or DELETED = #{deleted}
+      </if>
+      <if test="carrierType != null and carrierType != ''">
+        or CARRIER_TYPE = #{carrierType}
+      </if>
+      <if test="easCarrierId != null and easCarrierId != ''">
+        or EAS_CARRIER_ID = #{easCarrierId}
+      </if>
+      <if test="carrierBusinessAblelicense != null and carrierBusinessAblelicense != ''">
+        or CARRIER_BUSINESS_ABLELICENSE = #{carrierBusinessAblelicense}
+      </if>
+      <if test="carrierBusinessLicense != null and carrierBusinessLicense != ''">
+        or CARRIER_BUSINESS_LICENSE = #{carrierBusinessLicense}
+      </if>
+      <if test="carrierTransportCertificate != null and carrierTransportCertificate != ''">
+        or CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate}
+      </if>
+      <if test="carrierSsoId != null and carrierSsoId != ''">
+        or CARRIER_SSO_ID = #{carrierSsoId}
+      </if>
+      <if test="carrierSsoCode != null and carrierSsoCode != ''">
+        or CARRIER_SSO_CODE = #{carrierSsoCode}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.RmsCarrier">
-    insert into RMS_CARRIER (CARRIER_ID, CARRIER_TRANSPORT_TYPE,
-                             CARRIER_NAME, CARRIER_ABBREVIATION, CARRIER_ADDRESS,
-                             CARRIER_BID_AREA_ID, CARRIER_BID_TIME, CARRIER_LEGAL_REPRESENTATIVE,
-                             REGISTER_NO, CARRIER_AGENT, CARRIER_CONTACT_NUMBER,
-                             CARRIER_FAX, CARRIER_ACCOUNT, CARRIER_ACCOUNT_BLANK,
-                             CARRIER_DUTY_PARAGRAPH, CARRIER_POSTAL_CODE,
-                             REGISTER_CAPITAL, BUSINESS_SCOPE, ANNUAL_DATE,
-                             COMPANY_STATUS_DESC, COMPANY_TYPE_DESC, OPERATION_PERIOD,
-                             REGISTER_DATE, REGISTER_ORGANIZATION, REGISTER_APTITUDES,
-                             CREDENTIAL_DESC, CONTACTS_NAME, INSERT_USERNAME,
-                             INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
-                             INSERT_UPDATE_REMARK, DELETED, CARRIER_TYPE,
-                             EAS_CARRIER_ID, CARRIER_BUSINESS_ABLELICENSE,
-                             CARRIER_BUSINESS_LICENSE, CARRIER_TRANSPORT_CERTIFICATE,
-                             CARRIER_SSO_ID)
-    values (#{carrierId,jdbcType=DECIMAL}, #{carrierTransportType,jdbcType=VARCHAR},
-            #{carrierName,jdbcType=VARCHAR}, #{carrierAbbreviation,jdbcType=VARCHAR}, #{carrierAddress,jdbcType=VARCHAR},
-            #{carrierBidAreaId,jdbcType=DECIMAL}, #{carrierBidTime,jdbcType=TIMESTAMP}, #{carrierLegalRepresentative,jdbcType=VARCHAR},
-            #{registerNo,jdbcType=VARCHAR}, #{carrierAgent,jdbcType=VARCHAR}, #{carrierContactNumber,jdbcType=VARCHAR},
-            #{carrierFax,jdbcType=VARCHAR}, #{carrierAccount,jdbcType=VARCHAR}, #{carrierAccountBlank,jdbcType=VARCHAR},
-            #{carrierDutyParagraph,jdbcType=VARCHAR}, #{carrierPostalCode,jdbcType=VARCHAR},
-            #{registerCapital,jdbcType=VARCHAR}, #{businessScope,jdbcType=VARCHAR}, #{annualDate,jdbcType=VARCHAR},
-            #{companyStatusDesc,jdbcType=VARCHAR}, #{companyTypeDesc,jdbcType=VARCHAR}, #{operationPeriod,jdbcType=VARCHAR},
-            #{registerDate,jdbcType=TIMESTAMP}, #{registerOrganization,jdbcType=VARCHAR}, #{registerAptitudes,jdbcType=VARCHAR},
-            #{credentialDesc,jdbcType=VARCHAR}, #{contactsName,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR},
-            #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
-            #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{carrierType,jdbcType=VARCHAR},
-            #{easCarrierId,jdbcType=VARCHAR}, #{carrierBusinessAblelicense,jdbcType=VARCHAR},
-            #{carrierBusinessLicense,jdbcType=VARCHAR}, #{carrierTransportCertificate,jdbcType=VARCHAR},
-            #{carrierSsoId,jdbcType=VARCHAR})
+    insert into RMS_CARRIER (CARRIER_ID, CARRIER_TRANSPORT_TYPE, 
+      CARRIER_NAME, CARRIER_ABBREVIATION, CARRIER_ADDRESS, 
+      CARRIER_BID_AREA_ID, CARRIER_BID_TIME, CARRIER_LEGAL_REPRESENTATIVE, 
+      REGISTER_NO, CARRIER_AGENT, CARRIER_CONTACT_NUMBER, 
+      CARRIER_FAX, CARRIER_ACCOUNT, CARRIER_ACCOUNT_BLANK, 
+      CARRIER_DUTY_PARAGRAPH, CARRIER_POSTAL_CODE, 
+      REGISTER_CAPITAL, BUSINESS_SCOPE, ANNUAL_DATE, 
+      COMPANY_STATUS_DESC, COMPANY_TYPE_DESC, OPERATION_PERIOD, 
+      REGISTER_DATE, REGISTER_ORGANIZATION, REGISTER_APTITUDES, 
+      CREDENTIAL_DESC, CONTACTS_NAME, INSERT_USERNAME, 
+      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
+      INSERT_UPDATE_REMARK, DELETED, CARRIER_TYPE, 
+      EAS_CARRIER_ID, CARRIER_BUSINESS_ABLELICENSE, 
+      CARRIER_BUSINESS_LICENSE, CARRIER_TRANSPORT_CERTIFICATE, 
+      CARRIER_SSO_ID, CARRIER_SSO_CODE)
+    values (#{carrierId,jdbcType=DECIMAL}, #{carrierTransportType,jdbcType=VARCHAR}, 
+      #{carrierName,jdbcType=VARCHAR}, #{carrierAbbreviation,jdbcType=VARCHAR}, #{carrierAddress,jdbcType=VARCHAR}, 
+      #{carrierBidAreaId,jdbcType=DECIMAL}, #{carrierBidTime,jdbcType=TIMESTAMP}, #{carrierLegalRepresentative,jdbcType=VARCHAR}, 
+      #{registerNo,jdbcType=VARCHAR}, #{carrierAgent,jdbcType=VARCHAR}, #{carrierContactNumber,jdbcType=VARCHAR}, 
+      #{carrierFax,jdbcType=VARCHAR}, #{carrierAccount,jdbcType=VARCHAR}, #{carrierAccountBlank,jdbcType=VARCHAR}, 
+      #{carrierDutyParagraph,jdbcType=VARCHAR}, #{carrierPostalCode,jdbcType=VARCHAR}, 
+      #{registerCapital,jdbcType=VARCHAR}, #{businessScope,jdbcType=VARCHAR}, #{annualDate,jdbcType=VARCHAR}, 
+      #{companyStatusDesc,jdbcType=VARCHAR}, #{companyTypeDesc,jdbcType=VARCHAR}, #{operationPeriod,jdbcType=VARCHAR}, 
+      #{registerDate,jdbcType=TIMESTAMP}, #{registerOrganization,jdbcType=VARCHAR}, #{registerAptitudes,jdbcType=VARCHAR}, 
+      #{credentialDesc,jdbcType=VARCHAR}, #{contactsName,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, 
+      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{carrierType,jdbcType=VARCHAR}, 
+      #{easCarrierId,jdbcType=VARCHAR}, #{carrierBusinessAblelicense,jdbcType=VARCHAR}, 
+      #{carrierBusinessLicense,jdbcType=VARCHAR}, #{carrierTransportCertificate,jdbcType=VARCHAR}, 
+      #{carrierSsoId,jdbcType=VARCHAR}, #{carrierSsoCode,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsCarrier">
     insert into RMS_CARRIER
@@ -586,6 +596,9 @@
       <if test="carrierSsoId != null">
         CARRIER_SSO_ID,
       </if>
+      <if test="carrierSsoCode != null">
+        CARRIER_SSO_CODE,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="carrierId != null">
@@ -705,48 +718,52 @@
       <if test="carrierSsoId != null">
         #{carrierSsoId,jdbcType=VARCHAR},
       </if>
+      <if test="carrierSsoCode != null">
+        #{carrierSsoCode,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsCarrier">
     update RMS_CARRIER
     set CARRIER_TRANSPORT_TYPE = #{carrierTransportType,jdbcType=VARCHAR},
-        CARRIER_NAME = #{carrierName,jdbcType=VARCHAR},
-        CARRIER_ABBREVIATION = #{carrierAbbreviation,jdbcType=VARCHAR},
-        CARRIER_ADDRESS = #{carrierAddress,jdbcType=VARCHAR},
-        CARRIER_BID_AREA_ID = #{carrierBidAreaId,jdbcType=DECIMAL},
-        CARRIER_BID_TIME = #{carrierBidTime,jdbcType=TIMESTAMP},
-        CARRIER_LEGAL_REPRESENTATIVE = #{carrierLegalRepresentative,jdbcType=VARCHAR},
-        REGISTER_NO = #{registerNo,jdbcType=VARCHAR},
-        CARRIER_AGENT = #{carrierAgent,jdbcType=VARCHAR},
-        CARRIER_CONTACT_NUMBER = #{carrierContactNumber,jdbcType=VARCHAR},
-        CARRIER_FAX = #{carrierFax,jdbcType=VARCHAR},
-        CARRIER_ACCOUNT = #{carrierAccount,jdbcType=VARCHAR},
-        CARRIER_ACCOUNT_BLANK = #{carrierAccountBlank,jdbcType=VARCHAR},
-        CARRIER_DUTY_PARAGRAPH = #{carrierDutyParagraph,jdbcType=VARCHAR},
-        CARRIER_POSTAL_CODE = #{carrierPostalCode,jdbcType=VARCHAR},
-        REGISTER_CAPITAL = #{registerCapital,jdbcType=VARCHAR},
-        BUSINESS_SCOPE = #{businessScope,jdbcType=VARCHAR},
-        ANNUAL_DATE = #{annualDate,jdbcType=VARCHAR},
-        COMPANY_STATUS_DESC = #{companyStatusDesc,jdbcType=VARCHAR},
-        COMPANY_TYPE_DESC = #{companyTypeDesc,jdbcType=VARCHAR},
-        OPERATION_PERIOD = #{operationPeriod,jdbcType=VARCHAR},
-        REGISTER_DATE = #{registerDate,jdbcType=TIMESTAMP},
-        REGISTER_ORGANIZATION = #{registerOrganization,jdbcType=VARCHAR},
-        REGISTER_APTITUDES = #{registerAptitudes,jdbcType=VARCHAR},
-        CREDENTIAL_DESC = #{credentialDesc,jdbcType=VARCHAR},
-        CONTACTS_NAME = #{contactsName,jdbcType=VARCHAR},
-        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-        DELETED = #{deleted,jdbcType=DECIMAL},
-        CARRIER_TYPE = #{carrierType,jdbcType=VARCHAR},
-        EAS_CARRIER_ID = #{easCarrierId,jdbcType=VARCHAR},
-        CARRIER_BUSINESS_ABLELICENSE = #{carrierBusinessAblelicense,jdbcType=VARCHAR},
-        CARRIER_BUSINESS_LICENSE = #{carrierBusinessLicense,jdbcType=VARCHAR},
-        CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate,jdbcType=VARCHAR},
-        CARRIER_SSO_ID = #{carrierSsoId,jdbcType=VARCHAR}
+      CARRIER_NAME = #{carrierName,jdbcType=VARCHAR},
+      CARRIER_ABBREVIATION = #{carrierAbbreviation,jdbcType=VARCHAR},
+      CARRIER_ADDRESS = #{carrierAddress,jdbcType=VARCHAR},
+      CARRIER_BID_AREA_ID = #{carrierBidAreaId,jdbcType=DECIMAL},
+      CARRIER_BID_TIME = #{carrierBidTime,jdbcType=TIMESTAMP},
+      CARRIER_LEGAL_REPRESENTATIVE = #{carrierLegalRepresentative,jdbcType=VARCHAR},
+      REGISTER_NO = #{registerNo,jdbcType=VARCHAR},
+      CARRIER_AGENT = #{carrierAgent,jdbcType=VARCHAR},
+      CARRIER_CONTACT_NUMBER = #{carrierContactNumber,jdbcType=VARCHAR},
+      CARRIER_FAX = #{carrierFax,jdbcType=VARCHAR},
+      CARRIER_ACCOUNT = #{carrierAccount,jdbcType=VARCHAR},
+      CARRIER_ACCOUNT_BLANK = #{carrierAccountBlank,jdbcType=VARCHAR},
+      CARRIER_DUTY_PARAGRAPH = #{carrierDutyParagraph,jdbcType=VARCHAR},
+      CARRIER_POSTAL_CODE = #{carrierPostalCode,jdbcType=VARCHAR},
+      REGISTER_CAPITAL = #{registerCapital,jdbcType=VARCHAR},
+      BUSINESS_SCOPE = #{businessScope,jdbcType=VARCHAR},
+      ANNUAL_DATE = #{annualDate,jdbcType=VARCHAR},
+      COMPANY_STATUS_DESC = #{companyStatusDesc,jdbcType=VARCHAR},
+      COMPANY_TYPE_DESC = #{companyTypeDesc,jdbcType=VARCHAR},
+      OPERATION_PERIOD = #{operationPeriod,jdbcType=VARCHAR},
+      REGISTER_DATE = #{registerDate,jdbcType=TIMESTAMP},
+      REGISTER_ORGANIZATION = #{registerOrganization,jdbcType=VARCHAR},
+      REGISTER_APTITUDES = #{registerAptitudes,jdbcType=VARCHAR},
+      CREDENTIAL_DESC = #{credentialDesc,jdbcType=VARCHAR},
+      CONTACTS_NAME = #{contactsName,jdbcType=VARCHAR},
+      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      DELETED = #{deleted,jdbcType=DECIMAL},
+      CARRIER_TYPE = #{carrierType,jdbcType=VARCHAR},
+      EAS_CARRIER_ID = #{easCarrierId,jdbcType=VARCHAR},
+      CARRIER_BUSINESS_ABLELICENSE = #{carrierBusinessAblelicense,jdbcType=VARCHAR},
+      CARRIER_BUSINESS_LICENSE = #{carrierBusinessLicense,jdbcType=VARCHAR},
+      CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate,jdbcType=VARCHAR},
+      CARRIER_SSO_ID = #{carrierSsoId,jdbcType=VARCHAR},
+      CARRIER_SSO_CODE = #{carrierSsoCode,jdbcType=VARCHAR}
     where CARRIER_ID = #{carrierId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsCarrier">
@@ -866,6 +883,9 @@
       <if test="carrierSsoId != null">
         CARRIER_SSO_ID = #{carrierSsoId,jdbcType=VARCHAR},
       </if>
+      <if test="carrierSsoCode != null">
+        CARRIER_SSO_CODE = #{carrierSsoCode,jdbcType=VARCHAR},
+      </if>
     </set>
     where CARRIER_ID = #{carrierId,jdbcType=DECIMAL}
   </update>
@@ -882,218 +902,222 @@
     <include refid="whereLike" />
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into RMS_CARRIER
-    (CARRIER_ID,
-    CARRIER_TRANSPORT_TYPE, CARRIER_NAME,
-    CARRIER_ABBREVIATION, CARRIER_ADDRESS,
-    CARRIER_BID_AREA_ID, CARRIER_BID_TIME,
-    CARRIER_LEGAL_REPRESENTATIVE, REGISTER_NO,
-    CARRIER_AGENT, CARRIER_CONTACT_NUMBER,
-    CARRIER_FAX, CARRIER_ACCOUNT, CARRIER_ACCOUNT_BLANK,
-    CARRIER_DUTY_PARAGRAPH, CARRIER_POSTAL_CODE,
-    REGISTER_CAPITAL, BUSINESS_SCOPE,
-    ANNUAL_DATE, COMPANY_STATUS_DESC,
-    COMPANY_TYPE_DESC, OPERATION_PERIOD,
-    REGISTER_DATE, REGISTER_ORGANIZATION,
-    REGISTER_APTITUDES, CREDENTIAL_DESC,
-    CONTACTS_NAME, INSERT_USERNAME,
-    INSERT_TIME, UPDATE_USERNAME,
-    UPDATE_TIME, INSERT_UPDATE_REMARK,
-    DELETED, CARRIER_TYPE, EAS_CARRIER_ID,
-    CARRIER_BUSINESS_ABLELICENSE, CARRIER_BUSINESS_LICENSE,
-    CARRIER_TRANSPORT_CERTIFICATE, CARRIER_SSO_ID
-    )
-    ( <foreach collection="list" item="item" separator="union all">
-    select
-    #{item.carrierId,jdbcType=DECIMAL},
-    #{item.carrierTransportType,jdbcType=VARCHAR}, #{item.carrierName,jdbcType=VARCHAR},
-    #{item.carrierAbbreviation,jdbcType=VARCHAR}, #{item.carrierAddress,jdbcType=VARCHAR},
-    #{item.carrierBidAreaId,jdbcType=DECIMAL}, #{item.carrierBidTime,jdbcType=TIMESTAMP},
-    #{item.carrierLegalRepresentative,jdbcType=VARCHAR}, #{item.registerNo,jdbcType=VARCHAR},
-    #{item.carrierAgent,jdbcType=VARCHAR}, #{item.carrierContactNumber,jdbcType=VARCHAR},
-    #{item.carrierFax,jdbcType=VARCHAR}, #{item.carrierAccount,jdbcType=VARCHAR}, #{item.carrierAccountBlank,jdbcType=VARCHAR},
-    #{item.carrierDutyParagraph,jdbcType=VARCHAR}, #{item.carrierPostalCode,jdbcType=VARCHAR},
-    #{item.registerCapital,jdbcType=VARCHAR}, #{item.businessScope,jdbcType=VARCHAR},
-    #{item.annualDate,jdbcType=VARCHAR}, #{item.companyStatusDesc,jdbcType=VARCHAR},
-    #{item.companyTypeDesc,jdbcType=VARCHAR}, #{item.operationPeriod,jdbcType=VARCHAR},
-    #{item.registerDate,jdbcType=TIMESTAMP}, #{item.registerOrganization,jdbcType=VARCHAR},
-    #{item.registerAptitudes,jdbcType=VARCHAR}, #{item.credentialDesc,jdbcType=VARCHAR},
-    #{item.contactsName,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR},
-    #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
-    #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
-    #{item.deleted,jdbcType=DECIMAL}, #{item.carrierType,jdbcType=VARCHAR}, #{item.easCarrierId,jdbcType=VARCHAR},
-    #{item.carrierBusinessAblelicense,jdbcType=VARCHAR}, #{item.carrierBusinessLicense,jdbcType=VARCHAR},
-    #{item.carrierTransportCertificate,jdbcType=VARCHAR}, #{item.carrierSsoId,jdbcType=VARCHAR}
-    from dual
-  </foreach> )
+    insert into RMS_CARRIER 
+      (CARRIER_ID, 
+      CARRIER_TRANSPORT_TYPE, CARRIER_NAME, 
+      CARRIER_ABBREVIATION, CARRIER_ADDRESS, 
+      CARRIER_BID_AREA_ID, CARRIER_BID_TIME, 
+      CARRIER_LEGAL_REPRESENTATIVE, REGISTER_NO, 
+      CARRIER_AGENT, CARRIER_CONTACT_NUMBER, 
+      CARRIER_FAX, CARRIER_ACCOUNT, CARRIER_ACCOUNT_BLANK, 
+      CARRIER_DUTY_PARAGRAPH, CARRIER_POSTAL_CODE, 
+      REGISTER_CAPITAL, BUSINESS_SCOPE, 
+      ANNUAL_DATE, COMPANY_STATUS_DESC, 
+      COMPANY_TYPE_DESC, OPERATION_PERIOD, 
+      REGISTER_DATE, REGISTER_ORGANIZATION, 
+      REGISTER_APTITUDES, CREDENTIAL_DESC, 
+      CONTACTS_NAME, INSERT_USERNAME, 
+      INSERT_TIME, UPDATE_USERNAME, 
+      UPDATE_TIME, INSERT_UPDATE_REMARK, 
+      DELETED, CARRIER_TYPE, EAS_CARRIER_ID, 
+      CARRIER_BUSINESS_ABLELICENSE, CARRIER_BUSINESS_LICENSE, 
+      CARRIER_TRANSPORT_CERTIFICATE, CARRIER_SSO_ID, 
+      CARRIER_SSO_CODE)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.carrierId,jdbcType=DECIMAL}, 
+      #{item.carrierTransportType,jdbcType=VARCHAR}, #{item.carrierName,jdbcType=VARCHAR}, 
+      #{item.carrierAbbreviation,jdbcType=VARCHAR}, #{item.carrierAddress,jdbcType=VARCHAR}, 
+      #{item.carrierBidAreaId,jdbcType=DECIMAL}, #{item.carrierBidTime,jdbcType=TIMESTAMP}, 
+      #{item.carrierLegalRepresentative,jdbcType=VARCHAR}, #{item.registerNo,jdbcType=VARCHAR}, 
+      #{item.carrierAgent,jdbcType=VARCHAR}, #{item.carrierContactNumber,jdbcType=VARCHAR}, 
+      #{item.carrierFax,jdbcType=VARCHAR}, #{item.carrierAccount,jdbcType=VARCHAR}, #{item.carrierAccountBlank,jdbcType=VARCHAR}, 
+      #{item.carrierDutyParagraph,jdbcType=VARCHAR}, #{item.carrierPostalCode,jdbcType=VARCHAR}, 
+      #{item.registerCapital,jdbcType=VARCHAR}, #{item.businessScope,jdbcType=VARCHAR}, 
+      #{item.annualDate,jdbcType=VARCHAR}, #{item.companyStatusDesc,jdbcType=VARCHAR}, 
+      #{item.companyTypeDesc,jdbcType=VARCHAR}, #{item.operationPeriod,jdbcType=VARCHAR}, 
+      #{item.registerDate,jdbcType=TIMESTAMP}, #{item.registerOrganization,jdbcType=VARCHAR}, 
+      #{item.registerAptitudes,jdbcType=VARCHAR}, #{item.credentialDesc,jdbcType=VARCHAR}, 
+      #{item.contactsName,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR}, 
+      #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
+      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}, 
+      #{item.deleted,jdbcType=DECIMAL}, #{item.carrierType,jdbcType=VARCHAR}, #{item.easCarrierId,jdbcType=VARCHAR}, 
+      #{item.carrierBusinessAblelicense,jdbcType=VARCHAR}, #{item.carrierBusinessLicense,jdbcType=VARCHAR}, 
+      #{item.carrierTransportCertificate,jdbcType=VARCHAR}, #{item.carrierSsoId,jdbcType=VARCHAR}, 
+      #{item.carrierSsoCode,jdbcType=VARCHAR} from dual  
+   </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
-    update RMS_CARRIER
-    set
-    CARRIER_ID=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierId,jdbcType=DECIMAL}
-    </foreach>
-    ,CARRIER_TRANSPORT_TYPE=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierTransportType,jdbcType=VARCHAR}
-    </foreach>
-    ,CARRIER_NAME=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierName,jdbcType=VARCHAR}
-    </foreach>
-    ,CARRIER_ABBREVIATION=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierAbbreviation,jdbcType=VARCHAR}
-    </foreach>
-    ,CARRIER_ADDRESS=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierAddress,jdbcType=VARCHAR}
-    </foreach>
-    ,CARRIER_BID_AREA_ID=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierBidAreaId,jdbcType=DECIMAL}
-    </foreach>
-    ,CARRIER_BID_TIME=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierBidTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,CARRIER_LEGAL_REPRESENTATIVE=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierLegalRepresentative,jdbcType=VARCHAR}
-    </foreach>
-    ,REGISTER_NO=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.registerNo,jdbcType=VARCHAR}
-    </foreach>
-    ,CARRIER_AGENT=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierAgent,jdbcType=VARCHAR}
-    </foreach>
-    ,CARRIER_CONTACT_NUMBER=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierContactNumber,jdbcType=VARCHAR}
-    </foreach>
-    ,CARRIER_FAX=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierFax,jdbcType=VARCHAR}
-    </foreach>
-    ,CARRIER_ACCOUNT=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierAccount,jdbcType=VARCHAR}
-    </foreach>
-    ,CARRIER_ACCOUNT_BLANK=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierAccountBlank,jdbcType=VARCHAR}
-    </foreach>
-    ,CARRIER_DUTY_PARAGRAPH=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierDutyParagraph,jdbcType=VARCHAR}
-    </foreach>
-    ,CARRIER_POSTAL_CODE=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierPostalCode,jdbcType=VARCHAR}
-    </foreach>
-    ,REGISTER_CAPITAL=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.registerCapital,jdbcType=VARCHAR}
-    </foreach>
-    ,BUSINESS_SCOPE=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.businessScope,jdbcType=VARCHAR}
-    </foreach>
-    ,ANNUAL_DATE=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.annualDate,jdbcType=VARCHAR}
-    </foreach>
-    ,COMPANY_STATUS_DESC=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.companyStatusDesc,jdbcType=VARCHAR}
-    </foreach>
-    ,COMPANY_TYPE_DESC=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.companyTypeDesc,jdbcType=VARCHAR}
-    </foreach>
-    ,OPERATION_PERIOD=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.operationPeriod,jdbcType=VARCHAR}
-    </foreach>
-    ,REGISTER_DATE=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.registerDate,jdbcType=TIMESTAMP}
-    </foreach>
-    ,REGISTER_ORGANIZATION=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.registerOrganization,jdbcType=VARCHAR}
-    </foreach>
-    ,REGISTER_APTITUDES=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.registerAptitudes,jdbcType=VARCHAR}
-    </foreach>
-    ,CREDENTIAL_DESC=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.credentialDesc,jdbcType=VARCHAR}
-    </foreach>
-    ,CONTACTS_NAME=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.contactsName,jdbcType=VARCHAR}
-    </foreach>
-    ,INSERT_USERNAME=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-    </foreach>
-    ,INSERT_TIME=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,UPDATE_USERNAME=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-    </foreach>
-    ,UPDATE_TIME=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,INSERT_UPDATE_REMARK=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-    </foreach>
-    ,DELETED=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-    </foreach>
-    ,CARRIER_TYPE=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierType,jdbcType=VARCHAR}
-    </foreach>
-    ,EAS_CARRIER_ID=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.easCarrierId,jdbcType=VARCHAR}
-    </foreach>
-    ,CARRIER_BUSINESS_ABLELICENSE=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierBusinessAblelicense,jdbcType=VARCHAR}
-    </foreach>
-    ,CARRIER_BUSINESS_LICENSE=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierBusinessLicense,jdbcType=VARCHAR}
-    </foreach>
-    ,CARRIER_TRANSPORT_CERTIFICATE=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierTransportCertificate,jdbcType=VARCHAR}
-    </foreach>
-    ,CARRIER_SSO_ID=
-    <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
-      when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierSsoId,jdbcType=VARCHAR}
-    </foreach>
-    where CARRIER_ID in
-    <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-      #{item.carrierId,jdbcType=DECIMAL}
-    </foreach>
+     update RMS_CARRIER
+     set
+       CARRIER_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierId,jdbcType=DECIMAL}
+       </foreach>
+       ,CARRIER_TRANSPORT_TYPE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierTransportType,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierName,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_ABBREVIATION=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierAbbreviation,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_ADDRESS=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierAddress,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_BID_AREA_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierBidAreaId,jdbcType=DECIMAL}
+       </foreach>
+       ,CARRIER_BID_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierBidTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,CARRIER_LEGAL_REPRESENTATIVE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierLegalRepresentative,jdbcType=VARCHAR}
+       </foreach>
+       ,REGISTER_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.registerNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_AGENT=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierAgent,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_CONTACT_NUMBER=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierContactNumber,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_FAX=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierFax,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_ACCOUNT=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierAccount,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_ACCOUNT_BLANK=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierAccountBlank,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_DUTY_PARAGRAPH=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierDutyParagraph,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_POSTAL_CODE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierPostalCode,jdbcType=VARCHAR}
+       </foreach>
+       ,REGISTER_CAPITAL=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.registerCapital,jdbcType=VARCHAR}
+       </foreach>
+       ,BUSINESS_SCOPE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.businessScope,jdbcType=VARCHAR}
+       </foreach>
+       ,ANNUAL_DATE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.annualDate,jdbcType=VARCHAR}
+       </foreach>
+       ,COMPANY_STATUS_DESC=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.companyStatusDesc,jdbcType=VARCHAR}
+       </foreach>
+       ,COMPANY_TYPE_DESC=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.companyTypeDesc,jdbcType=VARCHAR}
+       </foreach>
+       ,OPERATION_PERIOD=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.operationPeriod,jdbcType=VARCHAR}
+       </foreach>
+       ,REGISTER_DATE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.registerDate,jdbcType=TIMESTAMP}
+       </foreach>
+       ,REGISTER_ORGANIZATION=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.registerOrganization,jdbcType=VARCHAR}
+       </foreach>
+       ,REGISTER_APTITUDES=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.registerAptitudes,jdbcType=VARCHAR}
+       </foreach>
+       ,CREDENTIAL_DESC=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.credentialDesc,jdbcType=VARCHAR}
+       </foreach>
+       ,CONTACTS_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.contactsName,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETED=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+       </foreach>
+       ,CARRIER_TYPE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierType,jdbcType=VARCHAR}
+       </foreach>
+       ,EAS_CARRIER_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.easCarrierId,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_BUSINESS_ABLELICENSE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierBusinessAblelicense,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_BUSINESS_LICENSE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierBusinessLicense,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_TRANSPORT_CERTIFICATE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierTransportCertificate,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_SSO_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierSsoId,jdbcType=VARCHAR}
+       </foreach>
+       ,CARRIER_SSO_CODE=
+       <foreach close="end" collection="list" index="index" item="item" open="case CARRIER_ID" separator=" ">
+          when #{item.carrierId,jdbcType=DECIMAL} then #{item.carrierSsoCode,jdbcType=VARCHAR}
+       </foreach>
+     where CARRIER_ID in 
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.carrierId,jdbcType=DECIMAL}
+     </foreach> 
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from RMS_CARRIER
-    where CARRIER_ID in
+    where CARRIER_ID in 
     <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>
@@ -1107,6 +1131,7 @@
     SELECT
     RC.CARRIER_ID AS "carrierId",
     RC.CARRIER_NAME AS "carrierName",
+    RC.CARRIER_SSO_CODE AS "carrierSsoCode",
     RC.CARRIER_TRANSPORT_CERTIFICATE AS "carrierTransportCertificate",
     RC.CARRIER_BUSINESS_LICENSE AS "carrierBusinessLicense",
     RC.CARRIER_BUSINESS_ABLELICENSE AS "carrierBusinessAblelicense",
@@ -1128,13 +1153,16 @@
     RC.CARRIER_TRANSPORT_TYPE AS "carrierTransportType",
     RC.CONTACTS_NAME AS "contactsName",
     RC.CARRIER_CONTACT_NUMBER AS "carrierContactNumber",
-    CONCAT(CONCAT(CONCAT(RBA.BID_AREA_PROVINCE,RBA.BID_AREA_CITY),RBA.BID_AREA_COUNTY),RBA.BID_AREA_COUNTRY)  "carrierBidArea"
+    CONCAT(CONCAT(CONCAT(RBA.BID_AREA_PROVINCE,RBA.BID_AREA_CITY),RBA.BID_AREA_COUNTY),RBA.BID_AREA_COUNTRY)
+    "carrierBidArea"
     FROM RMS_CARRIER RC
     left join RMS_BID_AREA RBA
-        on RBA.BID_AREA_ID = RC.CARRIER_BID_AREA_ID
+    on RBA.BID_AREA_ID = RC.CARRIER_BID_AREA_ID
     WHERE RC.DELETED != 1
+    <if test="con != null">
+      AND RC.CARRIER_NAME LIKE #{con}
+    </if>
     ORDER BY RC.INSERT_TIME DESC
-
     )
     <where>
       <if test="carrierName!= null">
@@ -1326,12 +1354,12 @@
     select RC.CARRIER_NAME as "carrierName",
            RC.CARRIER_ID as "carrierId"
     from RMS_CARRIER RC
-    left join  RMS_CAPACITY RCA
-    on RC.CARRIER_ID=RCA.CARRIER_ID
+           left join  RMS_CAPACITY RCA
+                      on RC.CARRIER_ID=RCA.CARRIER_ID
     where RCA.CAPACITY_ID=#{id}
   </select>
 
-<!-- 通过承运商SSO主键查询承运商ID -->
+  <!-- 通过承运商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}