|
|
@@ -56,37 +56,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
left join fs_store_product_scrm fp on fp.product_id = sol.main_id and sol.main_type = '商品'
|
|
|
<where>
|
|
|
<if test="mainType != null and mainType != ''">
|
|
|
- AND main_type = #{mainType}
|
|
|
+ AND sol.main_type = #{mainType}
|
|
|
</if>
|
|
|
<if test="title != null and title != ''">
|
|
|
- AND title like concat('%', #{title}, '%')
|
|
|
+ AND sol.title like concat('%', #{title}, '%')
|
|
|
</if>
|
|
|
<if test="businessType != null and businessType != ''">
|
|
|
- AND business_type = #{businessType}
|
|
|
+ AND sol.business_type = #{businessType}
|
|
|
</if>
|
|
|
<if test="businessTypes != null and businessTypes.length > 0">
|
|
|
- AND business_type in
|
|
|
+ AND sol.business_type in
|
|
|
<foreach collection="businessTypes" item="businessType" open="(" separator="," close=")">
|
|
|
#{businessType}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
<if test="status != null">
|
|
|
- AND status = #{status}
|
|
|
+ AND sol.status = #{status}
|
|
|
</if>
|
|
|
<if test="operName != null and operName != ''">
|
|
|
- AND oper_name like concat('%', #{operName}, '%')
|
|
|
+ AND sol.oper_name like concat('%', #{operName}, '%')
|
|
|
</if>
|
|
|
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
|
|
|
- and date_format(oper_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d')
|
|
|
+ and date_format(sol.oper_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d')
|
|
|
</if>
|
|
|
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
|
|
|
- and date_format(oper_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
|
|
|
+ and date_format(sol.oper_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
|
|
|
</if>
|
|
|
<if test="mainId != null">
|
|
|
- and main_id = #{mainId}
|
|
|
+ and sol.main_id = #{mainId}
|
|
|
</if>
|
|
|
</where>
|
|
|
- order by oper_id desc
|
|
|
+ order by sol.oper_id desc
|
|
|
</select>
|
|
|
|
|
|
|