개정판 1d79913e
issue #00000 error notice mail 안 되는 문제 수정
Change-Id: I307236bdea2ca63347b99a174c02e1e53f05a3a7
| ConvertService/ServiceBase/Markus.Service.DataBase/ConvertDatabase.cs | ||
|---|---|---|
| 61 | 61 |
var convertWaitingItems = entities.CONVERTER_DOC.OrderBy(x => x.CREATE_DATETIME).Where( |
| 62 | 62 |
x => |
| 63 | 63 |
//projectList.Contains(x.PROJECT_NO) && x.RECONVERTER < 2 && |
| 64 |
x.RECONVERTER < 2 &&
|
|
| 65 |
(x.STATUS == (int)StatusCodeType.None || x.STATUS > (int)StatusCodeType.Completed))
|
|
| 64 |
(x.RECONVERTER < 2 && (x.STATUS == (int)StatusCodeType.None || x.STATUS > (int)StatusCodeType.Completed))
|
|
| 65 |
|| (x.RECONVERTER == 2 && (x.STATUS == (int)StatusCodeType.None)))
|
|
| 66 | 66 |
.GroupBy(x => x.DOCUMENT_ID).Select(x => x.FirstOrDefault()) |
| 67 | 67 |
.Take(TakeCount); |
| 68 | 68 |
|
| ... | ... | |
| 712 | 712 |
{
|
| 713 | 713 |
try |
| 714 | 714 |
{
|
| 715 |
|
|
| 716 |
return Path.Combine(BaseStorage(ProjectNo), ProjectNo + "_Tile", (System.Convert.ToInt64(DocumentID) / 100).ToString(), DocumentID); |
|
| 715 |
#if XI_C_AND_A |
|
| 717 | 716 |
return Path.Combine(BaseStorage(ProjectNo), ProjectNo + "_Tile",DocumentID.Substring(0, 5).ToString(), DocumentID); |
| 717 |
#else |
|
| 718 |
return Path.Combine(BaseStorage(ProjectNo), ProjectNo + "_Tile", (System.Convert.ToInt64(DocumentID) / 100).ToString(), DocumentID); |
|
| 719 |
|
|
| 718 | 720 |
} |
| 719 | 721 |
catch (Exception) |
| 720 | 722 |
{
|
| ... | ... | |
| 834 | 836 |
List<Interface.ConvertItem> convertItems = new List<Interface.ConvertItem>(); |
| 835 | 837 |
|
| 836 | 838 |
|
| 837 |
var items = entities.CONVERTER_DOC.Where(x => x.STATUS == (int)statusCodeType).Take(takeCount).ToList(); |
|
| 839 |
var items = entities.CONVERTER_DOC.Where(x => x.STATUS == (int)statusCodeType).Where(@where).Take(takeCount).ToList();
|
|
| 838 | 840 |
|
| 839 | 841 |
if (items.Count() > 0) |
| 840 | 842 |
{
|
| ... | ... | |
| 1082 | 1084 |
var convertWaitingItems = entities.CONVERTER_DOC.OrderBy(x => x.CREATE_DATETIME).Where( |
| 1083 | 1085 |
x => |
| 1084 | 1086 |
projectList.Contains(x.PROJECT_NO) && |
| 1085 |
(x.STATUS > (int)StatusCodeType.None && x.STATUS < (int)StatusCodeType.Completed) && x.RECONVERTER < 2);
|
|
| 1087 |
((x.STATUS > (int)StatusCodeType.None && x.STATUS < (int)StatusCodeType.Completed) && x.RECONVERTER < 2));
|
|
| 1086 | 1088 |
|
| 1087 | 1089 |
return convertWaitingItems.ToList(); |
| 1088 | 1090 |
} |
내보내기 Unified diff
