From 9a2808a05d38dfa8675bd4a4fde5550c451ce6f6 Mon Sep 17 00:00:00 2001
From: liujiaqiang <1448951783@qq.com>
Date: Mon, 3 Jul 2023 16:12:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=AC=E8=AF=81=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=EF=BC=8C=E8=AE=A4=E7=BD=AA=E8=AE=A4=E7=BD=9A=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 24Hour/Controllers/Common/CommonController.cs | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)

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<App_ConfessionModel>()
+                    .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<App_HearingModel>()
+                    .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();
                 //预约类型分组统计