页面修改

Edu.Model/Entity/StudyAbroad/RB_Supplier.cs

@@ -91,5 +91,10 @@ namespace Edu.Model.Entity.StudyAbroad
 		/// 返佣值
 		/// </summary>
 		public decimal CommissionMoney { get; set; }
+
+		/// <summary>
+		/// 合同地址
+		/// </summary>
+		public string ContractUrl { get; set; }
 	}
 }

Edu.Model/ViewModel/StudyAbroad/RB_StudyAbroad_ViewModel.cs

@@ -50,8 +50,19 @@ namespace Edu.Model.ViewModel.StudyAbroad
         /// </summary>
         public int AuditType { get; set; }
 
+        /// <summary>
+        /// 审核状态
+        /// </summary>
         public int AuditState { get; set; }
 
+        /// <summary>
+        /// 审核人
+        /// </summary>
         public int AuditManId { get; set; }
+
+        /// <summary>
+        /// 供应商上传合同
+        /// </summary>
+        public string ContractUrl { get; set; }
     }
 }

Edu.Module.StudyAbroad/SupplierModule.cs

@@ -58,6 +58,7 @@ namespace Edu.Module.StudyAbroad
                     { nameof(RB_Supplier_ViewModel.Remark),model.Remark},
                     { nameof(RB_Supplier_ViewModel.CommissionType),model.CommissionType},
                     { nameof(RB_Supplier_ViewModel.CommissionMoney),model.CommissionMoney},
+                    { nameof(RB_Supplier_ViewModel.ContractUrl),model.ContractUrl},
                 };
                 flag = supplierRepository.Update(fileds, new WhereHelper(nameof(RB_Supplier_ViewModel.Id), model.Id));
             }

Edu.Repository/StudyAbroad/RB_StudyAbroadRepository.cs

@@ -28,7 +28,7 @@ namespace Edu.Repository.StudyAbroad
             var parameters = new DynamicParameters();
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT A.*,IFNULL(B.`Name`,'') AS SupplierName
+SELECT A.*,IFNULL(B.`Name`,'') AS SupplierName,IFNULL(B.ContractUrl,'') AS ContractUrl
 FROM RB_StudyAbroad AS A LEFT JOIN rb_supplier AS B ON A.SupplierId=B.Id
 WHERE 1=1
 ");
@@ -132,7 +132,7 @@ WHERE 1=1
             var parameters = new DynamicParameters();
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT A.*,IFNULL(B.`Name`,'') AS SupplierName
+SELECT A.*,IFNULL(B.`Name`,'') AS SupplierName,IFNULL(B.ContractUrl,'') AS ContractUrl
 FROM RB_StudyAbroad AS A LEFT JOIN rb_supplier AS B ON A.SupplierId=B.Id
 WHERE 1=1
 ");

Edu.WebApi/Controllers/StudyAbroad/StudyAbroadController.cs

@@ -74,6 +74,7 @@ namespace Edu.WebApi.Controllers.StudyAbroad
                     item.CreateByName,
                     item.CommissionType,
                     item.CommissionMoney,
+                    item.ContractUrl,
                     CreateTimeStr = Common.ConvertHelper.FormatTime(item.CreateTime),
                     item.UpdateByName,
                     UpdateTimeStr = Common.ConvertHelper.FormatTime(item.UpdateTime),
@@ -140,6 +141,7 @@ namespace Edu.WebApi.Controllers.StudyAbroad
                 School_Id = base.ParmJObj.GetInt("School_Id"),
                 CommissionMoney=base.ParmJObj.GetDecimal("CommissionMoney"),
                 CommissionType=base.ParmJObj.GetInt("CommissionType"),
+                ContractUrl=base.ParmJObj.GetStringValue("ContractUrl")
             };
             bool flag = supplierModule.SetSupplierModule(extModel);
             return flag ? ApiResult.Success() : ApiResult.Failed();
@@ -165,6 +167,7 @@ namespace Edu.WebApi.Controllers.StudyAbroad
                 Remark = extModel?.Remark ?? "",
                 CommissionType = extModel?.CommissionType ?? 0,
                 CommissionMoney = extModel?.CommissionMoney ?? 0,
+                ContractUrl=extModel?.ContractUrl??""
             };
             return ApiResult.Success(data: obj);
         }
@@ -243,7 +246,7 @@ namespace Edu.WebApi.Controllers.StudyAbroad
                     item.Name,
                     item.SupplierId,
                     item.SupplierName,
-                    item.SupplierContract,
+                    SupplierContract=item.ContractUrl,
                     item.SuggestPrice,
                     item.SellPrice,
                     item.Remark,
@@ -393,7 +396,7 @@ namespace Edu.WebApi.Controllers.StudyAbroad
                 extModel.Name,
                 extModel.SupplierId,
                 extModel.SupplierName,
-                extModel.SupplierContract,
+                SupplierContract= extModel.ContractUrl,
                 extModel.SuggestPrice,
                 extModel.SellPrice,
                 extModel.Remark,

Edu.WebApi/publish.cmd

 @echo off
     iisreset /STOP
-    dotnet publish -o E:\publish\edu.oytour.com -c realease
+    dotnet publish E:\Work\Git\Edu_Api\Edu.WebApi\Edu.WebApi.csproj -o E:\publish\edu.oytour.com -c realease
     iisreset /START 
 exit
\ No newline at end of file