Commit 6bd40f2f authored by 黄奎's avatar 黄奎

页面修改

parent 6d994ccf
...@@ -85,5 +85,10 @@ namespace Edu.Model.Entity.Customer ...@@ -85,5 +85,10 @@ namespace Edu.Model.Entity.Customer
/// 兑换截止日期 /// 兑换截止日期
/// </summary> /// </summary>
public DateTime ExchangeEndTime { get; set; } public DateTime ExchangeEndTime { get; set; }
/// <summary>
/// 任务值类型(1-人数,2-成交金额)
/// </summary>
public int TaskFinishType { get; set; }
} }
} }
...@@ -38,10 +38,7 @@ namespace Edu.Model.Entity.Customer ...@@ -38,10 +38,7 @@ namespace Edu.Model.Entity.Customer
/// </summary> /// </summary>
public string TargetId { get; set; } public string TargetId { get; set; }
/// <summary>
/// 任务值类型(1-人数,2-成交金额)
/// </summary>
public int TaskFinishType { get; set; }
/// <summary> /// <summary>
/// 任务完成值 /// 任务完成值
......
...@@ -179,6 +179,7 @@ namespace Edu.Module.Customer ...@@ -179,6 +179,7 @@ namespace Edu.Module.Customer
{nameof(RB_Task_Extend.UpdateBy),model.UpdateBy }, {nameof(RB_Task_Extend.UpdateBy),model.UpdateBy },
{nameof(RB_Task_Extend.UpdateTime),model.UpdateTime }, {nameof(RB_Task_Extend.UpdateTime),model.UpdateTime },
{nameof(RB_Task_Extend.ExchangeEndTime),model.ExchangeEndTime }, {nameof(RB_Task_Extend.ExchangeEndTime),model.ExchangeEndTime },
{nameof(RB_Task_Extend.TaskFinishType),model.TaskFinishType },
}; };
flag = customer_TaskRepository.Update(fileds, new WhereHelper(nameof(RB_Task_Extend.Id), model.Id)); flag = customer_TaskRepository.Update(fileds, new WhereHelper(nameof(RB_Task_Extend.Id), model.Id));
} }
...@@ -238,7 +239,6 @@ namespace Edu.Module.Customer ...@@ -238,7 +239,6 @@ namespace Edu.Module.Customer
{nameof(RB_TaskDetails_Extend.DetailsName),item.DetailsName }, {nameof(RB_TaskDetails_Extend.DetailsName),item.DetailsName },
{nameof(RB_TaskDetails_Extend.TaskType),item.TaskType }, {nameof(RB_TaskDetails_Extend.TaskType),item.TaskType },
{nameof(RB_TaskDetails_Extend.TargetId),item.TargetId }, {nameof(RB_TaskDetails_Extend.TargetId),item.TargetId },
{nameof(RB_TaskDetails_Extend.TaskFinishType),item.TaskFinishType },
{nameof(RB_TaskDetails_Extend.TaskFinishValue),item.TaskFinishValue }, {nameof(RB_TaskDetails_Extend.TaskFinishValue),item.TaskFinishValue },
{nameof(RB_TaskDetails_Extend.TaskKudo),item.TaskKudo }, {nameof(RB_TaskDetails_Extend.TaskKudo),item.TaskKudo },
{nameof(RB_TaskDetails_Extend.TaskKudoImg),item.TaskKudoImg }, {nameof(RB_TaskDetails_Extend.TaskKudoImg),item.TaskKudoImg },
......
...@@ -206,6 +206,7 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -206,6 +206,7 @@ namespace Edu.WebApi.Controllers.Customer
TaskEndTime = base.ParmJObj.GetDateTime("TaskEndTime"), TaskEndTime = base.ParmJObj.GetDateTime("TaskEndTime"),
TaskDesc = base.ParmJObj.GetStringValue("TaskDesc"), TaskDesc = base.ParmJObj.GetStringValue("TaskDesc"),
ExchangeEndTime = base.ParmJObj.GetDateTime("ExchangeEndTime"), ExchangeEndTime = base.ParmJObj.GetDateTime("ExchangeEndTime"),
TaskFinishType = base.ParmJObj.GetInt("TaskFinishType"),
}; };
string taskImageList = base.ParmJObj.GetStringValue("TaskImageList"); string taskImageList = base.ParmJObj.GetStringValue("TaskImageList");
List<string> imgList = new List<string>(); List<string> imgList = new List<string>();
...@@ -250,7 +251,7 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -250,7 +251,7 @@ namespace Edu.WebApi.Controllers.Customer
DetailsName=jobj.GetStringValue("DetailsName"), DetailsName=jobj.GetStringValue("DetailsName"),
TaskType = (TaskTypeEnum)jobj.GetInt("TaskType"), TaskType = (TaskTypeEnum)jobj.GetInt("TaskType"),
TargetId = string.Join(",", targetIds), TargetId = string.Join(",", targetIds),
TaskFinishType = jobj.GetInt("TaskFinishType"),
TaskFinishValue = jobj.GetDecimal("TaskFinishValue"), TaskFinishValue = jobj.GetDecimal("TaskFinishValue"),
TaskKudo=jobj.GetStringValue("TaskKudo"), TaskKudo=jobj.GetStringValue("TaskKudo"),
TaskKudoImg= JsonHelper.Serialize(imgKudoList), TaskKudoImg= JsonHelper.Serialize(imgKudoList),
......
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