프로젝트

일반

사용자정보

개정판 a37dc9a7

IDa37dc9a7b4dc498479b1aefad2ddb976c01eaa81
상위 7459b663
하위 5cf7fb68

김태성이(가) 일년 이상 전에 추가함

issue #000000 markup_data_id 제거

Change-Id: I6c4fb6353b0566d052ac59a55e4861ab58585f02

차이점 보기:

ID2.Manager/ID2.Manager.Dapper/Repository/DocumentRepository.cs
199 199
                    string query = $@"
200 200
                            select  doc.*, datediff(SECOND, doc.ID2StartDate, doc.ID2EndDate) as ID2JobTime,
201 201
                            files.[FileID] as FileID, files.*,
202
                            markus.MARKUP_DATA_ID as MARKUP_DATA_ID, markus.*
202
                            markus.PROJECT_NO as PROJECT_NO, markus.*
203 203
                            from     dbo.Documents doc
204 204
	                        LEFT OUTER JOIN AttachFIles files ON doc.DocID = fIles.RefID 
205 205
                            LEFT OUTER JOIN 
206
                                    (SELECT [MARKUP_DATA_ID]
207
                                           ,[PROJECT_NO] as PROJECT_NO
206
                                    (SELECT [PROJECT_NO] as PROJECT_NO
208 207
                                          ,[DOCUMENT_ID] as DocumentNo
209 208
                                          
210 209
                                          ,[PAGENUMBER]
......
241 240
                                    {
242 241
                                        doc.Markups = doc.Markups ?? new List<MarkupText>();
243 242

  
244
                                        if (!doc.Markups.Any(x => x.MARKUP_DATA_ID == markusText.MARKUP_DATA_ID))
243
                                        if (!doc.Markups.Any(x => x.Equals(markusText)))
245 244
                                        {
246 245
                                            doc.Markups.Add(markusText);
247 246
                                        }
......
275 274

  
276 275
                                    return doc;
277 276

  
278
                                }, dynamicParameters, splitOn: "DocID,FileID,MARKUP_DATA_ID").Distinct();
277
                                }, dynamicParameters, splitOn: "DocID,FileID,PROJECT_NO").Distinct();
279 278

  
280 279
                int totalCount = dynamicParameters.Get<int>("Total");
281 280

  

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)