Merge branch 'dev1'

Administrator

2018-11-30 d66e9c7c859f255b0e81e01a57707c5b9a34d7ff

 fanli/src/main/java/com/yeshi/fanli/mapping/push/PushGoodsMapper.xml

@@ -67,7 +67,7 @@
  
  
   <delete id="deleteBatchByPrimaryKey"  parameterType="java.util.List">
      delete from yeshi_ec_push_goods where gro_id in
      delete from yeshi_ec_push_goods where pg_id in
      <foreach item="item" collection="list" open="(" separator=","
         close=")">#{item}</foreach>
   </delete>
@@ -98,19 +98,21 @@
   
   <select id="listHistoryByPushTime" resultMap="BaseResultMap">
       SELECT <include refid="Base_Column_List" />  FROM yeshi_ec_push_goods
       WHERE  pg_is_push = 1   AND <![CDATA[pg_push_time >= #{pushTime}]]>
       WHERE pg_is_push = 1   AND <![CDATA[pg_push_time >= #{pushTime}]]>
            AND (pg_uid is null <if test='uid != null'>or pg_uid = #{uid} </if>)
         ORDER BY pg_push_time desc 
       LIMIT ${start},${count}
   </select>
   
   <select id="countHistoryByPushTime" resultType="java.lang.Long">
       SELECT IFNULL(count(pg_id),0)  FROM yeshi_ec_push_goods
       WHERE  pg_is_push = 1   AND <![CDATA[pg_push_time >= #{pushTime}]]>
       WHERE pg_is_push = 1   AND <![CDATA[pg_push_time >= #{pushTime}]]>
            AND (pg_uid is null <if test='uid != null'>or pg_uid = #{uid} </if>)
   </select>
   
    <select id="listByPushState" resultMap="BaseResultMap" parameterType="java.util.List">
       SELECT <include refid="Base_Column_List" />  FROM yeshi_ec_push_goods
       WHERE  pg_is_push = 1 AND  gro_id in
       WHERE  pg_is_push = 1 AND  pg_id in
      <foreach item="item" collection="list" open="(" separator=","
         close=")">#{item}</foreach>
   </select>