Modified getAnnotationAuditsChronologyByItemIDandUnitID to use derived applicability
Modified getContentAuditsSummaryByItemIDandUnitID to use derived applicability Modified getContentAuditsChronologyByItemIDandUnitID to use derived applicability
This commit is contained in:
parent
1941ab1f2b
commit
a7c689f23a
@ -4727,7 +4727,7 @@ join @tci tci on tci.itemid = ii.itemid
|
|||||||
) ah
|
) ah
|
||||||
where itemid in (select itemid from vefn_tblchilditems (@procitemid,@itemid,0))
|
where itemid in (select itemid from vefn_tblchilditems (@procitemid,@itemid,0))
|
||||||
and dts > @dts
|
and dts > @dts
|
||||||
and (dbo.ve_GetItemApplicability(ItemID) = '-1' or ',' + dbo.ve_GetItemApplicability(ItemID) + ',' like '%,' + cast(@UnitID as varchar(10)) + ',%')
|
and (dbo.ve_GetItemDerivedApplicability(ItemID) = '-1' or ',' + dbo.ve_GetItemDerivedApplicability(ItemID) + ',' like '%,' + cast(@UnitID as varchar(10)) + ',%')
|
||||||
--(select dts from versions where versionid = (select max(versionid) from revisions rr inner join versions vv on rr.revisionid = vv.revisionid
|
--(select dts from versions where versionid = (select max(versionid) from revisions rr inner join versions vv on rr.revisionid = vv.revisionid
|
||||||
--inner join stages ss on vv.stageid = ss.stageid where itemid = @procitemid and ss.isapproved = 1))
|
--inner join stages ss on vv.stageid = ss.stageid where itemid = @procitemid and ss.isapproved = 1))
|
||||||
order by ordinalpath,annotationid,auditid--actionwhen
|
order by ordinalpath,annotationid,auditid--actionwhen
|
||||||
@ -4797,7 +4797,7 @@ begin
|
|||||||
-- on t.icontentid = r.contentid
|
-- on t.icontentid = r.contentid
|
||||||
---- where ActionDTS > procdts or dts > procdts
|
---- where ActionDTS > procdts or dts > procdts
|
||||||
-- ) ah
|
-- ) ah
|
||||||
where dbo.ve_GetItemApplicability(ItemID) = '-1' or ',' + dbo.ve_GetItemApplicability(ItemID) + ',' like '%,' + cast(@UnitID as varchar(10)) + ',%'
|
where dbo.ve_GetItemDerivedApplicability(ItemID) = '-1' or ',' + dbo.ve_GetItemDerivedApplicability(ItemID) + ',' like '%,' + cast(@UnitID as varchar(10)) + ',%'
|
||||||
-- order by OrdinalPath, contentid,auditid--actionwhen
|
-- order by OrdinalPath, contentid,auditid--actionwhen
|
||||||
RETURN
|
RETURN
|
||||||
end
|
end
|
||||||
@ -4862,7 +4862,7 @@ ordinalpath nvarchar(max)
|
|||||||
)
|
)
|
||||||
insert into @Chrono
|
insert into @Chrono
|
||||||
select * from vefn_GetMyChronology(@ProcedureItemID,@SelectedItemID,@IncludeDeletedChildren,@DTS)
|
select * from vefn_GetMyChronology(@ProcedureItemID,@SelectedItemID,@IncludeDeletedChildren,@DTS)
|
||||||
where dbo.ve_GetItemApplicability(ItemID) = '-1' or ',' + dbo.ve_GetItemApplicability(ItemID) + ',' like '%,' + cast(@UnitID as varchar(10)) + ',%'
|
where dbo.ve_GetItemDerivedApplicability(ItemID) = '-1' or ',' + dbo.ve_GetItemDerivedApplicability(ItemID) + ',' like '%,' + cast(@UnitID as varchar(10)) + ',%'
|
||||||
select * from @Chrono
|
select * from @Chrono
|
||||||
where AuditID is null OR AuditID in (select min(auditID) from @Chrono group by contentid UNION select max(auditID) from @Chrono group by contentid)
|
where AuditID is null OR AuditID in (select min(auditID) from @Chrono group by contentid UNION select max(auditID) from @Chrono group by contentid)
|
||||||
order by OrdinalPath, contentid,auditid
|
order by OrdinalPath, contentid,auditid
|
||||||
|
Loading…
x
Reference in New Issue
Block a user