'一对多的车与承运商'

pom.xml

@@ -111,7 +111,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>RMS_OIL_PRICE</param>
+                        <param>RMS_CAPACITY_CARRIER</param>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -47,8 +47,11 @@ public class RmsCapacityController extends BaseRESTfulController {
     @PostMapping(value = "/insertCapacity")
     public RESTfulResult insertCapacity(@RequestBody(required = false) Map<String,Object> mapValue){
        int result = rmsCapacityService.insertCapacity(mapValue);
-       if (result <= 0){
-           return failed();
+       if (result == 0){
+           return success(0);
+       }
+       if (result == -1) {
+           return failed(-1);
        }
         return success(result);
     }
@@ -58,7 +61,6 @@ public class RmsCapacityController extends BaseRESTfulController {
      * @param rmsCapacity
      * @return
      */
-
     @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的rmsCapacity信息来更新详细信息")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "Short"),

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

@@ -0,0 +1,13 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.RmsCapacityCarrier;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface RmsCapacityCarrierMapper extends IBaseMapper<RmsCapacityCarrier, BigDecimal> {
+    @Select("select seq_CAPACITY_CARRIER.nextval from dual")
+    BigDecimal selectMaxId();
+}

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

@@ -0,0 +1,168 @@
+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;
+
+@ApiModel(value="运力和承运商中间表")
+public class RmsCapacityCarrier implements IBasePO<BigDecimal> {
+    /**
+     * 运力和承运商中间表主键(CAPACITY_CARRIER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="运力和承运商中间表主键",required=true)
+    private BigDecimal capacityCarrierId;
+
+    /**
+     * 运力ID(CAPACITY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="运力ID",required=false)
+    private BigDecimal capacityId;
+
+    /**
+     * 承运商ID(CARRIER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="承运商ID",required=false)
+    private BigDecimal carrierId;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 逻辑删除0：未删除；1：已删除(DELETED,DECIMAL,38)
+     */
+    @ApiModelProperty(value="逻辑删除0：未删除；1：已删除",required=false)
+    private BigDecimal deleted;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.capacityCarrierId;
+    }
+
+    @Override
+    public void setId(BigDecimal capacityCarrierId) {
+        this.capacityCarrierId = capacityCarrierId;
+    }
+
+    public BigDecimal getCapacityCarrierId() {
+        return capacityCarrierId;
+    }
+
+    public void setCapacityCarrierId(BigDecimal capacityCarrierId) {
+        this.capacityCarrierId = capacityCarrierId;
+    }
+
+    public BigDecimal getCapacityId() {
+        return capacityId;
+    }
+
+    public void setCapacityId(BigDecimal capacityId) {
+        this.capacityId = capacityId;
+    }
+
+    public BigDecimal getCarrierId() {
+        return carrierId;
+    }
+
+    public void setCarrierId(BigDecimal carrierId) {
+        this.carrierId = carrierId;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", capacityCarrierId=").append(capacityCarrierId);
+        sb.append(", capacityId=").append(capacityId);
+        sb.append(", carrierId=").append(carrierId);
+        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(", deleted=").append(deleted);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -1,8 +1,10 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.mapper.RmsCapacityCarrierMapper;
 import com.steerinfo.dil.mapper.RmsCapacityMapper;
 import com.steerinfo.dil.mapper.RmsCarrierMapper;
 import com.steerinfo.dil.model.RmsCapacity;
+import com.steerinfo.dil.model.RmsCapacityCarrier;
 import com.steerinfo.dil.service.IRmsCapacityService;
 import com.steerinfo.dil.util.DataChange;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,6 +12,7 @@ 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;
 
@@ -26,6 +29,9 @@ public class RmsCapacityServiceImpl implements IRmsCapacityService {
 
     @Autowired
     RmsCarrierMapper rmsCarrierMapper;
+
+    @Autowired
+    RmsCapacityCarrierMapper rmsCapacityCarrierMapper;
     /*
     * 获取运力信息
     * */
@@ -45,14 +51,41 @@ public class RmsCapacityServiceImpl implements IRmsCapacityService {
         BigDecimal carrierIds=DataChange.dataToBigDecimal(mapValue.get("carrierId"));
        // String carrierUserId = (String) mapValue.get("carrierUserId");
        // BigDecimal carrierId = rmsCarrierMapper.getCarrierIdByCarrierSSOId(carrierUserId);
-        //如果车辆已存在  那就是更改承运商
+        //如果车辆已存在  那就是增加承运商与车牌关系
         Integer capacityId = rmsCapacityMapper.selectBycapacityNumber(capacityNumber);
         if(capacityId != null){
-            rmsCapacity.setCapacityId(new BigDecimal(capacityId));
-            rmsCapacity.setCarrierId(carrierIds);
-            return rmsCapacityMapper.updateByPrimaryKeySelective(rmsCapacity);
+            Map<String,Object> map = new HashMap<>();
+            map.put("capacityId",capacityId);
+            map.put("carrierId",carrierIds);
+            List<RmsCapacityCarrier> rmsCapacityCarriers = rmsCapacityCarrierMapper.selectByParameters(map);
+            if (rmsCapacityCarriers != null && rmsCapacityCarriers.size() != 0) {
+                return -1;
+            }
+            else {
+                RmsCapacityCarrier rmsCapacityCarrier = new RmsCapacityCarrier();
+                rmsCapacityCarrier.setCapacityCarrierId(rmsCapacityCarrierMapper.selectMaxId());
+                rmsCapacityCarrier.setCapacityId(new BigDecimal(capacityId));
+                rmsCapacityCarrier.setCarrierId(carrierIds);
+                rmsCapacityCarrier.setInsertUsername("admin");
+                rmsCapacityCarrier.setUpdateUsername("admin");
+                rmsCapacityCarrier.setInsertTime(new Date());
+                rmsCapacityCarrier.setUpdateTime(new Date());
+                rmsCapacityCarrier.setDeleted(new BigDecimal(0));
+                rmsCapacityCarrierMapper.insertSelective(rmsCapacityCarrier);
+                return 0;
+            }
         }
         rmsCapacity.setCapacityId(rmsCapacityMapper.selectCapacityId());
+        RmsCapacityCarrier rmsCapacityCarrier = new RmsCapacityCarrier();
+        rmsCapacityCarrier.setCapacityCarrierId(rmsCapacityCarrierMapper.selectMaxId());
+        rmsCapacityCarrier.setCapacityId(rmsCapacity.getCapacityId());
+        rmsCapacityCarrier.setCarrierId(carrierIds);
+        rmsCapacityCarrier.setInsertUsername("admin");
+        rmsCapacityCarrier.setUpdateUsername("admin");
+        rmsCapacityCarrier.setInsertTime(new Date());
+        rmsCapacityCarrier.setUpdateTime(new Date());
+        rmsCapacityCarrier.setDeleted(new BigDecimal(0));
+        rmsCapacityCarrierMapper.insertSelective(rmsCapacityCarrier);
         rmsCapacity.setCarrierId(carrierIds);
         rmsCapacity.setCapacityTypeId(DataChange.dataToBigDecimal(mapValue.get("capacityTypeId")));
         rmsCapacity.setCapacityNumber(capacityNumber);

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

@@ -0,0 +1,319 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.RmsCapacityCarrierMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsCapacityCarrier">
+    <id column="CAPACITY_CARRIER_ID" jdbcType="DECIMAL" property="capacityCarrierId" />
+    <result column="CAPACITY_ID" jdbcType="DECIMAL" property="capacityId" />
+    <result column="CARRIER_ID" jdbcType="DECIMAL" property="carrierId" />
+    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+    <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+  </resultMap>
+  <sql id="columns">
+    CAPACITY_CARRIER_ID, CAPACITY_ID, CARRIER_ID, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
+    UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED
+  </sql>
+  <sql id="columns_alias">
+    t.CAPACITY_CARRIER_ID, t.CAPACITY_ID, t.CARRIER_ID, t.INSERT_USERNAME, t.INSERT_TIME, 
+    t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns" /> FROM RMS_CAPACITY_CARRIER
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM RMS_CAPACITY_CARRIER t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="capacityCarrierId != null">
+        and CAPACITY_CARRIER_ID = #{capacityCarrierId}
+      </if>
+      <if test="capacityId != null">
+        and CAPACITY_ID = #{capacityId}
+      </if>
+      <if test="carrierId != null">
+        and CARRIER_ID = #{carrierId}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="capacityCarrierId != null">
+        and CAPACITY_CARRIER_ID = #{capacityCarrierId}
+      </if>
+      <if test="capacityId != null">
+        and CAPACITY_ID = #{capacityId}
+      </if>
+      <if test="carrierId != null">
+        and CARRIER_ID = #{carrierId}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME LIKE '%${insertUsername}%'
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME LIKE '%${updateUsername}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+      </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from RMS_CAPACITY_CARRIER
+    where CAPACITY_CARRIER_ID = #{capacityCarrierId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from RMS_CAPACITY_CARRIER
+    where 1!=1 
+      <if test="capacityId != null">
+        or CAPACITY_ID = #{capacityId}
+      </if>
+      <if test="carrierId != null">
+        or CARRIER_ID = #{carrierId}
+      </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>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.RmsCapacityCarrier">
+    insert into RMS_CAPACITY_CARRIER (CAPACITY_CARRIER_ID, CAPACITY_ID, CARRIER_ID, 
+      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
+      UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED
+      )
+    values (#{capacityCarrierId,jdbcType=DECIMAL}, #{capacityId,jdbcType=DECIMAL}, #{carrierId,jdbcType=DECIMAL}, 
+      #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsCapacityCarrier">
+    insert into RMS_CAPACITY_CARRIER
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="capacityCarrierId != null">
+        CAPACITY_CARRIER_ID,
+      </if>
+      <if test="capacityId != null">
+        CAPACITY_ID,
+      </if>
+      <if test="carrierId != null">
+        CARRIER_ID,
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME,
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME,
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK,
+      </if>
+      <if test="deleted != null">
+        DELETED,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="capacityCarrierId != null">
+        #{capacityCarrierId,jdbcType=DECIMAL},
+      </if>
+      <if test="capacityId != null">
+        #{capacityId,jdbcType=DECIMAL},
+      </if>
+      <if test="carrierId != null">
+        #{carrierId,jdbcType=DECIMAL},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        #{deleted,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsCapacityCarrier">
+    update RMS_CAPACITY_CARRIER
+    set CAPACITY_ID = #{capacityId,jdbcType=DECIMAL},
+      CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
+      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}
+    where CAPACITY_CARRIER_ID = #{capacityCarrierId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsCapacityCarrier">
+    update RMS_CAPACITY_CARRIER
+    <set>
+      <if test="capacityId != null">
+        CAPACITY_ID = #{capacityId,jdbcType=DECIMAL},
+      </if>
+      <if test="carrierId != null">
+        CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        DELETED = #{deleted,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where CAPACITY_CARRIER_ID = #{capacityCarrierId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select" />
+    where CAPACITY_CARRIER_ID = #{capacityCarrierId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="where" />
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="whereLike" />
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into RMS_CAPACITY_CARRIER 
+      (CAPACITY_CARRIER_ID, 
+      CAPACITY_ID, CARRIER_ID, INSERT_USERNAME, 
+      INSERT_TIME, UPDATE_USERNAME, 
+      UPDATE_TIME, INSERT_UPDATE_REMARK, 
+      DELETED)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.capacityCarrierId,jdbcType=DECIMAL}, 
+      #{item.capacityId,jdbcType=DECIMAL}, #{item.carrierId,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR}, 
+      #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
+      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}, 
+      #{item.deleted,jdbcType=DECIMAL} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update RMS_CAPACITY_CARRIER
+     set
+       CAPACITY_CARRIER_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_CARRIER_ID" separator=" ">
+          when #{item.capacityCarrierId,jdbcType=DECIMAL} then #{item.capacityCarrierId,jdbcType=DECIMAL}
+       </foreach>
+       ,CAPACITY_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_CARRIER_ID" separator=" ">
+          when #{item.capacityCarrierId,jdbcType=DECIMAL} then #{item.capacityId,jdbcType=DECIMAL}
+       </foreach>
+       ,CARRIER_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_CARRIER_ID" separator=" ">
+          when #{item.capacityCarrierId,jdbcType=DECIMAL} then #{item.carrierId,jdbcType=DECIMAL}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_CARRIER_ID" separator=" ">
+          when #{item.capacityCarrierId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_CARRIER_ID" separator=" ">
+          when #{item.capacityCarrierId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_CARRIER_ID" separator=" ">
+          when #{item.capacityCarrierId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_CARRIER_ID" separator=" ">
+          when #{item.capacityCarrierId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_CARRIER_ID" separator=" ">
+          when #{item.capacityCarrierId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETED=
+       <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_CARRIER_ID" separator=" ">
+          when #{item.capacityCarrierId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+       </foreach>
+     where CAPACITY_CARRIER_ID in 
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.capacityCarrierId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from RMS_CAPACITY_CARRIER
+    where CAPACITY_CARRIER_ID in 
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+
+  
+</mapper>

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

@@ -720,8 +720,10 @@
     FROM RMS_CAPACITY RC
     LEFT JOIN RMS_CAPACITY_TYPE RCT
     ON RC.CAPACITY_TYPE_ID = RCT.CAPACITY_TYPE_ID
+    LEFT JOIN RMS_CAPACITY_CARRIER RCC
+    ON RCC.CAPACITY_ID = RC.CAPACITY_ID
     LEFT JOIN RMS_CARRIER RCA
-    ON RCA.CARRIER_ID = RC.CARRIER_ID
+    ON RCC.CARRIER_ID = RCA.CARRIER_ID
     WHERE RC.DELETED != 1
     <if test="carrierSSOId != null">
         and RCA.CARRIER_SSO_ID = #{carrierSSOId}