fix
This commit is contained in:
@@ -77,45 +77,45 @@
|
|||||||
from xfsg_point_info a
|
from xfsg_point_info a
|
||||||
left join xfsg_shop_info b on a.shop_id = b.id
|
left join xfsg_shop_info b on a.shop_id = b.id
|
||||||
left join store_${eid} c on b.shop_code = c.store_num
|
left join store_${eid} c on b.shop_code = c.store_num
|
||||||
where deleted = 0 and development_manager = #{request.developmentManager}
|
where a.deleted = 0 and a.development_manager = #{request.developmentManager}
|
||||||
<if test="request.keyword != null and request.keyword != ''">
|
<if test="request.keyword != null and request.keyword != ''">
|
||||||
and (point_code like concat('%', #{request.keyword}, '%') or point_name like concat('%', #{request.keyword},
|
and (a.point_code like concat('%', #{request.keyword}, '%') or a.point_name like concat('%', #{request.keyword},
|
||||||
'%'))
|
'%'))
|
||||||
</if>
|
</if>
|
||||||
<if test="request.developmentStartTime != null and request.developmentStartTime != ''">
|
<if test="request.developmentStartTime != null and request.developmentStartTime != ''">
|
||||||
and development_time >= #{request.developmentStartTime}
|
and a.development_time >= #{request.developmentStartTime}
|
||||||
</if>
|
</if>
|
||||||
<if test="request.developmentEndTime != null and request.developmentEndTime != ''">
|
<if test="request.developmentEndTime != null and request.developmentEndTime != ''">
|
||||||
<![CDATA[and development_time <= #{request.developmentEndTime}]]>
|
<![CDATA[and a.development_time <= #{request.developmentEndTime}]]>
|
||||||
</if>
|
</if>
|
||||||
<if test="request.pointStatusList != null and request.pointStatusList.size() > 0">
|
<if test="request.pointStatusList != null and request.pointStatusList.size() > 0">
|
||||||
and point_status in
|
and a.point_status in
|
||||||
<foreach collection="request.pointStatusList" item="pointStatus" open="(" close=")" separator=",">
|
<foreach collection="request.pointStatusList" item="pointStatus" open="(" close=")" separator=",">
|
||||||
#{pointStatus}
|
#{pointStatus}
|
||||||
</foreach>
|
</foreach>
|
||||||
</if>
|
</if>
|
||||||
<if test="request.storageStatus != null">
|
<if test="request.storageStatus != null">
|
||||||
and storage_status = #{request.storageStatus}
|
and a.storage_status = #{request.storageStatus}
|
||||||
</if>
|
</if>
|
||||||
<if test="request.operateUserId != null and request.operateUserId != ''">
|
<if test="request.operateUserId != null and request.operateUserId != ''">
|
||||||
and operate_user_id = #{request.operateUserId}
|
and a.operate_user_id = #{request.operateUserId}
|
||||||
</if>
|
</if>
|
||||||
<if test="request.createStartTime != null and request.createStartTime != ''">
|
<if test="request.createStartTime != null and request.createStartTime != ''">
|
||||||
and create_time >= #{request.createStartTime}
|
and a.create_time >= #{request.createStartTime}
|
||||||
</if>
|
</if>
|
||||||
<if test="request.createEndTime != null and request.createEndTime != ''">
|
<if test="request.createEndTime != null and request.createEndTime != ''">
|
||||||
<![CDATA[and create_time <= #{request.createEndTime}]]>
|
<![CDATA[and a.create_time <= #{request.createEndTime}]]>
|
||||||
</if>
|
</if>
|
||||||
<if test="request.regionIds != null and request.regionIds.size() > 0">
|
<if test="request.regionIds != null and request.regionIds.size() > 0">
|
||||||
and region_id in
|
and a.region_id in
|
||||||
<foreach collection="request.regionIds" item="regionId" index="index" open="(" separator="," close=")">
|
<foreach collection="request.regionIds" item="regionId" index="index" open="(" separator="," close=")">
|
||||||
#{regionId}
|
#{regionId}
|
||||||
</foreach>
|
</foreach>
|
||||||
</if>
|
</if>
|
||||||
<if test="request.areaCode!=null and request.areaCode!=''">
|
<if test="request.areaCode!=null and request.areaCode!=''">
|
||||||
and (province_code = #{request.areaCode} or city_code = #{request.areaCode} or district_code = #{request.areaCode})
|
and (a.province_code = #{request.areaCode} or a.city_code = #{request.areaCode} or a.district_code = #{request.areaCode})
|
||||||
</if>
|
</if>
|
||||||
order by id desc
|
order by a.id desc
|
||||||
</select>
|
</select>
|
||||||
<select id="getSelectedShopNum" resultType="com.cool.store.dto.point.LineCountDTO">
|
<select id="getSelectedShopNum" resultType="com.cool.store.dto.point.LineCountDTO">
|
||||||
select
|
select
|
||||||
|
|||||||
Reference in New Issue
Block a user