20240514 修改月报

2024-05-14 18:07:37 +08:00
parent 8b3c544f40
commit 8fac345874
4 changed files with 34 additions and 15 deletions
@@ -60,17 +60,40 @@ namespace FineUIPro.Web.CQMS.ProcessControl
            }
            //统计所给时间段的全部数量
            List<Model.ProcessControl_InspectionManagement> managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, string.Empty, StartDate, DateTime.Now, false);
-            List<string> compileMans = managementListSunNumber.Select(x => x.CompileMan).Distinct().ToList();
-            foreach (var item in compileMans)
+            var checkMans = managementListSunNumber.Select(x => x.AcceptanceCheckMan.Split(',').ToList());
+            List<string> compileMans = new List<string>();
+            foreach (var item in checkMans)
            {
-                Model.Sys_User user = BLL.UserService.GetUserByUserId(item);
+                string id = item.FirstOrDefault().Trim();
+                compileMans.Add(id);
+            }
+            checkMans= managementListSunNumber.Select(x => x.AcceptanceCheckMan.Split('、').ToList());
+            foreach (var item in checkMans)
+            {
+                string name = item.FirstOrDefault().Trim();
+                compileMans.Add(name);
+            }
+            //List<string> compileMans = managementListSunNumber.Select(x => x.CompileMan).Distinct().ToList();
+            foreach (var item in compileMans.Distinct())
+            {
+                Model.NCRStatisc Statistics = new Model.NCRStatisc();
+                Model.Sys_User user = BLL.UserService.GetUserByUserId(item);//新数据保存的用户Id
                if (user != null)
                {
-                    Model.NCRStatisc Statistics = new Model.NCRStatisc();
                    Statistics.WorkName = user.UserName;
-                    Statistics.CheckNum = managementListSunNumber.Where(x => x.CompileMan == item).Count();
+                    Statistics.CheckNum = managementListSunNumber.Where(x => x.AcceptanceCheckMan == item).Count();
                    StatisticsList.Add(Statistics);
                }
+                else
+                {
+                    Model.Sys_User u = BLL.UserService.GetUserByUserName(item);//老数据保存的姓名
+                    if (u!=null)
+                    {
+                        Statistics.WorkName = u.UserName;
+                        Statistics.CheckNum = managementListSunNumber.Where(x => x.AcceptanceCheckMan == item).Count();
+                        StatisticsList.Add(Statistics);
+                    }
+                }
            }
            Model.NCRStatisc StatisticsLast = new Model.NCRStatisc();
            StatisticsLast.WorkName = "合计";