1119

LogForceTestApp.Modules.MainModule/ViewModels/KBWindowViewModel.cs

@@ -500,10 +500,12 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
         //    }
         //}
         int[] nums = new int[30];
+        
         private void ShowPeope(string[] opername)
         {
             PerManage = new List<Person>();
             PerManage1 = new List<Person>();
+            PerManage2 = new List<Person>();
             for (int i = 0; i < opername.Length; i++)
             {
                 if (opername[i] == null || string.IsNullOrEmpty(opername[i]))
@@ -516,16 +518,35 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
                     nums[i] = value.Count();
                     PerManagement(opername[i], nums[i]);
                 }
+                var num= repository.GetAllQuery<Information>(c => c.OperatorCode == opername[i] && c.CreateTime <= DateTime.Today&& c.CreateTime >= DateTime.Today.AddDays(-9));
+                if (num.Count != 0)
+                {
+                    nums[i] = value.Count();
+                    PerManagement2(opername[i], nums[i]);
+                }
             }
         }
         public List<Person> PerManage { get; set; }
         private List<Person> PerManage1 { get; set; }
+        private List<Person> PerManage2 { get; set; }
         public void PerManagement(string ename, int yield)
         {
             //PerManage = new List<Person>();//放在外面就累加，放这里就不累加一直刷
             PerManage1.Add(new Person { Id = new Guid(), EmployeeName = ename, Yield = yield });
             var m = PerManage1.OrderByDescending(x => x.Yield).ToList();//降序
             PerManage = m;
+            //if (m.Count >= 3)
+            //{
+            //    FirstName = PerManage[0].EmployeeName;
+            //    SecondName = PerManage[1].EmployeeName;
+            //    ThirdName = PerManage[2].EmployeeName;
+            //}
+        }
+        public void PerManagement2(string ename, int yield)
+        {
+            PerManage2.Add(new Person { Id = new Guid(), EmployeeName = ename, Yield = yield });
+            var m = PerManage2.OrderByDescending(x => x.Yield).ToList();//降序
+            PerManage = m;
             if (m.Count >= 3)
             {
                 FirstName = PerManage[0].EmployeeName;
@@ -533,7 +554,6 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
                 ThirdName = PerManage[2].EmployeeName;
             }
         }
-
         #endregion
 
         #region 仓库
@@ -995,10 +1015,20 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
             }
             try
             {
-                var ps = repository.GetFirstDefault<ProStatus>(c => c.DateS == DateTime.Today&&c.OrdNoS==str);
+                var ps = repository.GetAllQuery<ProStatus>(c => c.OrdNoS==str);
                 if (ps != null)
                 {
-                    Finished = ps.RealityS;
+                    for (int i = 0; i < ps.Count; i++)
+                    {
+                        if (i==0)
+                        {
+                            Finished = ps[i].RealityS;
+                        }
+                        else
+                        {
+                            Finished = Finished + ps[i].RealityS;
+                        }
+                    }
                 }
             }
             catch (Exception)