개정판 0c624340
issue #000: Consolidate markupinfo select 문 수정, Team Consolidate는 LE의 Team 에서만 Consolidate 하도록 수정.
Change-Id: I4ed3955a98327ed3b63b94e2b993e640498529ae
| KCOM_API/ServiceDeepView.svc.cs | ||
|---|---|---|
| 1846 | 1846 |
List<KCOMDataModel.DataModel.MARKUP_DATA> instanceDataSet = new List<KCOMDataModel.DataModel.MARKUP_DATA>(); |
| 1847 | 1847 |
using (CIEntities Entity = new CIEntities(ConnectStringBuilder.ProjectCIConnectString(project_no).ToString())) |
| 1848 | 1848 |
{
|
| 1849 |
var markupInfo = Entity.MARKUP_INFO.Where(entity => entity.DOCINFO_ID == _doc_id).OrderByDescending(i => i.CONSOLIDATE).OrderByDescending(j => j.CREATE_TIME).FirstOrDefault();
|
|
| 1850 |
if (markupInfo.CONSOLIDATE == 1)
|
|
| 1849 |
var markupInfo = Entity.MARKUP_INFO.Where(entity => entity.DOCINFO_ID == _doc_id && entity.CONSOLIDATE == 1).OrderByDescending(j => j.CREATE_TIME).FirstOrDefault();
|
|
| 1850 |
if (markupInfo != null)
|
|
| 1851 | 1851 |
{
|
| 1852 | 1852 |
markupInfo.AVOID_CONSOLIDATE = 1; |
| 1853 | 1853 |
} |
| ... | ... | |
| 2084 | 2084 |
List<KCOMDataModel.DataModel.MARKUP_DATA> instanceDataSet = new List<KCOMDataModel.DataModel.MARKUP_DATA>(); |
| 2085 | 2085 |
using (CIEntities Entity = new CIEntities(ConnectStringBuilder.ProjectCIConnectString(project_no).ToString())) |
| 2086 | 2086 |
{
|
| 2087 |
var markupInfo = Entity.MARKUP_INFO.Where(entity => entity.DOCINFO_ID == _doc_id).OrderByDescending(i => i.CONSOLIDATE).OrderByDescending(j => j.CREATE_TIME).FirstOrDefault(); |
|
| 2088 |
if (markupInfo.PART_CONSOLIDATE == 1) |
|
| 2087 |
string user_dept = Entity.MEMBER.Where(m => m.ID == _user_id).FirstOrDefault().DEPARTMENT; |
|
| 2088 |
var markupInfos = Entity.MARKUP_INFO.Where(entity => entity.DOCINFO_ID == _doc_id |
|
| 2089 |
&& entity.PART_CONSOLIDATE == 1 |
|
| 2090 |
).OrderByDescending(j => j.CREATE_TIME).ToList(); |
|
| 2091 |
foreach (var markupinfo in markupInfos) |
|
| 2089 | 2092 |
{
|
| 2090 |
markupInfo.AVOID_CONSOLIDATE = 1; |
|
| 2093 |
string markupdept = Entity.MEMBER.Where(m => m.ID == markupinfo.USER_ID).FirstOrDefault().DEPARTMENT; |
|
| 2094 |
if (user_dept == markupdept) |
|
| 2095 |
{
|
|
| 2096 |
markupinfo.AVOID_CONSOLIDATE = 1; |
|
| 2097 |
} |
|
| 2091 | 2098 |
} |
| 2092 | 2099 |
|
| 2093 | 2100 |
foreach (MarkupInfoItem item in markupInfoItems) |
내보내기 Unified diff
