Skip to content

E
Education
Commit 331ff97d authored by liudong1993's avatar liudong1993
Browse files
Options

1、财务 归属部门主管审核；（合并审核问题） 

2、投稿  审核 + 列表  增加是否提成；
3、测试有效课时回调；
4、财务  复制财务单据；
5、学员名单  增加字段； 学员跟踪
parent b58a596d
Hide whitespace changes
Inline Side-by-side
Showing with 347 additions and 47 deletions
Edu.Model/ViewModel/EduTask/EduReceiptAudit.cs
View file @ 331ff97d
...@@ -39,6 +39,9 @@ namespace Edu.Model.ViewModel.EduTask ...@@ -39,6 +39,9 @@ namespace Edu.Model.ViewModel.EduTask
/// </summary> /// </summary>
public decimal BackMoney { get; set; } public decimal BackMoney { get; set; }
/// <summary>
/// 稿酬状态 1发放 2不发放
/// </summary>
public int RemunerationState { get; set; }
} }
} }
Edu.Model/ViewModel/Sell/RB_Order_Guest_Extend.cs
View file @ 331ff97d
using System; using System;
using System.Collections.Generic;
using Edu.Common.Enum.Course; using Edu.Common.Enum.Course;
using Edu.Common.Plugin; using Edu.Common.Plugin;
using Edu.Model.Entity.Sell; using Edu.Model.Entity.Sell;
...@@ -174,5 +175,50 @@ namespace Edu.Model.ViewModel.Sell ...@@ -174,5 +175,50 @@ namespace Edu.Model.ViewModel.Sell
/// 学员真实手机号码【13551126755】 /// 学员真实手机号码【13551126755】
/// </summary> /// </summary>
public string StuRealMobile { get; set; } public string StuRealMobile { get; set; }
/// <summary>
/// 学员渠道ID
/// </summary>
public int StuChannelId { get; set; }
/// <summary>
/// 学员渠道
/// </summary>
public string StuChannelName { get; set; }
/// <summary>
/// 来源人编号
/// </summary>
public int StuSourceId { get; set; }
/// <summary>
/// 客户来源见枚举
/// </summary>
public Common.Enum.User.StuCreateTypeEnum CreateType { get; set; }
/// <summary>
/// 对应学生ID
/// </summary>
public int StuId { get; set; }
/// <summary>
/// 对应学生负责人
/// </summary>
public int StuCreateBy { get; set; }
/// <summary>
/// 学员协助列表
/// </summary>
public List<Customer.RB_Student_Assist_Extend> AssistList { get; set; }
/// <summary>
/// 来源人
/// </summary>
public string StuSourceIdName { get; set; }
/// <summary>
/// 学员负责人
/// </summary>
public string StuCreateByName { get; set; }
} }
} }
Edu.Module.Course/OrderModule.cs
View file @ 331ff97d
...@@ -3864,9 +3864,9 @@ namespace Edu.Module.Course ...@@ -3864,9 +3864,9 @@ namespace Edu.Module.Course
{ {
userModel.UnSettlementMoney += model.CommissionMoeny; userModel.UnSettlementMoney += model.CommissionMoeny;
Dictionary<string, object> userKeyValues = new Dictionary<string, object>() Dictionary<string, object> userKeyValues = new Dictionary<string, object>()
{ {
{ nameof(RB_User_ReturnComission_ViewModel.UnSettlementMoney),userModel.UnSettlementMoney} { nameof(RB_User_ReturnComission_ViewModel.UnSettlementMoney),userModel.UnSettlementMoney}
}; };
List<WhereHelper> userWheres = new List<WhereHelper>() List<WhereHelper> userWheres = new List<WhereHelper>()
{ {
new WhereHelper() new WhereHelper()
...@@ -3889,11 +3889,27 @@ namespace Edu.Module.Course ...@@ -3889,11 +3889,27 @@ namespace Edu.Module.Course
} }
}; };
userReturnComissionRepository.Update(userKeyValues, userWheres); userReturnComissionRepository.Update(userKeyValues, userWheres);
Dictionary<string, object> keyValues = new Dictionary<string, object>() }
else {
userModel = new RB_User_ReturnComission_ViewModel()
{
UserId = model.OrderSourceId,
UserType = model.OrderSourceType,
CommissionType = model.CommissionType,
CanCashOutMoney = 0,
CashOutMoney = 0,
GroupId = model.GroupId,
SttlementMoney = 0,
UnSettlementMoney = model.CommissionMoeny,
Id = 0
};
userReturnComissionRepository.Insert(userModel);
}
Dictionary<string, object> keyValues = new Dictionary<string, object>()
{ {
{ nameof(RB_Order_ReturnComission.Status),0} { nameof(RB_Order_ReturnComission.Status),0}
}; };
List<WhereHelper> wheres = new List<WhereHelper>() List<WhereHelper> wheres = new List<WhereHelper>()
{ {
new WhereHelper() new WhereHelper()
{ {
...@@ -3908,8 +3924,7 @@ namespace Edu.Module.Course ...@@ -3908,8 +3924,7 @@ namespace Edu.Module.Course
OperatorEnum= OperatorEnum.Equal OperatorEnum= OperatorEnum.Equal
} }
}; };
returnComissionRepository.Update(keyValues, wheres); returnComissionRepository.Update(keyValues, wheres);
}
} }
} }
......
Edu.Module.Course/StudentBillModule.cs
View file @ 331ff97d
...@@ -17,6 +17,7 @@ using Edu.Model.ViewModel.User; ...@@ -17,6 +17,7 @@ using Edu.Model.ViewModel.User;
using Edu.Repository.BackClass; using Edu.Repository.BackClass;
using Edu.Repository.Contract; using Edu.Repository.Contract;
using Edu.Repository.Course; using Edu.Repository.Course;
using Edu.Repository.Customer;
using Edu.Repository.EduTask; using Edu.Repository.EduTask;
using Edu.Repository.Finance; using Edu.Repository.Finance;
using Edu.Repository.Flow; using Edu.Repository.Flow;
...@@ -93,6 +94,11 @@ namespace Edu.Module.Course ...@@ -93,6 +94,11 @@ namespace Edu.Module.Course
/// </summary> /// </summary>
private readonly ClassModule classModule = new ClassModule(); private readonly ClassModule classModule = new ClassModule();
/// <summary>
/// 账号处理类
/// </summary>
private readonly User.AccountModule accountModule = new User.AccountModule();
/// <summary> /// <summary>
/// 课程优惠信息 /// 课程优惠信息
/// </summary> /// </summary>
...@@ -108,6 +114,20 @@ namespace Edu.Module.Course ...@@ -108,6 +114,20 @@ namespace Edu.Module.Course
/// </summary> /// </summary>
private readonly RB_Education_ReceiptRepository education_ReceiptRepository = new RB_Education_ReceiptRepository(); private readonly RB_Education_ReceiptRepository education_ReceiptRepository = new RB_Education_ReceiptRepository();
/// <summary>
/// 学员协助
/// </summary>
private readonly RB_Student_AssistRepository student_AssistRepository = new RB_Student_AssistRepository();
/// <summary>
/// 同业
/// </summary>
private readonly RB_CustomerRepository customerRepository = new RB_CustomerRepository();
/// <summary>
/// 学生仓储层对象
/// </summary>
private readonly RB_StudentRepository studentRepository = new RB_StudentRepository();
/// <summary> /// <summary>
/// 计算学员退课金额 /// 计算学员退课金额
/// </summary> /// </summary>
...@@ -435,6 +455,71 @@ namespace Edu.Module.Course ...@@ -435,6 +455,71 @@ namespace Edu.Module.Course
public List<RB_Order_Guest_Extend> GetAllStudentPage(int pageIndex, int pageSize, out long rowsCount, RB_Order_Guest_Extend demodel) public List<RB_Order_Guest_Extend> GetAllStudentPage(int pageIndex, int pageSize, out long rowsCount, RB_Order_Guest_Extend demodel)
{ {
var orderstudentList = order_GuestRepository.GetAllStudentPage(pageIndex, pageSize, out rowsCount, demodel); var orderstudentList = order_GuestRepository.GetAllStudentPage(pageIndex, pageSize, out rowsCount, demodel);
if (orderstudentList.Any()) {
//课程顾问 协助老师 负责人； 客户来源 来源关联人
string stuIds = string.Join(",", orderstudentList.Select(x => x.StuId).Distinct().ToList());
//协助人员列表
var assistList = student_AssistRepository.GetStudentAssistListRepository(new Model.ViewModel.Customer.RB_Student_Assist_Extend()
{
QStuIds = stuIds
});
//内部介绍人
List<int> empIdList = Common.ConvertHelper.StringToList(string.Join(",", orderstudentList.Where(qitem => qitem.CreateType == StuCreateTypeEnum.InternalIntroduction).Select(qitem => qitem.StuSourceId)));
List<int> aIds = Common.ConvertHelper.StringToList(string.Join(",", assistList.Select(qitem => qitem.AssistId)));
List<RB_Account_ViewModel> accountList = new List<RB_Account_ViewModel>();
if (aIds != null && aIds.Count > 0)
{
empIdList.AddRange(aIds);
}
if (empIdList != null && empIdList.Count > 0)
{
accountList = accountModule.GetAccountListExtModule(new RB_Account_ViewModel() { QIds = string.Join(",", empIdList) });
}
//同业录入列表
List<Model.ViewModel.Customer.RB_Customer_Extend> customerList = new List<Model.ViewModel.Customer.RB_Customer_Extend>();
List<int> customerIdList = Common.ConvertHelper.StringToList(string.Join(",", orderstudentList.Where(qitem => qitem.CreateType == StuCreateTypeEnum.CustomerInput).Select(qitem => qitem.StuSourceId)));
if (customerIdList != null && customerIdList.Count > 0)
{
customerList = customerRepository.GetCustomerListRepository(new Model.ViewModel.Customer.RB_Customer_Extend()
{
CustomerIds = string.Join(",", customerIdList)
});
}
List<RB_Student_ViewModel> transStudentList = new List<RB_Student_ViewModel>();
//转介人列表
List<int> transIdList = Common.ConvertHelper.StringToList(string.Join(",", orderstudentList.Where(qitem => qitem.CreateType == StuCreateTypeEnum.TransIntroduction).Select(qitem => qitem.StuSourceId)));
if (transIdList != null && transIdList.Count > 0)
{
transStudentList = studentRepository.GetStudentListRepository(new RB_Student_ViewModel()
{
StuIds = string.Join(",", transIdList)
});
}
foreach (var item in orderstudentList)
{
var tempAssistList = assistList?.Where(qitem => qitem.StuId == item.StuId)?.ToList();
foreach (var sItem in tempAssistList)
{
sItem.AssistName = accountList?.FirstOrDefault(qitem => qitem.Id == sItem.AssistId)?.AccountName ?? "";
}
item.AssistList = tempAssistList;
if (item.CreateType == StuCreateTypeEnum.InternalIntroduction)
{
item.StuSourceIdName = accountList?.FirstOrDefault(qitem => qitem.Id == item.StuSourceId)?.AccountName ?? "";
}
else if (item.CreateType == StuCreateTypeEnum.CustomerInput)
{
item.StuSourceIdName = customerList?.FirstOrDefault(qitem => qitem.CustomerId == item.StuSourceId)?.CustomerName ?? "";
}
else if (item.CreateType == StuCreateTypeEnum.TransIntroduction)
{
item.StuSourceIdName = transStudentList?.FirstOrDefault(qitem => qitem.StuId == item.StuSourceId)?.StuName ?? "";
}
}
}
return orderstudentList; return orderstudentList;
} }
......
Edu.Module.EduTask/EducationReceiptModule.cs
View file @ 331ff97d
...@@ -975,9 +975,9 @@ namespace Edu.Module.EduTask ...@@ -975,9 +975,9 @@ namespace Edu.Module.EduTask
var aurList = education_RecordRepository.GetEducationRecordListRepository(new RB_Education_Record_ViewModel() var aurList = education_RecordRepository.GetEducationRecordListRepository(new RB_Education_Record_ViewModel()
{ {
ConditionId = auditModel.Id, ConditionId = auditModel.Id,
}); });
//审核关联列表 //审核关联列表
var arList = education_RelevanceRepository.GetEducationRelevanceListRepository(new RB_Education_Relevance_ViewModel() var arList = education_RelevanceRepository.GetEducationRelevanceListRepository(new RB_Education_Relevance_ViewModel()
{ {
ConditionId = auditModel.Id ConditionId = auditModel.Id
}); });
...@@ -1550,6 +1550,10 @@ namespace Edu.Module.EduTask ...@@ -1550,6 +1550,10 @@ namespace Edu.Module.EduTask
{nameof(RB_Contribute_Info_ViewModel.AuditState),(int)Common.Enum.WeChat.ContributeInfoStateEnum.Audited}, {nameof(RB_Contribute_Info_ViewModel.AuditState),(int)Common.Enum.WeChat.ContributeInfoStateEnum.Audited},
{nameof(RB_Contribute_Info_ViewModel.PublishDate), DateTime.Now} {nameof(RB_Contribute_Info_ViewModel.PublishDate), DateTime.Now}
}; };
if (auditModel.SpecialNode == 1)
{
fileds.Add(nameof(RB_Contribute_Info_ViewModel.RemunerationState), auditModel.RemunerationState);
}
flag = contribute_InfoRepository.Update(fileds, new WhereHelper(nameof(RB_Contribute_Info_ViewModel.Id), receiptModel.RelationId)); flag = contribute_InfoRepository.Update(fileds, new WhereHelper(nameof(RB_Contribute_Info_ViewModel.Id), receiptModel.RelationId));
} }
if (auditModel.AuditStatus == 3) if (auditModel.AuditStatus == 3)
......
Edu.Module.QYWeChat/QYContributeModule.cs
View file @ 331ff97d
...@@ -622,8 +622,6 @@ namespace Edu.Module.QYWeChat ...@@ -622,8 +622,6 @@ namespace Edu.Module.QYWeChat
} }
/// <summary> /// <summary>
/// 测试接口 /// 测试接口
/// </summary> /// </summary>
...@@ -992,6 +990,30 @@ namespace Edu.Module.QYWeChat ...@@ -992,6 +990,30 @@ namespace Edu.Module.QYWeChat
} }
} }
/// <summary>
/// 设置投稿发放
/// </summary>
/// <param name="contributeId"></param>
/// <param name="remunerationState"></param>
/// <param name="userInfo"></param>
/// <returns></returns>
public string SetRemunerationState(int contributeId, int remunerationState, UserInfo userInfo)
{
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Contribute_Info_ViewModel.RemunerationState), remunerationState},
{ nameof(RB_Contribute_Info_ViewModel.UpdateBy), userInfo.Id},
{ nameof(RB_Contribute_Info_ViewModel.UpdateTime), DateTime.Now}
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName = nameof(RB_Contribute_Info_ViewModel.Id),
FiledValue = contributeId,
OperatorEnum=OperatorEnum.Equal
}
};
bool flag = contribute_InfoRepository.Update(keyValues, wheres);
return flag ? "" : "出错了，请联系管理员";
}
#endregion #endregion
#region 小程序信息 #region 小程序信息
......
Edu.Module.User/StudentStatModule.cs
View file @ 331ff97d
...@@ -48,6 +48,10 @@ namespace Edu.Module.User ...@@ -48,6 +48,10 @@ namespace Edu.Module.User
/// 账户 /// 账户
/// </summary> /// </summary>
private readonly RB_AccountRepository accountRepository = new RB_AccountRepository(); private readonly RB_AccountRepository accountRepository = new RB_AccountRepository();
/// <summary>
/// 同业
/// </summary>
private readonly RB_CustomerRepository customerRepository = new RB_CustomerRepository();
#region 学员跟进 #region 学员跟进
...@@ -75,8 +79,50 @@ namespace Edu.Module.User ...@@ -75,8 +79,50 @@ namespace Edu.Module.User
var TotalData = student_OrderGuestRepository.GetStudentFollowUpStat(demodel); var TotalData = student_OrderGuestRepository.GetStudentFollowUpStat(demodel);
//查询每月续费介绍情况 //查询每月续费介绍情况
var ROList = student_RenewOrderRepository.GetStuMonthList(demodel.Group_Id); var ROList = student_RenewOrderRepository.GetStuMonthList(demodel.Group_Id);
//查询课程顾问
var stuAssistList = student_AssistRepository.GetStudentAssistListRepository(new RB_Student_Assist_Extend() { QStuIds = stuIds }); //协助人员列表
var assistList = student_AssistRepository.GetStudentAssistListRepository(new Model.ViewModel.Customer.RB_Student_Assist_Extend()
{
QStuIds = stuIds
});
//内部介绍人
List<int> empIdList = Common.ConvertHelper.StringToList(string.Join(",", slist.Where(qitem => qitem.CreateType == StuCreateTypeEnum.InternalIntroduction).Select(qitem => qitem.StuSourceId)));
List<int> aIds = Common.ConvertHelper.StringToList(string.Join(",", assistList.Select(qitem => qitem.AssistId)));
List<RB_Account_ViewModel> accountList = new List<RB_Account_ViewModel>();
if (aIds != null && aIds.Count > 0)
{
empIdList.AddRange(aIds);
}
List<int> scIds = Common.ConvertHelper.StringToList(string.Join(",", slist.Select(qitem => qitem.CreateBy)));
if (scIds != null && scIds.Count > 0)
{
empIdList.AddRange(scIds);
}
if (empIdList != null && empIdList.Count > 0)
{
accountList = accountRepository.GetAccountListExtRepository(new RB_Account_ViewModel() { QIds = string.Join(",", empIdList) });
}
//同业录入列表
List<Model.ViewModel.Customer.RB_Customer_Extend> customerList = new List<Model.ViewModel.Customer.RB_Customer_Extend>();
List<int> customerIdList = Common.ConvertHelper.StringToList(string.Join(",", slist.Where(qitem => qitem.CreateType == StuCreateTypeEnum.CustomerInput).Select(qitem => qitem.StuSourceId)));
if (customerIdList != null && customerIdList.Count > 0)
{
customerList = customerRepository.GetCustomerListRepository(new Model.ViewModel.Customer.RB_Customer_Extend()
{
CustomerIds = string.Join(",", customerIdList)
});
}
List<RB_Student_ViewModel> transStudentList = new List<RB_Student_ViewModel>();
//转介人列表
List<int> transIdList = Common.ConvertHelper.StringToList(string.Join(",", slist.Where(qitem => qitem.CreateType == StuCreateTypeEnum.TransIntroduction).Select(qitem => qitem.StuSourceId)));
if (transIdList != null && transIdList.Count > 0)
{
transStudentList = studentRepository.GetStudentListRepository(new RB_Student_ViewModel()
{
StuIds = string.Join(",", transIdList)
});
}
#region 组装数据 #region 组装数据
int MaxMonth = 2;//最大月份 int MaxMonth = 2;//最大月份
...@@ -84,26 +130,6 @@ namespace Edu.Module.User ...@@ -84,26 +130,6 @@ namespace Edu.Module.User
List<object> RList = new List<object>(); List<object> RList = new List<object>();
foreach (var item in slist) { foreach (var item in slist) {
//组合所有的月份 //组合所有的月份
//var MonthList = flist.Where(x => x.StuId == item.StuId).Select(x => x.MonthStr).ToList();
//MonthList.AddRange(xlist.Where(x => x.StuId == item.StuId).Select(x => x.MonthStr).ToList());
//MonthList.AddRange(zlist.Where(x => x.StuId == item.StuId).Select(x => x.MonthStr).ToList());
//MonthList = MonthList.Distinct().OrderBy(x => x).ToList();
//foreach (var month in MonthList) {
// var xmodel = xlist.Where(x => x.StuId == item.StuId && x.MonthStr == month).FirstOrDefault();
// var zmodel = zlist.Where(x => x.StuId == item.StuId && x.MonthStr == month).FirstOrDefault();
// var teacherModel = flist.Where(x => x.StuId == item.StuId && x.MonthStr == month && x.AssistType == AssistTypeEnum.Teacher).FirstOrDefault();
// var consultantModel = flist.Where(x => x.StuId == item.StuId && x.MonthStr == month && x.AssistType == AssistTypeEnum.CourseAdviser).FirstOrDefault();
// MonthObjList.Add(new
// {
// Month = month,
// IsRenew = xmodel != null ? 1 : 2,
// IntroductionNum = zmodel?.StuNum ?? 0,
// Teacher = teacherModel?.Remark ?? "",
// TeacherTime = teacherModel?.CreateTime.ToString("yyyy-MM-dd HH:mm") ?? "",
// Consultant = consultantModel?.Remark ?? "",
// ConsultantTime = consultantModel?.CreateTime.ToString("yyyy-MM-dd HH:mm") ?? ""
// });
//}
//查询学生首次报名 至 当月的所有月份 //查询学生首次报名 至 当月的所有月份
int month = 1; int month = 1;
...@@ -134,26 +160,57 @@ namespace Edu.Module.User ...@@ -134,26 +160,57 @@ namespace Edu.Module.User
}); });
} }
var AssistId = stuAssistList.Where(x => x.StuId == item.StuId && x.AssistType == AssistTypeEnum.CourseAdviser).FirstOrDefault()?.AssistId ?? 0; var tempAssistList = assistList?.Where(qitem => qitem.StuId == item.StuId)?.ToList();
string AssistName = ""; foreach (var sItem in tempAssistList)
if (AssistId > 0) { {
AssistName = accountRepository.GetEmployeeInfo(AssistId)?.EmployeeName ?? ""; sItem.AssistName = accountList?.FirstOrDefault(qitem => qitem.Id == sItem.AssistId)?.AccountName ?? "";
}
item.AssistList = tempAssistList;
if (item.CreateType == StuCreateTypeEnum.InternalIntroduction)
{
item.StuSourceIdName = accountList?.FirstOrDefault(qitem => qitem.Id == item.StuSourceId)?.AccountName ?? "";
}
else if (item.CreateType == StuCreateTypeEnum.CustomerInput)
{
item.StuSourceIdName = customerList?.FirstOrDefault(qitem => qitem.CustomerId == item.StuSourceId)?.CustomerName ?? "";
}
else if (item.CreateType == StuCreateTypeEnum.TransIntroduction)
{
item.StuSourceIdName = transStudentList?.FirstOrDefault(qitem => qitem.StuId == item.StuSourceId)?.StuName ?? "";
} }
item.CreateByName = accountList?.FirstOrDefault(qitem => qitem.Id == item.CreateBy)?.AccountName ?? "";
var StuObj = new var StuObj = new
{ {
item.StuId, item.StuId,
item.StuName, item.StuName,
item.StuTel, item.StuTel,
item.StuRealMobile, item.StuRealMobile,
AssistId,
AssistName,
ContractSTime = item.followUpTime, ContractSTime = item.followUpTime,
item.CourseName, item.CourseName,
JapanBaseInfo = item.JapanBaseInfo.ToName(), JapanBaseInfo = item.JapanBaseInfo.ToName(),
item.StuBirthStr, item.StuBirthStr,
item.StuGuestState, item.StuGuestState,
StuGuestStateName = item.StuGuestState.ToName(), StuGuestStateName = item.StuGuestState.ToName(),
MonthList = MonthObjList MonthList = MonthObjList,
item.CreateBy,
item.CreateByName,
AssistList = item.AssistList.Select(qitem => new
{
qitem.Id,
qitem.StuId,
qitem.AssistId,
qitem.AssistName,
qitem.AssistType,
AssistTypeName = qitem.AssistType.ToName()
}),
item.StuChannel,
item.StuChannelName,
item.CreateType,
CreateTypeName = item.CreateType.ToName(),
item.StuSourceId,
item.StuSourceIdName
}; };
RList.Add(StuObj); RList.Add(StuObj);
} }
......
Edu.Repository/Sell/RB_Order_GuestRepository.cs
View file @ 331ff97d
...@@ -687,11 +687,12 @@ WHERE {where}"; ...@@ -687,11 +687,12 @@ WHERE {where}";
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT a.*,contract.ContractNo,contract.Id as ContractId,b.CourseId,IFNULL(C.CourseName,'') AS CourseName,C.CourseRate,class.ClassName,class.ClassNo SELECT a.*,contract.ContractNo,contract.Id as ContractId,b.CourseId,IFNULL(C.CourseName,'') AS CourseName,C.CourseRate,class.ClassName,class.ClassNo
,class.Teacher_Id,teacher.TeacherName,b.CreateTime as OrderTime,b.EnterID,b.PreferPrice,b.Income,b.Refund,b.PlatformTax ,class.Teacher_Id,teacher.TeacherName,b.CreateTime as OrderTime,b.EnterID,b.PreferPrice,b.Income,b.Refund,b.PlatformTax
,(a.TotalHours-a.CompleteHours) as SurplusHours,gc.AbsenceNum,gc.LeaveNum,eventlog.EventlogNum,b.EffectStatus,b.JoinType,sog.Student_Id,st.StuTel,st.StuRealMobile ,(a.TotalHours-a.CompleteHours) as SurplusHours,gc.AbsenceNum,gc.LeaveNum,eventlog.EventlogNum,b.EffectStatus,b.JoinType,sog.Student_Id,st.StuTel,st.StuRealMobile,chl.Name as StuChannelName,st.CreateType,st.StuSourceId,st.StuId,st.CreateBy as StuCreateBy
FROM RB_Order_Guest AS A LEFT JOIN rb_order AS B ON A.OrderId=B.OrderId FROM RB_Order_Guest AS A LEFT JOIN rb_order AS B ON A.OrderId=B.OrderId
LEFT JOIN rb_education_contract as contract on contract.GuestId=a.Id AND contract.`Status`=0 LEFT JOIN rb_education_contract as contract on contract.GuestId=a.Id AND contract.`Status`=0
LEFT JOIN rb_student_orderguest as sog on sog.GuestId=a.Id AND sog.`Status`=0 LEFT JOIN rb_student_orderguest as sog on sog.GuestId=a.Id AND sog.`Status`=0
LEFT JOIN rb_student as st ON sog.Student_Id=st.StuId LEFT JOIN rb_student as st ON sog.Student_Id=st.StuId
LEFT JOIN rb_channel as chl ON st.StuChannel=chl.Id
LEFT JOIN rb_class as class on class.ClassId=b.ClassId LEFT JOIN rb_class as class on class.ClassId=b.ClassId
LEFT JOIN rb_course AS C ON (B.CourseId=C.CourseId AND B.CourseId>0 AND B.OrderType=1) LEFT JOIN rb_course AS C ON (B.CourseId=C.CourseId AND B.CourseId>0 AND B.OrderType=1)
LEFT JOIN rb_teacher as teacher on teacher.TId=class.Teacher_Id LEFT JOIN rb_teacher as teacher on teacher.TId=class.Teacher_Id
...@@ -781,6 +782,16 @@ WHERE 1=1 AND A.Status=0 AND class.Status=0 AND class.ClassStatus <>4 AND b.Or ...@@ -781,6 +782,16 @@ WHERE 1=1 AND A.Status=0 AND class.Status=0 AND class.ClassStatus <>4 AND b.Or
{ {
builder.AppendFormat($@" AND (a.TotalHours-a.CompleteHours) <20 "); builder.AppendFormat($@" AND (a.TotalHours-a.CompleteHours) <20 ");
} }
//2022-01-17
if (demodel.CreateType > 0)
{
builder.AppendFormat($@" AND st.CreateType ={(int)demodel.CreateType}");
}
if (demodel.StuChannelId > 0)
{
builder.AppendFormat($@" AND st.StuChannel ={demodel.StuChannelId}");
}
builder.AppendFormat($@" order by A.{nameof(RB_Order_Guest_Extend.Id)} desc"); builder.AppendFormat($@" order by A.{nameof(RB_Order_Guest_Extend.Id)} desc");
return GetPage<RB_Order_Guest_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList(); return GetPage<RB_Order_Guest_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
} }
......
Edu.Repository/User/RB_Student_OrderGuestRepository.cs
View file @ 331ff97d
...@@ -278,6 +278,10 @@ INNER JOIN rb_order o on sog.OrderId = o.OrderId ...@@ -278,6 +278,10 @@ INNER JOIN rb_order o on sog.OrderId = o.OrderId
{ {
where += $" and s.{nameof(RB_Student_ViewModel.StuChannel)} ={demodel.StuChannel}"; where += $" and s.{nameof(RB_Student_ViewModel.StuChannel)} ={demodel.StuChannel}";
} }
if (demodel.CreateType > 0)
{
where += $" and s.{nameof(RB_Student_ViewModel.CreateType)} ={(int)demodel.CreateType}";
}
if (demodel.StuGuestState > 0) if (demodel.StuGuestState > 0)
{ {
where += $" and org.GuestState ={(int)demodel.StuGuestState}"; where += $" and org.GuestState ={(int)demodel.StuGuestState}";
...@@ -351,7 +355,8 @@ INNER JOIN rb_order o on sog.OrderId = o.OrderId ...@@ -351,7 +355,8 @@ INNER JOIN rb_order o on sog.OrderId = o.OrderId
} }
} }
string sql = $@"SELECT s.StuId,s.StuName,s.StuTel,s.FirstEnrollDate,s.StuRealMobile,s.QQ,DATE_FORMAT(ec.CreateTime,'%Y-%m-%d') as followUpTime,c.CourseId,c.CourseName,s.JapanBaseInfo,s.StuBirth,org.GuestState as StuGuestState string sql = $@"SELECT s.StuId,s.StuName,s.StuTel,s.FirstEnrollDate,s.StuRealMobile,s.QQ,DATE_FORMAT(ec.CreateTime,'%Y-%m-%d') as followUpTime,
c.CourseId,c.CourseName,s.JapanBaseInfo,s.StuBirth,org.GuestState as StuGuestState,s.StuChannel,s.CreateType,s.StuSourceId,s.CreateBy
FROM rb_student s FROM rb_student s
INNER JOIN rb_student_orderguest og on og.Student_Id = s.StuId INNER JOIN rb_student_orderguest og on og.Student_Id = s.StuId
INNER JOIN (SELECT og.Student_Id,MAX(og.Id) as Id FROM rb_student_orderguest og INNER JOIN (SELECT og.Student_Id,MAX(og.Id) as Id FROM rb_student_orderguest og
...@@ -419,6 +424,10 @@ LEFT JOIN rb_education_contract ec on ec.GuestId = og.GuestId"; ...@@ -419,6 +424,10 @@ LEFT JOIN rb_education_contract ec on ec.GuestId = og.GuestId";
{ {
where += $" and s.{nameof(RB_Student_ViewModel.StuChannel)} ={demodel.StuChannel}"; where += $" and s.{nameof(RB_Student_ViewModel.StuChannel)} ={demodel.StuChannel}";
} }
if (demodel.CreateType > 0)
{
where += $" and s.{nameof(RB_Student_ViewModel.CreateType)} ={(int)demodel.CreateType}";
}
if (demodel.StuStage > 0) if (demodel.StuStage > 0)
{ {
where += $" and s.{nameof(RB_Student_ViewModel.StuStage)} ={demodel.StuStage}"; where += $" and s.{nameof(RB_Student_ViewModel.StuStage)} ={demodel.StuStage}";
......
Edu.WebApi/Controllers/Course/StuController.cs
View file @ 331ff97d
...@@ -345,11 +345,15 @@ namespace Edu.WebApi.Controllers.Course ...@@ -345,11 +345,15 @@ namespace Edu.WebApi.Controllers.Course
{ {
item.EnterName = UserReidsCache.GetUserLoginInfo(item.EnterID)?.AccountName ?? ""; item.EnterName = UserReidsCache.GetUserLoginInfo(item.EnterID)?.AccountName ?? "";
} }
if (item.StuCreateBy > 0)
{
item.StuCreateByName = UserReidsCache.GetUserLoginInfo(item.StuCreateBy)?.AccountName ?? "";
}
result.Add(new result.Add(new
{ {
item.Id, item.Id,
item.GuestName, item.GuestName,
Mobile=item.StuRealMobile, Mobile = item.StuRealMobile,
item.ContractId, item.ContractId,
item.ContractNo, item.ContractNo,
item.ClassId, item.ClassId,
...@@ -359,7 +363,7 @@ namespace Edu.WebApi.Controllers.Course ...@@ -359,7 +363,7 @@ namespace Edu.WebApi.Controllers.Course
item.Teacher_Id, item.Teacher_Id,
item.TeacherName, item.TeacherName,
item.OrderId, item.OrderId,
OrderTime =Common.ConvertHelper.FormatTime(item.OrderTime), OrderTime = Common.ConvertHelper.FormatTime(item.OrderTime),
item.EnterID, item.EnterID,
item.EnterName, item.EnterName,
item.PreferPrice, item.PreferPrice,
...@@ -381,7 +385,24 @@ namespace Edu.WebApi.Controllers.Course ...@@ -381,7 +385,24 @@ namespace Edu.WebApi.Controllers.Course
item.JoinTypeStr, item.JoinTypeStr,
item.Student_Id, item.Student_Id,
item.CourseRate, item.CourseRate,
CourseRateName=item.CourseRate.ToName().Replace("课程",""), CourseRateName = item.CourseRate.ToName().Replace("课程", ""),
item.StuCreateBy,
item.StuCreateByName,
AssistList = item.AssistList.Select(qitem => new
{
qitem.Id,
qitem.StuId,
qitem.AssistId,
qitem.AssistName,
qitem.AssistType,
AssistTypeName = qitem.AssistType.ToName()
}),
item.StuChannelId,
item.StuChannelName,
item.CreateType,
CreateTypeName = item.CreateType.ToName(),
item.StuSourceId,
item.StuSourceIdName
}); });
} }
pageModel.Count = rowsCount; pageModel.Count = rowsCount;
......
Edu.WebApi/Controllers/QYWeChat/QYContributeController.cs
View file @ 331ff97d
...@@ -771,6 +771,33 @@ namespace Edu.WebApi.Controllers.QYWeChat ...@@ -771,6 +771,33 @@ namespace Edu.WebApi.Controllers.QYWeChat
} }
} }
/// <summary>
/// 设置投稿发放
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetRemunerationState()
{
var userInfo = base.UserInfo;
JObject parms = JObject.Parse(base.RequestParm.Msg.ToString());
int ContributeId = parms.GetInt("ContributeId", 0);//投稿ID
int RemunerationState = parms.GetInt("RemunerationState", 1);//稿酬状态 1发放 2不发放
if (ContributeId <= 0)
{
return ApiResult.ParamIsNull("请传递投稿ID");
}
string msg = contributeModule.SetRemunerationState(ContributeId, RemunerationState, userInfo);
if (msg == "")
{
return ApiResult.Success();
}
else
{
return ApiResult.Failed(msg);
}
}
/// <summary> /// <summary>
/// 获取枚举列表 /// 获取枚举列表
/// </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