chenjingyong
/
ds8-solution-pro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

任务台台账调整

Browse Source
usertest
zhangxiaofeng 4 months ago
parent 5fd6bcf430
commit 27ac42327a
2 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File

36
ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageService.cs
Unescape Escape View File

@ -1337,7 +1337,7 @@ namespace DS.WMS.Core.TaskPlat.Method
//任务列表分组统计 //任务列表分组统计
var groupList = await tenantDb.Queryable<TaskBaseInfo>() var groupList = await tenantDb.Queryable<TaskBaseInfo>()
.LeftJoin<TaskBaseAllocation>((t, a) => t.Id == a.TaskId) .LeftJoin<TaskBaseAllocation>((t, a) => t.Id == a.TaskId)
.Where((t, a) => t.IS_PUBLIC == 1 || (t.IS_PUBLIC == 0 && (t.CreateBy == userId || a.UserId == userId))) .Where((t, a) => t.IS_PUBLIC == 1 || (t.IS_PUBLIC == 0 && a.Status != null && (t.CreateBy == userId || a.UserId == userId)))
.GroupBy((t, a) => new { t.TASK_TYPE, t.STATUS, a.Status, t.IS_PUBLIC }) .GroupBy((t, a) => new { t.TASK_TYPE, t.STATUS, a.Status, t.IS_PUBLIC })
.Select((t, a) => new .Select((t, a) => new
{ {
@ -1447,8 +1447,8 @@ namespace DS.WMS.Core.TaskPlat.Method
.Select(t => new { Key = t.Key, Total = t.ToList().Sum(p => p.Total) }) .Select(t => new { Key = t.Key, Total = t.ToList().Sum(p => p.Total) })
.ToList().ForEach(t => .ToList().ForEach(t =>
{ {
TaskStatusEnum currEnum = (TaskStatusEnum)System.Enum.Parse(typeof(TaskStatusEnum), t.Key); if (Enum.TryParse(t.Key, out TaskStatusEnum currEnum))
{
nextList.Add(new TaskUserStatItemNext nextList.Add(new TaskUserStatItemNext
{ {
TopKey = TaskStatLevelEnum.PERSON.ToString(), TopKey = TaskStatLevelEnum.PERSON.ToString(),
@ -1456,9 +1456,9 @@ namespace DS.WMS.Core.TaskPlat.Method
Name = currEnum.EnumDescription(), Name = currEnum.EnumDescription(),
Total = t.Total, Total = t.Total,
SortNo = (int)currEnum, SortNo = (int)currEnum,
ActionKey = $"{TaskStatLevelEnum.PERSON.ToString()}#{currEnum.ToString()}" ActionKey = $"{TaskStatLevelEnum.PERSON}#{currEnum}"
}); });
}
}); });
if (nextList.Count > 0) if (nextList.Count > 0)
@ -1468,9 +1468,8 @@ namespace DS.WMS.Core.TaskPlat.Method
.Select(t => new { Key = t.Key, Total = t.ToList().Sum(p => p.Total) }) .Select(t => new { Key = t.Key, Total = t.ToList().Sum(p => p.Total) })
.ToList().ForEach(t => .ToList().ForEach(t =>
{ {
//TaskBusiTypeEnum currEnum = (TaskBusiTypeEnum)System.Enum.Parse(typeof(TaskBusiTypeEnum), t.Key.TaskType); if (Enum.TryParse(t.Key.TaskType, out TaskBaseTypeEnum currEnum))
TaskBaseTypeEnum currEnum = (TaskBaseTypeEnum)System.Enum.Parse(typeof(TaskBaseTypeEnum), t.Key.TaskType); {
resultInfo.LevelTree.Add(new TaskUserStatItemTree resultInfo.LevelTree.Add(new TaskUserStatItemTree
{ {
TopKey = TaskStatLevelEnum.PERSON.ToString(), TopKey = TaskStatLevelEnum.PERSON.ToString(),
@ -1479,9 +1478,9 @@ namespace DS.WMS.Core.TaskPlat.Method
Name = currEnum.EnumDescription(), Name = currEnum.EnumDescription(),
Total = t.Total, Total = t.Total,
SortNo = (int)currEnum, SortNo = (int)currEnum,
ActionKey = $"{TaskStatLevelEnum.PERSON.ToString()}#{t.Key.AStatus}#{currEnum.ToString()}" ActionKey = $"{TaskStatLevelEnum.PERSON}#{t.Key.AStatus}#{currEnum}"
}); });
}
}); });
} }
#endregion #endregion
@ -1504,8 +1503,8 @@ namespace DS.WMS.Core.TaskPlat.Method
.Select(t => new { Key = t.Key, Total = t.ToList().Sum(p => p.Total) }) .Select(t => new { Key = t.Key, Total = t.ToList().Sum(p => p.Total) })
.ToList().ForEach(t => .ToList().ForEach(t =>
{ {
TaskStatusEnum currEnum = (TaskStatusEnum)System.Enum.Parse(typeof(TaskStatusEnum), t.Key); if (Enum.TryParse(t.Key, out TaskStatusEnum currEnum))
{
nextList.Add(new TaskUserStatItemNext nextList.Add(new TaskUserStatItemNext
{ {
TopKey = TaskStatLevelEnum.PUBLIC.ToString(), TopKey = TaskStatLevelEnum.PUBLIC.ToString(),
@ -1513,9 +1512,9 @@ namespace DS.WMS.Core.TaskPlat.Method
Name = currEnum.EnumDescription(), Name = currEnum.EnumDescription(),
Total = t.Total, Total = t.Total,
SortNo = (int)currEnum, SortNo = (int)currEnum,
ActionKey = $"{TaskStatLevelEnum.PUBLIC.ToString()}#{currEnum.ToString()}" ActionKey = $"{TaskStatLevelEnum.PUBLIC}#{currEnum}"
}); });
}
}); });
if (nextList.Count > 0) if (nextList.Count > 0)
@ -1525,9 +1524,8 @@ namespace DS.WMS.Core.TaskPlat.Method
.Select(t => new { Key = t.Key, Total = t.ToList().Sum(p => p.Total) }) .Select(t => new { Key = t.Key, Total = t.ToList().Sum(p => p.Total) })
.ToList().ForEach(t => .ToList().ForEach(t =>
{ {
//TaskBusiTypeEnum currEnum = (TaskBusiTypeEnum)System.Enum.Parse(typeof(TaskBusiTypeEnum), t.Key.TaskType); if (Enum.TryParse(t.Key.TaskType, out TaskBaseTypeEnum currEnum))
TaskBaseTypeEnum currEnum = (TaskBaseTypeEnum)System.Enum.Parse(typeof(TaskBaseTypeEnum), t.Key.TaskType); {
resultInfo.LevelTree.Add(new TaskUserStatItemTree resultInfo.LevelTree.Add(new TaskUserStatItemTree
{ {
TopKey = TaskStatLevelEnum.PUBLIC.ToString(), TopKey = TaskStatLevelEnum.PUBLIC.ToString(),
@ -1536,9 +1534,9 @@ namespace DS.WMS.Core.TaskPlat.Method
Name = currEnum.EnumDescription(), Name = currEnum.EnumDescription(),
Total = t.Total, Total = t.Total,
SortNo = (int)currEnum, SortNo = (int)currEnum,
ActionKey = $"{TaskStatLevelEnum.PUBLIC.ToString()}#{t.Key.TStatus}#{currEnum.ToString()}" ActionKey = $"{TaskStatLevelEnum.PUBLIC}#{t.Key.TStatus}#{currEnum}"
}); });
}
}); });
} }
#endregion #endregion

2
ds-wms-service/DS.WMS.TaskApi/appsettings.json
Unescape Escape View File

@ -21,6 +21,7 @@
"DefaultDbConnId": "1288018625843826688", "DefaultDbConnId": "1288018625843826688",
"DefaultDbType": 0, "DefaultDbType": 0,
"DefaultDbString": "server=rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com;port=3306;uid=rulesengine_admin;pwd=Rule1qaz2wsx!QAZ;database=shippingweb8_dev", "DefaultDbString": "server=rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com;port=3306;uid=rulesengine_admin;pwd=Rule1qaz2wsx!QAZ;database=shippingweb8_dev",
//"DefaultDbString": "server=60.209.125.238;port=32006;uid=root;pwd=Djy@Mysql.test;database=shippingweb8_dev",
"DBS": [ "DBS": [
{ {
"ConnId": "1288018625843826680", "ConnId": "1288018625843826680",
@ -28,6 +29,7 @@
"Enabled": false, "Enabled": false,
"HitRate": 40, "HitRate": 40,
"Connection": "server=rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com;port=3306;uid=rulesengine_admin;pwd=Rule1qaz2wsx!QAZ;database=shippingweb8_log" "Connection": "server=rm-m5e06xxqpa68a68ry5o.mysql.rds.aliyuncs.com;port=3306;uid=rulesengine_admin;pwd=Rule1qaz2wsx!QAZ;database=shippingweb8_log"
// "Connection": "server=60.209.125.238;port=32006;uid=root;pwd=Djy@Mysql.test;database=shippingweb8_log"
} }
] ]
}, },

Write Preview
Loading…
Cancel
Save