|
|
@@ -1635,7 +1635,7 @@
|
|
|
</select>
|
|
|
|
|
|
<update id="updateReleaseLock" parameterType="java.lang.String">
|
|
|
- update user a,user_lock_release b set a.share_type = 1,release_time = #{time} where b.status=1 and a.id=b.uid
|
|
|
+ update user a,user_lock_release b set a.share_type = 1,a.transfer_time = #{time} where b.status=1 and a.id=b.uid
|
|
|
</update>
|
|
|
|
|
|
<select id="marketingStatistics" parameterType="java.lang.String" resultType="com.goafanti.report.bo.marketingESBo">
|
|
|
@@ -1839,18 +1839,8 @@ from
|
|
|
on b.location_province=c.id left join district_glossory c1
|
|
|
on b.location_city=c1.id left join district_glossory c2
|
|
|
on b.location_area=c2.id left join industry_category d
|
|
|
- on b.industry = d.id left join( select aid, uid, contact_type from user_follow
|
|
|
- where aid = #{aid,jdbcType=VARCHAR} group by uid
|
|
|
- ) e on
|
|
|
- a.id = e.uid
|
|
|
- and a.aid = e.aid
|
|
|
+ on b.industry = d.id
|
|
|
where 1=1 and a.status=0
|
|
|
- <if test="follow ==0">
|
|
|
- and (e.contact_type !=0 or e.contact_type is null)
|
|
|
- </if>
|
|
|
- <if test="follow ==1">
|
|
|
- and e.contact_type=0
|
|
|
- </if>
|
|
|
<if test="type !=null and type!=''">
|
|
|
and a.`type`=#{type,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
@@ -1907,32 +1897,13 @@ inner join(
|
|
|
<select id="selectDepCustomerInformationCount" resultType="java.lang.Integer">
|
|
|
select count(0)
|
|
|
from user a left join organization_identity b
|
|
|
- on a.id=b.uid left join(
|
|
|
- select
|
|
|
- aid,
|
|
|
- uid,
|
|
|
- contact_type
|
|
|
- from
|
|
|
- user_follow
|
|
|
- where
|
|
|
- aid = #{aid,jdbcType=VARCHAR}
|
|
|
- group by
|
|
|
- uid
|
|
|
- ) e on
|
|
|
- a.id = e.uid
|
|
|
- and a.aid = e.aid inner join (select id
|
|
|
+ on a.id=b.uid inner join (select id
|
|
|
from admin
|
|
|
where id= #{aid,jdbcType=VARCHAR}
|
|
|
or superior_id= #{aid,jdbcType=VARCHAR}
|
|
|
) y
|
|
|
on y.id=a.information_maintainer
|
|
|
where 1=1 and a.status=0
|
|
|
- <if test="follow ==0">
|
|
|
- and (e.contact_type !=0 or e.contact_type is null)
|
|
|
- </if>
|
|
|
- <if test="follow ==1">
|
|
|
- and e.contact_type=0
|
|
|
- </if>
|
|
|
<if test="type !=null and type!=''">
|
|
|
and a.`type`=#{type,jdbcType=VARCHAR}
|
|
|
</if>
|