Commit 07c5f6ad authored by liudong1993's avatar liudong1993

1

parent dc9f1c24
......@@ -34,6 +34,11 @@ namespace REBORN.Model.Extend.Dmc
/// </summary>
public int IsApplyContract { get; set; }
/// <summary>
/// =1是 正常合同
/// </summary>
public int IsNormalThirdContract { get; set; }
/// <summary>
/// 合团附件
/// </summary>
......
......@@ -48,6 +48,10 @@ SELECT * FROM RB_Contract WHERE 1=1 AND Status=1
{
builder.AppendFormat(" AND {0}='{1}' ", nameof(RB_Contract_Extend.ThirdContractID), where.ThirdContractID);
}
if (where.IsNormalThirdContract == 1)
{
builder.AppendFormat(" AND {0} in({1}) ", nameof(RB_Contract_Extend.ThirdContractState), "0,1,2,4");
}
}
return Get<RB_Contract_Extend>(builder.ToString()).ToList();
}
......
......@@ -653,7 +653,7 @@ namespace REBORN.Services.DMCService
}
else
{
model = travelContractModule.GetContractModule(new RB_Contract_Extend { TCID = TCID, OrderId = orderID, GuestId = guestId, OrderType = OrderType });
model = travelContractModule.GetContractModule(new RB_Contract_Extend { TCID = TCID, OrderId = orderID, GuestId = guestId, OrderType = OrderType, IsNormalThirdContract = 1 });
UserInfo userInfo = CacheManager.User.RbUserCache.GetUserLoginInfo(request.uid);
if (userInfo != null)
{
......
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