1

JunmpPoliceStation/Controllers/TjController.cs

@@ -642,18 +642,18 @@ namespace JunmpPoliceStation.Controllers
                                 c.FirstOrDefault().FindCode,
                                 c.FirstOrDefault().OrgCode,
                                 zsCount = c.Count(f => f.CurrentState != null),
-                                zkCount = c.Where(f => f.CurrentState.Equals(0) || f.CurrentState.Equals(3)).Count(),
-                                ckCount = c.Where(f => !(f.CurrentState == null || f.CurrentState.Equals(0) || f.CurrentState.Equals(3) || f.CurrentState.Equals(6))).Count(),
-                                bfCount = c.Where(f => f.CurrentState.Equals(6)).Count(),
+                                zkCount = c.Where(f => (f.CurrentState.Equals(0) || f.CurrentState.Equals(3))&&f.CreateTime?.Year==DateTime.Now.Year).Count(),
+                                ckCount = c.Where(f => !(f.CurrentState == null || f.CurrentState.Equals(0) || f.CurrentState.Equals(3) || f.CurrentState.Equals(6)) && f.CreateTime?.Year == DateTime.Now.Year).Count(),
+                                bfCount = c.Where(f => f.CurrentState.Equals(6) && f.CreateTime?.Year == DateTime.Now.Year).Count(),
                                 priceCount = c.Where(f => !f.CurrentState.Equals(6) && f.Price != null).Sum(k => k.Price),
                                 children = c.OrderBy(z => z.TypeOneId).GroupBy(a => a.EquipmentCode).Select(c => new
                                 {
                                     id = c.FirstOrDefault().EquipmentCode,
                                     name = c.FirstOrDefault().EquipmentName,
                                     zsCount = c.Count(f => f.CurrentState != null),
-                                    zkCount = c.Where(f => f.CurrentState.Equals(0) || f.CurrentState.Equals(3)).Count(),
-                                    ckCount = c.Where(f => !(f.CurrentState == null || f.CurrentState.Equals(0) || f.CurrentState.Equals(3) || f.CurrentState.Equals(6))).Count(),
-                                    bfCount = c.Where(f => f.CurrentState.Equals(6)).Count(),
+                                    zkCount = c.Where(f => (f.CurrentState.Equals(0) || f.CurrentState.Equals(3)) && f.CreateTime?.Year == DateTime.Now.Year).Count(),
+                                    ckCount = c.Where(f => !(f.CurrentState == null || f.CurrentState.Equals(0) || f.CurrentState.Equals(3) || f.CurrentState.Equals(6)) && f.CreateTime?.Year == DateTime.Now.Year).Count(),
+                                    bfCount = c.Where(f => f.CurrentState.Equals(6) && f.CreateTime?.Year == DateTime.Now.Year).Count(),
                                     priceCount = c.Where(f => !f.CurrentState.Equals(6) && f.Price != null).Sum(k => k.Price)
                                 }).Where(f => f.id != null && f.zsCount != 0).ToList()
                             }).ToList();
@@ -685,18 +685,18 @@ namespace JunmpPoliceStation.Controllers
                                 c.OrderBy(f => f.OrgCode).FirstOrDefault().FindCode,
                                 c.OrderBy(f => f.OrgCode).FirstOrDefault().OrgCode,
                                 zsCount = c.Count(f => f.CurrentState != null),
-                                zkCount = c.Where(f => f.CurrentState.Equals(0) || f.CurrentState.Equals(3)).Count(),
-                                ckCount = c.Where(f => !(f.CurrentState == null || f.CurrentState.Equals(0) || f.CurrentState.Equals(3) || f.CurrentState.Equals(6))).Count(),
-                                bfCount = c.Where(f => f.CurrentState.Equals(6)).Count(),
+                                zkCount = c.Where(f => (f.CurrentState.Equals(0) || f.CurrentState.Equals(3)) && f.CreateTime?.Year == DateTime.Now.Year).Count(),
+                                ckCount = c.Where(f => !(f.CurrentState == null || f.CurrentState.Equals(0) || f.CurrentState.Equals(3) || f.CurrentState.Equals(6)) && f.CreateTime?.Year == DateTime.Now.Year).Count(),
+                                bfCount = c.Where(f => f.CurrentState.Equals(6) && f.CreateTime?.Year == DateTime.Now.Year).Count(),
                                 priceCount = c.Where(f => !f.CurrentState.Equals(6) && f.Price != null).Sum(k => k.Price),
                                 children = c.OrderBy(z => z.TypeOneId).GroupBy(a => a.EquipmentCode).Select(c => new
                                 {
                                     id = c.FirstOrDefault().EquipmentCode,
                                     name = c.FirstOrDefault().EquipmentName,
                                     zsCount = c.Count(f => f.CurrentState != null),
-                                    zkCount = c.Where(f => f.CurrentState.Equals(0) || f.CurrentState.Equals(3)).Count(),
-                                    ckCount = c.Where(f => !(f.CurrentState == null || f.CurrentState.Equals(0) || f.CurrentState.Equals(3) || f.CurrentState.Equals(6))).Count(),
-                                    bfCount = c.Where(f => f.CurrentState.Equals(6)).Count(),
+                                    zkCount = c.Where(f => (f.CurrentState.Equals(0) || f.CurrentState.Equals(3)) && f.CreateTime?.Year == DateTime.Now.Year).Count(),
+                                    ckCount = c.Where(f => !(f.CurrentState == null || f.CurrentState.Equals(0) || f.CurrentState.Equals(3) || f.CurrentState.Equals(6)) && f.CreateTime?.Year == DateTime.Now.Year).Count(),
+                                    bfCount = c.Where(f => f.CurrentState.Equals(6) && f.CreateTime?.Year == DateTime.Now.Year).Count(),
                                     priceCount = c.Where(f => !f.CurrentState.Equals(6) && f.Price != null).Sum(k => k.Price)
                                 }).Where(f => f.id != null && f.zsCount != 0).ToList()
                             }).ToList();