프로젝트

일반

사용자정보

개정판 3c43044d

ID3c43044d5bd94a0811e6c88bc3b44bb500c94f7d
상위 d016bfd6
하위 1886a3b1

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

issue #00000 markus Text 가져오도록 수정

Change-Id: I37cd5ebfef9679150f390f4f6a32057bf7589f83

차이점 보기:

ID2.Manager/ID2.Manager.Dapper/Repository/DocumentRepository.cs
68 68
            }
69 69

  
70 70
            string query = $@"
71
select   doc.*
71
select   doc.*,
72

  
73
  (
74
    select markus.USER_ID, markus.Text,markus.CREATE_DATE 
75
	from [markus_SEC].[dbo].[ViewMarkupData] markus where doc.DocumentNo = markus.DOCUMENT_ID
76
	FOR JSON PATH
77
  ) as MarkupText
72 78
from     dbo.Documents doc
73 79
where    doc.IsDeleted=0 {sbWhere}
74 80
order by doc.Seq;";
ID2.Manager/ID2.Manager.Data/Models/Documents.cs
120 120
        [DataMember]
121 121
        public string DTRemarks { get; set; }
122 122

  
123
        public List<MarkupText> MarkupTextList { get; set; }
123
        public string MarkupText { get; set; }
124 124

  
125 125
        public override bool Equals(object obj)
126 126
        {
......
142 142
                && this.ProdReviewer == other.ProdReviewer && this.ProdIsResult == other.ProdIsResult && this.ProdRemarks == other.ProdRemarks && this.ClientReviewer == other.ClientReviewer
143 143
                && this.ClientIsResult == other.ClientIsResult && this.ClientRemarks == other.ClientRemarks && this.DTIsGateWay == other.DTIsGateWay && this.DTIsImport == other.DTIsImport
144 144
                && this.DTIsRegSystem == other.DTIsRegSystem && this.DTRemarks == other.DTRemarks
145
                && this.MarkupTextList == other.MarkupTextList;
145
                && this.MarkupText == other.MarkupText;
146 146

  
147 147
        }
148 148
        public override int GetHashCode()
......
160 160
                + this.ProdReviewer.GetHashCode() + this.ProdIsResult.GetHashCode() + this.ProdRemarks.GetHashCode() + this.ClientReviewer.GetHashCode()
161 161
                + this.ClientIsResult.GetHashCode() + this.ClientRemarks.GetHashCode() + this.DTIsGateWay.GetHashCode() + this.DTIsImport.GetHashCode()
162 162
                + this.DTIsRegSystem.GetHashCode() + this.DTRemarks.GetHashCode()
163
                + this.MarkupTextList.GetHashCode();
163
                + this.MarkupText.GetHashCode();
164 164
        }
165 165

  
166 166
        //public class DocumentsComparer : IEqualityComparer<Documents>

내보내기 Unified diff

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