Skip to content

E
Education
Commit bd80004b authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 256d2755
Hide whitespace changes
Inline Side-by-side
Showing with 218 additions and 111 deletions
Edu.Model/Entity/Customer/RB_Student_Visit.cs
View file @ bd80004b
...@@ -82,5 +82,10 @@ namespace Edu.Model.Entity.Customer ...@@ -82,5 +82,10 @@ namespace Edu.Model.Entity.Customer
/// 删除状态(0-正常,1-禁用) /// 删除状态(0-正常,1-禁用)
/// </summary> /// </summary>
public DateStateEnum Status { get; set; } public DateStateEnum Status { get; set; }
/// <summary>
/// 是否到访(1-已到访，0-未到访)
/// </summary>
public int IsVisit { get; set; }
} }
} }
Edu.Model/ViewModel/Customer/RB_Student_Visit_Extend.cs
View file @ bd80004b
...@@ -20,6 +20,11 @@ namespace Edu.Model.ViewModel.Customer ...@@ -20,6 +20,11 @@ namespace Edu.Model.ViewModel.Customer
/// </summary> /// </summary>
public string ReceptionPersionName { get; set; } public string ReceptionPersionName { get; set; }
/// <summary>
/// 接待人电话
/// </summary>
public string ReceptionPersionTel { get; set; }
/// <summary> /// <summary>
/// 查询日期 /// 查询日期
/// </summary> /// </summary>
...@@ -29,5 +34,21 @@ namespace Edu.Model.ViewModel.Customer ...@@ -29,5 +34,21 @@ namespace Edu.Model.ViewModel.Customer
/// 学员名称 /// 学员名称
/// </summary> /// </summary>
public string StuName { get; set; } public string StuName { get; set; }
/// <summary>
/// 到访状态字符串
/// </summary>
public string IsVisitStr
{
get
{
string str = "未到访";
if (this.IsVisit == 1)
{
str = "已到访";
}
return str;
}
}
} }
} }
Edu.Module.Customer/CustomerStudentModule.cs
View file @ bd80004b
...@@ -51,6 +51,11 @@ namespace Edu.Module.Customer ...@@ -51,6 +51,11 @@ namespace Edu.Module.Customer
/// </summary> /// </summary>
private readonly RB_Student_OrderGuestRepository student_OrderGuestRepository = new RB_Student_OrderGuestRepository(); private readonly RB_Student_OrderGuestRepository student_OrderGuestRepository = new RB_Student_OrderGuestRepository();
/// <summary>
/// 学员协助人员仓储层对象
/// </summary>
private readonly RB_Student_AssistRepository student_AssistRepository = new RB_Student_AssistRepository();
#region 学员约访 #region 学员约访
...@@ -310,6 +315,8 @@ namespace Edu.Module.Customer ...@@ -310,6 +315,8 @@ namespace Edu.Module.Customer
{ {
item.SchoolName = schoolList?.FirstOrDefault(qitem => qitem.SId == item.School_Id)?.SName ?? ""; item.SchoolName = schoolList?.FirstOrDefault(qitem => qitem.SId == item.School_Id)?.SName ?? "";
item.ReceptionPersionName = empList?.FirstOrDefault(qitem => qitem.Id == item.ReceptionPersion)?.EmployeeName ?? ""; item.ReceptionPersionName = empList?.FirstOrDefault(qitem => qitem.Id == item.ReceptionPersion)?.EmployeeName ?? "";
item.ReceptionPersionTel = empList?.FirstOrDefault(qitem => qitem.Id == item.ReceptionPersion)?.EmployeeTel ?? "";
} }
} }
return list; return list;
...@@ -391,11 +398,12 @@ namespace Edu.Module.Customer ...@@ -391,11 +398,12 @@ namespace Edu.Module.Customer
/// <param name="Id"></param> /// <param name="Id"></param>
/// <param name="OperateId"></param> /// <param name="OperateId"></param>
/// <returns></returns> /// <returns></returns>
public bool SetStudentVisitFeedbackModule(string Feedback, int Id, int OperateId) public bool SetStudentVisitFeedbackModule(string Feedback, int Id, int OperateId,int IsVisit)
{ {
Dictionary<string, object> fileds = new Dictionary<string, object>() Dictionary<string, object> fileds = new Dictionary<string, object>()
{ {
{nameof(RB_Student_Visit_Extend.Feedback),Feedback }, {nameof(RB_Student_Visit_Extend.Feedback),Feedback },
{nameof(RB_Student_Visit_Extend.IsVisit),IsVisit },
}; };
var oldModel = GetStudentVisitModule(Id); var oldModel = GetStudentVisitModule(Id);
string logTitle = "修改到访"; string logTitle = "修改到访";
...@@ -404,6 +412,7 @@ namespace Edu.Module.Customer ...@@ -404,6 +412,7 @@ namespace Edu.Module.Customer
{ {
logContent += string.Format("反馈信息：由【{0}】=>【{1}】", oldModel.Feedback, Feedback); logContent += string.Format("反馈信息：由【{0}】=>【{1}】", oldModel.Feedback, Feedback);
} }
bool flag = student_VisitRepository.Update(fileds, new WhereHelper(nameof(RB_Student_Visit_Extend.Id), Id)); bool flag = student_VisitRepository.Update(fileds, new WhereHelper(nameof(RB_Student_Visit_Extend.Id), Id));
student_LogRepository.AddStuLogRepository(oldModel.StuId, Common.Enum.Log.StudentLogTypeEnum.Visit, logTitle, logContent, OperateId); student_LogRepository.AddStuLogRepository(oldModel.StuId, Common.Enum.Log.StudentLogTypeEnum.Visit, logTitle, logContent, OperateId);
return flag; return flag;
...@@ -476,5 +485,129 @@ namespace Edu.Module.Customer ...@@ -476,5 +485,129 @@ namespace Edu.Module.Customer
return list; return list;
} }
/// <summary>
/// 新增修改协助人员
/// </summary>
/// <param name="StuId"></param>
/// <param name="AssistList"></param>
/// <returns></returns>
public bool SetStudentAssistModule(int StuId, List<RB_Student_Assist_Extend> AssistList,int Uid)
{
bool flag = true;
string logTitle = "协助人员";
string logContent = "";
var oldAssistList = student_AssistRepository.GetStudentAssistListRepository(new Model.ViewModel.Customer.RB_Student_Assist_Extend()
{
StuId = StuId
});
List<int> ids1 = new List<int>();
if (AssistList != null)
{
ids1 = Common.Plugin.StringHelper.StringToListInt(string.Join(",", AssistList.Select(qitem => qitem.AssistId)));
}
if (oldAssistList != null)
{
List<int> ids2 = Common.Plugin.StringHelper.StringToListInt(string.Join(",", oldAssistList.Select(qitem => qitem.AssistId)));
if (ids2 != null && ids2.Count > 0)
{
ids1.AddRange(ids2);
}
}
string aids = string.Join(",", ids1);
List<Employee_ViewModel> empList = new List<Employee_ViewModel>();
if (!string.IsNullOrEmpty(aids))
{
empList = accountRepository.GetEmployeeListRepository(new Employee_ViewModel()
{
QIds = aids
});
}
//以前没有协同人员【直接新增】
if (oldAssistList == null || (oldAssistList != null && oldAssistList.Count == 0))
{
foreach (var item in oldAssistList)
{
student_AssistRepository.Insert(new Model.Entity.Customer.RB_Student_Assist()
{
AssistId = item.AssistId,
AssistType = item.AssistType,
StuId = StuId
});
logContent += string.Format("新增协同人员:" + empList?.FirstOrDefault(qitem => qitem.Id == item.AssistId)?.EmployeeName);
}
}
else
{
//现在没有协同人员了【直接删除以前的协同人员】
if (AssistList == null || (AssistList != null && AssistList.Count == 0))
{
student_AssistRepository.DeleteStudentAssistRepository(StuId);
foreach (var item in oldAssistList)
{
logContent += string.Format("删除协同人员:" + empList?.FirstOrDefault(qitem => qitem.Id == item.AssistId)?.EmployeeName);
}
}
//找出差异的数据
var deleteList = oldAssistList.Where(qitem => !AssistList.Any(oldItem => qitem.Id == oldItem.Id)).ToList();
foreach (var dItem in deleteList)
{
if (dItem.Id > 0)
{
logContent += string.Format("删除协同人员:" + empList?.FirstOrDefault(qitem => qitem.Id == dItem.AssistId)?.EmployeeName);
student_AssistRepository.Delete(dItem.Id);
}
}
foreach (var item in AssistList)
{
item.StuId = StuId;
if (item.Id == 0)
{
logContent += string.Format("新增协同人员:" + empList?.FirstOrDefault(qitem => qitem.Id == item.AssistId)?.EmployeeName);
student_AssistRepository.Insert(item);
}
else
{
var oldModel = oldAssistList?.FirstOrDefault(qitem => qitem.Id == item.Id);
if ((oldModel?.AssistId ?? 0) != item.AssistId)
{
logContent += string.Format("修改协同人员：【0】=>【{1}】",
empList?.FirstOrDefault(qitem => qitem.Id == (oldModel?.AssistId ?? 0))?.EmployeeName,
empList?.FirstOrDefault(qitem => qitem.Id == item.AssistId)?.EmployeeName
);
}
student_AssistRepository.Update(item);
}
}
}
student_LogRepository.AddStuLogRepository(StuId, Common.Enum.Log.StudentLogTypeEnum.BasicInfo, logTitle, logContent, Uid);
return flag;
}
/// <summary>
/// 获取学员协助人员列表
/// </summary>
/// <param name="StuId"></param>
/// <returns></returns>
public List<RB_Student_Assist_Extend> GeStudentAssistListModule(int StuId)
{
var list= student_AssistRepository.GetStudentAssistListRepository(new RB_Student_Assist_Extend()
{
StuId = StuId
});
string aIds = string.Join(",", list.Select(qitem => qitem.AssistId));
List<RB_Account_ViewModel> accountList = new List<RB_Account_ViewModel>();
if (!string.IsNullOrEmpty(aIds))
{
accountList = accountRepository.GetAccountListExtRepository(new RB_Account_ViewModel() { QIds = aIds });
}
foreach (var item in list)
{
item.AssistName = accountList?.FirstOrDefault(qitem => qitem.Id == item.AssistId)?.AccountName ?? "";
}
return list;
}
} }
} }
Edu.Repository/User/RB_StudentRepository.cs
View file @ bd80004b
...@@ -360,92 +360,6 @@ WHERE o.OrderState=1 and og.`Status`=0 and sog.`Status`=0 and og.GuestState=1 an ...@@ -360,92 +360,6 @@ WHERE o.OrderState=1 and og.`Status`=0 and sog.`Status`=0 and og.GuestState=1 an
logContent = "创建了该客户"; logContent = "创建了该客户";
logTitle = "创建客户"; logTitle = "创建客户";
} }
var oldAssistList = student_AssistRepository.GetStudentAssistListRepository(new Model.ViewModel.Customer.RB_Student_Assist_Extend()
{
StuId = model.StuId
});
List<int> ids1 = new List<int>();
if (model.AssistList != null)
{
ids1 = Common.Plugin.StringHelper.StringToListInt(string.Join(",", model.AssistList.Select(qitem => qitem.AssistId)));
}
if (oldAssistList != null)
{
List<int> ids2 = Common.Plugin.StringHelper.StringToListInt(string.Join(",", oldAssistList.Select(qitem => qitem.AssistId)));
if (ids2 != null && ids2.Count > 0)
{
ids1.AddRange(ids2);
}
}
string aids = string.Join(",", ids1);
List<Employee_ViewModel> empList = new List<Employee_ViewModel>();
if (!string.IsNullOrEmpty(aids))
{
empList = accountRepository.GetEmployeeListRepository(new Employee_ViewModel()
{
QIds = aids
});
}
//以前没有协同人员【直接新增】
if (oldAssistList == null || (oldAssistList != null && oldAssistList.Count == 0))
{
foreach (var item in oldAssistList)
{
student_AssistRepository.Insert(new Model.Entity.Customer.RB_Student_Assist()
{
AssistId = item.AssistId,
AssistType = item.AssistType,
StuId = model.StuId
});
logContent+=string.Format("新增协同人员:"+ empList?.FirstOrDefault(qitem=>qitem.Id==item.AssistId)?.EmployeeName);
}
}
else
{
//现在没有协同人员了【直接删除以前的协同人员】
if (model.AssistList == null || (model.AssistList != null && model.AssistList.Count == 0))
{
student_AssistRepository.DeleteStudentAssistRepository(model.StuId);
foreach (var item in oldAssistList)
{
logContent += string.Format("删除协同人员:" + empList?.FirstOrDefault(qitem => qitem.Id == item.AssistId)?.EmployeeName);
}
}
//找出差异的数据
var deleteList = oldAssistList.Where(qitem => !model.AssistList.Any(oldItem => qitem.Id == oldItem.Id)).ToList();
foreach (var dItem in deleteList)
{
if (dItem.Id > 0)
{
logContent += string.Format("删除协同人员:" + empList?.FirstOrDefault(qitem => qitem.Id == dItem.AssistId)?.EmployeeName);
student_AssistRepository.Delete(dItem.Id);
}
}
foreach (var item in model.AssistList)
{
item.StuId = model.StuId;
if (item.Id == 0)
{
logContent += string.Format("新增协同人员:" + empList?.FirstOrDefault(qitem => qitem.Id == item.AssistId)?.EmployeeName);
student_AssistRepository.Insert(item);
}
else
{
var oldModel = oldAssistList?.FirstOrDefault(qitem => qitem.Id == item.Id);
if ((oldModel?.AssistId ?? 0) != item.AssistId)
{
logContent += string.Format("修改协同人员：【0】=>【{1}】",
empList?.FirstOrDefault(qitem => qitem.Id == (oldModel?.AssistId ?? 0))?.EmployeeName,
empList?.FirstOrDefault(qitem => qitem.Id == item.AssistId)?.EmployeeName
);
}
student_AssistRepository.Update(item);
}
}
}
student_LogRepository.AddStuLogRepository(model.StuId, Common.Enum.Log.StudentLogTypeEnum.BasicInfo, logTitle, logContent, createBy, CreateType: model.CreateType); student_LogRepository.AddStuLogRepository(model.StuId, Common.Enum.Log.StudentLogTypeEnum.BasicInfo, logTitle, logContent, createBy, CreateType: model.CreateType);
return flag; return flag;
} }
......
Edu.WebApi/Controllers/Customer/CustomerStudentController.cs
View file @ bd80004b
using Edu.Cache.User; using Edu.Cache.User;
using Edu.Common.API; using Edu.Common.API;
using Edu.Common.Enum.User;
using Edu.Common.Plugin; using Edu.Common.Plugin;
using Edu.Model.ViewModel.Customer; using Edu.Model.ViewModel.Customer;
using Edu.Model.ViewModel.User; using Edu.Model.ViewModel.User;
...@@ -7,6 +8,7 @@ using Edu.Module.Customer; ...@@ -7,6 +8,7 @@ using Edu.Module.Customer;
using Edu.WebApi.Filter; using Edu.WebApi.Filter;
using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.Cors;
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;
...@@ -233,6 +235,8 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -233,6 +235,8 @@ namespace Edu.WebApi.Controllers.Customer
item.Feedback, item.Feedback,
CreateTime=Common.ConvertHelper.FormatTimeStr2(item.CreateTime), CreateTime=Common.ConvertHelper.FormatTimeStr2(item.CreateTime),
CreateByName, CreateByName,
item.IsVisit,
item.IsVisitStr,
}); });
} }
pageModel.Count = rowsCount; pageModel.Count = rowsCount;
...@@ -264,7 +268,7 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -264,7 +268,7 @@ namespace Edu.WebApi.Controllers.Customer
extModel.UpdateTime = DateTime.Now; extModel.UpdateTime = DateTime.Now;
extModel.Group_Id = base.UserInfo.Group_Id; extModel.Group_Id = base.UserInfo.Group_Id;
bool flag = customerStudentModule.SetStudentVisitModule(extModel); bool flag = customerStudentModule.SetStudentVisitModule(extModel);
return flag ? ApiResult.Success() : ApiResult.Failed(); return flag ? ApiResult.Success(data:extModel) : ApiResult.Failed();
} }
/// <summary> /// <summary>
...@@ -275,8 +279,9 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -275,8 +279,9 @@ namespace Edu.WebApi.Controllers.Customer
public ApiResult SetStudentVisitFeedback() public ApiResult SetStudentVisitFeedback()
{ {
var Id = base.ParmJObj.GetInt("Id"); var Id = base.ParmJObj.GetInt("Id");
int IsVisit = base.ParmJObj.GetInt("IsVisit");
string Feedback = base.ParmJObj.GetStringValue("Feedback"); string Feedback = base.ParmJObj.GetStringValue("Feedback");
bool flag = customerStudentModule.SetStudentVisitFeedbackModule(Feedback, Id, base.UserInfo.Id); bool flag = customerStudentModule.SetStudentVisitFeedbackModule(Feedback, Id, base.UserInfo.Id, IsVisit);
return flag ? ApiResult.Success() : ApiResult.Failed(); return flag ? ApiResult.Success() : ApiResult.Failed();
} }
...@@ -411,5 +416,51 @@ namespace Edu.WebApi.Controllers.Customer ...@@ -411,5 +416,51 @@ namespace Edu.WebApi.Controllers.Customer
pageModel.PageData = list; pageModel.PageData = list;
return ApiResult.Success(data: pageModel); return ApiResult.Success(data: pageModel);
} }
/// <summary>
/// 新增修改协助人员
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetStudentAssist()
{
var AssistList = new List<RB_Student_Assist_Extend>();
var StuId = base.ParmJObj.GetInt("StuId");
string assistListStr = base.ParmJObj.GetStringValue("AssistList");
if (!string.IsNullOrEmpty(assistListStr))
{
JArray jarray = JArray.Parse(assistListStr);
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 = StuId,
};
AssistList.Add(aModel);
}
}
}
bool flag = customerStudentModule.SetStudentAssistModule(StuId, AssistList,base.UserInfo.Id);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 获取协助人员列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetStudentAssistList()
{
var StuId = base.ParmJObj.GetInt("StuId");
var data = customerStudentModule.GeStudentAssistListModule(StuId);
return ApiResult.Success(data: data);
}
} }
} }
Edu.WebApi/Controllers/Duty/DutyPlanController.cs
View file @ bd80004b
...@@ -735,7 +735,10 @@ namespace Edu.WebApi.Controllers.Duty ...@@ -735,7 +735,10 @@ namespace Edu.WebApi.Controllers.Duty
item.SchoolName, item.SchoolName,
item.ReceptionPersion, item.ReceptionPersion,
item.ReceptionPersionName, item.ReceptionPersionName,
CreateTimeStr =Common.ConvertHelper.FormatTime(item.CreateTime) CreateTimeStr =Common.ConvertHelper.FormatTime(item.CreateTime),
item.IsVisit,
item.IsVisitStr,
item.ReceptionPersionTel,
}); });
} }
} }
......
Edu.WebApi/Controllers/User/UserController.cs
View file @ bd80004b
...@@ -778,27 +778,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -778,27 +778,7 @@ namespace Edu.WebApi.Controllers.User
{ {
return ApiResult.Failed("此学员手机号已绑定同行!请重新录入!"); 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); bool flag = studentModule.SetStudentModule(extModel);
return flag ? ApiResult.Success() : ApiResult.Failed(); return flag ? ApiResult.Success() : ApiResult.Failed();
} }
......
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