개정판 57ea162e
issue #0000
excel import
- row 순서대로 정렬
- capture 있을 경우 이미지 아이콘 보이도록 수정
Change-Id: I27a7fb54949ef5ac8f96e8222cac7040b02b41fc
ID2.Manager/ID2.Manager.Common/Helpers/ID2Excel.cs | ||
---|---|---|
167 | 167 |
var document = new Documents(); |
168 | 168 |
//document.DocID = Guid.NewGuid().ToString(); |
169 | 169 |
|
170 |
int toreview = 0; |
|
171 |
int frreview = 0; |
|
172 |
int id2work = 0; |
|
173 |
|
|
170 | 174 |
foreach (var cell in row.OrderBy(x=>x.COUMMN_INDEX)) |
171 | 175 |
{ |
172 | 176 |
var value = cell.VALUE.DefalutValue(); |
... | ... | |
234 | 238 |
FileData = ExcelToImageData(value) |
235 | 239 |
|
236 | 240 |
}); |
241 |
|
|
242 |
document.ToCapture = ++toreview; |
|
237 | 243 |
} |
238 | 244 |
break; |
239 | 245 |
case 22: |
... | ... | |
267 | 273 |
FileData = ExcelToImageData(value) |
268 | 274 |
|
269 | 275 |
}); |
276 |
|
|
277 |
document.FrCapture = ++frreview; |
|
270 | 278 |
} |
271 | 279 |
break; |
272 | 280 |
case 26: |
... | ... | |
303 | 311 |
FileData = ExcelToImageData(value) |
304 | 312 |
|
305 | 313 |
}); |
314 |
|
|
315 |
document.ID2Capture = ++id2work; |
|
306 | 316 |
} |
307 | 317 |
break; |
308 | 318 |
case 31: |
ID2.Manager/ID2.Manager.Dapper/Repository/ExcelDataRepository.cs | ||
---|---|---|
16 | 16 |
{ |
17 | 17 |
try |
18 | 18 |
{ |
19 |
string query = $@"select * from dbo.ImportExcel where [FILE_NAME] = @FileName and WORKSHEET_NAME = @WorksheetName"; |
|
19 |
string query = $@"select * from dbo.ImportExcel where [FILE_NAME] = @FileName and WORKSHEET_NAME = @WorksheetName order by ROW_INDEX, COUMMN_INDEX";
|
|
20 | 20 |
var dynamicParameters = new DynamicParameters(); |
21 | 21 |
dynamicParameters.Add("@FileName", FileName); |
22 | 22 |
dynamicParameters.Add("@WorksheetName", WorksheetName); |
내보내기 Unified diff