|
|
@ -41,6 +41,8 @@
|
|
|
|
<result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
|
|
|
|
<result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
|
|
|
|
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
|
|
|
|
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
|
|
|
|
<result property="remark" column="remark" jdbcType="VARCHAR"/>
|
|
|
|
<result property="remark" column="remark" jdbcType="VARCHAR"/>
|
|
|
|
|
|
|
|
<result property="areaCity" column="area_city" jdbcType="VARCHAR"/>
|
|
|
|
|
|
|
|
<result property="areaDistrict" column="area_district" jdbcType="VARCHAR"/>
|
|
|
|
</resultMap>
|
|
|
|
</resultMap>
|
|
|
|
|
|
|
|
|
|
|
|
<sql id="Base_Column_List">
|
|
|
|
<sql id="Base_Column_List">
|
|
|
@ -55,7 +57,7 @@
|
|
|
|
maintain_date,destory_depart,destory_user,
|
|
|
|
maintain_date,destory_depart,destory_user,
|
|
|
|
destory_date,destory_manner,status,
|
|
|
|
destory_date,destory_manner,status,
|
|
|
|
create_by,create_time,update_by,
|
|
|
|
create_by,create_time,update_by,
|
|
|
|
update_time,remark,carrier_name
|
|
|
|
update_time,remark,carrier_name,area_city,area_district
|
|
|
|
</sql>
|
|
|
|
</sql>
|
|
|
|
<select id="selectTdCarrierList" resultType="com.ruoyi.system.domain.carrier.TdCarrier">
|
|
|
|
<select id="selectTdCarrierList" resultType="com.ruoyi.system.domain.carrier.TdCarrier">
|
|
|
|
select <include refid="Base_Column_List"/> from td_carrier
|
|
|
|
select <include refid="Base_Column_List"/> from td_carrier
|
|
|
@ -75,6 +77,12 @@
|
|
|
|
<if test="carrierNumber!=null and carrierNumber!=''">
|
|
|
|
<if test="carrierNumber!=null and carrierNumber!=''">
|
|
|
|
AND carrier_number = #{carrierNumber}
|
|
|
|
AND carrier_number = #{carrierNumber}
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|
|
|
|
|
<if test="areaCity!=null and areaCity!=''">
|
|
|
|
|
|
|
|
AND area_city = #{areaCity}
|
|
|
|
|
|
|
|
</if>
|
|
|
|
|
|
|
|
<if test="areaDistrict!=null and areaDistrict!=''">
|
|
|
|
|
|
|
|
AND area_district = #{areaDistrict}
|
|
|
|
|
|
|
|
</if>
|
|
|
|
<if test="status!=null and status!=''">
|
|
|
|
<if test="status!=null and status!=''">
|
|
|
|
AND status = #{status}
|
|
|
|
AND status = #{status}
|
|
|
|
</if>
|
|
|
|
</if>
|
|
|
|