1

REBORN.Module.DMCModule/TravelContractModule.cs

@@ -567,7 +567,8 @@ namespace REBORN.Module.DMCModule
                      htModel.Change_Opinion == "1" ? (int)GroupAgreementResolution.ChangeRoute :
                      htModel.Terminate_Opinion == "1" ? (int)GroupAgreementResolution.Terminate : (int)GroupAgreementResolution.Other,
                     LeastCustomerNumber = htModel.Min_Number ?? 0,
-
+                    AgreeToTransfer = htModel.Instead_Opinion == 1 ? true : false,
+                    TransferToCompanyName = htModel.Instead_Company,
                     AgreeToDelay = htModel.Delay_Opinion == "1" ? true : false,
                     AgreeToChangeLine = htModel.Change_Opinion == "1" ? true : false,
                     AgreeToTerminate = htModel.Terminate_Opinion == "1" ? true : false,

REBORN.Repository/Dmc/RB_ContractRepository.cs

@@ -44,6 +44,10 @@ SELECT * FROM RB_Contract WHERE 1=1 AND Status=1
                 {
                     builder.AppendFormat(" AND {0}={1} ", nameof(RB_Contract_Extend.OrderType), where.OrderType);
                 }
+                if (!string.IsNullOrEmpty(where.ThirdContractID))
+                {
+                    builder.AppendFormat(" AND {0}='{1}' ", nameof(RB_Contract_Extend.ThirdContractID), where.ThirdContractID);
+                }
             }
             return Get<RB_Contract_Extend>(builder.ToString()).ToList();
         }

REBORN.Repository/Dmc/RB_Travel_ContractRepository.cs

@@ -85,6 +85,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.AllianceId={0} ", where.AllianceId);
                 }
+                if (!string.IsNullOrEmpty(where.ThirdContractID))
+                {
+                    builder.AppendFormat(" AND A.ThirdContractID='{0}' ", where.ThirdContractID);
+                }
             }
             return Get<RB_Travel_Contract_Extend>(builder.ToString()).ToList();
         }