添加我的代办云柜状态、文书状态查询

24Hour/Controllers/Common/CommonController.cs

@@ -685,7 +685,10 @@ namespace _24Hour.Controllers.Common
                 });
                 //获取文书签收记录
                 var Documentdata = await _db.Queryable<App_DocumentModel>()
-                    .Where(q => q.zjhm.Contains(_userdata.cardId) && q.zt.Contains("03")).ToArrayAsync();
+                    .WhereIF(Commondata.state != null&&Commondata.state==0, x => x.zt.Contains("03"))
+                     .WhereIF(Commondata.state != null&&Commondata.state==1, x => x.zt.Contains("1000"))
+                      .WhereIF(Commondata.state != null&&Commondata.state==2, x => x.zt.Contains("99")||x.zt.Contains("04"))
+                    .Where(q => q.zjhm.Contains(_userdata.cardId)).ToArrayAsync();
                 Documentdata.ToList().ForEach(q =>
                 {
                     var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault();
@@ -722,7 +725,10 @@ namespace _24Hour.Controllers.Common
                 });
                 //获取云柜记录
                 var CloudCabinetdata = await _db.Queryable<App_CloudCabinetModel>()
-                    .Where(q => (q.sfzh.Contains(_userdata.cardId) || q.lxhm == _userdata.phone) && q.zt.Contains("00")).ToArrayAsync();
+                    .WhereIF(Commondata.state != null&&Commondata.state==0, x => x.zt.Contains("00"))
+                     .WhereIF(Commondata.state != null&&Commondata.state==1, x => x.zt.Contains("1000"))
+                      .WhereIF(Commondata.state != null&&Commondata.state==2, x => x.zt.Contains("99"))
+                    .Where(q => (q.sfzh.Contains(_userdata.cardId) || q.lxhm == _userdata.phone)).ToArrayAsync();
                 CloudCabinetdata.ToList().ForEach(q =>
                 {
                     var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault();
@@ -1760,7 +1766,8 @@ namespace _24Hour.Controllers.Common
                     if (da != null)
                     {
                         satseGroupBy.Add(new { name = str[i], value = da.value });
-                    }else
+                    }
+                    else
                     {
                         satseGroupBy.Add(new { name = str[i], value = 0 });
                     }