修改

pom.xml

@@ -105,13 +105,13 @@
                 <artifactId>generator-maven-plugin</artifactId>
                 <version>3.0</version>
                 <configuration>
-                    <connUrl>jdbc:oracle:thin:@172.16.33.63:1521:ORCL</connUrl>
-                    <user>dzgt</user>
-                    <password>bigdata</password>
+                    <connUrl>jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri</connUrl>
+                    <user>dil</user>
+                    <password>Dil123789</password>
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>TB_PRODUCT_SUMMARY_DG</param>
+                        <param>RMS_CAPACITY</param>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -3,7 +3,6 @@ package com.steerinfo.dil.model;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -34,7 +33,7 @@ public class RmsCapacity implements IBasePO<BigDecimal> {
     private BigDecimal capacityTypeId;
 
     /**
-     * 运力状态(0：空闲中、1：运输中:2：待运中:3：维保中)(CAPACITY_STATUS,VARCHAR,32)
+     * 运力状态(0：空闲中、1：运输中:2：待运中:3：维保中)(CAPACITY_STATUS,DECIMAL,20)
      */
     @ApiModelProperty(value="运力状态(0：空闲中、1：运输中:2：待运中:3：维保中)",required=false)
     private BigDecimal capacityStatus;
@@ -82,13 +81,13 @@ public class RmsCapacity implements IBasePO<BigDecimal> {
     private String capacityFuelConsumption;
 
     /**
-     * 是否自有车辆（0：是；1：不是）(CAPACITY_OWNERIS,VARCHAR,32)
+     * 是否自有车辆（0：是；1：不是）(CAPACITY_OWNERIS,VARCHAR,16)
      */
     @ApiModelProperty(value="是否自有车辆（0：是；1：不是）",required=false)
     private String capacityOwneris;
 
     /**
-     * 运力是否黑名单（0：是；1：不是）(CAPACITY_BLACKLIST,VARCHAR,32)
+     * 运力是否黑名单（0：是；1：不是）(CAPACITY_BLACKLIST,VARCHAR,16)
      */
     @ApiModelProperty(value="运力是否黑名单（0：是；1：不是）",required=false)
     private String capacityBlacklist;
@@ -160,26 +159,28 @@ public class RmsCapacity implements IBasePO<BigDecimal> {
     private String driverLicenceUrl;
 
     /**
-     * 司机电话(CAPACITY_TEL,VARCHAR,16)
+     * 车辆使用单位(CAPACITY_USER_DEP,VARCHAR,255)
      */
-    @ApiModelProperty(value="司机电话",required=false)
-    private String capacityTel;
-
-    public String getCapacityTel() {
-        return capacityTel;
-    }
+    @ApiModelProperty(value="车辆使用单位",required=false)
+    private String capacityUserDep;
 
-    public void setCapacityTel(String capacityTel) {
-        this.capacityTel = capacityTel;
-    }
+    /**
+     * 运力联系方式(CAPACITY_TEL,VARCHAR,16)
+     */
+    @ApiModelProperty(value="运力联系方式",required=false)
+    private String capacityTel;
 
-    public String getCapacitySsoId() {
-        return capacitySsoId;
-    }
+    /**
+     * 江船航次(CAPACITY_BOOKING_NUMBER,DECIMAL,0)
+     */
+    @ApiModelProperty(value="江船航次",required=false)
+    private BigDecimal capacityBookingNumber;
 
-    public void setCapacitySsoId(String capacitySsoId) {
-        this.capacitySsoId = capacitySsoId;
-    }
+    /**
+     * 是否GPS(CAPACITY_GPS,VARCHAR,20)
+     */
+    @ApiModelProperty(value="是否GPS",required=false)
+    private String capacityGps;
 
     private static final long serialVersionUID = 1L;
 
@@ -249,14 +250,6 @@ public class RmsCapacity implements IBasePO<BigDecimal> {
         this.capacityEnergyId = capacityEnergyId == null ? null : capacityEnergyId.trim();
     }
 
-    public String getDriverLicenceUrl() {
-        return driverLicenceUrl;
-    }
-
-    public void setDriverLicenceUrl(String driverLicenceUrl) {
-        this.driverLicenceUrl = driverLicenceUrl;
-    }
-
     public BigDecimal getCapacityLenVal() {
         return capacityLenVal;
     }
@@ -385,34 +378,91 @@ public class RmsCapacity implements IBasePO<BigDecimal> {
         this.deleted = deleted;
     }
 
+    public String getCapacitySsoId() {
+        return capacitySsoId;
+    }
+
+    public void setCapacitySsoId(String capacitySsoId) {
+        this.capacitySsoId = capacitySsoId == null ? null : capacitySsoId.trim();
+    }
+
+    public String getDriverLicenceUrl() {
+        return driverLicenceUrl;
+    }
+
+    public void setDriverLicenceUrl(String driverLicenceUrl) {
+        this.driverLicenceUrl = driverLicenceUrl == null ? null : driverLicenceUrl.trim();
+    }
+
+    public String getCapacityUserDep() {
+        return capacityUserDep;
+    }
+
+    public void setCapacityUserDep(String capacityUserDep) {
+        this.capacityUserDep = capacityUserDep == null ? null : capacityUserDep.trim();
+    }
+
+    public String getCapacityTel() {
+        return capacityTel;
+    }
+
+    public void setCapacityTel(String capacityTel) {
+        this.capacityTel = capacityTel == null ? null : capacityTel.trim();
+    }
+
+    public BigDecimal getCapacityBookingNumber() {
+        return capacityBookingNumber;
+    }
+
+    public void setCapacityBookingNumber(BigDecimal capacityBookingNumber) {
+        this.capacityBookingNumber = capacityBookingNumber;
+    }
+
+    public String getCapacityGps() {
+        return capacityGps;
+    }
+
+    public void setCapacityGps(String capacityGps) {
+        this.capacityGps = capacityGps == null ? null : capacityGps.trim();
+    }
+
     @Override
     public String toString() {
-        return "RmsCapacity{" +
-                "capacityId=" + capacityId +
-                ", capacityNumber='" + capacityNumber + '\'' +
-                ", capacityMaxLoad=" + capacityMaxLoad +
-                ", capacityTypeId=" + capacityTypeId +
-                ", capacityStatus=" + capacityStatus +
-                ", carrierId=" + carrierId +
-                ", capacityEnergyId='" + capacityEnergyId + '\'' +
-                ", capacityLenVal=" + capacityLenVal +
-                ", capacityWidVal=" + capacityWidVal +
-                ", capacityHigVal=" + capacityHigVal +
-                ", capacityOilId=" + capacityOilId +
-                ", capacityFuelConsumption='" + capacityFuelConsumption + '\'' +
-                ", capacityOwneris='" + capacityOwneris + '\'' +
-                ", capacityBlacklist='" + capacityBlacklist + '\'' +
-                ", memo='" + memo + '\'' +
-                ", insertUsername='" + insertUsername + '\'' +
-                ", insertTime=" + insertTime +
-                ", updateUsername='" + updateUsername + '\'' +
-                ", updateTime=" + updateTime +
-                ", insertUpdateRemark='" + insertUpdateRemark + '\'' +
-                ", capacityCorlor='" + capacityCorlor + '\'' +
-                ", capacityVip='" + capacityVip + '\'' +
-                ", deleted=" + deleted +
-                ", capacitySsoId='" + capacitySsoId + '\'' +
-                ", driverLicenceUrl='" + driverLicenceUrl + '\'' +
-                '}';
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", capacityId=").append(capacityId);
+        sb.append(", capacityNumber=").append(capacityNumber);
+        sb.append(", capacityMaxLoad=").append(capacityMaxLoad);
+        sb.append(", capacityTypeId=").append(capacityTypeId);
+        sb.append(", capacityStatus=").append(capacityStatus);
+        sb.append(", carrierId=").append(carrierId);
+        sb.append(", capacityEnergyId=").append(capacityEnergyId);
+        sb.append(", capacityLenVal=").append(capacityLenVal);
+        sb.append(", capacityWidVal=").append(capacityWidVal);
+        sb.append(", capacityHigVal=").append(capacityHigVal);
+        sb.append(", capacityOilId=").append(capacityOilId);
+        sb.append(", capacityFuelConsumption=").append(capacityFuelConsumption);
+        sb.append(", capacityOwneris=").append(capacityOwneris);
+        sb.append(", capacityBlacklist=").append(capacityBlacklist);
+        sb.append(", memo=").append(memo);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", capacityCorlor=").append(capacityCorlor);
+        sb.append(", capacityVip=").append(capacityVip);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", capacitySsoId=").append(capacitySsoId);
+        sb.append(", driverLicenceUrl=").append(driverLicenceUrl);
+        sb.append(", capacityUserDep=").append(capacityUserDep);
+        sb.append(", capacityTel=").append(capacityTel);
+        sb.append(", capacityBookingNumber=").append(capacityBookingNumber);
+        sb.append(", capacityGps=").append(capacityGps);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
     }
 }

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

@@ -140,6 +140,7 @@ public class RmsCapacityServiceImpl implements IRmsCapacityService {
         if (!("".equals(map.get("capacityGps")))&&map.get("capacityGps")!=null){
             capacityGps = (String) map.get("capacityGps");
         }
+
         BigDecimal capacityCarrierId =DataChange.dataToBigDecimal(map.get("capacityCarrierId"));
         RmsCapacityCarrier rmsCapacityCarrier=new RmsCapacityCarrier();
         rmsCapacityCarrier.setCapacityCarrierId(capacityCarrierId);
@@ -150,6 +151,16 @@ public class RmsCapacityServiceImpl implements IRmsCapacityService {
             capacityNumber = (String) map.get("capacityNumber");
             rmsCapacityMapper.updatecapacityTel(capacityNumber,capacityTel,capacityCarrierId,capacityVip,capacityGps);
         }
+        RmsCapacity rmsCapacity = new RmsCapacity();
+        if(map.get("capacityId") != null) {
+            rmsCapacity.setCapacityId(DataChange.dataToBigDecimal(map.get("capacityId")));
+            rmsCapacity.setCapacityVip(capacityVip);
+            rmsCapacity.setCapacityGps(capacityGps);
+            rmsCapacity.setCapacityVip(capacityVip);
+            rmsCapacity.setCapacityBlacklist(capacityBlackList);
+            rmsCapacityMapper.updateByPrimaryKeySelective(rmsCapacity);
+        }
+
         return rmsCapacityCarrierMapper.updateByPrimaryKeySelective(rmsCapacityCarrier);
     }
 

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

@@ -27,22 +27,26 @@
     <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
     <result column="CAPACITY_SSO_ID" jdbcType="VARCHAR" property="capacitySsoId" />
     <result column="DRIVER_LICENCE_URL" jdbcType="VARCHAR" property="driverLicenceUrl" />
+    <result column="CAPACITY_USER_DEP" jdbcType="VARCHAR" property="capacityUserDep" />
     <result column="CAPACITY_TEL" jdbcType="VARCHAR" property="capacityTel" />
+    <result column="CAPACITY_BOOKING_NUMBER" jdbcType="DECIMAL" property="capacityBookingNumber" />
+    <result column="CAPACITY_GPS" jdbcType="VARCHAR" property="capacityGps" />
   </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_SSO_ID,DRIVER_LICENCE_URL,CAPACITY_TEL
+    CAPACITY_CORLOR, CAPACITY_VIP, DELETED, CAPACITY_SSO_ID, DRIVER_LICENCE_URL, CAPACITY_USER_DEP, 
+    CAPACITY_TEL, CAPACITY_BOOKING_NUMBER, CAPACITY_GPS
   </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_SSO_ID,DRIVER_LICENCE_URL,t.CAPACITY_TEL
+    t.CAPACITY_CORLOR, t.CAPACITY_VIP, t.DELETED, t.CAPACITY_SSO_ID, t.DRIVER_LICENCE_URL, 
+    t.CAPACITY_USER_DEP, t.CAPACITY_TEL, t.CAPACITY_BOOKING_NUMBER, t.CAPACITY_GPS
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM RMS_CAPACITY
@@ -51,7 +55,7 @@
     SELECT <include refid="columns_alias" /> FROM RMS_CAPACITY t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="capacityId != null">
         and CAPACITY_ID = #{capacityId}
       </if>
@@ -127,10 +131,22 @@
       <if test="driverLicenceUrl != null and driverLicenceUrl != ''">
         and DRIVER_LICENCE_URL = #{driverLicenceUrl}
       </if>
+      <if test="capacityUserDep != null and capacityUserDep != ''">
+        and CAPACITY_USER_DEP = #{capacityUserDep}
+      </if>
+      <if test="capacityTel != null and capacityTel != ''">
+        and CAPACITY_TEL = #{capacityTel}
+      </if>
+      <if test="capacityBookingNumber != null">
+        and CAPACITY_BOOKING_NUMBER = #{capacityBookingNumber}
+      </if>
+      <if test="capacityGps != null and capacityGps != ''">
+        and CAPACITY_GPS = #{capacityGps}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="capacityId != null">
         and CAPACITY_ID = #{capacityId}
       </if>
@@ -206,6 +222,18 @@
       <if test="driverLicenceUrl != null and driverLicenceUrl != ''">
         and DRIVER_LICENCE_URL LIKE '%${driverLicenceUrl}%'
       </if>
+      <if test="capacityUserDep != null and capacityUserDep != ''">
+        and CAPACITY_USER_DEP LIKE '%${capacityUserDep}%'
+      </if>
+      <if test="capacityTel != null and capacityTel != ''">
+        and CAPACITY_TEL LIKE '%${capacityTel}%'
+      </if>
+      <if test="capacityBookingNumber != null">
+        and CAPACITY_BOOKING_NUMBER = #{capacityBookingNumber}
+      </if>
+      <if test="capacityGps != null and capacityGps != ''">
+        and CAPACITY_GPS LIKE '%${capacityGps}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
@@ -214,99 +242,113 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from RMS_CAPACITY
-    where 1!=1 
-      <if test="capacityNumber != null and capacityNumber != ''">
-        or CAPACITY_NUMBER = #{capacityNumber}
-      </if>
-      <if test="capacityMaxLoad != null">
-        or CAPACITY_MAX_LOAD = #{capacityMaxLoad}
-      </if>
-      <if test="capacityTypeId != null">
-        or CAPACITY_TYPE_ID = #{capacityTypeId}
-      </if>
-      <if test="capacityStatus != null">
-        or CAPACITY_STATUS = #{capacityStatus}
-      </if>
-      <if test="carrierId != null">
-        or CARRIER_ID = #{carrierId}
-      </if>
-      <if test="capacityEnergyId != null and capacityEnergyId != ''">
-        or CAPACITY_ENERGY_ID = #{capacityEnergyId}
-      </if>
-      <if test="capacityLenVal != null">
-        or CAPACITY_LEN_VAL = #{capacityLenVal}
-      </if>
-      <if test="capacityWidVal != null">
-        or CAPACITY_WID_VAL = #{capacityWidVal}
-      </if>
-      <if test="capacityHigVal != null">
-        or CAPACITY_HIG_VAL = #{capacityHigVal}
-      </if>
-      <if test="capacityOilId != null">
-        or CAPACITY_OIL_ID = #{capacityOilId}
-      </if>
-      <if test="capacityFuelConsumption != null and capacityFuelConsumption != ''">
-        or CAPACITY_FUEL_CONSUMPTION = #{capacityFuelConsumption}
-      </if>
-      <if test="capacityOwneris != null and capacityOwneris != ''">
-        or CAPACITY_OWNERIS = #{capacityOwneris}
-      </if>
-      <if test="capacityBlacklist != null and capacityBlacklist != ''">
-        or CAPACITY_BLACKLIST = #{capacityBlacklist}
-      </if>
-      <if test="memo != null and memo != ''">
-        or MEMO = #{memo}
-      </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="capacityCorlor != null and capacityCorlor != ''">
-        or CAPACITY_CORLOR = #{capacityCorlor}
-      </if>
-      <if test="capacityVip != null and capacityVip != ''">
-        or CAPACITY_VIP = #{capacityVip}
-      </if>
-      <if test="deleted != null">
-        or DELETED = #{deleted}
-      </if>
-      <if test="capacitySsoId != null and capacitySsoId != ''">
-        or CAPACITY_SSO_ID = #{capacitySsoId}
-      </if>
+    where 1!=1
+    <if test="capacityNumber != null and capacityNumber != ''">
+      or CAPACITY_NUMBER = #{capacityNumber}
+    </if>
+    <if test="capacityMaxLoad != null">
+      or CAPACITY_MAX_LOAD = #{capacityMaxLoad}
+    </if>
+    <if test="capacityTypeId != null">
+      or CAPACITY_TYPE_ID = #{capacityTypeId}
+    </if>
+    <if test="capacityStatus != null">
+      or CAPACITY_STATUS = #{capacityStatus}
+    </if>
+    <if test="carrierId != null">
+      or CARRIER_ID = #{carrierId}
+    </if>
+    <if test="capacityEnergyId != null and capacityEnergyId != ''">
+      or CAPACITY_ENERGY_ID = #{capacityEnergyId}
+    </if>
+    <if test="capacityLenVal != null">
+      or CAPACITY_LEN_VAL = #{capacityLenVal}
+    </if>
+    <if test="capacityWidVal != null">
+      or CAPACITY_WID_VAL = #{capacityWidVal}
+    </if>
+    <if test="capacityHigVal != null">
+      or CAPACITY_HIG_VAL = #{capacityHigVal}
+    </if>
+    <if test="capacityOilId != null">
+      or CAPACITY_OIL_ID = #{capacityOilId}
+    </if>
+    <if test="capacityFuelConsumption != null and capacityFuelConsumption != ''">
+      or CAPACITY_FUEL_CONSUMPTION = #{capacityFuelConsumption}
+    </if>
+    <if test="capacityOwneris != null and capacityOwneris != ''">
+      or CAPACITY_OWNERIS = #{capacityOwneris}
+    </if>
+    <if test="capacityBlacklist != null and capacityBlacklist != ''">
+      or CAPACITY_BLACKLIST = #{capacityBlacklist}
+    </if>
+    <if test="memo != null and memo != ''">
+      or MEMO = #{memo}
+    </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="capacityCorlor != null and capacityCorlor != ''">
+      or CAPACITY_CORLOR = #{capacityCorlor}
+    </if>
+    <if test="capacityVip != null and capacityVip != ''">
+      or CAPACITY_VIP = #{capacityVip}
+    </if>
+    <if test="deleted != null">
+      or DELETED = #{deleted}
+    </if>
+    <if test="capacitySsoId != null and capacitySsoId != ''">
+      or CAPACITY_SSO_ID = #{capacitySsoId}
+    </if>
     <if test="driverLicenceUrl != null and driverLicenceUrl != ''">
       or DRIVER_LICENCE_URL = #{driverLicenceUrl}
     </if>
+    <if test="capacityUserDep != null and capacityUserDep != ''">
+      or CAPACITY_USER_DEP = #{capacityUserDep}
+    </if>
+    <if test="capacityTel != null and capacityTel != ''">
+      or CAPACITY_TEL = #{capacityTel}
+    </if>
+    <if test="capacityBookingNumber != null">
+      or CAPACITY_BOOKING_NUMBER = #{capacityBookingNumber}
+    </if>
+    <if test="capacityGps != null and capacityGps != ''">
+      or CAPACITY_GPS = #{capacityGps}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.RmsCapacity">
-    insert into RMS_CAPACITY (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_SSO_ID,DRIVER_LICENCE_URL
-      )
-    values (#{capacityId,jdbcType=DECIMAL}, #{capacityNumber,jdbcType=VARCHAR}, #{capacityMaxLoad,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}, #{capacitySsoId,jdbcType=VARCHAR}, #{driverLicenceUrl,jdbcType=VARCHAR}
-      )
+    insert into RMS_CAPACITY (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_SSO_ID,
+                              DRIVER_LICENCE_URL, CAPACITY_USER_DEP, CAPACITY_TEL,
+                              CAPACITY_BOOKING_NUMBER, CAPACITY_GPS)
+    values (#{capacityId,jdbcType=DECIMAL}, #{capacityNumber,jdbcType=VARCHAR}, #{capacityMaxLoad,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}, #{capacitySsoId,jdbcType=VARCHAR},
+            #{driverLicenceUrl,jdbcType=VARCHAR}, #{capacityUserDep,jdbcType=VARCHAR}, #{capacityTel,jdbcType=VARCHAR},
+            #{capacityBookingNumber,jdbcType=DECIMAL}, #{capacityGps,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsCapacity">
     insert into RMS_CAPACITY
@@ -386,9 +428,18 @@
       <if test="driverLicenceUrl != null">
         DRIVER_LICENCE_URL,
       </if>
+      <if test="capacityUserDep != null">
+        CAPACITY_USER_DEP,
+      </if>
       <if test="capacityTel != null">
         CAPACITY_TEL,
       </if>
+      <if test="capacityBookingNumber != null">
+        CAPACITY_BOOKING_NUMBER,
+      </if>
+      <if test="capacityGps != null">
+        CAPACITY_GPS,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="capacityId != null">
@@ -466,37 +517,50 @@
       <if test="driverLicenceUrl != null">
         #{driverLicenceUrl,jdbcType=VARCHAR},
       </if>
+      <if test="capacityUserDep != null">
+        #{capacityUserDep,jdbcType=VARCHAR},
+      </if>
       <if test="capacityTel != null">
         #{capacityTel,jdbcType=VARCHAR},
       </if>
+      <if test="capacityBookingNumber != null">
+        #{capacityBookingNumber,jdbcType=DECIMAL},
+      </if>
+      <if test="capacityGps != null">
+        #{capacityGps,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsCapacity">
     update RMS_CAPACITY
     set CAPACITY_NUMBER = #{capacityNumber,jdbcType=VARCHAR},
-      CAPACITY_MAX_LOAD = #{capacityMaxLoad,jdbcType=DECIMAL},
-      CAPACITY_TYPE_ID = #{capacityTypeId,jdbcType=DECIMAL},
-      CAPACITY_STATUS = #{capacityStatus,jdbcType=DECIMAL},
-      CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
-      CAPACITY_ENERGY_ID = #{capacityEnergyId,jdbcType=VARCHAR},
-      CAPACITY_LEN_VAL = #{capacityLenVal,jdbcType=DECIMAL},
-      CAPACITY_WID_VAL = #{capacityWidVal,jdbcType=DECIMAL},
-      CAPACITY_HIG_VAL = #{capacityHigVal,jdbcType=DECIMAL},
-      CAPACITY_OIL_ID = #{capacityOilId,jdbcType=DECIMAL},
-      CAPACITY_FUEL_CONSUMPTION = #{capacityFuelConsumption,jdbcType=VARCHAR},
-      CAPACITY_OWNERIS = #{capacityOwneris,jdbcType=VARCHAR},
-      CAPACITY_BLACKLIST = #{capacityBlacklist,jdbcType=VARCHAR},
-      MEMO = #{memo,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},
-      CAPACITY_CORLOR = #{capacityCorlor,jdbcType=VARCHAR},
-      CAPACITY_VIP = #{capacityVip,jdbcType=VARCHAR},
-      DELETED = #{deleted,jdbcType=DECIMAL},
-      CAPACITY_SSO_ID = #{capacitySsoId,jdbcType=VARCHAR}
-      DRIVER_LICENCE_URL = #{driverLicenceUrl,jdbcType=VARCHAR}
+        CAPACITY_MAX_LOAD = #{capacityMaxLoad,jdbcType=DECIMAL},
+        CAPACITY_TYPE_ID = #{capacityTypeId,jdbcType=DECIMAL},
+        CAPACITY_STATUS = #{capacityStatus,jdbcType=DECIMAL},
+        CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
+        CAPACITY_ENERGY_ID = #{capacityEnergyId,jdbcType=VARCHAR},
+        CAPACITY_LEN_VAL = #{capacityLenVal,jdbcType=DECIMAL},
+        CAPACITY_WID_VAL = #{capacityWidVal,jdbcType=DECIMAL},
+        CAPACITY_HIG_VAL = #{capacityHigVal,jdbcType=DECIMAL},
+        CAPACITY_OIL_ID = #{capacityOilId,jdbcType=DECIMAL},
+        CAPACITY_FUEL_CONSUMPTION = #{capacityFuelConsumption,jdbcType=VARCHAR},
+        CAPACITY_OWNERIS = #{capacityOwneris,jdbcType=VARCHAR},
+        CAPACITY_BLACKLIST = #{capacityBlacklist,jdbcType=VARCHAR},
+        MEMO = #{memo,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},
+        CAPACITY_CORLOR = #{capacityCorlor,jdbcType=VARCHAR},
+        CAPACITY_VIP = #{capacityVip,jdbcType=VARCHAR},
+        DELETED = #{deleted,jdbcType=DECIMAL},
+        CAPACITY_SSO_ID = #{capacitySsoId,jdbcType=VARCHAR},
+        DRIVER_LICENCE_URL = #{driverLicenceUrl,jdbcType=VARCHAR},
+        CAPACITY_USER_DEP = #{capacityUserDep,jdbcType=VARCHAR},
+        CAPACITY_TEL = #{capacityTel,jdbcType=VARCHAR},
+        CAPACITY_BOOKING_NUMBER = #{capacityBookingNumber,jdbcType=DECIMAL},
+        CAPACITY_GPS = #{capacityGps,jdbcType=VARCHAR}
     where CAPACITY_ID = #{capacityId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsCapacity">
@@ -574,6 +638,18 @@
       <if test="driverLicenceUrl != null">
         DRIVER_LICENCE_URL = #{driverLicenceUrl,jdbcType=VARCHAR},
       </if>
+      <if test="capacityUserDep != null">
+        CAPACITY_USER_DEP = #{capacityUserDep,jdbcType=VARCHAR},
+      </if>
+      <if test="capacityTel != null">
+        CAPACITY_TEL = #{capacityTel,jdbcType=VARCHAR},
+      </if>
+      <if test="capacityBookingNumber != null">
+        CAPACITY_BOOKING_NUMBER = #{capacityBookingNumber,jdbcType=DECIMAL},
+      </if>
+      <if test="capacityGps != null">
+        CAPACITY_GPS = #{capacityGps,jdbcType=VARCHAR},
+      </if>
     </set>
     where CAPACITY_ID = #{capacityId,jdbcType=DECIMAL}
   </update>
@@ -590,152 +666,175 @@
     <include refid="whereLike" />
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into RMS_CAPACITY 
-      (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_SSO_ID,DRIVER_LICENCE_URL)
-    ( <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.carrierId,jdbcType=DECIMAL}, #{item.capacityEnergyId,jdbcType=VARCHAR}, 
-      #{item.capacityLenVal,jdbcType=DECIMAL}, #{item.capacityWidVal,jdbcType=DECIMAL}, 
-      #{item.capacityHigVal,jdbcType=DECIMAL}, #{item.capacityOilId,jdbcType=DECIMAL}, 
-      #{item.capacityFuelConsumption,jdbcType=VARCHAR}, #{item.capacityOwneris,jdbcType=VARCHAR}, 
-      #{item.capacityBlacklist,jdbcType=VARCHAR}, #{item.memo,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR}, 
-      #{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}, #{item.capacitySsoId,jdbcType=VARCHAR}, #{item.driverLicenceUrl,jdbcType=VARCHAR} from dual
-   </foreach> )
+    insert into RMS_CAPACITY
+    (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_SSO_ID, DRIVER_LICENCE_URL,
+    CAPACITY_USER_DEP, CAPACITY_TEL,
+    CAPACITY_BOOKING_NUMBER, CAPACITY_GPS
+    )
+    ( <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.carrierId,jdbcType=DECIMAL}, #{item.capacityEnergyId,jdbcType=VARCHAR},
+    #{item.capacityLenVal,jdbcType=DECIMAL}, #{item.capacityWidVal,jdbcType=DECIMAL},
+    #{item.capacityHigVal,jdbcType=DECIMAL}, #{item.capacityOilId,jdbcType=DECIMAL},
+    #{item.capacityFuelConsumption,jdbcType=VARCHAR}, #{item.capacityOwneris,jdbcType=VARCHAR},
+    #{item.capacityBlacklist,jdbcType=VARCHAR}, #{item.memo,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR},
+    #{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}, #{item.capacitySsoId,jdbcType=VARCHAR}, #{item.driverLicenceUrl,jdbcType=VARCHAR},
+    #{item.capacityUserDep,jdbcType=VARCHAR}, #{item.capacityTel,jdbcType=VARCHAR},
+    #{item.capacityBookingNumber,jdbcType=DECIMAL}, #{item.capacityGps,jdbcType=VARCHAR}
+    from dual
+  </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
-     update RMS_CAPACITY
-     set
-       CAPACITY_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityId,jdbcType=DECIMAL}
-       </foreach>
-       ,CAPACITY_NUMBER=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityNumber,jdbcType=VARCHAR}
-       </foreach>
-       ,CAPACITY_MAX_LOAD=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityMaxLoad,jdbcType=DECIMAL}
-       </foreach>
-       ,CAPACITY_TYPE_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityTypeId,jdbcType=DECIMAL}
-       </foreach>
-       ,CAPACITY_STATUS=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityStatus,jdbcType=DECIMAL}
-       </foreach>
-       ,CARRIER_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.carrierId,jdbcType=DECIMAL}
-       </foreach>
-       ,CAPACITY_ENERGY_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityEnergyId,jdbcType=VARCHAR}
-       </foreach>
-       ,CAPACITY_LEN_VAL=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityLenVal,jdbcType=DECIMAL}
-       </foreach>
-       ,CAPACITY_WID_VAL=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityWidVal,jdbcType=DECIMAL}
-       </foreach>
-       ,CAPACITY_HIG_VAL=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityHigVal,jdbcType=DECIMAL}
-       </foreach>
-       ,CAPACITY_OIL_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityOilId,jdbcType=DECIMAL}
-       </foreach>
-       ,CAPACITY_FUEL_CONSUMPTION=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityFuelConsumption,jdbcType=VARCHAR}
-       </foreach>
-       ,CAPACITY_OWNERIS=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityOwneris,jdbcType=VARCHAR}
-       </foreach>
-       ,CAPACITY_BLACKLIST=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityBlacklist,jdbcType=VARCHAR}
-       </foreach>
-       ,MEMO=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.memo,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-       ,CAPACITY_CORLOR=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityCorlor,jdbcType=VARCHAR}
-       </foreach>
-       ,CAPACITY_VIP=
-       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityVip,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETED=
-       <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>
-        ,DRIVER_LICENCE_URL=
-        <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
-          when #{item.capacityId,jdbcType=DECIMAL} then #{item.driverLicenceUrl,jdbcType=VARCHAR}
-        </foreach>
-     where CAPACITY_ID in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.capacityId,jdbcType=DECIMAL}
-     </foreach> 
+    update RMS_CAPACITY
+    set
+    CAPACITY_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
+      when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityId,jdbcType=DECIMAL}
+    </foreach>
+    ,CAPACITY_NUMBER=
+    <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
+      when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityNumber,jdbcType=VARCHAR}
+    </foreach>
+    ,CAPACITY_MAX_LOAD=
+    <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
+      when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityMaxLoad,jdbcType=DECIMAL}
+    </foreach>
+    ,CAPACITY_TYPE_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
+      when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityTypeId,jdbcType=DECIMAL}
+    </foreach>
+    ,CAPACITY_STATUS=
+    <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
+      when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityStatus,jdbcType=DECIMAL}
+    </foreach>
+    ,CARRIER_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
+      when #{item.capacityId,jdbcType=DECIMAL} then #{item.carrierId,jdbcType=DECIMAL}
+    </foreach>
+    ,CAPACITY_ENERGY_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
+      when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityEnergyId,jdbcType=VARCHAR}
+    </foreach>
+    ,CAPACITY_LEN_VAL=
+    <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
+      when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityLenVal,jdbcType=DECIMAL}
+    </foreach>
+    ,CAPACITY_WID_VAL=
+    <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
+      when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityWidVal,jdbcType=DECIMAL}
+    </foreach>
+    ,CAPACITY_HIG_VAL=
+    <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
+      when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityHigVal,jdbcType=DECIMAL}
+    </foreach>
+    ,CAPACITY_OIL_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
+      when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityOilId,jdbcType=DECIMAL}
+    </foreach>
+    ,CAPACITY_FUEL_CONSUMPTION=
+    <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
+      when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityFuelConsumption,jdbcType=VARCHAR}
+    </foreach>
+    ,CAPACITY_OWNERIS=
+    <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
+      when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityOwneris,jdbcType=VARCHAR}
+    </foreach>
+    ,CAPACITY_BLACKLIST=
+    <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
+      when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityBlacklist,jdbcType=VARCHAR}
+    </foreach>
+    ,MEMO=
+    <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
+      when #{item.capacityId,jdbcType=DECIMAL} then #{item.memo,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_USERNAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
+      when #{item.capacityId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
+      when #{item.capacityId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,UPDATE_USERNAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
+      when #{item.capacityId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,UPDATE_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
+      when #{item.capacityId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,INSERT_UPDATE_REMARK=
+    <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
+      when #{item.capacityId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+    </foreach>
+    ,CAPACITY_CORLOR=
+    <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
+      when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityCorlor,jdbcType=VARCHAR}
+    </foreach>
+    ,CAPACITY_VIP=
+    <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
+      when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityVip,jdbcType=VARCHAR}
+    </foreach>
+    ,DELETED=
+    <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>
+    ,DRIVER_LICENCE_URL=
+    <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
+      when #{item.capacityId,jdbcType=DECIMAL} then #{item.driverLicenceUrl,jdbcType=VARCHAR}
+    </foreach>
+    ,CAPACITY_USER_DEP=
+    <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
+      when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityUserDep,jdbcType=VARCHAR}
+    </foreach>
+    ,CAPACITY_TEL=
+    <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
+      when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityTel,jdbcType=VARCHAR}
+    </foreach>
+    ,CAPACITY_BOOKING_NUMBER=
+    <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
+      when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityBookingNumber,jdbcType=DECIMAL}
+    </foreach>
+    ,CAPACITY_GPS=
+    <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
+      when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityGps,jdbcType=VARCHAR}
+    </foreach>
+    where CAPACITY_ID in
+    <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+      #{item.capacityId,jdbcType=DECIMAL}
+    </foreach>
   </update>
-  
   <delete id="batchDelete" parameterType="java.util.List">
     delete from RMS_CAPACITY
-    where CAPACITY_ID in 
+    where CAPACITY_ID in
     <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>
   </delete>
- 
+
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   <select id="getCapacityList" parameterType="java.util.Map" resultType="java.util.Map">