개정판 9096bc6d
issue #00000 markus convert Status를 documents.ConvertStatus로 추가
Change-Id: I15c66f894cfe80cd6ce1c5c3ce8327173a43dd67
| ID2.Manager/ID2.Manager.Dapper/Repository/BaseRepository.cs | ||
|---|---|---|
| 112 | 112 |
return this._DbConnection.Query<TFirst, TSecond, TFourth, TReturn >(sql, map: map, param: param, transaction: transaction, buffered: buffered, splitOn: splitOn, commandTimeout: commandTimeout, commandType: commandType); |
| 113 | 113 |
} |
| 114 | 114 |
|
| 115 |
public IEnumerable<TReturn> MultiQuery<TFirst, TSecond, TFourth, TFifth, TReturn>(string sql, Func<TFirst, TSecond, TFourth, TFifth, TReturn> map, object param = null, IDbTransaction transaction = null, bool buffered = true, string splitOn = "Id", int? commandTimeout = null, CommandType? commandType = null) |
|
| 116 |
{
|
|
| 117 |
if (this._DbConnection.State != ConnectionState.Open) |
|
| 118 |
{
|
|
| 119 |
this._DbConnection.Open(); |
|
| 120 |
} |
|
| 121 |
|
|
| 122 |
return this._DbConnection.Query<TFirst, TSecond, TFourth, TFifth, TReturn>(sql, map: map, param: param, transaction: transaction, buffered: buffered, splitOn: splitOn, commandTimeout: commandTimeout, commandType: commandType); |
|
| 123 |
} |
|
| 124 |
|
|
| 125 |
|
|
| 115 | 126 |
public T QueryFirst<T>(string sql) |
| 116 | 127 |
{
|
| 117 | 128 |
if (this._DbConnection.State != ConnectionState.Open) |
| ID2.Manager/ID2.Manager.Dapper/Repository/DocumentRepository.cs | ||
|---|---|---|
| 201 | 201 |
LEFT OUTER JOIN |
| 202 | 202 |
(SELECT [PROJECT_NO] as PROJECT_NO |
| 203 | 203 |
,[DOCUMENT_ID] as DocumentNo |
| 204 |
|
|
| 205 | 204 |
,[PAGENUMBER] |
| 206 | 205 |
,[Text] as TEXT |
| 207 | 206 |
,[CREATE_DATE] as CREATE_DATE |
| 208 | 207 |
,[NAME] as CREATE_USER |
| 209 | 208 |
FROM ViewMarkupData) markus |
| 210 |
ON doc.DocumentNo = markus.DocumentNo |
|
| 209 |
ON doc.RefProjectCode = markus.Project_NO AND doc.DocumentNo = markus.DocumentNo
|
|
| 211 | 210 |
where doc.IsDeleted=0 {sbWhere}
|
| 212 | 211 |
order by doc.Seq |
| 213 | 212 |
|
| ... | ... | |
| 234 | 233 |
|
| 235 | 234 |
if (markusText != null) |
| 236 | 235 |
{
|
| 237 |
doc.Markups = doc.Markups ?? new List<MarkupText>();
|
|
| 236 |
doc.ConvertStatus = 4;
|
|
| 238 | 237 |
|
| 239 |
if (!doc.Markups.Any(x => x.Equals(markusText)))
|
|
| 238 |
if (markusText.TEXT != null && markusText.CREATE_DATE != null && markusText.CREATE_USER != null)
|
|
| 240 | 239 |
{
|
| 241 |
doc.Markups.Add(markusText); |
|
| 240 |
doc.Markups = doc.Markups ?? new List<MarkupText>(); |
|
| 241 |
|
|
| 242 |
if (!doc.Markups.Any(x => x.Equals(markusText))) |
|
| 243 |
{
|
|
| 244 |
doc.Markups.Add(markusText); |
|
| 245 |
} |
|
| 242 | 246 |
} |
| 243 | 247 |
} |
| 244 | 248 |
|
| ... | ... | |
| 1309 | 1313 |
throw ex; |
| 1310 | 1314 |
} |
| 1311 | 1315 |
} |
| 1316 |
|
|
| 1317 |
public class MarkusConvert |
|
| 1318 |
{
|
|
| 1319 |
public string PROJECT_NO { get; set; }
|
|
| 1320 |
public string DOCUMENT_ID { get; set; }
|
|
| 1321 |
public int STATUS { get; set; }
|
|
| 1322 |
} |
|
| 1323 |
|
|
| 1312 | 1324 |
} |
| 1313 | 1325 |
} |
| ID2.Manager/ID2.Manager.Data/Models/Documents.cs | ||
|---|---|---|
| 145 | 145 |
|
| 146 | 146 |
public List<AttFileInfo> AttFiles { get; set; }
|
| 147 | 147 |
|
| 148 |
public int ConvertStatus { get; set; }
|
|
| 148 | 149 |
|
| 149 | 150 |
public override bool Equals(object obj) |
| 150 | 151 |
{
|
| ... | ... | |
| 178 | 179 |
&& this.AVEVAStatus == other.AVEVAStatus && this.AVEVAIssues == other.AVEVAIssues |
| 179 | 180 |
&& this.ProdReviewer == other.ProdReviewer && this.ProdIsResult == other.ProdIsResult && this.ProdRemarks == other.ProdRemarks && this.ClientReviewer == other.ClientReviewer |
| 180 | 181 |
&& this.ClientIsResult == other.ClientIsResult && this.ClientRemarks == other.ClientRemarks && this.DTIsGateWay == other.DTIsGateWay && this.DTIsImport == other.DTIsImport |
| 181 |
&& this.DTIsRegSystem == other.DTIsRegSystem && this.DTRemarks == other.DTRemarks |
|
| 182 |
&& this.DTIsRegSystem == other.DTIsRegSystem && this.DTRemarks == other.DTRemarks && this.ConvertStatus == other.ConvertStatus
|
|
| 182 | 183 |
&& isAttfilesEqual; |
| 183 | 184 |
|
| 184 | 185 |
if (result == false) |
| ... | ... | |
| 202 | 203 |
+ this.AVEVAStatus.GetNullableHash() + this.AVEVAIssues.GetNullableHash() |
| 203 | 204 |
+ this.ProdReviewer.GetNullableHash() + this.ProdIsResult.GetNullableHash() + this.ProdRemarks.GetNullableHash() + this.ClientReviewer.GetNullableHash() |
| 204 | 205 |
+ this.ClientIsResult.GetNullableHash() + this.ClientRemarks.GetNullableHash() + this.DTIsGateWay.GetNullableHash() + this.DTIsImport.GetNullableHash() |
| 205 |
+ this.DTIsRegSystem.GetNullableHash() + this.DTRemarks.GetNullableHash(); |
|
| 206 |
+ this.DTIsRegSystem.GetNullableHash() + this.DTRemarks.GetNullableHash() + this.ConvertStatus.GetNullableHash();
|
|
| 206 | 207 |
} |
| 207 | 208 |
|
| 208 | 209 |
public class DocumentsKeyComparer : IEqualityComparer<Documents> |
내보내기 Unified diff
