|
|
@@ -67,7 +67,6 @@ namespace Learun.Application.OA |
|
|
|
@"select ruserid,COUNT(1) as srnum from LR_OA_News t left join LR_OA_NewsShouldRead s on s.newsid=t.f_newsid |
|
|
|
left join lr_base_user u on s.RUserId=u.F_UserId |
|
|
|
WHERE t.F_TypeId = 2 and t.F_DeleteMark=0 and t.F_EnabledMark=1 |
|
|
|
and u.F_Account like '20%' |
|
|
|
and t.F_ReleaseTime>CONVERT(datetime,SUBSTRING(u.F_Account,1,4)+'-08-31',120) "); |
|
|
|
if (!queryParam["Year"].IsEmpty() && !queryParam["Month"].IsEmpty()) |
|
|
|
{ |
|
|
@@ -79,7 +78,6 @@ left join lr_base_user u on s.RUserId=u.F_UserId |
|
|
|
@" select ruserid,COUNT(1) as rnum from LR_OA_News t left join LR_OA_NewsRead r on r.newsid=t.f_newsid |
|
|
|
left join lr_base_user u on r.RUserId=u.F_UserId |
|
|
|
WHERE t.F_TypeId = 2 and t.F_DeleteMark=0 and t.F_EnabledMark=1 |
|
|
|
and u.F_Account like '20%' |
|
|
|
and t.F_ReleaseTime>CONVERT(datetime,SUBSTRING(u.F_Account,1,4)+'-08-31',120) |
|
|
|
and DATEDIFF(HOUR,t.F_ReleaseTime,r.RTime)<=24*7 "); |
|
|
|
if (!queryParam["Year"].IsEmpty() && !queryParam["Month"].IsEmpty()) |
|
|
|