Skip to content

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

页面修改

parent b3b27513
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 49 deletions
Edu.Model/Entity/User/RB_Student.cs
View file @ 5ab61937
using Edu.Common.Enum; using Edu.Common.Enum;
using Edu.Common.Enum.Course; using Edu.Common.Enum.Course;
using Edu.Common.Enum.User;
using System; using System;
using VT.FW.DB; using VT.FW.DB;
...@@ -165,5 +166,15 @@ namespace Edu.Model.Entity.User ...@@ -165,5 +166,15 @@ namespace Edu.Model.Entity.User
/// 身份证居住地 /// 身份证居住地
/// </summary> /// </summary>
public string StuIDCardAddress { get; set; } public string StuIDCardAddress { get; set; }
/// <summary>
/// 录入方式(1-员工录入，2-同业录入)
/// </summary>
public int CreateType { get; set; }
/// <summary>
/// 客户阶段(见枚举)
/// </summary>
public StuStageEnum StuStage { get; set; }
} }
} }
Edu.Model/ViewModel/User/RB_Student_ViewModel.cs
View file @ 5ab61937
...@@ -8,7 +8,7 @@ namespace Edu.Model.ViewModel.User ...@@ -8,7 +8,7 @@ namespace Edu.Model.ViewModel.User
/// 学生视图实体类 /// 学生视图实体类
/// </summary> /// </summary>
[Serializable] [Serializable]
public class RB_Student_ViewModel : Model.Entity.User.RB_Student public class RB_Student_ViewModel : Entity.User.RB_Student
{ {
/// <summary> /// <summary>
/// 创建人姓名 /// 创建人姓名
......
Edu.Repository/User/RB_StudentRepository.cs
View file @ 5ab61937
...@@ -140,6 +140,7 @@ WHERE 1=1 ...@@ -140,6 +140,7 @@ WHERE 1=1
builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.AreaId), query.AreaId); builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.AreaId), query.AreaId);
} }
} }
builder.AppendFormat(" ORDER BY t.{0} DESC ", nameof(RB_Student_ViewModel.StuId));
return GetPage<RB_Student_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList(); return GetPage<RB_Student_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
} }
......
Edu.WebApi/Controllers/User/UserController.cs
View file @ 5ab61937
...@@ -651,19 +651,36 @@ namespace Edu.WebApi.Controllers.User ...@@ -651,19 +651,36 @@ namespace Edu.WebApi.Controllers.User
public ApiResult GetStudentPageList() public ApiResult GetStudentPageList()
{ {
var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString()); var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var query = Common.Plugin.JsonHelper.DeserializeObject<RB_Student_ViewModel>(RequestParm.Msg.ToString()); var query = new RB_Student_ViewModel()
{
};
query.Group_Id = base.UserInfo.Group_Id; query.Group_Id = base.UserInfo.Group_Id;
var list = studentModule.GetStudentPageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query); var data = studentModule.GetStudentPageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
foreach (var item in list) List<object> list = new List<object>();
foreach (var item in data)
{ {
if (item.CreateBy > 0) if (item.CreateBy > 0)
{ {
item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? ""; item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
} }
if (item.UpdateBy > 0)
list.Add(new
{ {
item.UpdateByName = UserReidsCache.GetUserLoginInfo(item.UpdateBy)?.AccountName ?? ""; item.StuId,
} item.StuName,
item.StuTel,
item.StuIcon,
item.StuSex,
StuSexStr = item.StuSex == 0 ? "男" : "女",
StuBirth = Common.ConvertHelper.FormatDate(item.StuBirth),
item.StuStage,
StuStageName = item.StuStage.ToName(),
CreateTimeStr = Common.ConvertHelper.FormatTime(item.CreateTime),
item.CreateByName,
item.CreateType,
CreateTypeStr = item.CreateType == 1 ? "员工录入" : "同业录入",
});
} }
pageModel.Count = rowsCount; pageModel.Count = rowsCount;
pageModel.PageData = list; pageModel.PageData = list;
...@@ -711,26 +728,26 @@ namespace Edu.WebApi.Controllers.User ...@@ -711,26 +728,26 @@ namespace Edu.WebApi.Controllers.User
{ {
var extModel = new RB_Student_ViewModel() var extModel = new RB_Student_ViewModel()
{ {
StuId=base.ParmJObj.GetInt("StuId"), StuId = base.ParmJObj.GetInt("StuId"),
StuName=base.ParmJObj.GetStringValue("StuName"), StuName = base.ParmJObj.GetStringValue("StuName"),
StuTel=base.ParmJObj.GetStringValue("StuTel"), StuTel = base.ParmJObj.GetStringValue("StuTel"),
StuIcon=base.ParmJObj.GetStringValue("StuIcon"), StuIcon = base.ParmJObj.GetStringValue("StuIcon"),
StuSex=base.ParmJObj.GetInt("StuSex"), StuSex = base.ParmJObj.GetInt("StuSex"),
StuBirth=base.ParmJObj.GetDateTime("StuBirth"), StuBirth = base.ParmJObj.GetDateTime("StuBirth"),
ProviceId=base.ParmJObj.GetInt("ProviceId"), ProviceId = base.ParmJObj.GetInt("ProviceId"),
CityId=base.ParmJObj.GetInt("CityId"), CityId = base.ParmJObj.GetInt("CityId"),
AreaId=base.ParmJObj.GetInt("AreaId"), AreaId = base.ParmJObj.GetInt("AreaId"),
Interest=base.ParmJObj.GetInt("Interest"), Interest = base.ParmJObj.GetInt("Interest"),
JapanBaseInfo=(GuestBasicsEnum)base.ParmJObj.GetInt("JapanBaseInfo"), JapanBaseInfo = (GuestBasicsEnum)base.ParmJObj.GetInt("JapanBaseInfo"),
StuProfession=base.ParmJObj.GetStringValue("StuProfession"), StuProfession = base.ParmJObj.GetStringValue("StuProfession"),
StuEducation=(GuestEducationEnum)base.ParmJObj.GetInt("StuEducation"), StuEducation = (GuestEducationEnum)base.ParmJObj.GetInt("StuEducation"),
StuPurpose=(GuestLearningGoalsEnum)base.ParmJObj.GetInt("StuPurpose"), StuPurpose = (GuestLearningGoalsEnum)base.ParmJObj.GetInt("StuPurpose"),
StuSource=(OrderSourceEnum)base.ParmJObj.GetInt("StuSource"), StuSource = (OrderSourceEnum)base.ParmJObj.GetInt("StuSource"),
StuAddress=base.ParmJObj.GetStringValue("StuAddress"), StuAddress = base.ParmJObj.GetStringValue("StuAddress"),
StuContract=base.ParmJObj.GetStringValue("StuContract"), StuContract = base.ParmJObj.GetStringValue("StuContract"),
StuContractMobile=base.ParmJObj.GetStringValue("StuContractMobile"), StuContractMobile = base.ParmJObj.GetStringValue("StuContractMobile"),
StuIDCard=base.ParmJObj.GetStringValue("StuIDCard"), StuIDCard = base.ParmJObj.GetStringValue("StuIDCard"),
StuIDCardAddress=base.ParmJObj.GetStringValue("StuIDCardAddress"), StuIDCardAddress = base.ParmJObj.GetStringValue("StuIDCardAddress"),
}; };
var customer = base.AppletCustomerInfo; var customer = base.AppletCustomerInfo;
extModel.Status = DateStateEnum.Normal; extModel.Status = DateStateEnum.Normal;
...@@ -760,8 +777,8 @@ namespace Edu.WebApi.Controllers.User ...@@ -760,8 +777,8 @@ namespace Edu.WebApi.Controllers.User
var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString()); var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var query = new RB_Student_ViewModel() var query = new RB_Student_ViewModel()
{ {
KeyWords=base.ParmJObj.GetStringValue("KeyWords"), KeyWords = base.ParmJObj.GetStringValue("KeyWords"),
StuId=base.ParmJObj.GetInt("StuId"), StuId = base.ParmJObj.GetInt("StuId"),
}; };
var customer = base.AppletCustomerInfo; var customer = base.AppletCustomerInfo;
query.Group_Id = customer.GroupId; query.Group_Id = customer.GroupId;
...@@ -808,7 +825,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -808,7 +825,7 @@ namespace Edu.WebApi.Controllers.User
extModel.StuIcon, extModel.StuIcon,
extModel.StuSex, extModel.StuSex,
extModel.StuBirth, extModel.StuBirth,
StuBirthStr=Common.ConvertHelper.FormatDate(extModel.StuBirth), StuBirthStr = Common.ConvertHelper.FormatDate(extModel.StuBirth),
extModel.ProviceId, extModel.ProviceId,
extModel.CityId, extModel.CityId,
extModel.AreaId, extModel.AreaId,
...@@ -816,7 +833,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -816,7 +833,7 @@ namespace Edu.WebApi.Controllers.User
extModel.StuStatus, extModel.StuStatus,
extModel.Interest, extModel.Interest,
extModel.JapanBaseInfo, extModel.JapanBaseInfo,
JapanBaseInfoName= extModel.JapanBaseInfo.ToName(), JapanBaseInfoName = extModel.JapanBaseInfo.ToName(),
extModel.CustomerId, extModel.CustomerId,
extModel.StuProfession, extModel.StuProfession,
extModel.StuEducation, extModel.StuEducation,
...@@ -830,7 +847,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -830,7 +847,7 @@ namespace Edu.WebApi.Controllers.User
extModel.StuContractMobile, extModel.StuContractMobile,
extModel.StuIDCard, extModel.StuIDCard,
extModel.StuIDCardAddress, extModel.StuIDCardAddress,
CreateTimeStr=Common.ConvertHelper.FormatDate(extModel.CreateTime), CreateTimeStr = Common.ConvertHelper.FormatDate(extModel.CreateTime),
newClassStatus, newClassStatus,
classStatusName classStatusName
}; };
...@@ -889,17 +906,17 @@ namespace Edu.WebApi.Controllers.User ...@@ -889,17 +906,17 @@ namespace Edu.WebApi.Controllers.User
var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString()); var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var query = new Employee_ViewModel() var query = new Employee_ViewModel()
{ {
Dept_Id=base.ParmJObj.GetInt("Dept_Id"), Dept_Id = base.ParmJObj.GetInt("Dept_Id"),
EmployeeName=base.ParmJObj.GetStringValue("EmployeeName"), EmployeeName = base.ParmJObj.GetStringValue("EmployeeName"),
EndBirthDate=base.ParmJObj.GetStringValue("EndBirthDate"), EndBirthDate = base.ParmJObj.GetStringValue("EndBirthDate"),
EndEntryTime=base.ParmJObj.GetStringValue("EndEntryTime"), EndEntryTime = base.ParmJObj.GetStringValue("EndEntryTime"),
EndLeaveTime=base.ParmJObj.GetStringValue("EndLeaveTime"), EndLeaveTime = base.ParmJObj.GetStringValue("EndLeaveTime"),
LeaveStatus=(LeaveStatusEnum)base.ParmJObj.GetInt("LeaveStatus"), LeaveStatus = (LeaveStatusEnum)base.ParmJObj.GetInt("LeaveStatus"),
Post_Id=base.ParmJObj.GetInt("Post_Id"), Post_Id = base.ParmJObj.GetInt("Post_Id"),
School_Id=base.ParmJObj.GetInt("School_Id"), School_Id = base.ParmJObj.GetInt("School_Id"),
StartBirthDate=base.ParmJObj.GetStringValue("StartBirthDate"), StartBirthDate = base.ParmJObj.GetStringValue("StartBirthDate"),
StartEntryTime=base.ParmJObj.GetStringValue("StartEntryTime"), StartEntryTime = base.ParmJObj.GetStringValue("StartEntryTime"),
StartLeaveTime=base.ParmJObj.GetStringValue("StartLeaveTime"), StartLeaveTime = base.ParmJObj.GetStringValue("StartLeaveTime"),
}; };
query.Group_Id = base.UserInfo.Group_Id; query.Group_Id = base.UserInfo.Group_Id;
var list = employeeModule.GetEmployeePageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query); var list = employeeModule.GetEmployeePageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
...@@ -1058,7 +1075,8 @@ namespace Edu.WebApi.Controllers.User ...@@ -1058,7 +1075,8 @@ namespace Edu.WebApi.Controllers.User
} }
} }
} }
else if (extModel.LeaveStatus != LeaveStatusEnum.Departure) { else if (extModel.LeaveStatus != LeaveStatusEnum.Departure)
{
//新增用户情况 //新增用户情况
var configmodel = departmentModule.GetWeChatConfigModel(base.UserInfo.Group_Id); var configmodel = departmentModule.GetWeChatConfigModel(base.UserInfo.Group_Id);
if (configmodel != null && configmodel.Enable == 1 && configmodel.DeptEmpEnable == 1) if (configmodel != null && configmodel.Enable == 1 && configmodel.DeptEmpEnable == 1)
...@@ -1439,9 +1457,9 @@ namespace Edu.WebApi.Controllers.User ...@@ -1439,9 +1457,9 @@ namespace Edu.WebApi.Controllers.User
{ {
DeptId = base.ParmJObj.GetInt("DeptId"), DeptId = base.ParmJObj.GetInt("DeptId"),
DeptName = base.ParmJObj.GetStringValue("DeptName"), DeptName = base.ParmJObj.GetStringValue("DeptName"),
DeptTier=base.ParmJObj.GetInt("DeptTier"), DeptTier = base.ParmJObj.GetInt("DeptTier"),
ParentId=base.ParmJObj.GetInt("ParentId"), ParentId = base.ParmJObj.GetInt("ParentId"),
Status=(DateStateEnum)base.ParmJObj.GetInt("Status"), Status = (DateStateEnum)base.ParmJObj.GetInt("Status"),
}; };
query.School_Id = -1; query.School_Id = -1;
var School_Id = base.ParmJObj.GetStringValue("School_Id"); var School_Id = base.ParmJObj.GetStringValue("School_Id");
...@@ -1870,7 +1888,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -1870,7 +1888,7 @@ namespace Edu.WebApi.Controllers.User
var AccountType = (AccountTypeEnum)base.ParmJObj.GetInt("AccountType"); var AccountType = (AccountTypeEnum)base.ParmJObj.GetInt("AccountType");
var Remark = base.ParmJObj.GetStringValue("Remark"); var Remark = base.ParmJObj.GetStringValue("Remark");
var targetAccountType = (AccountTypeEnum)base.ParmJObj.GetInt("TargetAccountType"); var targetAccountType = (AccountTypeEnum)base.ParmJObj.GetInt("TargetAccountType");
if (AccountId <= 0|| base.ParmJObj.GetInt("AccountType")<=0) if (AccountId <= 0 || base.ParmJObj.GetInt("AccountType") <= 0)
{ {
return ApiResult.ParamIsNull(message: "请选择用户"); return ApiResult.ParamIsNull(message: "请选择用户");
} }
...@@ -1878,7 +1896,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -1878,7 +1896,7 @@ namespace Edu.WebApi.Controllers.User
{ {
return ApiResult.ParamIsNull(message: "请选择用户目标职能!"); return ApiResult.ParamIsNull(message: "请选择用户目标职能!");
} }
var flag = managerModule.SetEmployeeTypeModule(targetAccountType, AccountId, AccountType,Remark,base.UserInfo); var flag = managerModule.SetEmployeeTypeModule(targetAccountType, AccountId, AccountType, Remark, base.UserInfo);
return flag ? ApiResult.Success() : ApiResult.Failed(); return flag ? ApiResult.Success() : ApiResult.Failed();
} }
#endregion #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