Commit ebc4cd93 authored by 黄奎's avatar 黄奎

页面修改

parent 12a9f2e5
...@@ -10,6 +10,11 @@ namespace Edu.Model.ViewModel.Customer ...@@ -10,6 +10,11 @@ namespace Edu.Model.ViewModel.Customer
/// </summary> /// </summary>
public class RB_Customer_Task_Extend : RB_Customer_Task public class RB_Customer_Task_Extend : RB_Customer_Task
{ {
/// <summary>
/// 创建人
/// </summary>
public string CreateByName { get; set;}
/// <summary> /// <summary>
/// 任务详情列表 /// 任务详情列表
/// </summary> /// </summary>
......
...@@ -72,6 +72,8 @@ namespace Edu.Module.Customer ...@@ -72,6 +72,8 @@ namespace Edu.Module.Customer
{nameof(RB_Customer_Task_Extend.TaskKudo),model.TaskKudo }, {nameof(RB_Customer_Task_Extend.TaskKudo),model.TaskKudo },
{nameof(RB_Customer_Task_Extend.TaskStartTime),model.TaskStartTime }, {nameof(RB_Customer_Task_Extend.TaskStartTime),model.TaskStartTime },
{nameof(RB_Customer_Task_Extend.TaskEndTime),model.TaskEndTime }, {nameof(RB_Customer_Task_Extend.TaskEndTime),model.TaskEndTime },
{nameof(RB_Customer_Task_Extend.UpdateBy),model.UpdateBy },
{nameof(RB_Customer_Task_Extend.UpdateTime),model.UpdateTime },
}; };
flag = customer_TaskRepository.Update(fileds, new WhereHelper(nameof(RB_Customer_Task_Extend.Id), model.Id)); flag = customer_TaskRepository.Update(fileds, new WhereHelper(nameof(RB_Customer_Task_Extend.Id), model.Id));
} }
...@@ -137,7 +139,7 @@ namespace Edu.Module.Customer ...@@ -137,7 +139,7 @@ namespace Edu.Module.Customer
} }
/// <summary> /// <summary>
/// 根据编号删除任务 /// 根据任务编号删除任务
/// </summary> /// </summary>
/// <param name="CustomerId"></param> /// <param name="CustomerId"></param>
/// <returns></returns> /// <returns></returns>
...@@ -153,7 +155,7 @@ namespace Edu.Module.Customer ...@@ -153,7 +155,7 @@ namespace Edu.Module.Customer
/// <summary> /// <summary>
/// 根据客户编号获取任务实体类 /// 根据任务编号获取任务实体类
/// </summary> /// </summary>
/// <param name="CustomerId"></param> /// <param name="CustomerId"></param>
/// <returns></returns> /// <returns></returns>
......
...@@ -7,6 +7,7 @@ using Edu.WebApi.Filter; ...@@ -7,6 +7,7 @@ using Edu.WebApi.Filter;
using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
...@@ -20,8 +21,17 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -20,8 +21,17 @@ namespace Edu.WebApi.Controllers.Customer
[EnableCors("AllowCors")] [EnableCors("AllowCors")]
public class B2BCustomerController : BaseController public class B2BCustomerController : BaseController
{ {
/// <summary>
/// 同行管理处理类对象
/// </summary>
private readonly CustomerModule customerModule = new CustomerModule(); private readonly CustomerModule customerModule = new CustomerModule();
/// <summary>
/// 同行任务处理类对象
/// </summary>
private readonly CustomerTaskModule taskModule = new CustomerTaskModule();
#region 同行管理
/// <summary> /// <summary>
/// 获取同行分页列表 /// 获取同行分页列表
...@@ -131,5 +141,106 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -131,5 +141,106 @@ namespace Edu.WebApi.Controllers.Customer
var flag = customerModule.AuditCustomerModule(model); var flag = customerModule.AuditCustomerModule(model);
return flag ? ApiResult.Success() : ApiResult.Failed(); return flag ? ApiResult.Success() : ApiResult.Failed();
} }
#endregion
#region 任务管理
/// <summary>
/// 获取同行任务分页列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetCustomerTaskPage()
{
var pageModel = JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var query = new RB_Customer_Task_Extend()
{
Group_Id = base.UserInfo.Group_Id,
TaskName = base.ParmJObj.GetStringValue("TaskName"),
};
var list = taskModule.GetCustomerTaskPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
foreach (var item in list)
{
if (item.CreateBy > 0)
{
item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
}
}
pageModel.PageData = list;
pageModel.Count = rowsCount;
return ApiResult.Success(data: pageModel);
}
/// <summary>
/// 新增修改同业客户资料
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetCustomerTask()
{
var model = new RB_Customer_Task_Extend()
{
Id = base.ParmJObj.GetInt("Id"),
TaskName=base.ParmJObj.GetStringValue("TaskName"),
TaskNum=base.ParmJObj.GetInt("TaskNum"),
TaskKudo=base.ParmJObj.GetStringValue("TaskKudo"),
TaskStartTime=base.ParmJObj.GetDateTime("TaskStartTime"),
TaskEndTime=base.ParmJObj.GetDateTime("TaskEndTime"),
};
model.Status = Common.Enum.DateStateEnum.Normal;
model.CreateBy = base.UserInfo.Id;
model.CreateTime = DateTime.Now;
model.UpdateTime = DateTime.Now;
model.Group_Id = base.UserInfo.Group_Id;
model.School_Id = base.UserInfo.School_Id;
model.DetailsList = new List<RB_Customer_TaskDetails_Extend>();
string details = base.ParmJObj.GetStringValue("DetailsList");
if (!string.IsNullOrEmpty(details))
{
JArray jarray = JArray.Parse(details);
if (jarray != null && jarray.Count > 0)
{
foreach (var jItem in jarray)
{
JObject jobj = JObject.Parse(jItem.ToString());
model.DetailsList.Add(new RB_Customer_TaskDetails_Extend()
{
DetailId = jobj.GetInt("DetailId"),
TaskId = jobj.GetInt("TaskId"),
TaskType = jobj.GetInt("TaskType"),
TargetId = jobj.GetInt("TargetId"),
});
}
}
}
var flag = taskModule.SetCustomerTaskModule(model);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 根据任务编号删除任务
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult RemoveCustomerTask()
{
var Id = base.ParmJObj.GetInt("Id");
var flag = taskModule.RemoveCustomerTaskModule(Id);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 根据任务编号获取任务实体类
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetCustomerTask()
{
var Id = base.ParmJObj.GetInt("Id");
var data = taskModule.GetCustomerTaskModule(Id);
return ApiResult.Success(data: data);
}
#endregion
} }
} }
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