Commit 810ff77e by 1391696987

审核通过备注变空,修复汇总查询不到问题

parent 07a1384f
...@@ -1410,7 +1410,7 @@ public GatherResponse GetGatherTotal(Gather gather) ...@@ -1410,7 +1410,7 @@ public GatherResponse GetGatherTotal(Gather gather)
if (gather != null && !string.IsNullOrEmpty(gather.SearchQuery)) if (gather != null && !string.IsNullOrEmpty(gather.SearchQuery))
{ {
exp = exp.And(t => t.Category.Contains(gather.SearchQuery) || t.Source.Contains(gather.SearchQuery)); exp = exp.And(t => t.Category.Contains(gather.SearchQuery) || t.Source.Contains(gather.SearchQuery) || t.Department.Contains(gather.SearchQuery));
} }
var user = userRepository.GetEntities(); var user = userRepository.GetEntities();
var userLogin= user.FirstOrDefault(t => t.ID == gather.UserId); var userLogin= user.FirstOrDefault(t => t.ID == gather.UserId);
...@@ -1420,8 +1420,7 @@ public GatherResponse GetGatherTotal(Gather gather) ...@@ -1420,8 +1420,7 @@ public GatherResponse GetGatherTotal(Gather gather)
.Select(s => Regex.Replace(s.SheetName.Replace(" ", "").Replace(".", ""), "[0-9]", "")) .Select(s => Regex.Replace(s.SheetName.Replace(" ", "").Replace(".", ""), "[0-9]", ""))
.Distinct().ToList(); .Distinct().ToList();
exp = exp.And(t => userSource.Contains(t.Source)); exp = exp.And(t => userSource.Contains(t.Source));
var hasDepartment = perdeptdicRepository.GetEntities(p=>p.AccountingUnit.Contains(userLogin.Department)).Select(s=>s.HISDeptName).Distinct().ToList();
var hasDepartment = perdeptdicRepository.GetEntities(p=>p.AccountingUnit.Contains(userLogin.Department)).Select(s=>s.Department).Distinct();
exp = exp.And(t => hasDepartment.Contains(t.Department)); exp = exp.And(t => hasDepartment.Contains(t.Department));
} }
...@@ -1814,6 +1813,7 @@ public void AuditGather(List<Gather> gather) ...@@ -1814,6 +1813,7 @@ public void AuditGather(List<Gather> gather)
{ {
d.AuditTime = DateTime.Now; d.AuditTime = DateTime.Now;
d.States = (int)AuditGatherEnum.已通过; d.States = (int)AuditGatherEnum.已通过;
d.Remark = null;
}); });
else if (gatherFirst.Status == "失败") else if (gatherFirst.Status == "失败")
datas.ForEach(d => datas.ForEach(d =>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment