Commit 0f931b87 authored by liudong1993's avatar liudong1993

1

parent 86fd01de
...@@ -2774,7 +2774,7 @@ namespace Edu.Module.Course ...@@ -2774,7 +2774,7 @@ namespace Edu.Module.Course
{ {
var gmodel = order_GuestRepository.GetEntity(guestId); var gmodel = order_GuestRepository.GetEntity(guestId);
if (gmodel == null) { return false; } if (gmodel == null) { return false; }
var cmodel = education_ContractRepository.GetList(new RB_Education_Contract_ViewModel() { Group_Id = gmodel.Group_Id, GuestId = gmodel.Id }).Where(x => x.Status != 4).FirstOrDefault(); var cmodel = education_ContractRepository.GetList(new RB_Education_Contract_ViewModel() { Group_Id = gmodel.Group_Id, GuestId = gmodel.Id, Status = -1 }).Where(x => x.Status != 4).FirstOrDefault();
if (cmodel != null) if (cmodel != null)
{ {
//有合同 //有合同
......
...@@ -191,10 +191,11 @@ namespace Edu.Module.Course ...@@ -191,10 +191,11 @@ namespace Edu.Module.Course
{ {
FinaceNum = string.Join(",", flist.Select(qitem => qitem.FrID)); FinaceNum = string.Join(",", flist.Select(qitem => qitem.FrID));
} }
var contractModel= education_ContractRepository.GetList(new RB_Education_Contract_ViewModel() var contractModel = education_ContractRepository.GetList(new RB_Education_Contract_ViewModel()
{ {
OrderId = OrderId, OrderId = OrderId,
GuestId = GuestId GuestId = GuestId,
Status = -1
})?.FirstOrDefault(); })?.FirstOrDefault();
string ProtocolNum = (contractModel?.ContractNo ?? "") + "-T"; string ProtocolNum = (contractModel?.ContractNo ?? "") + "-T";
RB_BackClass_Protocol model = new RB_BackClass_Protocol() RB_BackClass_Protocol model = new RB_BackClass_Protocol()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment