|
|
@@ -1345,7 +1345,7 @@
|
|
|
where a.split_status in (0,2) and b.project_status =a.project_status and a.task_receiver = #{aid}
|
|
|
and b.date_time BETWEEN #{startTime} and #{endTime} group by a.task_receiver )y on x.aid=y.aid
|
|
|
left join (select aid,sum(if(a.`type` in (0,1,2),1,0)) countPublicRelease,sum(if(a.`type` in (3),1,0)) countAssist
|
|
|
- from public_release a left join public_release_details b on a.id=b.prid where aid= #{aid}
|
|
|
+ from public_release a left join public_release_details b on a.id=b.prid where aid= #{aid} and a.status =2
|
|
|
and a.release_start BETWEEN #{startTime} and #{endTime} group by a.aid)z on x.aid=z.aid
|
|
|
</select>
|
|
|
<select id="consultantthisMonthUser" resultType="com.goafanti.admin.bo.ConsultantUserCount">
|
|
|
@@ -1369,6 +1369,7 @@
|
|
|
from ( select if(a.`type` in (0,1,2),1,0) countPublicRelease,if(a.`type` in (3),1,0) countAssist,
|
|
|
DATE_FORMAT(a.release_start ,'%Y-%m-%d') dates
|
|
|
from public_release a left join public_release_details b on a.id=b.prid where aid= #{aid}
|
|
|
+ and a.status =2
|
|
|
and a.release_start BETWEEN #{firstDay} and #{endDay})x
|
|
|
group by x.dates
|
|
|
</select>
|