linyang
/
24Hour.Service
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

添加查询测、展示字段

master
林杨 2 years ago
parent
f33989cc07
commit
95fa1f0651
8 changed files with 194 additions and 73 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 179
      24Hour/Controllers/Common/CommonController.cs
  2. 8
      24Hour/Controllers/system/SystemControllerController.cs
  3. 2
      24Hour/Properties/PublishProfiles/FolderProfile.pubxml.user
  4. 11
      Elight.Entity/AppMode/App_ConfessionModel.cs
  5. 11
      Elight.Entity/AppMode/App_HearingModel.cs
  6. 12
      Elight.Entity/AppMode/App_LawyerServicesModel.cs
  7. 11
      Elight.Entity/AppMode/App_ReceptionModel.cs
  8. 11
      Elight.Entity/AppMode/App_RemoteModel.cs

179
24Hour/Controllers/Common/CommonController.cs
Unescape View File

@ -1,4 +1,5 @@
using Elight.Entity; using com.sun.org.apache.xalan.@internal.xsltc.runtime;
using Elight.Entity;
using Elight.Entity.SystemModel; using Elight.Entity.SystemModel;
using Elight.Logic; using Elight.Logic;
using Elight.Utility; using Elight.Utility;
@ -10,6 +11,7 @@ using javax.xml.crypto;
using jdk.nashorn.@internal.ir; using jdk.nashorn.@internal.ir;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Quartz.Logging;
using SqlSugar; using SqlSugar;
using System.Drawing.Printing; using System.Drawing.Printing;
using System.Security.AccessControl; using System.Security.AccessControl;
@ -85,7 +87,10 @@ namespace _24Hour.Controllers.Common
username = q.createusername, username = q.createusername,
handleId = q.receptionuser, handleId = q.receptionuser,
handleuser = q.receptionusername handleuser = q.receptionusername,
operatorId = q.operatorId,
operatorName = q.operatorName
}); });
}); });
//获取远程会见预约记录 //获取远程会见预约记录
@ -109,7 +114,9 @@ namespace _24Hour.Controllers.Common
creationtime = q.creationtime, creationtime = q.creationtime,
username = q.createusername, username = q.createusername,
handleId = q.meetwitId, handleId = q.meetwitId,
handleuser = q.meetwitname handleuser = q.meetwitname,
operatorId = q.operatorId,
operatorName = q.operatorName
}); });
}); });
//获取远程接待预约记录 //获取远程接待预约记录
@ -133,7 +140,9 @@ namespace _24Hour.Controllers.Common
creationtime = q.creationtime, creationtime = q.creationtime,
username = q.createusername, username = q.createusername,
handleId = q.meetwitId, handleId = q.meetwitId,
handleuser = q.meetwitname handleuser = q.meetwitname,
operatorId = q.operatorId,
operatorName = q.operatorName
}); });
}); });
@ -158,7 +167,9 @@ namespace _24Hour.Controllers.Common
creationtime = q.creationtime, creationtime = q.creationtime,
username = q.createusername, username = q.createusername,
handleId = q.meetwitId, handleId = q.meetwitId,
handleuser = q.meetwitname handleuser = q.meetwitname,
operatorId = q.operatorId,
operatorName = q.operatorName
}); });
}); });
//获取听证预约记录 //获取听证预约记录
@ -183,7 +194,9 @@ namespace _24Hour.Controllers.Common
creationtime = q.creationtime, creationtime = q.creationtime,
username = q.lawyeruser, username = q.lawyeruser,
handleId = q.receptionuser, handleId = q.receptionuser,
handleuser = q.receptionusername handleuser = q.receptionusername,
operatorId = q.operatorId,
operatorName = q.operatorName
}); });
}); });
//条件查询 //条件查询
@ -329,7 +342,8 @@ namespace _24Hour.Controllers.Common
location = "", location = "",
courtname = "", courtname = "",
casetype = "", casetype = "",
operatorId = q.operatorId,
operatorName = q.operatorName,
state = q.state, state = q.state,
reason = q.reason, reason = q.reason,
sttime = q.receptiontime, sttime = q.receptiontime,
@ -368,7 +382,8 @@ namespace _24Hour.Controllers.Common
location = "", location = "",
courtname = "", courtname = "",
casetype = "", casetype = "",
operatorId = q.operatorId,
operatorName = q.operatorName,
Code = q.Code, Code = q.Code,
state = q.state,//状态 state = q.state,//状态
reason = q.reason,//原因 reason = q.reason,//原因
@ -410,7 +425,8 @@ namespace _24Hour.Controllers.Common
location = "", location = "",
courtname = "", courtname = "",
casetype = "", casetype = "",
operatorId = q.operatorId,
operatorName = q.operatorName,
qrsj = q.acceptancetime, qrsj = q.acceptancetime,
state = q.state,//状态 state = q.state,//状态
reason = q.reason,//原因 reason = q.reason,//原因
@ -451,7 +467,8 @@ namespace _24Hour.Controllers.Common
location = "", location = "",
courtname = "", courtname = "",
casetype = "", casetype = "",
operatorId = q.operatorId,
operatorName = q.operatorName,
qrsj = q.acceptancetime, qrsj = q.acceptancetime,
state = q.state,//状态 state = q.state,//状态
reason = q.reason,//原因 reason = q.reason,//原因
@ -487,7 +504,8 @@ namespace _24Hour.Controllers.Common
lawyerunit = q.lawyerunit,//律师事务所 lawyerunit = q.lawyerunit,//律师事务所
location = q.location,//预约地点 location = q.location,//预约地点
operatorId = q.operatorId,
operatorName = q.operatorName,
qrsj = q.acceptancetime, qrsj = q.acceptancetime,
phone = q.contact,//联系方式 phone = q.contact,//联系方式
matter = q.witnessrequest,//事由 matter = q.witnessrequest,//事由
@ -537,9 +555,13 @@ namespace _24Hour.Controllers.Common
var Userdata = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.usertype == 0).ToArrayAsync(); var Userdata = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.usertype == 0).ToArrayAsync();
//获取律师服务预约记录 //获取律师服务预约记录
var Lawyerdata = await _db.Queryable<App_LawyerServicesModel>() var Lawyerdata = await _db.Queryable<App_LawyerServicesModel>()
.WhereIF(Commondata.state != null && Commondata.state != 0, x => x.state == Commondata.state) //.WhereIF(Commondata.state != null && Commondata.state != 0, x => x.state == Commondata.state)
.WhereIF(Commondata.state != null && Commondata.state == 0, x => x.state == Commondata.state || x.state == 1) //.WhereIF(Commondata.state != null && Commondata.state == 0, x => x.state == Commondata.state || x.state == 1)
.Where(q => q.IsDeleted == 0 && q.receptionuser == _userdata.department).ToArrayAsync(); // .WhereIF(Commondata.state != null && Commondata.state == 1, x => x.state == 1)
.WhereIF(Commondata.state != null, x => x.state == Commondata.state)
.WhereIF(!string.IsNullOrEmpty(_userdata.department), x => x.receptionuser==_userdata.department)
.Where(q => q.IsDeleted == 0 && !string.IsNullOrEmpty(q.receptionuser)).ToArrayAsync();
//.Where(q => q.IsDeleted == 0 && q.receptionuser == _userdata.department).ToArrayAsync();
Lawyerdata.ToList().ForEach(q => Lawyerdata.ToList().ForEach(q =>
{ {
var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault();
@ -555,7 +577,10 @@ namespace _24Hour.Controllers.Common
phone = q.phone, phone = q.phone,
matter = q.matter,//事由 matter = q.matter,//事由
objectstr = "",//访问对象（案件名称） objectstr = "",//访问对象（案件名称）
handleId = q.receptionuser,
handleuser = q.receptionusername,
operatorId = q.operatorId,
operatorName = q.operatorName,
lawyerunit = "", lawyerunit = "",
location = "", location = "",
courtname = "", courtname = "",
@ -575,9 +600,13 @@ namespace _24Hour.Controllers.Common
}); });
//获取远程会见预约记录 //获取远程会见预约记录
var Remotedata = await _db.Queryable<App_RemoteModel>() var Remotedata = await _db.Queryable<App_RemoteModel>()
.WhereIF(Commondata.state != null && Commondata.state != 0, x => x.state == Commondata.state) //.WhereIF(Commondata.state != null && Commondata.state != 0, x => x.state == Commondata.state)
.WhereIF(Commondata.state != null && Commondata.state == 0, x => x.state == Commondata.state || x.state == 1) // .WhereIF(Commondata.state != null && Commondata.state == 1, x => x.state == 1)
.Where(q => q.IsDeleted == 0 && q.meetwitId == _userdata.department).ToArrayAsync();
//.WhereIF(Commondata.state != null && Commondata.state == 0, x => x.state == Commondata.state || x.state == 1)
.WhereIF(Commondata.state != null, x => x.state == Commondata.state)
.WhereIF(!string.IsNullOrEmpty(_userdata.department), x => x.meetwitId==_userdata.department)
.Where(q => q.IsDeleted == 0 && !string.IsNullOrEmpty(q.meetwitId)).ToArrayAsync();
Remotedata.ToList().ForEach(q => Remotedata.ToList().ForEach(q =>
{ {
var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault();
@ -593,6 +622,8 @@ namespace _24Hour.Controllers.Common
matter = "",//事由 matter = "",//事由
objectstr = "",//访问对象（案件名称） objectstr = "",//访问对象（案件名称）
operatorId = q.operatorId,
operatorName = q.operatorName,
lawyerunit = "", lawyerunit = "",
location = "", location = "",
courtname = "", courtname = "",
@ -614,9 +645,13 @@ namespace _24Hour.Controllers.Common
}); });
//获取远程接待预约记录 //获取远程接待预约记录
var Receptiondata = await _db.Queryable<App_ReceptionModel>() var Receptiondata = await _db.Queryable<App_ReceptionModel>()
.WhereIF(Commondata.state != null && Commondata.state != 0, x => x.state == Commondata.state) //.WhereIF(Commondata.state != null && Commondata.state != 0, x => x.state == Commondata.state)
.WhereIF(Commondata.state != null && Commondata.state == 0, x => x.state == Commondata.state || x.state == 1) //.WhereIF(Commondata.state != null && Commondata.state == 0, x => x.state == Commondata.state || x.state == 1)
.Where(q => q.IsDeleted == 0 && q.meetwitId == _userdata.department).ToArrayAsync(); // .WhereIF(Commondata.state != null && Commondata.state == 1, x => x.state == 1)
.WhereIF(Commondata.state != null, x => x.state == Commondata.state)
.WhereIF(!string.IsNullOrEmpty(_userdata.department), x => x.meetwitId==_userdata.department)
.Where(q => q.IsDeleted == 0 && !string.IsNullOrEmpty(q.meetwitId)).ToArrayAsync();
//.Where(q => q.IsDeleted == 0 && q.meetwitId == _userdata.department).ToArrayAsync();
Receptiondata.ToList().ForEach(q => Receptiondata.ToList().ForEach(q =>
{ {
var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault();
@ -632,6 +667,8 @@ namespace _24Hour.Controllers.Common
matter = q.matter,//事由 matter = q.matter,//事由
objectstr = "",//访问对象（案件名称） objectstr = "",//访问对象（案件名称）
operatorId = q.operatorId,
operatorName = q.operatorName,
lawyerunit = "", lawyerunit = "",
location = "", location = "",
courtname = "", courtname = "",
@ -653,9 +690,13 @@ namespace _24Hour.Controllers.Common
}); });
//获取听证服务预约记录 //获取听证服务预约记录
var Hearingdata = await _db.Queryable<App_HearingModel>() var Hearingdata = await _db.Queryable<App_HearingModel>()
.WhereIF(Commondata.state != null && Commondata.state != 0, x => x.state == Commondata.state) //.WhereIF(Commondata.state != null && Commondata.state != 0, x => x.state == Commondata.state)
.WhereIF(Commondata.state != null && Commondata.state == 0, x => x.state == Commondata.state || x.state == 1) //.WhereIF(Commondata.state != null && Commondata.state == 0, x => x.state == Commondata.state || x.state == 1)
.Where(q => q.IsDeleted == 0 && q.receptionuser == _userdata.department).ToArrayAsync(); // .WhereIF(Commondata.state != null && Commondata.state == 1, x => x.state == 1)
.WhereIF(Commondata.state != null, x => x.state == Commondata.state)
.WhereIF(!string.IsNullOrEmpty(_userdata.department), x => x.receptionuser==_userdata.department)
.Where(q => q.IsDeleted == 0 && !string.IsNullOrEmpty(q.receptionuser)).ToArrayAsync();
//.Where(q => q.IsDeleted == 0 && q.receptionuser == _userdata.department).ToArrayAsync();
Hearingdata.ToList().ForEach(q => Hearingdata.ToList().ForEach(q =>
{ {
var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault();
@ -669,7 +710,10 @@ namespace _24Hour.Controllers.Common
color = da?.color, color = da?.color,
icon = da?.icon, icon = da?.icon,
name = q.lawyeruser,//律师律师名称 name = q.lawyeruser,//律师律师名称
handleId = q.receptionuser,
handleuser = q.receptionusername,
operatorId = q.operatorId,
operatorName = q.operatorName,
lawyerunit = q.lawyerunit,//律师事务所 lawyerunit = q.lawyerunit,//律师事务所
location = q.location,//预约地点 location = q.location,//预约地点
qrsj = q.acceptancetime, qrsj = q.acceptancetime,
@ -709,7 +753,6 @@ namespace _24Hour.Controllers.Common
color = da?.color, color = da?.color,
icon = da?.icon, icon = da?.icon,
name = q.wsmc,//文书名称 name = q.wsmc,//文书名称
lawyerunit = Unitdata?.unitname,//单位 lawyerunit = Unitdata?.unitname,//单位
location = "",//预约地点 location = "",//预约地点
phone = "",//联系方式 phone = "",//联系方式
@ -751,7 +794,6 @@ namespace _24Hour.Controllers.Common
lawyerunit = Unitdata?.unitname,// lawyerunit = Unitdata?.unitname,//
location = "",// location = "",//
phone = q.lxhm,//联系方式 phone = q.lxhm,//联系方式
matter = !string.IsNullOrEmpty(q.gjkqmm) ? q.gjkqmm : q.wbkqmm,//取件码 matter = !string.IsNullOrEmpty(q.gjkqmm) ? q.gjkqmm : q.wbkqmm,//取件码
objectstr = "",//干警取件码 objectstr = "",//干警取件码
@ -771,9 +813,12 @@ namespace _24Hour.Controllers.Common
}); });
//获取认罪认罚预约记录 //获取认罪认罚预约记录
var Confessiondata = await _db.Queryable<App_ConfessionModel>() var Confessiondata = await _db.Queryable<App_ConfessionModel>()
.WhereIF(Commondata.state != null && Commondata.state != 0, x => x.state == Commondata.state) //.WhereIF(Commondata.state != null && Commondata.state != 0, x => x.state == Commondata.state)
.WhereIF(Commondata.state != null && Commondata.state == 0, x => x.state == Commondata.state || x.state == 1) //.WhereIF(Commondata.state != null && Commondata.state == 0, x => x.state == Commondata.state || x.state == 1)
.Where(q => q.IsDeleted == 0 && q.meetwitId == _userdata.department).ToArrayAsync(); .WhereIF(Commondata.state != null, x => x.state == Commondata.state)
.WhereIF(!string.IsNullOrEmpty(_userdata.department), x => x.meetwitId==_userdata.department)
.Where(q => q.IsDeleted == 0 && !string.IsNullOrEmpty(q.meetwitId)).ToArrayAsync();
//.Where(q => q.IsDeleted == 0 && q.meetwitId == _userdata.department).ToArrayAsync();
Confessiondata.ToList().ForEach(q => Confessiondata.ToList().ForEach(q =>
{ {
var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault();
@ -789,6 +834,8 @@ namespace _24Hour.Controllers.Common
matter = q.matter,//事由 matter = q.matter,//事由
objectstr = "",//访问对象（案件名称） objectstr = "",//访问对象（案件名称）
operatorId = q.operatorId,
operatorName = q.operatorName,
lawyerunit = "", lawyerunit = "",
location = "", location = "",
courtname = "", courtname = "",
@ -840,8 +887,9 @@ namespace _24Hour.Controllers.Common
var Stagingdata = await _db.Queryable<StagingModel>().Where(q => q.IsDelete == 0).ToArrayAsync(); var Stagingdata = await _db.Queryable<StagingModel>().Where(q => q.IsDelete == 0).ToArrayAsync();
var Userdata = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.usertype == 0).ToArrayAsync(); var Userdata = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.usertype == 0).ToArrayAsync();
//获取律师服务预约记录 //获取律师服务预约记录
var Lawyerdata = await _db.Queryable<App_LawyerServicesModel>() var Lawyerdata = await _db.Queryable<App_LawyerServicesModel>().WhereIF(!string.IsNullOrEmpty(_userdata.department), x => x.receptionuser==_userdata.department)
.Where(q => q.IsDeleted == 0 && q.receptionuser == _userdata.department && q.state != 2 && q.state != 3).ToArrayAsync(); .Where(q => q.IsDeleted == 0 && !string.IsNullOrEmpty(q.receptionuser) && q.state != 2 && q.state != 3).ToArrayAsync();
// .Where(q => q.IsDeleted == 0 && q.receptionuser == _userdata.department && q.state != 2 && q.state != 3).ToArrayAsync();
Lawyerdata.ToList().ForEach(q => Lawyerdata.ToList().ForEach(q =>
{ {
var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault();
@ -862,7 +910,7 @@ namespace _24Hour.Controllers.Common
location = "", location = "",
courtname = "", courtname = "",
casetype = "", casetype = "",
qrsj = q.acceptancetime,
state = q.state, state = q.state,
reason = q.reason, reason = q.reason,
sttime = q.receptiontime, sttime = q.receptiontime,
@ -872,12 +920,15 @@ namespace _24Hour.Controllers.Common
receive = q.createuserId, receive = q.createuserId,
username = userda?.name, username = userda?.name,
yyname = q.createusername,//预约人名称 yyname = q.createusername,//预约人名称
notes = q.notes notes = q.notes,
operatorId = q.operatorId,
operatorName = q.operatorName
}); });
}); });
//获取远程会见预约记录 //获取远程会见预约记录
var Remotedata = await _db.Queryable<App_RemoteModel>() var Remotedata = await _db.Queryable<App_RemoteModel>()
.Where(q => q.IsDeleted == 0 && q.meetwitId == _userdata.department && q.state != 2 && q.state != 3).ToArrayAsync(); .WhereIF(!string.IsNullOrEmpty(_userdata.department), x => x.meetwitId==_userdata.department)
.Where(q => q.IsDeleted == 0 && !string.IsNullOrEmpty(q.meetwitId) && q.state != 2 && q.state != 3).ToArrayAsync();
Remotedata.ToList().ForEach(q => Remotedata.ToList().ForEach(q =>
{ {
var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault();
@ -892,12 +943,13 @@ namespace _24Hour.Controllers.Common
phone = q.phone, phone = q.phone,
matter = "",//事由 matter = "",//事由
objectstr = "",//访问对象（案件名称） objectstr = "",//访问对象（案件名称）
qrsj = q.acceptancetime,
lawyerunit = "", lawyerunit = "",
location = "", location = "",
courtname = "", courtname = "",
casetype = "", casetype = "",
operatorId = q.operatorId,
operatorName = q.operatorName,
Code = q.Code, Code = q.Code,
state = q.state,//状态 state = q.state,//状态
reason = q.reason,//原因 reason = q.reason,//原因
@ -913,8 +965,9 @@ namespace _24Hour.Controllers.Common
}); });
}); });
//获取远程接待预约记录 //获取远程接待预约记录
var Receptiondata = await _db.Queryable<App_ReceptionModel>() var Receptiondata = await _db.Queryable<App_ReceptionModel>().WhereIF(!string.IsNullOrEmpty(_userdata.department), x => x.meetwitId==_userdata.department)
.Where(q => q.IsDeleted == 0 && q.meetwitId == _userdata.department && q.state != 2 && q.state != 3).ToArrayAsync(); .Where(q => q.IsDeleted == 0 && !string.IsNullOrEmpty(q.meetwitId) && q.state != 2 && q.state != 3).ToArrayAsync();
// .Where(q => q.IsDeleted == 0 && q.meetwitId == _userdata.department && q.state != 2 && q.state != 3).ToArrayAsync();
Receptiondata.ToList().ForEach(q => Receptiondata.ToList().ForEach(q =>
{ {
var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault();
@ -929,12 +982,13 @@ namespace _24Hour.Controllers.Common
phone = q.phone, phone = q.phone,
matter = q.matter,//事由 matter = q.matter,//事由
objectstr = "",//访问对象（案件名称） objectstr = "",//访问对象（案件名称）
qrsj = q.acceptancetime,
lawyerunit = "", lawyerunit = "",
location = "", location = "",
courtname = "", courtname = "",
casetype = "", casetype = "",
operatorId = q.operatorId,
operatorName = q.operatorName,
Code = "", Code = "",
state = q.state,//状态 state = q.state,//状态
reason = q.reason,//原因 reason = q.reason,//原因
@ -950,8 +1004,9 @@ namespace _24Hour.Controllers.Common
}); });
}); });
//获取认罪认罚预约记录 //获取认罪认罚预约记录
var Confessiondata = await _db.Queryable<App_ConfessionModel>() var Confessiondata = await _db.Queryable<App_ConfessionModel>().WhereIF(!string.IsNullOrEmpty(_userdata.department), x => x.meetwitId==_userdata.department)
.Where(q => q.IsDeleted == 0 && q.meetwitId == _userdata.department && q.state != 2 && q.state != 3).ToArrayAsync(); .Where(q => q.IsDeleted == 0 && !string.IsNullOrEmpty(q.meetwitId) && q.state != 2 && q.state != 3).ToArrayAsync();
//.Where(q => q.IsDeleted == 0 && q.meetwitId == _userdata.department && q.state != 2 && q.state != 3).ToArrayAsync();
Confessiondata.ToList().ForEach(q => Confessiondata.ToList().ForEach(q =>
{ {
var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault();
@ -966,12 +1021,13 @@ namespace _24Hour.Controllers.Common
phone = q.phone, phone = q.phone,
matter = q.matter,//事由 matter = q.matter,//事由
objectstr = "",//访问对象（案件名称） objectstr = "",//访问对象（案件名称）
qrsj = q.acceptancetime,
lawyerunit = "", lawyerunit = "",
location = "", location = "",
courtname = "", courtname = "",
casetype = "", casetype = "",
operatorId = q.operatorId,
operatorName = q.operatorName,
Code = "", Code = "",
state = q.state,//状态 state = q.state,//状态
reason = q.reason,//原因 reason = q.reason,//原因
@ -987,8 +1043,9 @@ namespace _24Hour.Controllers.Common
}); });
}); });
//获取听证服务预约记录 //获取听证服务预约记录
var Hearingdata = await _db.Queryable<App_HearingModel>() var Hearingdata = await _db.Queryable<App_HearingModel>().WhereIF(!string.IsNullOrEmpty(_userdata.department), x => x.receptionuser==_userdata.department)
.Where(q => q.IsDeleted == 0 && q.receptionuser == _userdata.department && q.state != 2 && q.state != 3).ToArrayAsync(); .Where(q => q.IsDeleted == 0 && !string.IsNullOrEmpty(q.receptionuser) && q.state != 2 && q.state != 3).ToArrayAsync();
// .Where(q => q.IsDeleted == 0 && q.receptionuser == _userdata.department && q.state != 2 && q.state != 3).ToArrayAsync();
Hearingdata.ToList().ForEach(q => Hearingdata.ToList().ForEach(q =>
{ {
var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault();
@ -1002,10 +1059,11 @@ namespace _24Hour.Controllers.Common
color = da?.color, color = da?.color,
icon = da?.icon, icon = da?.icon,
name = q.lawyeruser,//律师律师名称 name = q.lawyeruser,//律师律师名称
qrsj = q.acceptancetime,
lawyerunit = q.lawyerunit,//律师事务所 lawyerunit = q.lawyerunit,//律师事务所
location = q.location,//预约地点 location = q.location,//预约地点
operatorId = q.operatorId,
operatorName = q.operatorName,
phone = q.contact,//联系方式 phone = q.contact,//联系方式
matter = q.witnessrequest,//事由 matter = q.witnessrequest,//事由
objectstr = "",//访问对象（案件名称） objectstr = "",//访问对象（案件名称）
@ -1042,7 +1100,6 @@ namespace _24Hour.Controllers.Common
lawyerunit = Unitdata?.unitname,//律师事务所 lawyerunit = Unitdata?.unitname,//律师事务所
location = "",//预约地点 location = "",//预约地点
phone = "",//联系方式 phone = "",//联系方式
matter = q.ajmc,//事由 matter = q.ajmc,//事由
objectstr = "",//访问对象（案件名称） objectstr = "",//访问对象（案件名称）
@ -1077,10 +1134,8 @@ namespace _24Hour.Controllers.Common
color = da?.color, color = da?.color,
icon = da?.icon, icon = da?.icon,
name = q.cljs,//材料件数 name = q.cljs,//材料件数
lawyerunit = Unitdata?.unitname,// lawyerunit = Unitdata?.unitname,//
location = "",// location = "",//
phone = q.lxhm,//联系方式 phone = q.lxhm,//联系方式
matter = !string.IsNullOrEmpty(q.gjkqmm) ? q.gjkqmm : q.wbkqmm,//取件码 matter = !string.IsNullOrEmpty(q.gjkqmm) ? q.gjkqmm : q.wbkqmm,//取件码
objectstr = "", objectstr = "",
@ -1172,6 +1227,8 @@ namespace _24Hour.Controllers.Common
Lawyerbol.FirstOrDefault().acceptancetime = dto.time; Lawyerbol.FirstOrDefault().acceptancetime = dto.time;
Lawyerbol.FirstOrDefault().reason = dto.reason; Lawyerbol.FirstOrDefault().reason = dto.reason;
Lawyerbol.FirstOrDefault().state = Convert.ToInt32(dto.state); Lawyerbol.FirstOrDefault().state = Convert.ToInt32(dto.state);
Lawyerbol.FirstOrDefault().operatorId =_userdata.Id;
Lawyerbol.FirstOrDefault().operatorName = _userdata.name;
} }
else else
{ {
@ -1179,7 +1236,7 @@ namespace _24Hour.Controllers.Common
Lawyerbol.FirstOrDefault().receptionusername = dto.username; Lawyerbol.FirstOrDefault().receptionusername = dto.username;
} }
_db.BeginTran(); _db.BeginTran();
var num = await _db.Updateable(Lawyerbol.FirstOrDefault()).UpdateColumns(it => new { it.receptionuser, it.receptionusername, it.acceptancetime, it.reason, it.state }).ExecuteCommandAsync(); var num = await _db.Updateable(Lawyerbol.FirstOrDefault()).UpdateColumns(it => new { it.receptionuser, it.receptionusername, it.acceptancetime, it.reason, it.state,it.operatorId,it.operatorName }).ExecuteCommandAsync();
_db.CommitTran(); _db.CommitTran();
if (num > 0) if (num > 0)
{ {
@ -1198,6 +1255,8 @@ namespace _24Hour.Controllers.Common
RemoteModelbol.FirstOrDefault().acceptancetime = dto.time; RemoteModelbol.FirstOrDefault().acceptancetime = dto.time;
RemoteModelbol.FirstOrDefault().reason = dto.reason; RemoteModelbol.FirstOrDefault().reason = dto.reason;
RemoteModelbol.FirstOrDefault().state = Convert.ToInt32(dto.state); RemoteModelbol.FirstOrDefault().state = Convert.ToInt32(dto.state);
RemoteModelbol.FirstOrDefault().operatorId =_userdata.Id;
RemoteModelbol.FirstOrDefault().operatorName = _userdata.name;
} }
else else
{ {
@ -1205,7 +1264,7 @@ namespace _24Hour.Controllers.Common
RemoteModelbol.FirstOrDefault().meetwitname = dto.username; RemoteModelbol.FirstOrDefault().meetwitname = dto.username;
} }
_db.BeginTran(); _db.BeginTran();
var num = await _db.Updateable(RemoteModelbol.FirstOrDefault()).UpdateColumns(it => new { it.meetwitId, it.meetwitname, it.acceptancetime, it.reason, it.state }).ExecuteCommandAsync(); var num = await _db.Updateable(RemoteModelbol.FirstOrDefault()).UpdateColumns(it => new { it.meetwitId, it.meetwitname, it.acceptancetime, it.reason, it.state, it.operatorId, it.operatorName }).ExecuteCommandAsync();
_db.CommitTran(); _db.CommitTran();
if (num > 0) if (num > 0)
{ {
@ -1224,6 +1283,8 @@ namespace _24Hour.Controllers.Common
Receptiondata.FirstOrDefault().acceptancetime = dto.time; Receptiondata.FirstOrDefault().acceptancetime = dto.time;
Receptiondata.FirstOrDefault().reason = dto.reason; Receptiondata.FirstOrDefault().reason = dto.reason;
Receptiondata.FirstOrDefault().state = Convert.ToInt32(dto.state); Receptiondata.FirstOrDefault().state = Convert.ToInt32(dto.state);
Receptiondata.FirstOrDefault().operatorId =_userdata.Id;
Receptiondata.FirstOrDefault().operatorName = _userdata.name;
} }
else else
{ {
@ -1231,7 +1292,7 @@ namespace _24Hour.Controllers.Common
Receptiondata.FirstOrDefault().meetwitname = dto.username; Receptiondata.FirstOrDefault().meetwitname = dto.username;
} }
_db.BeginTran(); _db.BeginTran();
var num = await _db.Updateable(Receptiondata.FirstOrDefault()).UpdateColumns(it => new { it.meetwitId, it.meetwitname, it.acceptancetime, it.reason, it.state }).ExecuteCommandAsync(); var num = await _db.Updateable(Receptiondata.FirstOrDefault()).UpdateColumns(it => new { it.meetwitId, it.meetwitname, it.acceptancetime, it.reason, it.state, it.operatorId, it.operatorName }).ExecuteCommandAsync();
_db.CommitTran(); _db.CommitTran();
if (num > 0) if (num > 0)
{ {
@ -1249,6 +1310,8 @@ namespace _24Hour.Controllers.Common
Confessiondata.FirstOrDefault().acceptancetime = dto.time; Confessiondata.FirstOrDefault().acceptancetime = dto.time;
Confessiondata.FirstOrDefault().reason = dto.reason; Confessiondata.FirstOrDefault().reason = dto.reason;
Confessiondata.FirstOrDefault().state =Convert.ToInt32(dto.state); Confessiondata.FirstOrDefault().state =Convert.ToInt32(dto.state);
Confessiondata.FirstOrDefault().operatorId =_userdata.Id;
Confessiondata.FirstOrDefault().operatorName = _userdata.name;
} }
else else
{ {
@ -1256,7 +1319,7 @@ namespace _24Hour.Controllers.Common
Confessiondata.FirstOrDefault().meetwitname = dto.username; Confessiondata.FirstOrDefault().meetwitname = dto.username;
} }
_db.BeginTran(); _db.BeginTran();
var num = await _db.Updateable(Confessiondata.FirstOrDefault()).UpdateColumns(it => new { it.meetwitId, it.meetwitname, it.acceptancetime, it.reason, it.state }).ExecuteCommandAsync(); var num = await _db.Updateable(Confessiondata.FirstOrDefault()).UpdateColumns(it => new { it.meetwitId, it.meetwitname, it.acceptancetime, it.reason, it.state, it.operatorId, it.operatorName }).ExecuteCommandAsync();
_db.CommitTran(); _db.CommitTran();
if (num > 0) if (num > 0)
{ {
@ -1275,6 +1338,8 @@ namespace _24Hour.Controllers.Common
Hearingdata.FirstOrDefault().acceptancetime = dto.time; Hearingdata.FirstOrDefault().acceptancetime = dto.time;
Hearingdata.FirstOrDefault().reason = dto.reason; Hearingdata.FirstOrDefault().reason = dto.reason;
Hearingdata.FirstOrDefault().state = Convert.ToInt32(dto.state); Hearingdata.FirstOrDefault().state = Convert.ToInt32(dto.state);
Confessiondata.FirstOrDefault().operatorId =_userdata.Id;
Confessiondata.FirstOrDefault().operatorName = _userdata.name;
} }
else else
{ {
@ -1282,7 +1347,7 @@ namespace _24Hour.Controllers.Common
Hearingdata.FirstOrDefault().receptionusername = dto.username; Hearingdata.FirstOrDefault().receptionusername = dto.username;
} }
_db.BeginTran(); _db.BeginTran();
var num = await _db.Updateable(Hearingdata.FirstOrDefault()).UpdateColumns(it => new { it.receptionuser, it.receptionusername, it.acceptancetime, it.reason, it.state }).ExecuteCommandAsync(); var num = await _db.Updateable(Hearingdata.FirstOrDefault()).UpdateColumns(it => new { it.receptionuser, it.receptionusername, it.acceptancetime, it.reason, it.state, it.operatorId, it.operatorName }).ExecuteCommandAsync();
_db.CommitTran(); _db.CommitTran();
if (num > 0) if (num > 0)
{ {

8
24Hour/Controllers/system/SystemControllerController.cs
Unescape View File

@ -547,7 +547,7 @@ namespace _24Hour.Controllers.system
try try
{ {
//查询角色下的菜单 //查询角色下的菜单
var list=await _db.Queryable<App_Sys_RoleMenuModel>().Where(q => q.roleId== RoleMenudata.Id).ToListAsync(); var list = await _db.Queryable<App_Sys_RoleMenuModel>().Where(q => q.roleId== RoleMenudata.Id).ToListAsync();
_db.BeginTran(); _db.BeginTran();
//删除角色下的菜单 //删除角色下的菜单
await _db.Deleteable(list).ExecuteCommandAsync(); await _db.Deleteable(list).ExecuteCommandAsync();
@ -932,7 +932,7 @@ namespace _24Hour.Controllers.system
try try
{ {
//添加单位前判断单位编码是否重复 //添加单位前判断单位编码是否重复
var data = await _db.Queryable<App_Sys_DepartModel>().Where(q => q.departCode == Departdata.departCode).FirstAsync(); var data = await _db.Queryable<App_Sys_DepartModel>().Where(q => q.departCode == Departdata.departCode && q.IsDelete==0).FirstAsync();
if (data != null) if (data != null)
{ {
@ -974,7 +974,7 @@ namespace _24Hour.Controllers.system
try try
{ {
//判断单位编码是否已存在 //判断单位编码是否已存在
var data = await _db.Queryable<App_Sys_DepartModel>().Where(q => q.departCode == Departdata.departCode).FirstAsync(); var data = await _db.Queryable<App_Sys_DepartModel>().Where(q => q.departCode == Departdata.departCode && q.IsDelete==0).FirstAsync();
if (data != null) if (data != null)
{ {
@ -1066,7 +1066,7 @@ namespace _24Hour.Controllers.system
var treelist = await _db.Queryable<App_Sys_MenuTree>() var treelist = await _db.Queryable<App_Sys_MenuTree>()
.WhereIF(!Menudata.name.IsNull(), q => q.name.Contains(Menudata.name)) .WhereIF(!Menudata.name.IsNull(), q => q.name.Contains(Menudata.name))
.WhereIF(!Menudata.title.IsNull(), q => q.title.Contains(Menudata.title)) .WhereIF(!Menudata.title.IsNull(), q => q.title.Contains(Menudata.title))
.Where(q => q.IsDelete == 0).OrderBy(q=>q.sortnum,OrderByType.Desc).ToTreeAsync(it => it.children, it => it.pid, null); .Where(q => q.IsDelete == 0).OrderBy(q => q.sortnum, OrderByType.Desc).ToTreeAsync(it => it.children, it => it.pid, null);
result.IsSucceed = true; result.IsSucceed = true;
result.result = treelist; result.result = treelist;
return result; return result;

2
24Hour/Properties/PublishProfiles/FolderProfile.pubxml.user
Unescape View File

@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<_PublishTargetUrl>D:\24小时发布</_PublishTargetUrl> <_PublishTargetUrl>D:\24小时发布</_PublishTargetUrl>
<History>True|2023-07-01T03:15:50.0622714Z;True|2023-07-01T10:12:33.0301410+08:00;True|2023-06-30T20:53:10.2775714+08:00;True|2023-06-30T20:47:24.3123829+08:00;True|2023-06-30T18:44:10.1995292+08:00;True|2023-06-30T18:35:05.6876552+08:00;True|2023-06-30T14:33:30.1363930+08:00;True|2023-06-30T14:17:02.8263130+08:00;True|2023-06-30T14:16:41.6529398+08:00;True|2023-06-30T10:20:34.2470363+08:00;True|2023-06-30T09:51:41.3251931+08:00;True|2023-06-29T16:07:09.3334291+08:00;True|2023-06-29T15:56:52.9510718+08:00;True|2023-06-29T15:49:16.8161173+08:00;True|2023-06-27T18:06:12.3724487+08:00;True|2023-06-27T17:22:11.4211972+08:00;True|2023-06-27T15:48:34.1728433+08:00;True|2023-06-13T18:05:11.2568840+08:00;False|2023-06-13T18:04:56.9546003+08:00;</History> <History>True|2023-07-01T07:55:14.1686837Z;True|2023-07-01T15:52:20.6931207+08:00;True|2023-07-01T15:16:19.0847303+08:00;True|2023-07-01T14:32:30.7938970+08:00;True|2023-07-01T14:11:46.9198753+08:00;True|2023-07-01T13:52:41.7443973+08:00;True|2023-07-01T12:05:00.1914915+08:00;True|2023-07-01T11:35:15.2688362+08:00;True|2023-07-01T11:15:50.0622714+08:00;True|2023-07-01T10:12:33.0301410+08:00;True|2023-06-30T20:53:10.2775714+08:00;True|2023-06-30T20:47:24.3123829+08:00;True|2023-06-30T18:44:10.1995292+08:00;True|2023-06-30T18:35:05.6876552+08:00;True|2023-06-30T14:33:30.1363930+08:00;True|2023-06-30T14:17:02.8263130+08:00;True|2023-06-30T14:16:41.6529398+08:00;True|2023-06-30T10:20:34.2470363+08:00;True|2023-06-30T09:51:41.3251931+08:00;True|2023-06-29T16:07:09.3334291+08:00;True|2023-06-29T15:56:52.9510718+08:00;True|2023-06-29T15:49:16.8161173+08:00;True|2023-06-27T18:06:12.3724487+08:00;True|2023-06-27T17:22:11.4211972+08:00;True|2023-06-27T15:48:34.1728433+08:00;True|2023-06-13T18:05:11.2568840+08:00;False|2023-06-13T18:04:56.9546003+08:00;</History>
<LastFailureDetails /> <LastFailureDetails />
</PropertyGroup> </PropertyGroup>
</Project> </Project>

11
Elight.Entity/AppMode/App_ConfessionModel.cs
Unescape View File

@ -19,6 +19,17 @@ namespace Elight.Entity
[DataMember] [DataMember]
[SugarColumn(IsPrimaryKey = true)] [SugarColumn(IsPrimaryKey = true)]
public string? Id { get; set; } public string? Id { get; set; }
/// <summary>
/// 操作人id
/// </summary>
[DataMember]
public string? operatorId { get; set; }
/// <summary>
/// 操作人
/// </summary>
[DataMember]
public string? operatorName { get; set; }
/// <summary> /// <summary>
/// 单位编码 /// 单位编码
/// </summary> /// </summary>

11
Elight.Entity/AppMode/App_HearingModel.cs
Unescape View File

@ -19,6 +19,17 @@ namespace Elight.Entity
[DataMember] [DataMember]
[SugarColumn(IsPrimaryKey = true)] [SugarColumn(IsPrimaryKey = true)]
public string? Id { get; set; } public string? Id { get; set; }
///// <summary>
///// 操作人id
///// </summary>
//[DataMember]
public string? operatorId { get; set; }
/// <summary>
/// 操作人
/// </summary>
[DataMember]
public string? operatorName { get; set; }
/// <summary> /// <summary>
/// 单位编码 /// 单位编码
/// </summary> /// </summary>

12
Elight.Entity/AppMode/App_LawyerServicesModel.cs
Unescape View File

@ -106,6 +106,18 @@ namespace Elight.Entity
[DataMember] [DataMember]
public string? createuserId { get; set; } public string? createuserId { get; set; }
/// <summary>
/// 操作人id
/// </summary>
[DataMember]
public string? operatorId { get; set; }
/// <summary>
/// 操作人
/// </summary>
[DataMember]
public string? operatorName { get; set; }
/// <summary> /// <summary>
/// 创建日期 /// 创建日期
/// </summary> /// </summary>

11
Elight.Entity/AppMode/App_ReceptionModel.cs
Unescape View File

@ -24,6 +24,17 @@ namespace Elight.Entity
/// </summary> /// </summary>
[DataMember] [DataMember]
public string? unitCode { get; set; } public string? unitCode { get; set; }
/// <summary>
/// 操作人id
/// </summary>
[DataMember]
public string? operatorId { get; set; }
/// <summary>
/// 操作人
/// </summary>
[DataMember]
public string? operatorName { get; set; }
/// <summary> /// <summary>
/// 预约手机号 /// 预约手机号
/// </summary> /// </summary>

11
Elight.Entity/AppMode/App_RemoteModel.cs
Unescape View File

@ -19,6 +19,17 @@ namespace Elight.Entity
[DataMember] [DataMember]
[SugarColumn(IsPrimaryKey = true)] [SugarColumn(IsPrimaryKey = true)]
public string? Id { get; set; } public string? Id { get; set; }
/// <summary>
/// 操作人id
/// </summary>
[DataMember]
public string? operatorId { get; set; }
/// <summary>
/// 操作人
/// </summary>
[DataMember]
public string? operatorName { get; set; }
/// <summary> /// <summary>
/// 单位编码 /// 单位编码
/// </summary> /// </summary>

Write Preview
Loading…
Cancel
Save