diff --git a/24Hour/Controllers/Common/CommonController.cs b/24Hour/Controllers/Common/CommonController.cs
index c6775b8..2058aca 100644
--- a/24Hour/Controllers/Common/CommonController.cs
+++ b/24Hour/Controllers/Common/CommonController.cs
@@ -68,7 +68,7 @@ namespace _24Hour.Controllers.Common
Lawyerdata.ToList().ForEach(q =>
{
var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault();
- var userda=Userdata.Where(x => x.Id == q.receptionuser).FirstOrDefault();
+ var userda = Userdata.Where(x => x.Id == q.receptionuser).FirstOrDefault();
list.Add(new
{
type = 0,
@@ -188,11 +188,11 @@ namespace _24Hour.Controllers.Common
list = list.WhereIF(Commondata.username.NotNull(), x => $"{x.username}".Contains(Commondata.username))
.WhereIF(Commondata.handleuser.NotNull(), x => $"{x.handleuser}".Contains(Commondata.handleuser))
.WhereIF(Commondata.StartTime != null && Commondata.EndTime != null, q => q.creationtime >= Commondata.StartTime && q.creationtime < Commondata.EndTime.Value.AddDays(1)).ToList();
- Commondata.RowsCount = list.Count();
- list =list.OrderByDescending(q => q.creationtime).ToList()
- .Skip(Commondata.PageSize * (Commondata.PageIndex - 1)).Take(Commondata.PageSize).ToList();
+ Commondata.RowsCount = list.Count();
+ list =list.OrderByDescending(q => q.creationtime).ToList()
+ .Skip(Commondata.PageSize * (Commondata.PageIndex - 1)).Take(Commondata.PageSize).ToList();
result.IsSucceed = true;
- result.result =new { Paging= Commondata, Data= list.ToList() } ;
+ result.result =new { Paging = Commondata, Data = list.ToList() };
}
catch (System.Exception ex)
@@ -213,7 +213,7 @@ namespace _24Hour.Controllers.Common
///
[HttpGet]
[Route("queryreunitId")]
- public async Task queryreunitId(string? Id,int type)
+ public async Task queryreunitId(string? Id, int type)
{
try
{
@@ -254,8 +254,8 @@ namespace _24Hour.Controllers.Common
case 4:
//获取文书签收记录
var Documentdata = await _db.Queryable()
- .Where(q => q.Id == Id).ToListAsync();
- var unitda= _Unitdata.Where(q => q.unitCode == Documentdata.FirstOrDefault().dwbm).FirstOrDefault();
+ .Where(q => q.Id == Id).ToListAsync();
+ var unitda = _Unitdata.Where(q => q.unitCode == Documentdata.FirstOrDefault().dwbm).FirstOrDefault();
Documentdata.FirstOrDefault().dwbm = unitda.unitname;
result.result = Documentdata.FirstOrDefault();
break;
@@ -307,14 +307,14 @@ namespace _24Hour.Controllers.Common
Lawyerdata.ToList().ForEach(q =>
{
var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault();
- var userda=Userdata.Where(x => x.Id == q.receptionuser).FirstOrDefault();
- var Unitdata = _Unitdata.Where(x=>x.unitCode==q.unitCode).FirstOrDefault();
+ var userda = Userdata.Where(x => x.Id == q.receptionuser).FirstOrDefault();
+ var Unitdata = _Unitdata.Where(x => x.unitCode==q.unitCode).FirstOrDefault();
list.Add(new
{
type = 0,
Id = q.Id,
daId = da?.Id,
- Unitname= Unitdata?.unitname,
+ Unitname = Unitdata?.unitname,
title = da?.title,
color = da?.color,
icon = da?.icon,
@@ -334,7 +334,7 @@ namespace _24Hour.Controllers.Common
ettime = "",
creationtime = q.creationtime,
receptionuser = q.receptionuser,
- receive= q.receptionuser,
+ receive = q.receptionuser,
username = userda?.name,
notes = q.notes
});
@@ -366,7 +366,7 @@ namespace _24Hour.Controllers.Common
courtname = "",
casetype = "",
- Code =q.Code,
+ Code = q.Code,
state = q.state,//状态
reason = q.reason,//原因
sttime = q.sttime,
@@ -375,8 +375,8 @@ namespace _24Hour.Controllers.Common
receptionuser = q.meetwitId,
username = q.meetwitname,
receive = q.meetwitId,
- notes =q.notes,
- appurl=q.appurl
+ notes = q.notes,
+ appurl = q.appurl
});
});
//获取远程接待预约记录
@@ -396,13 +396,13 @@ namespace _24Hour.Controllers.Common
color = da?.color,
icon = da?.icon,
Unitname = Unitdata?.unitname,
- name ="",
+ name = "",
phone = q.phone,
matter = q.matter,//事由
objectstr = "",//访问对象（案件名称）
Code = "",
- lawyerunit ="",
+ lawyerunit = "",
location = "",
courtname = "",
casetype = "",
@@ -479,7 +479,7 @@ namespace _24Hour.Controllers.Common
Unitname = Unitdata?.unitname,
name = q.lawyeruser,//律师律师名称
- lawyerunit =q.lawyerunit,//律师事务所
+ lawyerunit = q.lawyerunit,//律师事务所
location = q.location,//预约地点
phone = q.contact,//联系方式
@@ -685,7 +685,10 @@ namespace _24Hour.Controllers.Common
});
//获取文书签收记录
var Documentdata = await _db.Queryable()
- .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()
- .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();
@@ -747,7 +753,7 @@ namespace _24Hour.Controllers.Common
state = q.zt,//状态
reason = "",
sttime = unixStartTime.AddMilliseconds(long.Parse(q.cjsj)),//创建时间
- ettime = q.qjsj==null?"":unixStartTime.AddMilliseconds(long.Parse(q.qjsj)).ToString("yyyy-MM-dd HH:mm"),//取件时间
+ ettime = q.qjsj==null ? "" : unixStartTime.AddMilliseconds(long.Parse(q.qjsj)).ToString("yyyy-MM-dd HH:mm"),//取件时间
creationtime = unixStartTime.AddMilliseconds(long.Parse(q.cjsj)),//创建时间
receptionuser = "",
username = "",
@@ -1044,8 +1050,8 @@ namespace _24Hour.Controllers.Common
username = "",//办理人名称
receive = "",//办接收人
notes = "",
- appurl = "" ,
- yyname =""
+ appurl = "",
+ yyname = ""
});
});
@@ -1069,7 +1075,7 @@ namespace _24Hour.Controllers.Common
lawyerunit = Unitdata?.unitname,//
location = "",//
- phone =q.lxhm,//联系方式
+ phone = q.lxhm,//联系方式
matter = !string.IsNullOrEmpty(q.gjkqmm) ? q.gjkqmm : q.wbkqmm,//取件码
objectstr = "",
Code = "",
@@ -1088,7 +1094,7 @@ namespace _24Hour.Controllers.Common
});
list = list.OrderByDescending(q => q.creationtime).ToList();
result.IsSucceed = true;
- result.result =new {count= list.ToList().Count(), list = list.Take(10).ToList() } ;
+ result.result =new { count = list.ToList().Count(), list = list.Take(10).ToList() };
}
catch (System.Exception ex)
@@ -1111,7 +1117,7 @@ namespace _24Hour.Controllers.Common
///
[HttpGet]
[Route("Updateuser")]
- public async Task Updateuser(string? Id, string? userId,string? username)
+ public async Task Updateuser(string? Id, string? userId, string? username)
{
try
{
@@ -1232,7 +1238,7 @@ namespace _24Hour.Controllers.Common
var Unitdata = _Unitdata.Where(x => x.unitCode == q.unitCode).FirstOrDefault();
list.Add(new
{
- type=0,
+ type = 0,
Id = q.Id,
Unitname = Unitdata?.unitname,
title = da?.title,
@@ -1377,7 +1383,7 @@ namespace _24Hour.Controllers.Common
sttime = "",
ettime = "",
state = q.zt,
- creationtime= unixStartTime.AddMilliseconds(long.Parse(q.zhxgsj)),//最新时间
+ creationtime = unixStartTime.AddMilliseconds(long.Parse(q.zhxgsj)),//最新时间
});
});
@@ -1744,13 +1750,13 @@ namespace _24Hour.Controllers.Common
});
});
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();
+ .WhereIF(Commondata.StartTime != null && Commondata.EndTime != null, q => q.sttime >= Commondata.StartTime && q.sttime < Commondata.EndTime.Value.AddDays(1)).OrderByDescending(q => q.creationtime).ToList();
//预约类型分组统计
- var GroupBy=list.ToList().GroupBy(q => new { q.daId, q.title }).Select(x => new { name = x.Key.title, value = x.ToList().Count()});
+ var GroupBy = list.ToList().GroupBy(q => new { q.daId, q.title }).Select(x => new { name = x.Key.title, value = x.ToList().Count() });
//日期分组统计
var datetme = list.ToList().GroupBy(q => DateTime.Parse($"{q.creationtime}").ToString("yyyy-MM-dd")).Select(x => new { time = x.Key, value = x.ToList().Count() });
//预约状态分组
- var satselist = list.ToList().GroupBy(q => $"{q.statetype}").Select(x => new{ statetype = x.Key, value = x.ToList().Count() }).ToList();
+ var satselist = list.ToList().GroupBy(q => $"{q.statetype}").Select(x => new { statetype = x.Key, value = x.ToList().Count() }).ToList();
var satseGroupBy = new List();
string[] strnum = new string[] { "0", "1", "2", "3" };
string[] str = new string[] { "待办理", "已受理", "拒绝", "结束" };
@@ -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 });
}