diff --git a/24Hour/Controllers/Common/CommonController.cs b/24Hour/Controllers/Common/CommonController.cs index f01e72c..efd1263 100644 --- a/24Hour/Controllers/Common/CommonController.cs +++ b/24Hour/Controllers/Common/CommonController.cs @@ -1166,7 +1166,7 @@ namespace _24Hour.Controllers.Common { Lawyerbol.FirstOrDefault().acceptancetime = dto.time; Lawyerbol.FirstOrDefault().reason = dto.reason; - Lawyerbol.FirstOrDefault().state = dto.state == true ? 1 : 2; + Lawyerbol.FirstOrDefault().state = Convert.ToInt32(dto.state); } else { @@ -1174,7 +1174,7 @@ namespace _24Hour.Controllers.Common Lawyerbol.FirstOrDefault().receptionusername = dto.username; } _db.BeginTran(); - var num = await _db.Updateable(Lawyerbol.FirstOrDefault()).UpdateColumns(it => new { it.receptionuser }).ExecuteCommandAsync(); + var num = await _db.Updateable(Lawyerbol.FirstOrDefault()).UpdateColumns(it => new { it.receptionuser, it.receptionusername, it.acceptancetime, it.reason, it.state }).ExecuteCommandAsync(); _db.CommitTran(); if (num > 0) { @@ -1192,7 +1192,7 @@ namespace _24Hour.Controllers.Common { RemoteModelbol.FirstOrDefault().acceptancetime = dto.time; RemoteModelbol.FirstOrDefault().reason = dto.reason; - RemoteModelbol.FirstOrDefault().state = dto.state == true ? 1 : 2; + RemoteModelbol.FirstOrDefault().state = Convert.ToInt32(dto.state); } else { @@ -1200,7 +1200,7 @@ namespace _24Hour.Controllers.Common RemoteModelbol.FirstOrDefault().meetwitname = dto.username; } _db.BeginTran(); - var num = await _db.Updateable(RemoteModelbol.FirstOrDefault()).UpdateColumns(it => new { it.meetwitId, it.meetwitname }).ExecuteCommandAsync(); + var num = await _db.Updateable(RemoteModelbol.FirstOrDefault()).UpdateColumns(it => new { it.meetwitId, it.meetwitname, it.acceptancetime, it.reason, it.state }).ExecuteCommandAsync(); _db.CommitTran(); if (num > 0) { @@ -1218,7 +1218,7 @@ namespace _24Hour.Controllers.Common { Receptiondata.FirstOrDefault().acceptancetime = dto.time; Receptiondata.FirstOrDefault().reason = dto.reason; - Receptiondata.FirstOrDefault().state = dto.state == true ? 1 : 2; + Receptiondata.FirstOrDefault().state = Convert.ToInt32(dto.state); } else { @@ -1226,7 +1226,7 @@ namespace _24Hour.Controllers.Common Receptiondata.FirstOrDefault().meetwitname = dto.username; } _db.BeginTran(); - var num = await _db.Updateable(Receptiondata.FirstOrDefault()).UpdateColumns(it => new { it.meetwitId, it.meetwitname }).ExecuteCommandAsync(); + var num = await _db.Updateable(Receptiondata.FirstOrDefault()).UpdateColumns(it => new { it.meetwitId, it.meetwitname, it.acceptancetime, it.reason, it.state }).ExecuteCommandAsync(); _db.CommitTran(); if (num > 0) { @@ -1243,7 +1243,7 @@ namespace _24Hour.Controllers.Common { Confessiondata.FirstOrDefault().acceptancetime = dto.time; Confessiondata.FirstOrDefault().reason = dto.reason; - Confessiondata.FirstOrDefault().state = dto.state == true ? 1 : 2; + Confessiondata.FirstOrDefault().state =Convert.ToInt32(dto.state); } else { @@ -1251,7 +1251,7 @@ namespace _24Hour.Controllers.Common Confessiondata.FirstOrDefault().meetwitname = dto.username; } _db.BeginTran(); - var num = await _db.Updateable(Confessiondata.FirstOrDefault()).UpdateColumns(it => new { it.meetwitId, it.meetwitname }).ExecuteCommandAsync(); + var num = await _db.Updateable(Confessiondata.FirstOrDefault()).UpdateColumns(it => new { it.meetwitId, it.meetwitname, it.acceptancetime, it.reason, it.state }).ExecuteCommandAsync(); _db.CommitTran(); if (num > 0) { @@ -1269,7 +1269,7 @@ namespace _24Hour.Controllers.Common { Hearingdata.FirstOrDefault().acceptancetime = dto.time; Hearingdata.FirstOrDefault().reason = dto.reason; - Hearingdata.FirstOrDefault().state = dto.state == true ? 1 : 2; + Hearingdata.FirstOrDefault().state = Convert.ToInt32(dto.state); } else { @@ -1277,7 +1277,7 @@ namespace _24Hour.Controllers.Common Hearingdata.FirstOrDefault().receptionusername = dto.username; } _db.BeginTran(); - var num = await _db.Updateable(Hearingdata.FirstOrDefault()).UpdateColumns(it => new { it.receptionuser, it.receptionusername }).ExecuteCommandAsync(); + var num = await _db.Updateable(Hearingdata.FirstOrDefault()).UpdateColumns(it => new { it.receptionuser, it.receptionusername, it.acceptancetime, it.reason, it.state }).ExecuteCommandAsync(); _db.CommitTran(); if (num > 0) { diff --git a/Elight.Entity/AppMode/App_LawyerServicesModel.cs b/Elight.Entity/AppMode/App_LawyerServicesModel.cs index f66e43e..d0495bd 100644 --- a/Elight.Entity/AppMode/App_LawyerServicesModel.cs +++ b/Elight.Entity/AppMode/App_LawyerServicesModel.cs @@ -90,7 +90,7 @@ namespace Elight.Entity public string? reason { get; set; } /// - /// 0:待办理,1:同意 ,2:拒绝 + /// 0:待办理,1:同意 ,2:拒绝 3, 结束 /// [DataMember] public int state { get; set; } diff --git a/Elight.Entity/SystemModel/UpdateuserDto.cs b/Elight.Entity/SystemModel/UpdateuserDto.cs index e94c483..d1877f2 100644 --- a/Elight.Entity/SystemModel/UpdateuserDto.cs +++ b/Elight.Entity/SystemModel/UpdateuserDto.cs @@ -22,10 +22,10 @@ namespace Elight.Entity.SystemModel public string? username { get; set; } /// - /// true 同意,false 拒绝 + /// 1 同意,2 拒绝 3结束 /// - public bool? state { get; set; } + public int? state { get; set; } /// /// 原因