개정판 e8a86b9b
issue #0000
캡쳐항목변경
- 캡쳐된 항목만 표시하기위해
- ID2 도프텍, 삼성 (DB 컬럼도 같이 삭제)
- Valiation 도프텍, 삼성
document 조회 쿼리 수정
- total count
Change-Id: I7e8703b0826d5f1bebf51645d97fd5645b511acf
| ID2.Manager/ID2.Manager.Dapper/Repository/DocumentRepository.cs | ||
|---|---|---|
| 74 | 74 |
if (string.IsNullOrEmpty(projectCode)) |
| 75 | 75 |
{
|
| 76 | 76 |
sbWhere.Append(" and isnull(doc.RefProjectCode,'') in (select Code from dbo.Projects where ParentID=@RefGroupID union all select '') ");
|
| 77 |
sbTotalWhere.Append(" and isnull(doc.RefProjectCode,'') in (select Code from dbo.Projects where ParentID=@RefGroupID union all select '') ");
|
|
| 77 | 78 |
parameters.Add("RefGroupID", projectGroupID);
|
| 78 | 79 |
} |
| 79 | 80 |
else |
| 80 | 81 |
{
|
| 82 |
sbTotalWhere.Append(" and isnull(doc.RefProjectCode,'') in (select Code from dbo.Projects where ParentID=@RefGroupID union all select '') ");
|
|
| 83 |
parameters.Add("RefGroupID", projectGroupID);
|
|
| 84 |
|
|
| 81 | 85 |
sbWhere.Append(" and doc.RefProjectCode=@RefProjectCode ");
|
| 82 |
sbTotalWhere.Append(" and doc.RefProjectCode=@RefProjectCode ");
|
|
| 83 | 86 |
parameters.Add("RefProjectCode", projectCode);
|
| 84 | 87 |
} |
| 85 | 88 |
if (!string.IsNullOrEmpty(personIncharge)) |
| ... | ... | |
| 210 | 213 |
System.Diagnostics.Debug.WriteLine(attfile.FileName); |
| 211 | 214 |
if (!doc.AttFiles.Any(x => x.FileID == attfile.FileID)) |
| 212 | 215 |
{
|
| 216 |
switch (attfile.Category) |
|
| 217 |
{
|
|
| 218 |
case "toreview": |
|
| 219 |
doc.ToCapture++; |
|
| 220 |
break; |
|
| 221 |
case "frreview": |
|
| 222 |
doc.FrCapture++; |
|
| 223 |
break; |
|
| 224 |
case "prodvalidation": |
|
| 225 |
doc.ProdCapture++; |
|
| 226 |
break; |
|
| 227 |
case "clientvalidation": |
|
| 228 |
doc.ClientCapture++; |
|
| 229 |
break; |
|
| 230 |
} |
|
| 231 |
|
|
| 213 | 232 |
doc.AttFiles.Add(attfile); |
| 214 | 233 |
} |
| 215 | 234 |
} |
| ID2.Manager/ID2.Manager.Data/Models/Documents.cs | ||
|---|---|---|
| 91 | 91 |
public string ToRemarks { get; set; }
|
| 92 | 92 |
[DataMember] |
| 93 | 93 |
public string ToCreator { get; set; }
|
| 94 |
[DataMember] |
|
| 95 |
public string ToCapture { get; set; }
|
|
| 94 |
public int ToCapture { get; set; }
|
|
| 96 | 95 |
[DataMember] |
| 97 | 96 |
public string ToIsMarkup { get; set; }
|
| 98 | 97 |
[DataMember] |
| ... | ... | |
| 101 | 100 |
public string FrRemarks { get; set; }
|
| 102 | 101 |
[DataMember] |
| 103 | 102 |
public string FrCreator { get; set; }
|
| 104 |
[DataMember] |
|
| 105 |
public string FrCapture { get; set; }
|
|
| 103 |
public int FrCapture { get; set; }
|
|
| 106 | 104 |
[DataMember] |
| 107 | 105 |
public string FrIsMarkup { get; set; }
|
| 108 | 106 |
[DataMember] |
| ... | ... | |
| 161 | 159 |
public string ProdIsResult { get; set; }
|
| 162 | 160 |
[DataMember] |
| 163 | 161 |
public string ProdRemarks { get; set; }
|
| 162 |
public int ProdCapture { get; set; }
|
|
| 164 | 163 |
[DataMember] |
| 165 | 164 |
public string ClientReviewer { get; set; }
|
| 166 | 165 |
[DataMember] |
| 167 | 166 |
public string ClientIsResult { get; set; }
|
| 168 | 167 |
[DataMember] |
| 169 | 168 |
public string ClientRemarks { get; set; }
|
| 169 |
public int ClientCapture { get; set; }
|
|
| 170 | 170 |
[DataMember] |
| 171 | 171 |
public string DTIsGateWay { get; set; }
|
| 172 | 172 |
[DataMember] |
| ID2.Manager/ID2.Manager/Main.cs | ||
|---|---|---|
| 1348 | 1348 |
case "AVEVAConnection": |
| 1349 | 1349 |
case "ReviewFileName"://일단주석 |
| 1350 | 1350 |
case "SystemLink": |
| 1351 |
case "ToCapture": |
|
| 1352 |
case "FrCapture": |
|
| 1353 | 1351 |
case "ID2Connection": |
| 1354 | 1352 |
this.GetCommandColBtnElement(e.CellElement.Children[0], e.CellElement.ColumnInfo.Name); |
| 1355 | 1353 |
break; |
| 1354 |
//case "ToCapture": |
|
| 1355 |
// if (result.ToCapture > 0) |
|
| 1356 |
// {
|
|
| 1357 |
// e.CellElement.Image = Properties.Resources.files18; |
|
| 1358 |
// } |
|
| 1359 |
// break; |
|
| 1360 |
//case "FrCapture": |
|
| 1361 |
// if (result.FrCapture > 0) |
|
| 1362 |
// {
|
|
| 1363 |
// e.CellElement.Image = Properties.Resources.files18; |
|
| 1364 |
// } |
|
| 1365 |
// break; |
|
| 1366 |
//case "ProdCapture": |
|
| 1367 |
// if (result.ProdCapture > 0) |
|
| 1368 |
// {
|
|
| 1369 |
// e.CellElement.Image = Properties.Resources.files18; |
|
| 1370 |
// e.CellElement.Text = result.ProdCapture.ToString(); |
|
| 1371 |
// } |
|
| 1372 |
// break; |
|
| 1373 |
//case "ClientCapture": |
|
| 1374 |
// if (result.ClientCapture > 0) |
|
| 1375 |
// {
|
|
| 1376 |
// e.CellElement.Image = Properties.Resources.files18; |
|
| 1377 |
// } |
|
| 1378 |
// break; |
|
| 1356 | 1379 |
} |
| 1357 | 1380 |
} |
| 1358 | 1381 |
else |
내보내기 Unified diff
