|
@@ -715,7 +715,8 @@
|
|
|
RC.CAPACITY_OWNERIS AS "capacityOwneris",
|
|
|
RC.CAPACITY_VIP AS "capacityVip",
|
|
|
RC.CAPACITY_BLACKLIST AS "capacityBlacklist",
|
|
|
- RCA.CARRIER_NAME AS "carrierName"
|
|
|
+ RCA.CARRIER_NAME AS "carrierName",
|
|
|
+ RC.INSERT_UPDATE_REMARK "insertRemark"
|
|
|
FROM RMS_CAPACITY RC
|
|
|
LEFT JOIN RMS_CAPACITY_TYPE RCT
|
|
|
ON RC.CAPACITY_TYPE_ID = RCT.CAPACITY_TYPE_ID
|
|
@@ -779,13 +780,18 @@
|
|
|
"capacityBlacklist" in #{item}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
-
|
|
|
<if test="carrierName!= null">
|
|
|
and
|
|
|
<foreach collection="carrierName" item="item" open="(" separator="," close=")">
|
|
|
"carrierName" in #{item}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
+ <if test="insertRemark!= null">
|
|
|
+ and
|
|
|
+ <foreach collection="insertRemark" item="item" open="(" separator="," close=")">
|
|
|
+ "insertRemark" in #{item}
|
|
|
+ </foreach>
|
|
|
+ </if>
|
|
|
</where>
|
|
|
<include refid="orderBy"></include>
|
|
|
</select>
|
|
@@ -797,8 +803,6 @@
|
|
|
</if>
|
|
|
</if>
|
|
|
</sql>
|
|
|
-
|
|
|
-
|
|
|
<select id="getCapacityById" resultType="java.util.LinkedHashMap" >
|
|
|
SELECT
|
|
|
RC.CAPACITY_ID AS "capacityId",
|