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

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

@@ -126,10 +126,18 @@ public class RmsCapacityController extends BaseRESTfulController {
                                                Integer apiId,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               String con) {
+                                               String con,
+                                               String carrierSSOId) {
+        int count = 0;
         if (mapValue==null){
             mapValue=new HashMap<>();
         }
+        if(carrierSSOId != null){
+            if(!"null".equals(carrierSSOId)) {
+                mapValue.put("carrierSSOId", carrierSSOId);
+                count++;
+            }
+        }
         //框计算
         if (con != null) {
             if (!"undefined".equals(con)) {
@@ -142,7 +150,7 @@ public class RmsCapacityController extends BaseRESTfulController {
         //初始化过滤
         List<Map<String, Object>> listTotal = null;
         //如果有条件查询则跳过初始化，和创建索引
-        if (mapValue.size() == 0) {
+        if (mapValue.size() == count) {
             //将查询结果存入索引中
             listTotal = rmsCapacityService.getCapacityList(null);
             Map<String, Object> map = new HashMap<>();

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

@@ -168,20 +168,11 @@ public class RmsCarDriverController extends BaseRESTfulController {
       return success(carrierName);
   }
 
-
-  /*
-  * 图片上传
-  *
-   */
-    @PostMapping("/upload")
-    public RESTfulResult upLoadPhoto(@RequestParam("file") MultipartFile file)  {
-        String str="行驶证";
-        int result=rmsCarDriverService.uploadPhoto(file,str);
-        if (result==-1){
-            return failed();
-        }
-        return success(result);
+    //根据司机id查询承运商
+    @PostMapping(value = "/getCarrierNameByDriverId/{id}")
+    public RESTfulResult getCarrierNameByDriverId(@PathVariable("id") BigDecimal id){
+        Map<String,Object> map = rmsCarDriverService.getCarrierNameByDriverId(id);
+        return success(map);
     }
 
-
  }

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

@@ -78,7 +78,6 @@ public class RmsCarrierController extends BaseRESTfulController {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-
         //框计算
         if (con != null) {
             if (!"undefined".equals(con)) {
@@ -109,33 +108,9 @@ public class RmsCarrierController extends BaseRESTfulController {
         if (listTotal == null) {
             listTotal = rmsCarrierService.getCarrierList(mapValue);
         }
-        System.out.println(listTotal);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = rmsCarrierService.getCarrierList(mapValue);
-        //        将中标区域id转换为先对应的地方
-        for (Map<String, Object> map : columnList) {
-            BigDecimal carrierBidAreaId = (BigDecimal) map.get("carrierBidAreaId");
-            if (carrierBidAreaId != null) {
-                //        根据id获取中标区域然后进行拼接
-                Map<String, Object> map1 = rmsBidAreaService.getBidAreaById(carrierBidAreaId);
-                String carrierBidArea = "";
-                if (map1.get("bidAreaProvince") != null) {
-                    carrierBidArea = carrierBidArea + (String) map1.get("bidAreaProvince");
-                }
-                if (map1.get("bidAreaCity") != null) {
-                    carrierBidArea = carrierBidArea + (String) map1.get("bidAreaCity");
-                }
-                if (map1.get("bidAreaCount") != null) {
-                    carrierBidArea = carrierBidArea + (String) map1.get("bidAreaCount");
-                }
-                if (map1.get("bidAreaCountry") != null) {
-                    carrierBidArea = carrierBidArea + (String) map1.get("bidAreaCountry");
-                }
-                map.put("carrierBidArea", carrierBidArea);
-            }
-        }
-
         PageListAdd data = columnDataUtil.tableColumnData(apiId, listTotal, columnList);
         System.out.println(data);
         return success(data);
@@ -149,11 +124,10 @@ public class RmsCarrierController extends BaseRESTfulController {
      */
     @ApiOperation(value = "创建", notes = "根据RmsCarrier对象创建")
     @ApiImplicitParam(name = "rmsCarrier", value = "详细实体rmsCarrier", required = true, dataType = "RmsCarrier")
-    //@RequiresPermissions("rmscarrier:create")
     @PostMapping(value = "/insertCarrier")
     public RESTfulResult insertCarrier(@RequestBody(required = false) Map<String, Object> mapValue) throws ParseException {
         int result = rmsCarrierService.insertCarrier(mapValue);
-        if (result <= 0) {
+        if (result == 0) {
             return failed();
         }
         return success(result);
@@ -301,6 +275,11 @@ public class RmsCarrierController extends BaseRESTfulController {
         }
         return success(result);
     }
-
+    //根据运力id查询承运商名称
+    @PostMapping(value = "/getCarrierNameById/{id}")
+    public RESTfulResult getCarrierNameById(@PathVariable("id") BigDecimal id){
+        Map<String,Object> map = rmsCarrierService.getCarrierNameById(id);
+        return success(map);
+    }
 
 }

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

@@ -119,7 +119,7 @@ public class RmsShipperController extends BaseRESTfulController {
     @PostMapping(value = "/insertShipper")
     public RESTfulResult insertShipper(@RequestBody RmsShipper rmsShipper){
         int result= rmsShipperService.insertShipper(rmsShipper);
-        if(result <= 0){
+        if(result==-1){
             return failed();
         }
         return success(result);
@@ -166,4 +166,44 @@ public class RmsShipperController extends BaseRESTfulController {
         List<Map<String, Object>> list= rmsShipperService.getShipperById(id);
         return success(list);
     }
+
+    @ApiOperation(value="新增组织结构实绩")
+    @PostMapping(value = "/addShipperResult")
+    public RESTfulResult addShipperResult(@RequestBody(required = false) Map<String, Object> map){
+        Integer i = null;
+        try {
+            i = rmsShipperService.addShipperResult(map);
+            if(i != 1){
+                return failed(i);
+            }
+        } catch (Exception e) {
+            return failed();
+        }
+        return success(i);
+    }
+
+    @ApiOperation(value="修改组织结构实绩")
+    @PostMapping(value = "/updateShipperResult")
+    public RESTfulResult updateShipperResult(@RequestBody(required = false) Map<String, Object> map){
+        Integer i = null;
+        try {
+            i = rmsShipperService.updateShipperResult(map);
+            if(i != 1){
+                return failed();
+            }
+        } catch (Exception e) {
+            return failed();
+        }
+        return success(i);
+    }
+
+    @ApiOperation(value="删除组织结构实绩")
+    @PostMapping(value = "/deleteShipperResult")
+    public RESTfulResult deleteShipperResult(@RequestBody(required = false) Map<String, Object> map){
+        Integer i = rmsShipperService.deleteShipperResult(map);
+        if(i != 1){
+            return failed(i);
+        }
+        return success(i);
+    }
 }

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

@@ -24,5 +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/RmsCarDriverMapper.java

@@ -35,4 +35,8 @@ public interface RmsCarDriverMapper extends IBaseMapper<RmsCarDriver,BigDecimal>
     int selectByIdentityCard(String driverIdentityCardId);
     //查询最大的司机id
     BigDecimal getMaxDriveId();
+
+    //根据司机id查询承运商
+    Map<String, Object> getCarrierNameByDriverId(BigDecimal id);
+
 }

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

@@ -21,7 +21,14 @@ public interface RmsCarrierMapper extends IBaseMapper<RmsCarrier, BigDecimal> {
     @Select("SELECT seq__RMS_CARRIER.nextval FROM dual")
     BigDecimal getCarrierId();
 
-    int selectParameterCarrierName(String carrierName);
+    //通过承运商名称查承运商主键
+    Integer selectParameterCarrierName(String carrierName);
+
 //    获得当前表中的最大id
     BigDecimal getMaxCarrierId();
+
+    Map<String,Object> getCarrierNameById(BigDecimal id);
+
+    //通过承运商SSO主键查询承运商ID
+    BigDecimal getCarrierIdByCarrierSSOId(String carrierSSOId);
 }

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

@@ -22,5 +22,9 @@ public interface RmsShipperMapper extends IBaseMapper<RmsShipper, BigDecimal> {
 //根据id详细获取托运人信息
     List<Map<String, Object>> selectShipperById(BigDecimal id);
 
-    int selectByParametersCompanyBranch(String shipperCompanyBranch);
+    Integer selectByParametersCompanyBranch(String shipperCompanyBranch);
+
+    //通过SSO主键查询组织机构主键
+    Integer selectShipperResultId(String pId);
+
 }

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

@@ -147,6 +147,20 @@ public class RmsCapacity implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="逻辑删除",required=false)
     private BigDecimal deleted;
 
+    /**
+     * SSO主键(CAPACITY_SSO_ID,VARCHAR,100)
+     */
+    @ApiModelProperty(value="SSO主键",required=false)
+    private String capacitySsoId;
+
+    public String getCapacitySsoId() {
+        return capacitySsoId;
+    }
+
+    public void setCapacitySsoId(String capacitySsoId) {
+        this.capacitySsoId = capacitySsoId;
+    }
+
     private static final long serialVersionUID = 1L;
 
     @Override

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

@@ -220,23 +220,29 @@ public class RmsCarrier implements IBasePO<BigDecimal> {
     private String easCarrierId;
 
     /**
-     * 营业执照(CARRIER_BUSINESS_ABLELICENSE,VARCHAR,50)
+     * 营业执照(CARRIER_BUSINESS_ABLELICENSE,VARCHAR,90)
      */
     @ApiModelProperty(value="营业执照",required=false)
     private String carrierBusinessAblelicense;
 
     /**
-     * 经营许可证(照片)(CARRIER_BUSINESS_LICENSE,VARCHAR,50)
+     * 经营许可证(照片)(CARRIER_BUSINESS_LICENSE,VARCHAR,90)
      */
     @ApiModelProperty(value="经营许可证(照片)",required=false)
     private String carrierBusinessLicense;
 
     /**
-     * 运输证(照片)(CARRIER_TRANSPORT_CERTIFICATE,VARCHAR,50)
+     * 运输证(照片)(CARRIER_TRANSPORT_CERTIFICATE,VARCHAR,90)
      */
     @ApiModelProperty(value="运输证(照片)",required=false)
     private String carrierTransportCertificate;
 
+    /**
+     * SSO主键(CARRIER_SSO_ID,VARCHAR,40)
+     */
+    @ApiModelProperty(value="SSO主键",required=false)
+    private String carrierSsoId;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -553,6 +559,14 @@ public class RmsCarrier implements IBasePO<BigDecimal> {
         this.carrierTransportCertificate = carrierTransportCertificate == null ? null : carrierTransportCertificate.trim();
     }
 
+    public String getCarrierSsoId() {
+        return carrierSsoId;
+    }
+
+    public void setCarrierSsoId(String carrierSsoId) {
+        this.carrierSsoId = carrierSsoId == null ? null : carrierSsoId.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -597,6 +611,7 @@ public class RmsCarrier implements IBasePO<BigDecimal> {
         sb.append(", carrierBusinessAblelicense=").append(carrierBusinessAblelicense);
         sb.append(", carrierBusinessLicense=").append(carrierBusinessLicense);
         sb.append(", carrierTransportCertificate=").append(carrierTransportCertificate);
+        sb.append(", carrierSsoId=").append(carrierSsoId);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -28,22 +28,22 @@ public class RmsShipper implements IBasePO<BigDecimal> {
     private String shipperAbbreviation;
 
     /**
-     * 属分公司(SHIPPER_COMPANY_BRANCH,VARCHAR,32)
+     * 父级ID(SHIPPER_FATHER_ID,DECIMAL,0)
      */
-    @ApiModelProperty(value="属分公司",required=false)
-    private String shipperCompanyBranch;
+    @ApiModelProperty(value="父级ID",required=false)
+    private BigDecimal shipperFatherId;
 
     /**
-     * 分公司下属分厂(SHIPPER_BRANCH_FACTORY,VARCHAR,32)
+     * SSO主键(SHIPPER_SSO_ID,VARCHAR,32)
      */
-    @ApiModelProperty(value="分公司下属分厂",required=false)
-    private String shipperBranchFactory;
+    @ApiModelProperty(value="SSO主键",required=false)
+    private String shipperSsoId;
 
     /**
-     * 分厂下属区域(SHIPPER_FACTORY_AREA,VARCHAR,32)
+     * 部门级别(SHIPPER_DEPARTMENT_LEVEL,VARCHAR,32)
      */
-    @ApiModelProperty(value="分厂下属区域",required=false)
-    private String shipperFactoryArea;
+    @ApiModelProperty(value="部门级别",required=false)
+    private String shipperDepartmentLevel;
 
     /**
      * 区分代码(SHIPPER_PARTITION_CODE,VARCHAR,8)
@@ -225,6 +225,30 @@ public class RmsShipper implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="逻辑删除",required=false)
     private BigDecimal deleted;
 
+    /**
+     * 属分公司(SHIPPER_COMPANY_BRANCH,VARCHAR,100)
+     */
+    @ApiModelProperty(value="属分公司",required=false)
+    private String shipperCompanyBranch;
+
+    /**
+     * 分公司下属分厂(SHIPPER_BRANCH_FACTORY,VARCHAR,100)
+     */
+    @ApiModelProperty(value="分公司下属分厂",required=false)
+    private String shipperBranchFactory;
+
+    /**
+     * 分厂下属区域(SHIPPER_FACTORY_AREA,VARCHAR,100)
+     */
+    @ApiModelProperty(value="分厂下属区域",required=false)
+    private String shipperFactoryArea;
+
+    /**
+     * 机构编码(SHIPPER_ORG_CODE,VARCHAR,50)
+     */
+    @ApiModelProperty(value="机构编码",required=false)
+    private String shipperOrgCode;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -261,28 +285,28 @@ public class RmsShipper implements IBasePO<BigDecimal> {
         this.shipperAbbreviation = shipperAbbreviation == null ? null : shipperAbbreviation.trim();
     }
 
-    public String getShipperCompanyBranch() {
-        return shipperCompanyBranch;
+    public BigDecimal getShipperFatherId() {
+        return shipperFatherId;
     }
 
-    public void setShipperCompanyBranch(String shipperCompanyBranch) {
-        this.shipperCompanyBranch = shipperCompanyBranch == null ? null : shipperCompanyBranch.trim();
+    public void setShipperFatherId(BigDecimal shipperFatherId) {
+        this.shipperFatherId = shipperFatherId;
     }
 
-    public String getShipperBranchFactory() {
-        return shipperBranchFactory;
+    public String getShipperSsoId() {
+        return shipperSsoId;
     }
 
-    public void setShipperBranchFactory(String shipperBranchFactory) {
-        this.shipperBranchFactory = shipperBranchFactory == null ? null : shipperBranchFactory.trim();
+    public void setShipperSsoId(String shipperSsoId) {
+        this.shipperSsoId = shipperSsoId == null ? null : shipperSsoId.trim();
     }
 
-    public String getShipperFactoryArea() {
-        return shipperFactoryArea;
+    public String getShipperDepartmentLevel() {
+        return shipperDepartmentLevel;
     }
 
-    public void setShipperFactoryArea(String shipperFactoryArea) {
-        this.shipperFactoryArea = shipperFactoryArea == null ? null : shipperFactoryArea.trim();
+    public void setShipperDepartmentLevel(String shipperDepartmentLevel) {
+        this.shipperDepartmentLevel = shipperDepartmentLevel == null ? null : shipperDepartmentLevel.trim();
     }
 
     public String getShipperPartitionCode() {
@@ -525,6 +549,38 @@ public class RmsShipper implements IBasePO<BigDecimal> {
         this.deleted = deleted;
     }
 
+    public String getShipperCompanyBranch() {
+        return shipperCompanyBranch;
+    }
+
+    public void setShipperCompanyBranch(String shipperCompanyBranch) {
+        this.shipperCompanyBranch = shipperCompanyBranch == null ? null : shipperCompanyBranch.trim();
+    }
+
+    public String getShipperBranchFactory() {
+        return shipperBranchFactory;
+    }
+
+    public void setShipperBranchFactory(String shipperBranchFactory) {
+        this.shipperBranchFactory = shipperBranchFactory == null ? null : shipperBranchFactory.trim();
+    }
+
+    public String getShipperFactoryArea() {
+        return shipperFactoryArea;
+    }
+
+    public void setShipperFactoryArea(String shipperFactoryArea) {
+        this.shipperFactoryArea = shipperFactoryArea == null ? null : shipperFactoryArea.trim();
+    }
+
+    public String getShipperOrgCode() {
+        return shipperOrgCode;
+    }
+
+    public void setShipperOrgCode(String shipperOrgCode) {
+        this.shipperOrgCode = shipperOrgCode == null ? null : shipperOrgCode.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -534,9 +590,9 @@ public class RmsShipper implements IBasePO<BigDecimal> {
         sb.append(", shipperId=").append(shipperId);
         sb.append(", shipperName=").append(shipperName);
         sb.append(", shipperAbbreviation=").append(shipperAbbreviation);
-        sb.append(", shipperCompanyBranch=").append(shipperCompanyBranch);
-        sb.append(", shipperBranchFactory=").append(shipperBranchFactory);
-        sb.append(", shipperFactoryArea=").append(shipperFactoryArea);
+        sb.append(", shipperFatherId=").append(shipperFatherId);
+        sb.append(", shipperSsoId=").append(shipperSsoId);
+        sb.append(", shipperDepartmentLevel=").append(shipperDepartmentLevel);
         sb.append(", shipperPartitionCode=").append(shipperPartitionCode);
         sb.append(", shipperAddress=").append(shipperAddress);
         sb.append(", shipperLegalRepresentative=").append(shipperLegalRepresentative);
@@ -567,6 +623,10 @@ public class RmsShipper implements IBasePO<BigDecimal> {
         sb.append(", shipperAppid=").append(shipperAppid);
         sb.append(", shipperSecretkey=").append(shipperSecretkey);
         sb.append(", deleted=").append(deleted);
+        sb.append(", shipperCompanyBranch=").append(shipperCompanyBranch);
+        sb.append(", shipperBranchFactory=").append(shipperBranchFactory);
+        sb.append(", shipperFactoryArea=").append(shipperFactoryArea);
+        sb.append(", shipperOrgCode=").append(shipperOrgCode);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/dil/service/IRmsCarDriverService.java

@@ -31,5 +31,6 @@ public interface IRmsCarDriverService  {
 
     List<Map<String, Object>> getCarrierName(String state);
 
-    int uploadPhoto(MultipartFile file, String str);
+
+    Map<String, Object> getCarrierNameByDriverId(BigDecimal id);
 }

src/main/java/com/steerinfo/dil/service/IRmsCarrierService.java

@@ -36,4 +36,6 @@ public interface IRmsCarrierService {
     List<Map<String, Object>> getCarrierBidAreaList(Map<String, Object> mapVal);
 //    处理承运商照片
     int uploadCarrier(MultipartFile multipartFile, String str);
+    //根据id查询承运商名称
+    Map<String,Object> getCarrierNameById(BigDecimal id);
 }

src/main/java/com/steerinfo/dil/service/IRmsShipperService.java

@@ -19,7 +19,7 @@ import java.util.Map;
  * @see null
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
  */
-public interface IRmsShipperService{
+public interface IRmsShipperService {
 //    实现获取托运人列表
     List<Map<String, Object>> getShipperList(Map<String, Object> mapVal);
 //增加托运人信息
@@ -30,4 +30,13 @@ public interface IRmsShipperService{
     int deleteShipper(BigDecimal id);
 //    根据id值展示托运人
     List<Map<String, Object>> getShipperById(BigDecimal id);
+
+    //新增组织机构实绩
+    int addShipperResult(Map<String, Object> map);
+
+    //修改组织机构实绩
+    int updateShipperResult(Map<String, Object> map);
+
+    //删除组织机构实绩
+    int deleteShipperResult(Map<String, Object> map);
 }

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;
     /*
     * 获取运力信息
     * */
@@ -33,38 +37,35 @@ 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")) ;
-        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");
-        int i=0;
-        //返回没有逻辑删除，且存在该车牌号的数量
-        int isrmsCapacitie = rmsCapacityMapper.selectBycapacityNumber(number);
-        RmsCapacity rmsCapacity=new RmsCapacity();
-        if(isrmsCapacitie==0){
+        RmsCapacity rmsCapacity = new RmsCapacity();
+        String capacityNumber = (String) mapValue.get("capacityNumber");
+        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.setCapacityTypeId(capacityTypeId);
-            rmsCapacity.setCapacityNumber(number);
-            rmsCapacity.setCapacityCorlor(capacityCorlor);
-            rmsCapacity.setCapacityOwneris(capacityOwneris);
-            rmsCapacity.setCapacityVip(capacityVip);
-            rmsCapacity.setCapacityBlacklist(capacityBlacklist);
-            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;
+            return rmsCapacityMapper.updateByPrimaryKeySelective(rmsCapacity);
         }
-        return i;
+        rmsCapacity.setCapacityId(rmsCapacityMapper.selectCapacityId());
+        rmsCapacity.setCarrierId(carrierId);
+        rmsCapacity.setCapacityTypeId(DataChange.dataToBigDecimal(mapValue.get("capacityTypeId")));
+        rmsCapacity.setCapacityNumber(capacityNumber);
+        rmsCapacity.setCapacityCorlor((String) mapValue.get("capacityCorlor"));
+        rmsCapacity.setCapacityOwneris((String)mapValue.get("capacityOwneris"));
+        rmsCapacity.setCapacityVip((String)mapValue.get("capacityVip"));
+        rmsCapacity.setCapacityBlacklist((String)mapValue.get("capacityBlacklist"));
+        rmsCapacity.setCapacitySsoId((String) mapValue.get("ssoId"));
+        rmsCapacity.setCapacityStatus(new BigDecimal(0));
+        rmsCapacity.setDeleted(new BigDecimal(0));
+        rmsCapacity.setInsertTime(new Date());
+        rmsCapacity.setInsertUsername("admin");
+        return rmsCapacityMapper.insertSelective(rmsCapacity);
     }
 
     /*

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

@@ -119,51 +119,11 @@ public class RmsCarDriverServiceImpl implements IRmsCarDriverService {
         state = "%"+state+"%";
         return rmsCarDriverMapper.getCarrierName(state);
     }
-    //
+
+    //根据司机id查询承运商
     @Override
-    public int uploadPhoto(MultipartFile file, String str) {
-        int result = 0;
-//        根据str判断当前照片类型f
-        String name = file.getName();
-        Long workId = 0L;
-        Long datacenterId = 0L;
-        byte[] fileNames=null;
-//        id自动生成器
-        IdGenerator idGenerator = new IdGenerator(workId, datacenterId);
-//        图片存储的地址
-        String uploadPath = "C:/workspaces/stworkspace/image/";
-//        图片名称默认为空
-        String imagePath = str;
-//        创建一个map用来存储四张照片的地址
-        Map<String, Object> map=new HashMap<>();
-        String FileNames = UploadUtils.uploadFile(file, idGenerator, uploadPath, imagePath);
-        System.out.println(FileNames);
-        //         判断照片是否能上传成功
-        if (FileNames!=null){
-            fileNames = UploadUtils.imageToByte(FileNames);
-            map.put(str,fileNames);
-//             将照片的二进制插入到数据库
-            RmsCarDriver rmsCarDriver=new RmsCarDriver();
-            rmsCarDriver.setDriverId(rmsCarDriverMapper.getMaxDriveId());
-            if (map.get("行驶证")!=null){
-                rmsCarDriver.setDriverPermitPhoto((String) map.get("行驶证"));
-            }
-            if (map.get("驾驶证")!=null){
-                rmsCarDriver.setDriverLisencePhoto((String)map.get("驾驶证"));
-            }
-            if (map.get("运输证")!=null){
-                rmsCarDriver.setDriverLisencePhoto((String)map.get("运输证"));
-            }
-            if(map.get("从业资格证")!=null){
-                rmsCarDriver.setDriverLisencePhoto((String)map.get("从业资格证"));
-            }
-            result+=rmsCarDriverMapper.insertSelective(rmsCarDriver);
-        }else{
-            result=-1;
-        }
-        return result;
+    public Map<String, Object> getCarrierNameByDriverId(BigDecimal id) {
+        return rmsCarDriverMapper.getCarrierNameByDriverId(id);
     }
-
-
 }
 

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

@@ -3,7 +3,9 @@ package com.steerinfo.dil.service.impl;
 import com.steerinfo.dil.mapper.RmsBidAreaMapper;
 import com.steerinfo.dil.mapper.RmsCarrierMapper;
 import com.steerinfo.dil.model.RmsCarrier;
+import com.steerinfo.dil.model.RmsShipper;
 import com.steerinfo.dil.service.IRmsCarrierService;
+import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.framework.utils.misc.IdGenerator;
 import com.steerinfo.framework.utils.upload.UploadUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -123,68 +125,57 @@ public class RmsCarrierServiceImpl implements IRmsCarrierService {
     /**
      * 添加承运商信息
      *
-     * @param mapValue
+     * @param map
      * @return
      */
     @Override
-    public int insertCarrier(Map<String, Object> mapValue) throws ParseException {
-//        获取用户名以及默认密码
-//        String username = (String) mapValue.get("username");
-//        String password = "123456";
-
-
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+    public int insertCarrier(Map<String, Object> map){
+        //承运商数据
+        Map<String, Object> formMap = (Map<String, Object>) map.get("from");
+        //获取承运商名称查看是否已存在数据库中
+        String carrierName = (String) formMap.get("carrierName");
+        Integer size = rmsCarrierMapper.selectParameterCarrierName(carrierName);
+        if(size != null){
+            return 0;
+        }
         RmsCarrier rmsCarrier = new RmsCarrier();
-        Map<String, Object> map1 = (Map<String, Object>) mapValue.get("RmsCarrier");
-        Map<String, Object> registerDate = (Map<String, Object>) mapValue.get("registerDate");
-        String carrierName=(String) map1.get("carrierName");
-        Date date = new Date(0);
-        int i = 0;
-        Integer transportType = (Integer) map1.get("carrierTransportType");
-        int size = rmsCarrierMapper.selectParameterCarrierName(carrierName);
-        String registerDates = (String) registerDate.get("registerDate");
-        Date registerDate2 = simpleDateFormat.parse(registerDates);
-        if (size == 0) {
-            if (transportType != null) {
-                if (transportType.equals(1)) {
-                    rmsCarrier.setCarrierTransportType("危化品");
-                }
-                if (transportType.equals(2)) {
-                    rmsCarrier.setCarrierTransportType("其他");
-                }
-                rmsCarrier.setInsertTime(new Date());
-                rmsCarrier.setInsertUsername("admin");
-                rmsCarrier.setDeleted(new BigDecimal(0));
-                rmsCarrier.setCarrierId(rmsCarrierMapper.getCarrierId());
-
-                rmsCarrier.setRegisterDate(registerDate2);
-                if (registerDate.get("registerDate").equals(date)) {
-                    rmsCarrier.setRegisterDate(null);
-                }
-                rmsCarrier.setCarrierName((String) map1.get("carrierName"));
-                rmsCarrier.setCarrierAbbreviation((String) map1.get("carrierAbbreviation"));
-                rmsCarrier.setCarrierAddress((String) map1.get("carrierAddress"));
-                rmsCarrier.setRegisterNo((String) map1.get("registerNo"));
-                Integer carrierBidAreaId = (Integer) map1.get("carrierBidAreaId");
-                rmsCarrier.setCarrierBidAreaId(new BigDecimal(carrierBidAreaId));
-                rmsCarrier.setCarrierLegalRepresentative((String) map1.get("carrierLegalRepresentative"));
-                rmsCarrier.setRegisterCapital((String) map1.get("registerCapital"));
-                rmsCarrier.setBusinessScope((String) map1.get("businessScope"));
-                rmsCarrier.setAnnualDate((String) map1.get("annualDate"));
-                rmsCarrier.setCompanyStatusDesc((String) map1.get("companyStatusDesc"));
-                rmsCarrier.setCompanyTypeDesc((String) map1.get("companyTypeDesc"));
-                rmsCarrier.setOperationPeriod((String) map1.get("operationPeriod"));
-                rmsCarrier.setRegisterOrganization((String) map1.get("registerOrganization"));
-                rmsCarrier.setRegisterAptitudes((String) map1.get("registerAptitudes"));
-                rmsCarrier.setContactsName((String) map1.get("contactsName"));
-                rmsCarrier.setCarrierContactNumber((String) map1.get("carrierContactNumber"));
-                rmsCarrier.setCarrierType((String) map1.get("carrierType"));
-                i += rmsCarrierMapper.insertSelective(rmsCarrier);
-            } else {
-                i = -1;
-            }
+        rmsCarrier.setId(rmsCarrierMapper.getCarrierId());
+        rmsCarrier.setCarrierName(carrierName);
+        rmsCarrier.setCarrierType((String) formMap.get("carrierType"));
+        BigDecimal carrierTransportType = DataChange.dataToBigDecimal(formMap.get("carrierTransportType"));
+        rmsCarrier.setCarrierTransportType(carrierTransportType.intValue() == 1 ? "危化品" : "其他"); //运输类别
+        //承运商公司注册日期
+        if(formMap.get("registerDate") != null) {
+            rmsCarrier.setRegisterDate(new Date((long) formMap.get("registerDate")));
         }
-        return i;
+        rmsCarrier.setCarrierAddress((String) formMap.get("carrierAddress")); //公司地址
+        rmsCarrier.setCarrierAbbreviation((String) formMap.get("carrierAbbreviation"));//别名
+        rmsCarrier.setRegisterNo((String) formMap.get("registerNo")); //注册编号
+        rmsCarrier.setCarrierBidAreaId(DataChange.dataToBigDecimal(formMap.get("carrierBidAreaId"))); //所属区域
+        rmsCarrier.setCarrierLegalRepresentative((String) formMap.get("carrierLegalRepresentative")); //
+        rmsCarrier.setRegisterCapital((String) formMap.get("registerCapital"));
+        rmsCarrier.setBusinessScope((String) formMap.get("businessScope"));
+        rmsCarrier.setAnnualDate((String) formMap.get("annualDate"));
+        rmsCarrier.setCompanyStatusDesc((String) formMap.get("companyStatusDesc"));
+        rmsCarrier.setCompanyTypeDesc((String) formMap.get("companyTypeDesc"));
+        rmsCarrier.setOperationPeriod((String) formMap.get("operationPeriod"));
+        rmsCarrier.setRegisterOrganization((String) formMap.get("registerOrganization"));
+        rmsCarrier.setRegisterAptitudes((String) formMap.get("registerAptitudes"));
+        rmsCarrier.setContactsName((String) formMap.get("contactsName"));
+        rmsCarrier.setCarrierContactNumber(String.valueOf(formMap.get("carrierContactNumber")));
+        //添加SSO主键
+        String userId =(String) map.get("userId");
+        rmsCarrier.setCarrierSsoId(userId);
+        //添加三张图片路径
+        Map<String,Object> photosUrlMap =(Map<String, Object>) map.get("imageUrls");
+        rmsCarrier.setCarrierTransportCertificate((String) photosUrlMap.get("imageUrl1"));//运输证
+        rmsCarrier.setCarrierBusinessLicense((String) photosUrlMap.get("imageUrl2"));//经营许可证
+        rmsCarrier.setCarrierBusinessAblelicense((String) photosUrlMap.get("imageUrl3"));//营业执照
+        //常规字段
+        rmsCarrier.setInsertTime(new Date());
+        rmsCarrier.setInsertUsername("admin");
+        rmsCarrier.setDeleted(new BigDecimal(0));
+        return rmsCarrierMapper.insertSelective(rmsCarrier);
      }
 
         /**
@@ -252,6 +243,11 @@ public class RmsCarrierServiceImpl implements IRmsCarrierService {
          }
          return result;
      }
+
+    @Override
+    public Map<String,Object> getCarrierNameById(BigDecimal id) {
+        return rmsCarrierMapper.getCarrierNameById(id);
+    }
 }
 
 

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

@@ -2,14 +2,12 @@ package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.mapper.RmsShipperMapper;
 import com.steerinfo.dil.model.RmsShipper;
-import com.steerinfo.dil.model.RmsSupplier;
 import com.steerinfo.dil.service.IRmsShipperService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -50,20 +48,20 @@ public class RmsShipperServiceImpl implements IRmsShipperService {
      */
     @Override
     public int insertShipper(RmsShipper rmsShipper) {
-        int i=0;
-        String shipperCompanyBranch=rmsShipper.getShipperCompanyBranch();
-        int size=rmsShipperMapper.selectByParametersCompanyBranch(shipperCompanyBranch);
-        if (size==0){
-            rmsShipper.setInsertTime(new Date());
-            rmsShipper.setInsertUsername("admin");
-            rmsShipper.setDeleted(new BigDecimal(0));
-            rmsShipper.setShipperId(rmsShipperMapper.getShipperId());
-            i+=rmsShipperMapper.insertSelective(rmsShipper);
-        }
-        else{
-            i=-1;
-        }
-        return i;
+//        int i=0;
+////        String shipperCompanyBranch=rmsShipper.getShipperCompanyBranch();
+////        int size=rmsShipperMapper.selectByParametersCompanyBranch(shipperCompanyBranch);
+//        if (size==0){
+//            rmsShipper.setInsertTime(new Date());
+//            rmsShipper.setInsertUsername("admin");
+//            rmsShipper.setDeleted(new BigDecimal(0));
+//            rmsShipper.setShipperId(rmsShipperMapper.getShipperId());
+//            i+=rmsShipperMapper.insertSelective(rmsShipper);
+//        }
+//        else{
+//            i=-1;
+//        }
+        return 0;
     }
 
     /**
@@ -99,4 +97,66 @@ public class RmsShipperServiceImpl implements IRmsShipperService {
     public List<Map<String, Object>> getShipperById(BigDecimal id) {
         return rmsShipperMapper.selectShipperById(id);
     }
+
+    /**
+     * 新增组织结构实绩
+     * @param map
+     * @return
+     */
+    @Override
+    public int addShipperResult(Map<String, Object> map) {
+        RmsShipper rmsShipper = new RmsShipper();
+        //新增主键
+        BigDecimal shipperId = rmsShipperMapper.getShipperId();
+        rmsShipper.setId(shipperId);
+        //添加机构名称
+        rmsShipper.setShipperName((String) map.get("orgName"));
+        //设置机构主键
+        rmsShipper.setShipperSsoId((String) map.get("orgId"));
+        //设置机构编码
+        rmsShipper.setShipperOrgCode((String) map.get("orgCode"));
+        //通过父级主键查询实绩主键
+        if(map.get("pId") != null){
+            Integer id = rmsShipperMapper.selectShipperResultId((String) map.get("pId"));
+            rmsShipper.setShipperFatherId(new BigDecimal(id));
+        }
+        //添加部门级别
+        rmsShipper.setShipperDepartmentLevel((String) map.get("depType"));
+        rmsShipper.setInsertTime(new Date());
+        rmsShipper.setInsertUsername("admin");
+        return rmsShipperMapper.insertSelective(rmsShipper);
+    }
+
+    /**
+     * 修改组织结构实绩
+     * @param map
+     * @return
+     */
+    @Override
+    public int updateShipperResult(Map<String, Object> map) {
+        RmsShipper rmsShipper = new RmsShipper();
+        //查询实绩主键
+        Integer orgId = rmsShipperMapper.selectShipperResultId((String) map.get("orgId"));
+        rmsShipper.setId(new BigDecimal(orgId));
+        //添加机构名称
+        rmsShipper.setShipperName((String) map.get("orgName"));
+        return rmsShipperMapper.updateByPrimaryKeySelective(rmsShipper);
+    }
+
+    /**
+     * 删除组织结构实绩
+     * @param map
+     * @return
+     */
+    public int deleteShipperResult(Map<String, Object> map) {
+        String mes = (String) map.get("orgId");
+        if(mes == null || "".equals(mes)){
+            return 0;
+        }
+        Integer orgId = rmsShipperMapper.selectShipperResultId(mes);
+        if(orgId == null){
+            return 0;
+        }
+        return rmsShipperMapper.deleteByPrimaryKey(new BigDecimal(orgId));
+    }
 }

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

@@ -44,7 +44,6 @@ public class RmsWarehouseServiceImpl  implements IRmsWarehouseService {
     * */
     @Override
     public int insertWarehouse(RmsWarehouse rmsWarehouse) {
-            rmsWarehouse.setWarehouseTypeId(new BigDecimal(3));
             rmsWarehouse.setDeleted(new BigDecimal(0));
             rmsWarehouse.setInsertUsername("admin");
             rmsWarehouse.setInsertTime(new Date());

src/main/java/com/steerinfo/dil/util/DataChange.java

@@ -43,22 +43,13 @@ public class DataChange {
     public static BigDecimal
     dataToBigDecimal(Object data){
         if (data != null){
-            if(data instanceof String){
-                String data1 = (String) data;
-                if(data1.length() == 0)
-                    return new BigDecimal(0);
-                return new BigDecimal(data1);
-            }
-            if(data instanceof Integer){
-                Integer data2 = (Integer) data;
-                return new BigDecimal(data2);
-            }
-            if(data instanceof Double){
-                Double data3 = (Double) data;
-                return new BigDecimal(data3);
-            }
             if(data instanceof BigDecimal){
                 return (BigDecimal) data;
+            }else {
+                String s = String.valueOf(data);
+                if(!"".equals(s)){
+                    return new BigDecimal(s);
+                }
             }
         }
         return new BigDecimal(0);

src/main/resources/application-dev.yml

@@ -3,6 +3,8 @@ spring:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
     password: Dil123789
     username: dil
+
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dal-dazhou-rms-api
+

src/main/resources/application-prod.yml

@@ -6,3 +6,4 @@ spring:
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dal-dazhou-rms-api
+

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

@@ -25,20 +25,21 @@
     <result column="CAPACITY_CORLOR" jdbcType="VARCHAR" property="capacityCorlor" />
     <result column="CAPACITY_VIP" jdbcType="VARCHAR" property="capacityVip" />
     <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+    <result column="CAPACITY_SSO_ID" jdbcType="VARCHAR" property="capacitySsoId" />
   </resultMap>
   <sql id="columns">
     CAPACITY_ID, CAPACITY_NUMBER, CAPACITY_MAX_LOAD, CAPACITY_TYPE_ID, CAPACITY_STATUS, 
     CARRIER_ID, CAPACITY_ENERGY_ID, CAPACITY_LEN_VAL, CAPACITY_WID_VAL, CAPACITY_HIG_VAL, 
     CAPACITY_OIL_ID, CAPACITY_FUEL_CONSUMPTION, CAPACITY_OWNERIS, CAPACITY_BLACKLIST, 
     MEMO, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
-    CAPACITY_CORLOR, CAPACITY_VIP, DELETED
+    CAPACITY_CORLOR, CAPACITY_VIP, DELETED, CAPACITY_SSO_ID
   </sql>
   <sql id="columns_alias">
     t.CAPACITY_ID, t.CAPACITY_NUMBER, t.CAPACITY_MAX_LOAD, t.CAPACITY_TYPE_ID, t.CAPACITY_STATUS, 
     t.CARRIER_ID, t.CAPACITY_ENERGY_ID, t.CAPACITY_LEN_VAL, t.CAPACITY_WID_VAL, t.CAPACITY_HIG_VAL, 
     t.CAPACITY_OIL_ID, t.CAPACITY_FUEL_CONSUMPTION, t.CAPACITY_OWNERIS, t.CAPACITY_BLACKLIST, 
     t.MEMO, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, 
-    t.CAPACITY_CORLOR, t.CAPACITY_VIP, t.DELETED
+    t.CAPACITY_CORLOR, t.CAPACITY_VIP, t.DELETED, t.CAPACITY_SSO_ID
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM RMS_CAPACITY
@@ -60,7 +61,7 @@
       <if test="capacityTypeId != null">
         and CAPACITY_TYPE_ID = #{capacityTypeId}
       </if>
-      <if test="capacityStatus != null and capacityStatus != ''">
+      <if test="capacityStatus != null">
         and CAPACITY_STATUS = #{capacityStatus}
       </if>
       <if test="carrierId != null">
@@ -117,6 +118,9 @@
       <if test="deleted != null">
         and DELETED = #{deleted}
       </if>
+      <if test="capacitySsoId != null and capacitySsoId != ''">
+        and CAPACITY_SSO_ID = #{capacitySsoId}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -133,8 +137,8 @@
       <if test="capacityTypeId != null">
         and CAPACITY_TYPE_ID = #{capacityTypeId}
       </if>
-      <if test="capacityStatus != null and capacityStatus != ''">
-        and CAPACITY_STATUS LIKE '%${capacityStatus}%'
+      <if test="capacityStatus != null">
+        and CAPACITY_STATUS = #{capacityStatus}
       </if>
       <if test="carrierId != null">
         and CARRIER_ID = #{carrierId}
@@ -190,9 +194,12 @@
       <if test="deleted != null">
         and DELETED = #{deleted}
       </if>
+      <if test="capacitySsoId != null and capacitySsoId != ''">
+        and CAPACITY_SSO_ID LIKE '%${capacitySsoId}%'
+      </if>
     </where>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
     delete from RMS_CAPACITY
     where CAPACITY_ID = #{capacityId,jdbcType=DECIMAL}
   </delete>
@@ -208,7 +215,7 @@
       <if test="capacityTypeId != null">
         or CAPACITY_TYPE_ID = #{capacityTypeId}
       </if>
-      <if test="capacityStatus != null and capacityStatus != ''">
+      <if test="capacityStatus != null">
         or CAPACITY_STATUS = #{capacityStatus}
       </if>
       <if test="carrierId != null">
@@ -265,6 +272,9 @@
       <if test="deleted != null">
         or DELETED = #{deleted}
       </if>
+      <if test="capacitySsoId != null and capacitySsoId != ''">
+        or CAPACITY_SSO_ID = #{capacitySsoId}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.RmsCapacity">
     insert into RMS_CAPACITY (CAPACITY_ID, CAPACITY_NUMBER, CAPACITY_MAX_LOAD, 
@@ -274,15 +284,17 @@
       CAPACITY_OWNERIS, CAPACITY_BLACKLIST, MEMO, 
       INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
       UPDATE_TIME, INSERT_UPDATE_REMARK, CAPACITY_CORLOR, 
-      CAPACITY_VIP, DELETED)
+      CAPACITY_VIP, DELETED, CAPACITY_SSO_ID
+      )
     values (#{capacityId,jdbcType=DECIMAL}, #{capacityNumber,jdbcType=VARCHAR}, #{capacityMaxLoad,jdbcType=DECIMAL}, 
-      #{capacityTypeId,jdbcType=DECIMAL}, #{capacityStatus,jdbcType=DECIMAL}, #{carrierId,jdbcType=DECIMAL},
+      #{capacityTypeId,jdbcType=DECIMAL}, #{capacityStatus,jdbcType=DECIMAL}, #{carrierId,jdbcType=DECIMAL}, 
       #{capacityEnergyId,jdbcType=VARCHAR}, #{capacityLenVal,jdbcType=DECIMAL}, #{capacityWidVal,jdbcType=DECIMAL}, 
       #{capacityHigVal,jdbcType=DECIMAL}, #{capacityOilId,jdbcType=DECIMAL}, #{capacityFuelConsumption,jdbcType=VARCHAR}, 
       #{capacityOwneris,jdbcType=VARCHAR}, #{capacityBlacklist,jdbcType=VARCHAR}, #{memo,jdbcType=VARCHAR}, 
       #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{capacityCorlor,jdbcType=VARCHAR}, 
-      #{capacityVip,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL})
+      #{capacityVip,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{capacitySsoId,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsCapacity">
     insert into RMS_CAPACITY
@@ -356,6 +368,9 @@
       <if test="deleted != null">
         DELETED,
       </if>
+      <if test="capacitySsoId != null">
+        CAPACITY_SSO_ID,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="capacityId != null">
@@ -427,6 +442,9 @@
       <if test="deleted != null">
         #{deleted,jdbcType=DECIMAL},
       </if>
+      <if test="capacitySsoId != null">
+        #{capacitySsoId,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsCapacity">
@@ -452,7 +470,8 @@
       INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
       CAPACITY_CORLOR = #{capacityCorlor,jdbcType=VARCHAR},
       CAPACITY_VIP = #{capacityVip,jdbcType=VARCHAR},
-      DELETED = #{deleted,jdbcType=DECIMAL}
+      DELETED = #{deleted,jdbcType=DECIMAL},
+      CAPACITY_SSO_ID = #{capacitySsoId,jdbcType=VARCHAR}
     where CAPACITY_ID = #{capacityId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsCapacity">
@@ -524,10 +543,13 @@
       <if test="deleted != null">
         DELETED = #{deleted,jdbcType=DECIMAL},
       </if>
+      <if test="capacitySsoId != null">
+        CAPACITY_SSO_ID = #{capacitySsoId,jdbcType=VARCHAR},
+      </if>
     </set>
     where CAPACITY_ID = #{capacityId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
     <include refid="select" />
     where CAPACITY_ID = #{capacityId,jdbcType=DECIMAL}
   </select>
@@ -552,12 +574,12 @@
       INSERT_TIME, UPDATE_USERNAME, 
       UPDATE_TIME, INSERT_UPDATE_REMARK, 
       CAPACITY_CORLOR, CAPACITY_VIP, 
-      DELETED)
+      DELETED, CAPACITY_SSO_ID)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.capacityId,jdbcType=DECIMAL}, 
       #{item.capacityNumber,jdbcType=VARCHAR}, #{item.capacityMaxLoad,jdbcType=DECIMAL}, 
-      #{item.capacityTypeId,jdbcType=DECIMAL}, #{item.capacityStatus,jdbcType=DECIMAL},
+      #{item.capacityTypeId,jdbcType=DECIMAL}, #{item.capacityStatus,jdbcType=DECIMAL}, 
       #{item.carrierId,jdbcType=DECIMAL}, #{item.capacityEnergyId,jdbcType=VARCHAR}, 
       #{item.capacityLenVal,jdbcType=DECIMAL}, #{item.capacityWidVal,jdbcType=DECIMAL}, 
       #{item.capacityHigVal,jdbcType=DECIMAL}, #{item.capacityOilId,jdbcType=DECIMAL}, 
@@ -566,7 +588,7 @@
       #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
       #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}, 
       #{item.capacityCorlor,jdbcType=VARCHAR}, #{item.capacityVip,jdbcType=VARCHAR}, 
-      #{item.deleted,jdbcType=DECIMAL} from dual  
+      #{item.deleted,jdbcType=DECIMAL}, #{item.capacitySsoId,jdbcType=VARCHAR} from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -664,6 +686,10 @@
        <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
           when #{item.capacityId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
        </foreach>
+       ,CAPACITY_SSO_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
+          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacitySsoId,jdbcType=VARCHAR}
+       </foreach>
      where CAPACITY_ID in 
      <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
     #{item.capacityId,jdbcType=DECIMAL}
@@ -691,13 +717,14 @@
     RC.CAPACITY_BLACKLIST AS "capacityBlacklist",
     RCA.CARRIER_NAME AS "carrierName"
     FROM RMS_CAPACITY RC
-    LEFT JOIN
-    RMS_CAPACITY_TYPE RCT
-    ON RC.CAPACITY_TYPE_ID=RCT.CAPACITY_TYPE_ID
-    LEFT JOIN
-    RMS_CARRIER RCA
-    ON RCA.CARRIER_ID=RC.CARRIER_ID
-    WHERE RC.DELETED!=1
+    LEFT JOIN RMS_CAPACITY_TYPE RCT
+    ON RC.CAPACITY_TYPE_ID = RCT.CAPACITY_TYPE_ID
+    LEFT JOIN RMS_CARRIER RCA
+    ON RCA.CARRIER_ID = RC.CARRIER_ID
+    WHERE RC.DELETED != 1
+      <if test="carrierSSOId != null">
+        and RCA.CARRIER_SSO_ID = #{carrierSSOId}
+      </if>
     ORDER BY RC.INSERT_TIME DESC
     )
     <where>
@@ -754,7 +781,7 @@
         </foreach>
       </if>
     </where>
-   <include refid="orderBy"></include>
+    <include refid="orderBy"></include>
   </select>
   <sql id="orderBy">
     <if test="orderField!=null and orderField !=''">
@@ -764,42 +791,43 @@
       </if>
     </if>
   </sql>
-  
+
 
   <select id="getCapacityById" resultType="java.util.LinkedHashMap" >
-         SELECT
-            RC.CAPACITY_ID AS "capacityId",
-            RC.CAPACITY_TYPE_ID AS "capacityTypeId",
-            RC.CAPACITY_NUMBER AS "capacityNumber",
-            RC.CAPACITY_CORLOR AS "capacityCorlor",
-            RC.CAPACITY_OWNERIS AS "capacityOwneris",
-            RC.CAPACITY_VIP AS "capacityVip",
-            RC.CAPACITY_BLACKLIST AS "capacityBlacklist",
-            RC.CARRIER_ID AS "carrierId"
-            FROM RMS_CAPACITY RC
-            WHERE RC.CAPACITY_ID=#{id}
+    SELECT
+      RC.CAPACITY_ID AS "capacityId",
+      RC.CAPACITY_TYPE_ID AS "capacityTypeId",
+      RC.CAPACITY_NUMBER AS "capacityNumber",
+      RC.CAPACITY_CORLOR AS "capacityCorlor",
+      RC.CAPACITY_OWNERIS AS "capacityOwneris",
+      RC.CAPACITY_VIP AS "capacityVip",
+      RC.CAPACITY_BLACKLIST AS "capacityBlacklist",
+      RC.CARRIER_ID AS "carrierId"
+    FROM RMS_CAPACITY RC
+    WHERE RC.CAPACITY_ID=#{id}
 
   </select>
 
   <select id="getCapacityTypeId" resultType="java.util.LinkedHashMap">
     SELECT
-        RCT.CAPACITY_TYPE_ID AS "id",
-        RCT.CAPACITY_TYPE_ID AS "value",
-        RCT.CAPACITY_TYPE_NAME AS "label"
-        FROM RMS_CAPACITY_TYPE RCT
+      RCT.CAPACITY_TYPE_ID AS "id",
+      RCT.CAPACITY_TYPE_ID AS "value",
+      RCT.CAPACITY_TYPE_NAME AS "label"
+    FROM RMS_CAPACITY_TYPE RCT
   </select>
 
   <select id="getCarrierId" resultType="java.util.LinkedHashMap">
     SELECT
-    RC.CARRIER_ID AS "id",
-    RC.CARRIER_ID AS "value",
-    RC.CARRIER_NAME AS "label"
+      RC.CARRIER_ID AS "id",
+      RC.CARRIER_ID AS "value",
+      RC.CARRIER_NAME AS "label"
     FROM RMS_CARRIER RC
     WHERE RC.DELETED!=1
   </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/RmsCarDriverMapper.xml

@@ -951,11 +951,7 @@
     RCD.DRIVER_IDENTITY_CARD AS "driverIdentityCard",
     RCD.DRIVER_PHONE AS "driverPhone",
     RTT.TYPE_NAME AS "typeName",
-    RC.CARRIER_NAME AS "carrierName",
-    RCD.DRIVING_PERMIT_NO AS "driverPermitNo",
-    RCD.DRIVING_LICENCE AS "driverLicence1",
-    RCD.DRIVING_LICENCE AS "driverLicence2",
-    RCD.DRIVING_LICENCE AS "driverLicence3"
+    RC.CARRIER_NAME AS "carrierName"
     FROM RMS_CAR_DRIVER RCD
     LEFT JOIN RMS_CARRIER RC
     ON RCD.CARRIER_ID=RC.CARRIER_ID
@@ -1015,29 +1011,6 @@
           "carrierName" in #{item}
         </foreach>
       </if>
-      <if test="driverPermitNo!= null">
-        and
-        <foreach collection="driverPermitNo" item="item" open="(" separator="," close=")">
-          "driverPermitNo" in #{item}
-        </foreach>
-      </if>
-      <if test="driverLicence1!= null">
-        and
-        <foreach collection="driverLicence1" item="item" open="(" separator="," close=")">
-          "driverLicence1" in #{item}
-        </foreach>
-      </if>
-      <if test="driverLicence2!= null">
-        and
-        <foreach collection="driverLicence2" item="item" open="(" separator="," close=")">
-          "driverLicence2" in #{item}
-        </foreach>
-      </if> <if test="driverLicence3!= null">
-      and
-      <foreach collection="driverLicence3" item="item" open="(" separator="," close=")">
-        "driverLicence3" in #{item}
-      </foreach>
-    </if>
     </where>
     <include refid="orderBy"></include>
   </select>
@@ -1095,7 +1068,17 @@
   </select>
 
   <select id="getMaxDriveId" resultType="DECIMAL">
-    select max(RCD.DRIVER_ID+1) from RMS_CAR_DRIVER RCD
+    select max(RCD.DRIVER_ID) from RMS_CAR_DRIVER RCD
+  </select>
+
+  <select id="getCarrierNameByDriverId" resultType="java.util.Map" parameterType="java.math.BigDecimal">
+    select
+      RC.CARRIER_ID as "carrierId",
+      RC.CARRIER_NAME as "carrierName"
+    from RMS_CARRIER RC
+    left join RMS_CAR_DRIVER RCD
+    on RCD.CARRIER_ID=RC.CARRIER_ID
+    where RCD.DRIVER_ID=#{id}
   </select>
 </mapper>
 

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

@@ -40,6 +40,7 @@
     <result column="CARRIER_BUSINESS_ABLELICENSE" jdbcType="VARCHAR" property="carrierBusinessAblelicense" />
     <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" />
   </resultMap>
   <sql id="columns">
     CARRIER_ID, CARRIER_TRANSPORT_TYPE, CARRIER_NAME, CARRIER_ABBREVIATION, CARRIER_ADDRESS, 
@@ -49,7 +50,8 @@
     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_BUSINESS_ABLELICENSE, CARRIER_BUSINESS_LICENSE, CARRIER_TRANSPORT_CERTIFICATE, 
+    CARRIER_SSO_ID
   </sql>
   <sql id="columns_alias">
     t.CARRIER_ID, t.CARRIER_TRANSPORT_TYPE, t.CARRIER_NAME, t.CARRIER_ABBREVIATION, t.CARRIER_ADDRESS, 
@@ -60,7 +62,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_TRANSPORT_CERTIFICATE, t.CARRIER_SSO_ID
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM RMS_CARRIER
@@ -69,7 +71,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>
@@ -184,10 +186,13 @@
       <if test="carrierTransportCertificate != null and carrierTransportCertificate != ''">
         and CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate}
       </if>
+      <if test="carrierSsoId != null and carrierSsoId != ''">
+        and CARRIER_SSO_ID = #{carrierSsoId}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="carrierId != null">
         and CARRIER_ID = #{carrierId}
       </if>
@@ -302,158 +307,164 @@
       <if test="carrierTransportCertificate != null and carrierTransportCertificate != ''">
         and CARRIER_TRANSPORT_CERTIFICATE LIKE '%${carrierTransportCertificate}%'
       </if>
+      <if test="carrierSsoId != null and carrierSsoId != ''">
+        and CARRIER_SSO_ID LIKE '%${carrierSsoId}%'
+      </if>
     </where>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
     delete from RMS_CARRIER
     where CARRIER_ID = #{carrierId,jdbcType=DECIMAL}
   </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>
+    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>
   </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
-      )
-    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}
-      )
+    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>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsCarrier">
     insert into RMS_CARRIER
@@ -572,6 +583,9 @@
       <if test="carrierTransportCertificate != null">
         CARRIER_TRANSPORT_CERTIFICATE,
       </if>
+      <if test="carrierSsoId != null">
+        CARRIER_SSO_ID,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="carrierId != null">
@@ -688,47 +702,51 @@
       <if test="carrierTransportCertificate != null">
         #{carrierTransportCertificate,jdbcType=VARCHAR},
       </if>
+      <if test="carrierSsoId != null">
+        #{carrierSsoId,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_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}
     where CARRIER_ID = #{carrierId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsCarrier">
@@ -845,10 +863,13 @@
       <if test="carrierTransportCertificate != null">
         CARRIER_TRANSPORT_CERTIFICATE = #{carrierTransportCertificate,jdbcType=VARCHAR},
       </if>
+      <if test="carrierSsoId != null">
+        CARRIER_SSO_ID = #{carrierSsoId,jdbcType=VARCHAR},
+      </if>
     </set>
     where CARRIER_ID = #{carrierId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
     <include refid="select" />
     where CARRIER_ID = #{carrierId,jdbcType=DECIMAL}
   </select>
@@ -861,212 +882,218 @@
     <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)
-    ( <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} 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
+    )
+    ( <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>
   <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>
-     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>
+    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>
@@ -1100,10 +1127,14 @@
     RC.REGISTER_APTITUDES AS "registerAptitudes",
     RC.CARRIER_TRANSPORT_TYPE AS "carrierTransportType",
     RC.CONTACTS_NAME AS "contactsName",
-    RC.CARRIER_CONTACT_NUMBER AS "carrierContactNumber"
+    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"
     FROM RMS_CARRIER RC
+    left join RMS_BID_AREA RBA
+        on RBA.BID_AREA_ID = RC.CARRIER_BID_AREA_ID
     WHERE RC.DELETED != 1
     ORDER BY RC.INSERT_TIME DESC
+
     )
     <where>
       <if test="carrierName!= null">
@@ -1279,9 +1310,9 @@
     where  RC.CARRIER_ID=#{id}
   </select>
 
-  <!--  通过传入的值判断当前表是否存在相同的数量-->
-  <select id="selectParameterCarrierName" resultType="java.lang.Integer">
-    SELECT COUNT(*)
+  <!--  通过承运商名称查承运商主键-->
+  <select id="selectParameterCarrierName" parameterType="string" resultType="java.lang.Integer">
+    SELECT RC.CARRIER_ID
     FROM RMS_CARRIER RC
     WHERE RC.CARRIER_NAME = #{carrierName}
       AND RC.DELETED =0
@@ -1291,5 +1322,18 @@
     SELECT MAX(RC.CARRIER_ID)
     FROM RMS_CARRIER RC
   </select>
-  
+  <select id="getCarrierNameById" resultType="java.util.Map" parameterType="java.math.BigDecimal">
+    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
+    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>

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

@@ -453,7 +453,7 @@
     FROM RMS_WAREHOUSE RW
     LEFT JOIN RMS_SHIPPER RS
     ON RW.SHIPPER_ID=RS.SHIPPER_ID
-    WHERE RW.WAREHOUSE_TYPE_ID=3 AND RW.DELETED!=1
+    WHERE RW.DELETED!=1
     ORDER BY RW.INSERT_TIME DESC
     )
     <where>