移交管理优化：子项完成状态判断逻辑调整；

2024-11-20 11:29:46 +08:00
parent 981b4e2f63
commit 448fa6c4f2
31 changed files with 300 additions and 103 deletions
@@ -916,7 +916,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
                                u.UnitId,
                                u.UnitName,
                                c.IssuedDate,
-                                c.Status
+                                c.Status,
+                                c.ImplementationFrontState,

                            };

@@ -926,8 +927,10 @@ namespace FineUIPro.Web.CQMS.ManageReport
                Model.NCRReportStatisc NCRStatisc = new Model.NCRReportStatisc();
                NCRStatisc.Num = i;
                NCRStatisc.WorkName = item.UnitName;
-                NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Count(x => x.Status == "3");
-                NCRStatisc.OKNum = AllList.Count(x => x.Status == "3");
+                //NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Count(x => x.Status == "3");
+                //NCRStatisc.OKNum = AllList.Count(x => x.Status == "3");
+                NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
+                NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
                NCRStatisc.CheckNum = AllList.Count();
                if (NCRStatisc.CheckNum != 0)//被除数不能为零
                {