프로젝트

일반

사용자정보

개정판 7dc72b5c

ID7dc72b5c71a331b284f149eef80b6fdc6f00f765
상위 1760e592
하위 9fc9bc2c, bc01d8d5

유성호이(가) 일년 이상 전에 추가함

issue #0000
속도 이슈로 markus data 연동 제외

Change-Id: Iedf8833030f98df9d2ead6b102e95b2d8fdbf872

차이점 보기:

ID2.Manager/ID2.Manager.Dapper/Repository/DocumentRepository.cs
109 109
            if (projectCode == null)
110 110
            {
111 111
                sbWhere.Append(" and prj.Code is null ");
112
                sbTotalWhere.Append(" and isnull(doc.RefProjectCode,'') in (select Code from dbo.Projects where ParentID=@RefGroupID union all select '') ");
112
                sbTotalWhere.Append(" and doc.RefProjectCode in (select Code from dbo.Projects where ParentID=@RefGroupID) ");
113 113
                parameters.Add("RefGroupID", projectGroupID);
114 114
            }
115 115
            else if (projectCode.Equals(string.Empty))
116 116
            {
117
                sbWhere.Append(" and isnull(doc.RefProjectCode,'') in (select Code from dbo.Projects where ParentID=@RefGroupID union all select '') ");
118
                sbTotalWhere.Append(" and isnull(doc.RefProjectCode,'') in (select Code from dbo.Projects where ParentID=@RefGroupID union all select '') ");
117
                sbWhere.Append(" and doc.RefProjectCode in (select Code from dbo.Projects where ParentID=@RefGroupID) ");
118
                sbTotalWhere.Append(" and doc.RefProjectCode in (select Code from dbo.Projects where ParentID=@RefGroupID) ");
119 119
                parameters.Add("RefGroupID", projectGroupID);
120 120
            }
121 121
            else
122 122
            {
123
                sbTotalWhere.Append(" and isnull(doc.RefProjectCode,'') in (select Code from dbo.Projects where ParentID=@RefGroupID union all select '') ");
123
                sbTotalWhere.Append(" and doc.RefProjectCode in (select Code from dbo.Projects where ParentID=@RefGroupID) ");
124 124
                parameters.Add("RefGroupID", projectGroupID);
125 125

  
126 126
                sbWhere.Append(" and doc.RefProjectCode=@RefProjectCode ");
......
204 204

  
205 205
                //files.[FileID],files.[FileID] as AttFileID, files.RefID, files.Category, files.FileType, files.FileName, files.FilePath, files.FileExtension, files.FileData, files.Remark, files.CreatedDate, files.Creator,
206 206
                string query = $@"
207
select  doc.*,
208
prj.Team,
209
files.[FileID] as FileID, files.*,
210
markus.PROJECT_NO as PROJECT_NO, markus.*
207
select   doc.*
208
        ,prj.Team
209
        ,files.*
210
        ,null PROJECT_NO
211
		,null DOCUMENT_ID
212
		,null PAGENUMBER
213
		,null [TEXT]
214
		,null CREATE_DATE
215
		,null CREATE_USER
211 216
from     dbo.Documents doc
212
left outer join dbo.Projects prj on doc.RefProjectCode=prj.Code
213
LEFT OUTER JOIN AttachFIles files ON doc.DocID = fIles.RefID 
214
LEFT OUTER JOIN 
215
        (SELECT [PROJECT_NO] as PROJECT_NO
216
                ,[DOCUMENT_ID] as DocumentNo
217
                ,[PAGENUMBER]
218
                ,[Text] as TEXT
219
                ,[CREATE_DATE] as CREATE_DATE
220
                ,[NAME] as CREATE_USER
221
            FROM ViewMarkupData) markus 
222
ON doc.RefProjectCode = markus.Project_NO AND doc.DocumentNo = markus.DocumentNo
217
             left outer join dbo.Projects prj on doc.RefProjectCode=prj.Code
218
left outer join AttachFIles files ON doc.DocID = fIles.RefID
223 219
where    doc.IsDeleted=0 {sbWhere}
224 220
order by doc.Seq
225 221

  
ID2.Manager/ID2.Manager.Data/Models/MarkupText.cs
15 15

  
16 16
        public string CREATE_USER { get; set; }
17 17

  
18
        public string DocumentNo { get; set; }
18
        public string DOCUMENT_ID { get; set; }
19 19

  
20 20
        public string TEXT { get; set; }
21 21
        public DateTime CREATE_DATE { get; set; }
......
28 28
                && CREATE_USER == other.CREATE_USER
29 29
                && TEXT == other.TEXT
30 30
                && CREATE_DATE == other.CREATE_DATE
31
                && DocumentNo == other.DocumentNo;
31
                && DOCUMENT_ID == other.DOCUMENT_ID;
32 32
        }
33 33

  
34 34
        public override int GetHashCode()
35 35
        {
36
            return this.CREATE_USER.GetNullableHash() + this.TEXT.GetNullableHash() + this.CREATE_DATE.GetNullableHash() + PROJECT_NO.GetNullableHash() + DocumentNo.GetNullableHash();
36
            return this.CREATE_USER.GetNullableHash() + this.TEXT.GetNullableHash() + this.CREATE_DATE.GetNullableHash() + PROJECT_NO.GetNullableHash() + DOCUMENT_ID.GetNullableHash();
37 37
        }
38 38

  
39 39

  
ID2.Manager/ID2.Manager/Main.cs
586 586
        #region Init, Load
587 587
        private void Initialize()
588 588
        {
589
            this.Text = $"{Globals.Name} (Ver : {Application.ProductVersion})";
589
            this.Text = $"{Globals.Name} (Ver : {Application.ProductVersion} {"markus data(X)"})";
590 590

  
591 591
            this.ID2ManagerRadRibbonBar.Expanded = false;
592 592

  

내보내기 Unified diff