Commit 760e4efa authored by 黄奎's avatar 黄奎

页面修改

parent 00cf1e2f
using Edu.Common.Plugin;
using System;
using System.Collections.Generic;
using System.Text;
namespace Edu.Common.Enum.User
{
/// <summary>
/// 协助人员枚举
/// </summary>
public enum AssistTypeEnum
{
/// <summary>
/// 市场人员
/// </summary>
[EnumField("市场人员")]
Market = 1,
/// <summary>
/// 课程顾问
/// </summary>
[EnumField("课程顾问")]
CourseAdviser = 2,
/// <summary>
/// 学管
/// </summary>
[EnumField("学管")]
StuManager = 3,
/// <summary>
/// 教师
/// </summary>
[EnumField("教师")]
Teacher = 4,
/// <summary>
/// 其他
/// </summary>
[EnumField("其他")]
Other = 5,
}
}
using Edu.Common.Plugin;
using System;
using System.Collections.Generic;
using System.Text;
namespace Edu.Common.Enum.User
{
/// <summary>
/// 收客渠道
/// </summary>
public enum StuChannelEnum
{
/// <summary>
/// 线下推广
/// </summary>
[EnumField("线下推广")]
OfflinePromote = 1,
/// <summary>
/// 线下活动
/// </summary>
[EnumField("线下活动")]
OfflineActivity = 2,
/// <summary>
/// 公众号
/// </summary>
[EnumField("公众号")]
OfficialAccount = 3,
/// <summary>
/// 朋友圈
/// </summary>
[EnumField("朋友圈")]
WechatMoments =4,
/// <summary>
/// 过路客
/// </summary>
[EnumField("过路客")]
PassBy = 5,
/// <summary>
/// 第三方平台
/// </summary>
[EnumField("第三方平台")]
ThirdPartyPlatform = 6,
}
}
\ No newline at end of file
using Edu.Common.Enum.User;
using System;
using System.Collections.Generic;
using System.Text;
using VT.FW.DB;
namespace Edu.Model.Entity.Customer
{
/// <summary>
/// 学员协助人员实体类
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_Student_Assist
{
/// <summary>
/// 主键编号
/// </summary>
public int Id { get; set; }
/// <summary>
/// 学员编号
/// </summary>
public int StuId { get; set; }
/// <summary>
/// 协助类型(见枚举)
/// </summary>
public AssistTypeEnum AssistType { get; set; }
/// <summary>
/// 协助类型编号
/// </summary>
public int AssistId { get; set; }
}
}
using Edu.Model.Entity.Customer;
using System;
using System.Collections.Generic;
using System.Text;
namespace Edu.Model.ViewModel.Customer
{
public class RB_Student_Assist_Extend : RB_Student_Assist
{
}
}
using Edu.Common;
using Edu.Common.Enum.Course;
using Edu.Model.ViewModel.Customer;
using System;
using System.Collections.Generic;
namespace Edu.Model.ViewModel.User
{
......@@ -181,5 +183,10 @@ namespace Edu.Model.ViewModel.User
/// 本周新增客户数量
/// </summary>
public int TodayCount { get; set; }
/// <summary>
/// 协助人员
/// </summary>
public List<RB_Student_Assist_Extend> AssistList { get; set; }
}
}
\ No newline at end of file
using Edu.Model.Entity.Customer;
using Edu.Model.ViewModel.Customer;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Edu.Repository.Customer
{
/// <summary>
/// 学员协助人员仓储层
/// </summary>
public class RB_Student_AssistRepository : BaseRepository<RB_Student_Assist>
{
/// <summary>
/// 获取学员协助人员列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Student_Assist_Extend> GetStudentAssistListRepository(RB_Student_Assist_Extend query)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.*
FROM RB_Student_Assist AS A
WHERE 1=1
");
if (query != null)
{
if (query.StuId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_Assist_Extend.StuId), query.StuId);
}
}
return Get<RB_Student_Assist_Extend>(builder.ToString()).ToList();
}
}
}
......@@ -26,6 +26,11 @@ namespace Edu.Repository.User
/// </summary>
private readonly RB_Student_LogRepository student_LogRepository = new RB_Student_LogRepository();
/// <summary>
/// 学员协同人员仓储层对象
/// </summary>
private readonly RB_Student_AssistRepository student_AssistRepository = new RB_Student_AssistRepository();
/// <summary>
/// 获取学生列表
/// </summary>
......@@ -356,6 +361,13 @@ WHERE o.OrderState=1 and og.`Status`=0 and sog.`Status`=0 and og.GuestState=1 an
logTitle = "创建客户";
}
if (model.AssistList != null && model.AssistList.Count > 0)
{
var oldAssistList = student_AssistRepository.GetStudentAssistListRepository(new Model.ViewModel.Customer.RB_Student_Assist_Extend()
{
});
}
student_LogRepository.AddStuLogRepository(model.StuId, Common.Enum.Log.StudentLogTypeEnum.BasicInfo, logTitle, logContent, createBy, CreateType: model.CreateType);
return flag;
}
......
......@@ -9,6 +9,7 @@ using Edu.Common.Enum;
using Edu.Common.Enum.Course;
using Edu.Common.Enum.User;
using Edu.Common.Plugin;
using Edu.Model.ViewModel.Customer;
using Edu.Model.ViewModel.Log;
using Edu.Model.ViewModel.User;
using Edu.Module.Course;
......@@ -19,6 +20,7 @@ using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
namespace Edu.WebApi.Controllers.User
{
......@@ -764,10 +766,51 @@ namespace Edu.WebApi.Controllers.User
{
return ApiResult.Failed("此学员手机号已绑定同行!请重新录入!");
}
extModel.AssistList = new List<RB_Student_Assist_Extend>();
string AssistList = base.ParmJObj.GetStringValue("AssistList");
if (!string.IsNullOrEmpty(AssistList))
{
JArray jarray = JArray.Parse(AssistList);
if (jarray != null && jarray.Count > 0)
{
foreach (var jItem in jarray)
{
JObject jobj = JObject.Parse(jItem.ToString());
var aModel = new RB_Student_Assist_Extend()
{
Id = jobj.GetInt("Id"),
AssistId = jobj.GetInt("AssistId"),
AssistType = (AssistTypeEnum)jobj.GetInt("AssistType"),
StuId = jobj.GetInt("StuId"),
};
extModel.AssistList.Add(aModel);
}
}
}
bool flag = studentModule.SetStudentModule(extModel);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 获取收客平台列表
/// </summary>
/// <returns></returns>
public ApiResult GetStuChannelList()
{
var list = Common.Plugin.EnumHelper.EnumToList(typeof(StuChannelEnum));
return ApiResult.Success(data: list);
}
/// <summary>
/// 获取协助人员类型列表
/// </summary>
/// <returns></returns>
public ApiResult GetAssistTypeList()
{
var list = Common.Plugin.EnumHelper.EnumToList(typeof(AssistTypeEnum));
return ApiResult.Success(data: list);
}
/// <summary>
/// 同业小程序添加学生名单
/// </summary>
......@@ -822,16 +865,7 @@ namespace Edu.WebApi.Controllers.User
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 获取收客平台列表
/// </summary>
/// <returns></returns>
public ApiResult GetStuChannelList()
{
var list = Common.Plugin.EnumHelper.EnumToList(typeof(StuChannelEnum));
return ApiResult.Success(data: list);
}
/// <summary>
/// 学员转交
/// </summary>
......
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