diff --git a/24Hour/Controllers/Common/CommonController.cs b/24Hour/Controllers/Common/CommonController.cs index bcb71ae..849e811 100644 --- a/24Hour/Controllers/Common/CommonController.cs +++ b/24Hour/Controllers/Common/CommonController.cs @@ -1948,6 +1948,66 @@ namespace _24Hour.Controllers.Common appurl = "" }); }); + //获取认罪认罚预约记录 + var Confessiondata = await _db.Queryable() + .Where(q => q.IsDeleted == 0 && q.unitCode == _userdata.unitCode).ToArrayAsync(); + Confessiondata.ToList().ForEach(q => + { + var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); + list.Add(new + { + type = 3, + Id = q.Id, + daId = da?.Id, + title = da?.title, + color = da?.color, + icon = da?.icon, + name = "", + phone = q.phone, + matter = q.matter,//事由 + objectstr = "",//访问对象(案件名称) + Code = "", + statetype = $"{q.state}",//状态 + reason = q.reason,//原因 + sttime = q.sttime, + ettime = "", + creationtime = q.creationtime, + receptionuser = q.meetwitId, + username = q.meetwitname, + notes = q.notes, + appurl = "" + }); + }); + //获取听证预约记录 + var Hearingdata = await _db.Queryable() + .Where(q => q.IsDeleted == 0 && q.unitCode == _userdata.unitCode).ToArrayAsync(); + Hearingdata.ToList().ForEach(q => + { + var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); + list.Add(new + { + type = 4, + Id = q.Id, + daId = da?.Id, + title = da?.title, + color = da?.color, + icon = da?.icon, + name = "", + phone = q.contact, + matter = q.witnessrequest,//事由 + objectstr = "",//访问对象(案件名称) + Code = "", + statetype = $"{q.state}",//状态 + reason = q.reason,//原因 + sttime = q.reservationtime, + ettime = "", + creationtime = q.creationtime, + receptionuser = q.receptionuser, + username = q.receptionusername, + notes = q.notes, + appurl = "" + }); + }); list = list .WhereIF(Commondata.StartTime != null && Commondata.EndTime != null, q => q.sttime >= Commondata.StartTime && q.sttime < Commondata.EndTime.Value.AddDays(1)).OrderByDescending(q => q.creationtime).ToList(); //预约类型分组统计