|
|
@@ -989,13 +989,7 @@
|
|
|
</if>
|
|
|
</select>
|
|
|
|
|
|
- <select id="checkTime" resultType="java.lang.Integer">
|
|
|
- select id from public_release where aid=#{aid} and status in (0,1,2)
|
|
|
- and (alone in (0,1) or (alone=2 and assist=2))
|
|
|
- and ( (release_start >= #{start} and release_start <= #{end})
|
|
|
- or (release_start < #{start} and release_end > #{start})
|
|
|
- or (release_start < #{end} and release_end > #{end}))
|
|
|
- </select>
|
|
|
+
|
|
|
<select id="getTimeUserFollow" resultType="com.goafanti.common.model.OutPublicReleaseCount">
|
|
|
select e.id province,d.id depId,a.aid,a.uid,a.new_user newUser ,1 quantity from (select a.aid,b.uid,b.new_user from public_release a
|
|
|
left join public_release_details b on a.id=b.prid
|
|
|
@@ -1186,10 +1180,19 @@
|
|
|
from public_release_details a
|
|
|
where a.prid = #{prid}
|
|
|
</select>
|
|
|
- <select id="checkTech" resultType="com.goafanti.common.model.PublicRelease">
|
|
|
- SELECT id
|
|
|
- from public_release
|
|
|
- where status =1 and `type` =0 and assist =1
|
|
|
+ <select id="checkTime" resultMap="PublicReleaseMap">
|
|
|
+ select
|
|
|
+ <include refid="PublicReleaseAllSql"/>
|
|
|
+ from public_release where aid=#{aid} and status in (0,1,2)
|
|
|
+ and (alone in (0,1) or (alone=2 and assist=2))
|
|
|
+ and ( (release_start >= #{start} and release_start <= #{end})
|
|
|
+ or (release_start < #{start} and release_end > #{start})
|
|
|
+ or (release_start < #{end} and release_end > #{end}))
|
|
|
+ </select>
|
|
|
+ <select id="checkTech" resultMap="PublicReleaseMap">
|
|
|
+ select
|
|
|
+ <include refid="PublicReleaseAllSql"/>
|
|
|
+ from public_release where status =1 and `type` =0 and assist =1
|
|
|
and FIND_IN_SET(#{aid},assist_aid)
|
|
|
and ( (release_start >= #{start} and release_start <= #{end})
|
|
|
or (release_start < #{start} and release_end > #{start})
|