Skip to content

E
Education
Commit edc03069 authored by 吴春's avatar 吴春
Browse files
Options

提交代码

parent 998b4dc0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 988 additions and 536 deletions
Edu.Common/Config.cs
View file @ edc03069
......@@ -695,5 +695,28 @@ namespace Edu.Common
return ReadConfigKey("Notice_BaseKey");
}
}
/// <summary>
/// 合同功能菜单code（学管）
/// </summary>
public static string EducationContractSchool
{
get
{
return ReadConfigKey("EducationContractSchool");
}
}
/// <summary>
/// 合同功能菜单code（行政）
/// </summary>
public static string EducationContractAdmin
{
get
{
return ReadConfigKey("EducationContractAdmin");
}
}
}
}
\ No newline at end of file
Edu.Model/ViewModel/Course/RB_Class_Plan_ViewModel.cs
View file @ edc03069
......@@ -150,5 +150,11 @@ namespace Edu.Model.ViewModel.Course
/// </summary>
public int TotalPlanNum { get; set; }
/// <summary>
/// 排序字段
/// </summary>
public int OrderBy { get; set; }
}
}
Edu.Model/ViewModel/Course/RB_Education_Contract_ViewModel.cs
View file @ edc03069
......@@ -187,14 +187,18 @@ namespace Edu.Model.ViewModel.Course
{
case 0: str = "草稿"; break;
case 1: str = "提交审核"; break;
case 2: str = "审核通过"; break;
case 2: str = "行政审核通过"; break;
case 3: str = "驳回"; break;
case 4: str = "取消"; break;
case 5: str = "学管审核通过"; break;
}
return str;
}
}
/// <summary>
/// 学员生日字符串
/// </summary>
......@@ -503,5 +507,21 @@ namespace Edu.Model.ViewModel.Course
return dayStr;
}
}
/// <summary>
/// 行政审核以及学管审核状态字段
/// </summary>
public string SelectEexamineStatus { get; set; }
/// <summary>
/// 学管审核状态
/// </summary>
public string SchoolStatusStr { get; set; }
/// <summary>
/// 行政审核状态
/// </summary>
public string AdminStatusStr { get; set; }
}
}
Edu.Module.Course/EducationContractModule.cs
View file @ edc03069
......@@ -112,25 +112,25 @@ namespace Edu.Module.Course
string dxMoney = StringHelper.MoneyToUpper(Money.ToString());
obj = new
{
StudentName=guestModel?.GuestName??"",
StuBirth=Common.ConvertHelper.FormatDate(guestModel?.BirthDate),
StuSex=(guestModel?.Sex??0)==1?0:1,
StuAddress=guestModel?.ContactAddress??"",
StuTel= guestModel?.Mobile??"",
StuEmail="",
CourseName= courseModel?.CourseName??"",
SchoolName=classModel?.SchoolName??"",
SchoolPrincipal= empList?.Where(qitem=>qitem.Id==(classModel?.ManagerId??0))?.FirstOrDefault()?.EmployeeName??"",
StartLevel=guestModel?.Basics??"",
CourseConsultant= empList?.Where(qitem => qitem.Id == (orderModel?.EnterID ?? 0))?.FirstOrDefault()?.EmployeeName ?? "",
Payee= empList?.Where(qitem => qitem.Id == (orderModel?.EnterID ?? 0))?.FirstOrDefault()?.EmployeeName ?? "",
FirstClassHours= courseModel?.ClassHours??0,
FirstCourseFee= PreferPrice,
FirstBookFee =0,
FirstClassFee=0,
FirstDiscountMoney= DiscountMoney,
FirstMoney= Money,
CNYCaps= dxMoney,
StudentName = guestModel?.GuestName ?? "",
StuBirth = Common.ConvertHelper.FormatDate(guestModel?.BirthDate),
StuSex = (guestModel?.Sex ?? 0) == 1 ? 0 : 1,
StuAddress = guestModel?.ContactAddress ?? "",
StuTel = guestModel?.Mobile ?? "",
StuEmail = "",
CourseName = courseModel?.CourseName ?? "",
SchoolName = classModel?.SchoolName ?? "",
SchoolPrincipal = empList?.Where(qitem => qitem.Id == (classModel?.ManagerId ?? 0))?.FirstOrDefault()?.EmployeeName ?? "",
StartLevel = guestModel?.Basics ?? "",
CourseConsultant = empList?.Where(qitem => qitem.Id == (orderModel?.EnterID ?? 0))?.FirstOrDefault()?.EmployeeName ?? "",
Payee = empList?.Where(qitem => qitem.Id == (orderModel?.EnterID ?? 0))?.FirstOrDefault()?.EmployeeName ?? "",
FirstClassHours = courseModel?.ClassHours ?? 0,
FirstCourseFee = PreferPrice,
FirstBookFee = 0,
FirstClassFee = 0,
FirstDiscountMoney = DiscountMoney,
FirstMoney = Money,
CNYCaps = dxMoney,
Money,
};
return obj;
......@@ -149,6 +149,87 @@ namespace Edu.Module.Course
{
var list = education_ContractRepository.GetEducationContractPageListRepository(pageIndex, pageSize, out count, dmodel);
if (list != null && list.Count > 0)
{
var userIds = string.Join(",", list.Select(x => x.CreateBy).Distinct());
var alist = accountRepository.GetAccountListExtRepository(new Model.ViewModel.User.RB_Account_ViewModel() { QIds = userIds });
foreach (var item in list)
{
var amodel = alist.Where(x => x.Id == item.CreateBy).FirstOrDefault();
item.CreateByName = amodel?.AccountName ?? "";
item.CreateByPhoto = amodel?.UserIcon ?? "";
if (item.Status == 1)
{
item.SchoolStatusStr = "待审核";
item.AdminStatusStr = "待审核";
}
else if (item.Status == 2)
{
item.SchoolStatusStr = "审核通过";
item.AdminStatusStr = "审核通过";
}
else if (item.Status == 3)
{
if (item.AuditEmpId > 0 && item.SchoolManageEmpId > 0)
{
if (item.SchoolManageAuditDate.HasValue)
{
item.SchoolStatusStr = "审核通过";
item.AdminStatusStr = "驳回";
}
else {
if (item.AuditDate > item.SchoolManageAuditDate)
{
item.SchoolStatusStr = "审核通过";
item.AdminStatusStr = "驳回";
}
else
{
item.SchoolStatusStr = "驳回";
item.AdminStatusStr = "";
}
}
}
else if (item.SchoolManageEmpId > 0)
{
item.SchoolStatusStr = "驳回";
item.AdminStatusStr = "";
}
else {
item.SchoolStatusStr = "";
item.AdminStatusStr = "驳回";
}
}
else if (item.Status == 4)
{
item.SchoolStatusStr = "合同已取消";
item.AdminStatusStr = "合同已取消";
}
else if (item.Status == 5)
{
item.SchoolStatusStr = "审核通过";
item.SchoolStatusStr = "待审核";
}
}
}
return list;
}
/// <summary>
/// 获取分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="demodel"></param>
/// <param name="orderIds"></param>
/// <returns></returns>
public List<RB_Education_Contract_ViewModel> GetEducationContractPageList_V2(int pageIndex, int pageSize, out long rowsCount, RB_Education_Contract_ViewModel demodel)
{
var list = education_ContractRepository.GetEducationContractPageList_V2(pageIndex, pageSize, out rowsCount, demodel);
if (list != null && list.Count > 0)
{
var userIds = string.Join(",", list.Select(x => x.CreateBy).Distinct());
var alist = accountRepository.GetAccountListExtRepository(new Model.ViewModel.User.RB_Account_ViewModel() { QIds = userIds });
......@@ -296,6 +377,50 @@ namespace Edu.Module.Course
return education_ContractRepository.Update(keyValues, new WhereHelper(nameof(RB_Education_Contract_ViewModel.Id), contractId));
}
/// <summary>
/// 同和审核
/// </summary>
/// <param name="contractId"></param>
/// <param name="state"></param>
/// <param name="userInfo"></param>
/// <returns></returns>
public bool SetEducationContractAuditModule_V2(int contractId, int state, int type, UserInfo userInfo)
{
Dictionary<string, object> keyValues = new Dictionary<string, object>();
if (state == 5 && type == 2)
{
keyValues.Add(nameof(RB_Education_Contract_ViewModel.IsCompanySeal), 1);
keyValues.Add(nameof(RB_Education_Contract_ViewModel.SealDate), DateTime.Now);
}
else
{
keyValues.Add(nameof(RB_Education_Contract_ViewModel.Status), state);
if (state == 1 || state == 4)
{
keyValues.Add(nameof(RB_Education_Contract_ViewModel.UpdateBy), userInfo.Id);
keyValues.Add(nameof(RB_Education_Contract_ViewModel.UpdateTime), DateTime.Now);
}
else
{
if (type == 1)//学管审核
{
keyValues.Add(nameof(RB_Education_Contract_ViewModel.SchoolManageEmpId), userInfo.Id);
keyValues.Add(nameof(RB_Education_Contract_ViewModel.SchoolManageAuditDate), DateTime.Now);
}
else if (type == 2)//行政审核
{
keyValues.Add(nameof(RB_Education_Contract_ViewModel.AuditEmpId), userInfo.Id);
keyValues.Add(nameof(RB_Education_Contract_ViewModel.AuditDate), DateTime.Now);
}
}
}
return education_ContractRepository.Update(keyValues, new WhereHelper(nameof(RB_Education_Contract_ViewModel.Id), contractId));
}
/// <summary>
/// 合同签名
/// </summary>
......@@ -348,7 +473,7 @@ namespace Edu.Module.Course
return flag;
}
// <summary>
/// 获取分页列表
/// </summary>
......
Edu.Module.Course/OrderModule2.cs
View file @ edc03069
......@@ -146,7 +146,8 @@ namespace Edu.Module.Course
UpdateBy=userinfo.Id,
UpdateTime=DateTime.Now,
RecipientIds="",
VerifyStatus= Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit
VerifyStatus= Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit,
ReceiptFile= receiptFile
}, out message);
if (flag)
{
......
Edu.Repository/Course/RB_Class_PlanRepository.cs
View file @ edc03069
......@@ -644,6 +644,7 @@ GROUP BY A.ClassPlanId,A.ClassId ,A.ClassDate,A.ClassRoomId,A.CompleteProgress
StringBuilder whereReserve = new StringBuilder();
where.AppendFormat(" AND B.ClassStatus IN(1,2) and b.`Status`=0 ");
whereReserve.AppendFormat(" AND A.{0}={1} ", nameof(RB_Reserve_Class_Extend.Status), (int)DateStateEnum.Normal);
string orderby = " a.ClassDate asc ,a.NewPlanDateTime asc";
if (query != null)
{
if (query.Group_Id > 0)
......@@ -680,13 +681,17 @@ GROUP BY A.ClassPlanId,A.ClassId ,A.ClassDate,A.ClassRoomId,A.CompleteProgress
{
where.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.ClassId), query.ClassId);
}
if (query.OrderBy==1)
{
orderby = " a.ClassDate desc ,a.NewPlanDateTime asc";
}
}
StringBuilder builder = new StringBuilder();
StringBuilder builderClass = new StringBuilder();
StringBuilder builderReserveClass = new StringBuilder();
builderReserveClass.AppendFormat(@"SELECT 2 as ClassType,A.ReserveClassId as ClassTimeId ,a.ClassTime as StartTime,a.EndTime,0 as ClassPlanId,0 as ClassId,a.ClassDate,a.ClassRoomId,'试听课' as ClassName,a.ClassContent as CourseName,
builderReserveClass.AppendFormat(@"SELECT 2 as ClassType,A.ReserveClassId as ClassTimeId,a.ClassTime AS NewPlanDateTime ,a.ClassTime as StartTime,a.EndTime,0 as ClassPlanId,0 as ClassId,a.ClassDate,a.ClassRoomId,'试听课' as ClassName,a.ClassContent as CourseName,
a.TeacherId as Teacher_Id,IFNULL(D.TeacherName,'') AS TeacherName,IFNULL(E.RoomName,'') AS RoomName,
IFNULL(E.SeatNum,0) AS RoomNum,0 as TotalPlanNum
FROM RB_Reserve_Class AS A LEFT JOIN rb_teacher AS D ON A.TeacherId=D.TId
......@@ -695,7 +700,7 @@ WHERE 1=1 {0} ", whereReserve.ToString());
builderClass.AppendFormat(@"
SELECT 1 as ClassType,F.ClassTimeId,F.StartTime,f.EndTime,A.ClassPlanId, A.ClassId,A.ClassDate,A.ClassRoomId,B.ClassName,C.CourseName,
SELECT 1 as ClassType,F.ClassTimeId,CONCAT( DATE_FORMAT(A.ClassDate,'%Y-%m-%d') ,' ',f.StartTime,':00') AS NewPlanDateTime,F.StartTime,f.EndTime,A.ClassPlanId, A.ClassId,A.ClassDate,A.ClassRoomId,B.ClassName,C.CourseName,
B.Teacher_Id,IFNULL(D.TeacherName,'') AS TeacherName,E.RoomName,IFNULL(E.SeatNum,0) AS RoomNum,plan.TotalPlanNum
FROM rb_class_time as F INNER JOIN
rb_class_plan AS A on F.ClassPlanId=a.ClassPlanId
......@@ -712,21 +717,21 @@ WHERE 1=1 AND A.`Status`=0 {0}
builder.AppendFormat(@"SELECT A.ClassType,A.ClassTimeId,A.Teacher_Id,A.TeacherName,A.RoomName, a.RoomNum,A.StartTime,A.EndTime,A.ClassPlanId,A.ClassId,A.ClassDate,A.ClassRoomId,A.ClassName,A.CourseName,a.TotalPlanNum,
(SELECT COUNT(*) from rb_class_plan where `Status`=0 and DATE_FORMAT(ClassDate,'%Y-%m-%d') <=DATE_FORMAT(a.ClassDate,'%Y-%m-%d') and ClassId=a.ClassId) as Ranks
FROM ( {0} ) AS A
GROUP BY a.ClassType,A.ClassTimeId,A.ClassPlanId,A.ClassId ,A.ClassDate,A.ClassRoomId ", builderClass.ToString());
GROUP BY a.ClassType,A.ClassTimeId,A.ClassPlanId,A.ClassId ,A.ClassDate,A.ClassRoomId ORDER BY {1}", builderClass.ToString(), orderby);
}
else if (query.ClassType == 2)
{
builder.AppendFormat(@"SELECT A.ClassType,A.ClassTimeId,A.Teacher_Id,A.TeacherName,A.RoomName, a.RoomNum,A.StartTime,A.EndTime,A.ClassPlanId,A.ClassId,A.ClassDate,A.ClassRoomId,A.ClassName,A.CourseName,a.TotalPlanNum,
(SELECT COUNT(*) from rb_class_plan where `Status`=0 and DATE_FORMAT(ClassDate,'%Y-%m-%d') <=DATE_FORMAT(a.ClassDate,'%Y-%m-%d') and ClassId=a.ClassId) as Ranks
FROM ( {0} ) AS A
GROUP BY a.ClassType,A.ClassTimeId,A.ClassPlanId,A.ClassId ,A.ClassDate,A.ClassRoomId ", builderReserveClass.ToString());
GROUP BY a.ClassType,A.ClassTimeId,A.ClassPlanId,A.ClassId ,A.ClassDate,A.ClassRoomId ORDER BY {1} ", builderReserveClass.ToString(), orderby);
}
else
{
builder.AppendFormat(@"SELECT A.ClassType,A.ClassTimeId,A.Teacher_Id,A.TeacherName,A.RoomName, a.RoomNum,A.StartTime,A.EndTime,A.ClassPlanId,A.ClassId,A.ClassDate,A.ClassRoomId,A.ClassName,A.CourseName,a.TotalPlanNum,
(SELECT COUNT(*) from rb_class_plan where `Status`=0 and DATE_FORMAT(ClassDate,'%Y-%m-%d') <=DATE_FORMAT(a.ClassDate,'%Y-%m-%d') and ClassId=a.ClassId) as Ranks
FROM ( {0} UNION all {1} ) AS A
GROUP BY a.ClassType,A.ClassTimeId,A.ClassPlanId,A.ClassId ,A.ClassDate,A.ClassRoomId ORDER BY a.ClassDate asc ", builderClass.ToString(), builderReserveClass.ToString());
GROUP BY a.ClassType,A.ClassTimeId,A.ClassPlanId,A.ClassId ,A.ClassDate,A.ClassRoomId ORDER BY {2} ", builderClass.ToString(), builderReserveClass.ToString(), orderby);
}
return GetPage<RB_Class_Plan_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
}
......
Edu.Repository/Course/RB_Education_ContractRepository.cs
View file @ edc03069
......@@ -67,7 +67,7 @@ namespace Edu.Repository.Course
{
where += $@" AND {nameof(RB_Education_Contract_ViewModel.CType)} ={(int)demodel.CType}";
}
if (!string.IsNullOrEmpty(demodel.ContractNo))
{
where += $@" AND {nameof(RB_Education_Contract_ViewModel.ContractNo)} LIKE @ContractNo ";
......@@ -231,7 +231,7 @@ namespace Edu.Repository.Course
where += $@" AND c.{nameof(RB_Education_Contract_ViewModel.CourseName)} LIKE @CourseName ";
parameters.Add("CourseName", "%" + demodel.CourseName.Trim() + "%");
}
if (!string.IsNullOrEmpty(demodel.ClassName))
if (!string.IsNullOrEmpty(demodel.ClassName))
{
where += $@" AND c1.{nameof(RB_Education_Contract_ViewModel.ClassName)} LIKE @ClassName ";
parameters.Add("ClassName", "%" + demodel.ClassName.Trim() + "%");
......@@ -276,5 +276,81 @@ left join {datebaseStr}.rb_tradeway t on f.FrID = t.FinanceId
WHERE {where} GROUP BY c.Id ORDER BY c.Id DESC ";
return GetPage<RB_Education_Contract_ViewModel>(pageIndex, pageSize, out rowsCount, sql, parameters).ToList();
}
/// <summary>
/// 获取分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="demodel"></param>
/// <param name="orderIds"></param>
/// <returns></returns>
public List<RB_Education_Contract_ViewModel> GetEducationContractPageList_V2(int pageIndex, int pageSize, out long rowsCount, RB_Education_Contract_ViewModel demodel)
{
DynamicParameters parameters = new DynamicParameters();
string where = $@" 1=1";
if (demodel.Group_Id > 0)
{
where += $@" AND {nameof(RB_Education_Contract_ViewModel.Group_Id)} ={demodel.Group_Id}";
}
if (demodel.School_Id > 0)
{
where += $@" AND {nameof(RB_Education_Contract_ViewModel.School_Id)} ={demodel.School_Id}";
}
if (demodel.OrderId > 0)
{
where += $@" AND {nameof(RB_Education_Contract_ViewModel.OrderId)} ={demodel.OrderId}";
}
if (demodel.CType > 0)
{
where += $@" AND {nameof(RB_Education_Contract_ViewModel.CType)} ={(int)demodel.CType}";
}
if (!string.IsNullOrEmpty(demodel.ContractNo))
{
where += $@" AND {nameof(RB_Education_Contract_ViewModel.ContractNo)} LIKE @ContractNo ";
parameters.Add("ContractNo", "%" + demodel.ContractNo.Trim() + "%");
}
if (!string.IsNullOrEmpty(demodel.StudentName))
{
where += $@" AND {nameof(RB_Education_Contract_ViewModel.StudentName)} LIKE @StudentName ";
parameters.Add("StudentName", "%" + demodel.StudentName.Trim() + "%");
}
if (!string.IsNullOrWhiteSpace(demodel.SelectEexamineStatus))
{
where += $@" AND {nameof(RB_Education_Contract_ViewModel.Status)} in( {demodel.SelectEexamineStatus})";
}
else {
where += $@" AND {nameof(RB_Education_Contract_ViewModel.Status)} NOT IN(0,4) ";
}
//if (demodel.IsAduit == 0)
//{
// if (demodel.Status >= 0)
// {
// where += $@" AND {nameof(RB_Education_Contract_ViewModel.Status)} ={demodel.Status}";
// }
// else
// {
// where += $@" AND {nameof(RB_Education_Contract_ViewModel.Status)} NOT IN(0,4) ";
// }
//}
//else
//{
// if (demodel.CreateBy > 0)
// {
// where += $@" AND {nameof(RB_Education_Contract_ViewModel.CreateBy)} ={demodel.CreateBy}";
// }
// if (demodel.Status >= 0)
// {
// where += $@" AND {nameof(RB_Education_Contract_ViewModel.Status)} ={demodel.Status}";
// }
//}
string sql = $@" SELECT * FROM RB_Education_Contract WHERE {where} ORDER BY Id DESC ";
return GetPage<RB_Education_Contract_ViewModel>(pageIndex, pageSize, out rowsCount, sql, parameters).ToList();
}
}
}
Edu.WebApi/Controllers/Course/EducationContractController.cs
View file @ edc03069
using System;
using System.Collections.Generic;
using System.Linq;
using Edu.Common;
using Edu.Common.API;
using Edu.Common.Enum.Course;
using Edu.Common.Plugin;
......@@ -55,7 +57,7 @@ namespace Edu.WebApi.Controllers.Course
CType = (ContractTypeEnum)base.ParmJObj.GetInt("CType"),
Status = base.ParmJObj.GetInt("Status"),
StudentName = base.ParmJObj.GetStringValue("StudentName"),
IsAduit=base.ParmJObj.GetInt("IsAduit")
IsAduit = base.ParmJObj.GetInt("IsAduit")
};
dmodel.Group_Id = userInfo.Group_Id;
dmodel.CreateBy = userInfo.Id;
......@@ -66,7 +68,7 @@ namespace Edu.WebApi.Controllers.Course
x.Id,
x.CType,
CTypeName = x.CType.ToName(),
IsStuSign=!string.IsNullOrEmpty(x.Sign)?1:0,
IsStuSign = !string.IsNullOrEmpty(x.Sign) ? 1 : 0,
x.OrderId,
x.GuestId,
x.ContractNo,
......@@ -88,6 +90,134 @@ namespace Edu.WebApi.Controllers.Course
return ApiResult.Success("", pageModel);
}
/// <summary>
/// 获取合同分页列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetMyEducationContractPageList()
{
var userInfo = base.UserInfo;
var pageModel = JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var dmodel = new RB_Education_Contract_ViewModel()
{
OrderId = base.ParmJObj.GetInt("OrderId"),
ContractNo = base.ParmJObj.GetStringValue("ContractNo"),
CType = (ContractTypeEnum)base.ParmJObj.GetInt("CType"),
Status = base.ParmJObj.GetInt("Status"),
StudentName = base.ParmJObj.GetStringValue("StudentName"),
IsAduit = base.ParmJObj.GetInt("IsAduit")
};
dmodel.Group_Id = userInfo.Group_Id;
dmodel.CreateBy = userInfo.Id;
var list = educationContractModule.GetEducationContractPageListModule(pageModel.PageIndex, pageModel.PageSize, out long count, dmodel);
pageModel.Count = Convert.ToInt32(count);
pageModel.PageData = list.Select(x => new
{
x.Id,
x.CType,
CTypeName = x.CType.ToName(),
IsStuSign = !string.IsNullOrEmpty(x.Sign) ? 1 : 0,
x.OrderId,
x.GuestId,
x.ContractNo,
x.StudentName,
x.SchoolName,
x.CourseName,
x.CNYCaps,
x.Money,
x.Exam,
x.Sign,
x.Status,
x.StatusStr,
x.IsCompanySeal,
x.CreateBy,
x.CreateByName,
x.CreateByPhoto,
CreateTime = x.CreateTime.ToString("yyyy-MM-dd HH:mm"),
x.SchoolStatusStr,
x.AdminStatusStr
});
return ApiResult.Success("", pageModel);
}
/// <summary>
/// 获取合同分页列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetEducationContractPageCodeList()
{
var userInfo = base.UserInfo;
var pageModel = JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var dmodel = new RB_Education_Contract_ViewModel()
{
OrderId = base.ParmJObj.GetInt("OrderId"),
ContractNo = base.ParmJObj.GetStringValue("ContractNo"),
CType = (ContractTypeEnum)base.ParmJObj.GetInt("CType"),
StudentName = base.ParmJObj.GetStringValue("StudentName"),
IsAduit = base.ParmJObj.GetInt("IsAduit")
};
List<RB_Education_Contract_ViewModel> list = new List<RB_Education_Contract_ViewModel>();
dmodel.Group_Id = userInfo.Group_Id;
dmodel.CreateBy = userInfo.Id;
int Type = 0;
if (CheckUserActionAuth(Config.EducationContractSchool))
{
dmodel.SelectEexamineStatus = "1";
Type = 1;
}
else if (CheckUserActionAuth(Config.EducationContractAdmin))
{
dmodel.SelectEexamineStatus = "5,2";
Type = 2;
}
else
{
pageModel.Count = 0;
pageModel.PageData = new { Type, Result = new List<object>() };
return ApiResult.Success("您暂无审核权限", pageModel);
}
list = educationContractModule.GetEducationContractPageList_V2(pageModel.PageIndex, pageModel.PageSize, out long count, dmodel);
pageModel.Count = Convert.ToInt32(count);
var Result = list.Select(x => new
{
x.Id,
x.CType,
CTypeName = x.CType.ToName(),
IsStuSign = !string.IsNullOrEmpty(x.Sign) ? 1 : 0,
x.OrderId,
x.GuestId,
x.ContractNo,
x.StudentName,
x.SchoolName,
x.CourseName,
x.CNYCaps,
x.Money,
x.Exam,
x.Sign,
x.Status,
x.StatusStr,
x.IsCompanySeal,
x.CreateBy,
x.CreateByName,
x.CreateByPhoto,
CreateTime = x.CreateTime.ToString("yyyy-MM-dd HH:mm")
});
pageModel.PageData = new { Type, Result };
return ApiResult.Success("", pageModel);
}
/// <summary>
/// 获取合同详情
/// </summary>
......@@ -177,6 +307,8 @@ namespace Edu.WebApi.Controllers.Course
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 设置合同审核
/// </summary>
......@@ -195,6 +327,56 @@ namespace Edu.WebApi.Controllers.Course
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 设置合同审核
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetEducationContractAuditCode()
{
var userInfo = base.UserInfo;
int ContractId = base.ParmJObj.GetInt("ContractId", 0);//合同id
int oldType = 0;
if (CheckUserActionAuth(Config.EducationContractSchool))
{
oldType = 1;
}
else if (CheckUserActionAuth(Config.EducationContractAdmin))
{
oldType = 2;
}
if (oldType == 0)//没有审核权限的
{
return ApiResult.ParamIsNull("您暂无审核权限");
}
int State = base.ParmJObj.GetInt("State", 1);// 状态 1提交审核 2通过 3驳回 4取消 5盖章,6-学管审核通过
if (oldType == 1)//学管审核
{
if (State == 2 || State == 5)
{
return ApiResult.ParamIsNull("您暂无审核权限");
}
}
else if (oldType == 2)
{
if (State == 6)
{
return ApiResult.ParamIsNull("您暂无审核权限");
}
}
if (ContractId <= 0)
{
return ApiResult.ParamIsNull("请传递合同id");
}
bool flag = educationContractModule.SetEducationContractAuditModule_V2(ContractId, State, oldType, userInfo);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 复制合同
/// </summary>
......@@ -208,7 +390,7 @@ namespace Edu.WebApi.Controllers.Course
{
return ApiResult.ParamIsNull("请传递合同id");
}
var model= educationContractModule.GetEducationContractModule(ContractId);
var model = educationContractModule.GetEducationContractModule(ContractId);
model.Id = 0;
model.Group_Id = userInfo.Group_Id;
model.CreateBy = userInfo.Id;
......
Edu.WebApi/Controllers/Course/OrderController.cs
View file @ edc03069
......@@ -2055,22 +2055,22 @@ namespace Edu.WebApi.Controllers.Course
//申请原因
var applyReason = base.ParmJObj.GetStringValue("applyReason");
string receiptFile = string.Empty;
//try
//{
// List<string> receiptFileList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(base.ParmJObj.GetStringValue("ReceiptFileList"));
// if (receiptFileList == null || !receiptFileList.Any())
// {
// return ApiResult.Failed("附件必须上传");
// }
// else
// {
// receiptFile = JsonHelper.Serialize(receiptFileList);
// }
//}
//catch (Exception ex)
//{
// Common.Plugin.LogHelper.Write(ex, "BackClassApply");
//}
try
{
List<string> receiptFileList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(base.ParmJObj.GetStringValue("ReceiptFileList"));
if (receiptFileList == null || !receiptFileList.Any())
{
return ApiResult.Failed("附件必须上传");
}
else
{
receiptFile = JsonHelper.Serialize(receiptFileList);
}
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "BackClassApply");
}
bool flag = orderModule.CreateBackClassApplyModule(GuestId, OrderId, applyReason, base.UserInfo, receiptFile, out string message);
return flag ? ApiResult.Success(message: message) : ApiResult.Failed(message: message);
......
Edu.WebApi/Controllers/Course/TeacherClassController.cs
View file @ edc03069
......@@ -181,6 +181,7 @@ namespace Edu.WebApi.Controllers.Course
Group_Id = base.UserInfo.Group_Id,
School_Id = -1,
ClassId = base.ParmJObj.GetInt("ClassId"),
OrderBy= base.ParmJObj.GetInt("OrderBy",0),
ClassType = base.ParmJObj.GetInt("ClassType")// //课程类型(0-全部,1-正常,2-试听课)
};
var result = classModule.GetTeacherPlan(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
......
Edu.WebApi/Controllers/EduTask/ChangePlanController.cs
View file @ edc03069
......@@ -59,15 +59,15 @@ namespace Edu.WebApi.Controllers.EduTask
string receiptFile = string.Empty;
try
{
//List<string> receiptFileList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(base.ParmJObj.GetStringValue("ReceiptFileList"));
//if (receiptFileList == null || !receiptFileList.Any())
//{
// return ApiResult.Failed("附件必须上传");
//}
//else
//{
// receiptFile = JsonHelper.Serialize(receiptFileList);
//}
List<string> receiptFileList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(base.ParmJObj.GetStringValue("ReceiptFileList"));
if (receiptFileList == null || !receiptFileList.Any())
{
return ApiResult.Failed("附件必须上传");
}
else
{
receiptFile = JsonHelper.Serialize(receiptFileList);
}
if (model.MoveType == 1)
{
model.OldChangePlanItemList = Common.Plugin.JsonHelper.DeserializeObject<List<ChangePlanItem>>(base.ParmJObj.GetStringValue("OldChangePlanItemList"));
......
Edu.WebApi/Controllers/EduTask/OrderChangeController.cs
View file @ edc03069
......@@ -56,22 +56,22 @@ namespace Edu.WebApi.Controllers.EduTask
OutTime=base.ParmJObj.GetDateTime("OutTime"),
};
string receiptFile = string.Empty;
//try
//{
// List<string> receiptFileList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(base.ParmJObj.GetStringValue("ReceiptFileList"));
// if (receiptFileList == null || !receiptFileList.Any())
// {
// return ApiResult.Failed("附件必须上传");
// }
// else
// {
// receiptFile = JsonHelper.Serialize(receiptFileList);
// }
//}
//catch (Exception ex)
//{
// Common.Plugin.LogHelper.Write(ex, "SetOrderChange");
//}
try
{
List<string> receiptFileList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(base.ParmJObj.GetStringValue("ReceiptFileList"));
if (receiptFileList == null || !receiptFileList.Any())
{
return ApiResult.Failed("附件必须上传");
}
else
{
receiptFile = JsonHelper.Serialize(receiptFileList);
}
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "SetOrderChange");
}
if (Convert.ToDateTime(Common.ConvertHelper.FormatDate(model.OutTime)) < Convert.ToDateTime(Common.ConvertHelper.FormatDate(DateTime.Now)) )
{
return ApiResult.ParamIsNull(message: "转出本班日期必须大于今天!");
......@@ -145,22 +145,22 @@ namespace Edu.WebApi.Controllers.EduTask
OutTime = base.ParmJObj.GetDateTime("OutTime"),
};
string receiptFile = string.Empty;
//try
//{
// List<string> receiptFileList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(base.ParmJObj.GetStringValue("ReceiptFileList"));
// if (receiptFileList == null || !receiptFileList.Any())
// {
// return ApiResult.Failed("附件必须上传");
// }
// else
// {
// receiptFile = JsonHelper.Serialize(receiptFileList);
// }
//}
//catch (Exception ex)
//{
// Common.Plugin.LogHelper.Write(ex, "SetOrderSplit");
//}
try
{
List<string> receiptFileList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(base.ParmJObj.GetStringValue("ReceiptFileList"));
if (receiptFileList == null || !receiptFileList.Any())
{
return ApiResult.Failed("附件必须上传");
}
else
{
receiptFile = JsonHelper.Serialize(receiptFileList);
}
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "SetOrderSplit");
}
var oldOrderModel = orderModule.GetClassOrderInfoModule(model.SourceOrderId);
if (oldOrderModel == null)
{
......
Edu.WebApi/Controllers/EduTask/StopStudentClassController.cs
View file @ edc03069
......@@ -59,15 +59,15 @@ namespace Edu.WebApi.Controllers.EduTask
return ApiResult.Failed("请选择生效日期");
}
model.TakeEffectTime = Convert.ToDateTime(takeEffectTime);
//List<string> receiptFileList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(base.ParmJObj.GetStringValue("ReceiptFileList"));
//if (receiptFileList == null || !receiptFileList.Any())
//{
// return ApiResult.Failed("附件必须上传");
//}
//else
//{
// receiptFile = JsonHelper.Serialize(receiptFileList);
//}
List<string> receiptFileList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(base.ParmJObj.GetStringValue("ReceiptFileList"));
if (receiptFileList == null || !receiptFileList.Any())
{
return ApiResult.Failed("附件必须上传");
}
else
{
receiptFile = JsonHelper.Serialize(receiptFileList);
}
}
catch (Exception ex)
{
......
Edu.WebApi/Controllers/EduTask/TempInvitationClassController.cs
View file @ edc03069
......@@ -69,22 +69,22 @@ namespace Edu.WebApi.Controllers.EduTask
return ApiResult.Failed("请选择您要邀请的时间");
}
string receiptFile = string.Empty;
//try
//{
// List<string> receiptFileList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(base.ParmJObj.GetStringValue("ReceiptFileList"));
// if (receiptFileList == null || !receiptFileList.Any())
// {
// return ApiResult.Failed("附件必须上传");
// }
// else
// {
// receiptFile = JsonHelper.Serialize(receiptFileList);
// }
//}
//catch (Exception ex)
//{
// Common.Plugin.LogHelper.Write(ex, "SetStudentTempInvitation");
//}
try
{
List<string> receiptFileList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(base.ParmJObj.GetStringValue("ReceiptFileList"));
if (receiptFileList == null || !receiptFileList.Any())
{
return ApiResult.Failed("附件必须上传");
}
else
{
receiptFile = JsonHelper.Serialize(receiptFileList);
}
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "SetStudentTempInvitation");
}
//判断之前是否有申请过，没有才添加
var studentTempIvvitationList = tempInvitationClassModule.GetTemporaryInvitationListRepository(new RB_Student_TempInvitation_ViewModel { ClassId = model.ClassId });
if (studentTempIvvitationList != null && studentTempIvvitationList.Any())
......
Edu.WebApi/appsettings.json
View file @ edc03069
{
"ConnectionStrings": {
"DefaultConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"DefaultConnectionPName": "MySql.Data.MySqlClient",
"FinanceConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"FinanceConnectionPName": "MySql.Data.MySqlClient",
"DataStatisticsConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_datastatistics;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"DataStatisticsConnectionPName": "MySql.Data.MySqlClient",
"LogConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_sys;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"LogConnectionPName": "MySql.Data.MySqlClient"
},
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"SettlementRate": "0.60",
"SellCommissionFFBL": "0.15",
"JwtSecretKey": "@VIITTOREBORN*2018",
"MallJwtSecretKey": "@VIITTOREBORN*2018123",
"JwtExpirTime": 86400,
"IsSendMsg": 2,
"AllowedHosts": "*",
"OpenValidation": "False",
"UploadSiteUrl": "http://192.168.1.36:8120",
"ViewFileSiteUrl": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com",
"ErpViewFileSiteUrl": "http://imgfile.oytour.com",
"Mongo": "mongodb://47.96.25.130:27017",
"MongoDBName": "Edu",
"WkHtmlToPdfPath": "D:/wkhtmltopdf/bin/",
"FinanceKey": "FinanceMallInsertToERPViitto2020",
"PaymentFinanceApi": "http://192.168.20.7:8083/api/Mall/InsertFinanceBatchForMallOut",
"IncomeFinanceApi": "http://192.168.20.7:8083/api/Mall/InsertFinanceBatchForMallIn",
"sTenpayNotifyUrl": "http://eduapi.oytour.com/api/WeChatPay/WxPayCallback", //下单回调地址
"sTenpayNotifyRefundUrl": "http://eduapi.oytour.com/api/WeChatPay/Refunds", //退款回调地址
"FinanceDateBase": "reborn_finance",
"EduDateBase": "uat_reborn_edu",
"JHTenantId": "15",
"JHMallBaseId": "5",
"Notice_BaseKey": "Notice_BaseKey",
"RabbitMqConfig": {
"HostName": "47.96.25.130",
"VirtualHost": "/",
"Port": 5672,
"UserName": "guest",
"Password": "viitto2019",
"QueenName": "vt_sys_message_test"
},
"RedisSetting": {
"RedisServer": "47.96.23.199",
"RedisPort": "6379",
"RedisPwd": "Viitto2018"
},
"VirtualDirectory": "WebFile",
//未填写 未打分 下降比例
"OKRMatterValue": "30,100,100",
//是否是线上环境
"IsOnline": false,
//退课流程编号
"BackClassFlowId": 1,
//分区校长岗位编号
"SchoolPostId": 3,
//教务长
"JiaoWuZhang": 8,
//留学就业部门主管审核编号[王涛]
"StudyAbroadDirectorId": 64,
//留学就业部门负责人审核编号[姚顺先]
"StudyAbroadManagerId": 52,
//合同默认抬头
"ContractDefaultTitle": "JH-DZ-CD-",
//消息推送AppId
"PushAppId": "JiaHeJiaoYu",
//是否推送消息
"IsPushMessage": "1",
//超过下班时间60分钟不能打卡
"MoreThanMinutes": 60,
//连续缺课课时
"AbsentHours": 12,
//值班时间验证日期
"DutyDate": "2021-06-30",
//调课流程编号
"ChangeClassFlowId": 2,
//停课流程编号
"StopClassFlowId": 3,
//临时上课邀请流程编号
"TempInvitationClassFlowId": 4,
//订单转班流程编号
"OrderTransClassFlowId": 5,
//订单分拆流程编号
"OrderSplitClassFlowId": 6
"ConnectionStrings": {
"DefaultConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"DefaultConnectionPName": "MySql.Data.MySqlClient",
"FinanceConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"FinanceConnectionPName": "MySql.Data.MySqlClient",
"DataStatisticsConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_datastatistics;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"DataStatisticsConnectionPName": "MySql.Data.MySqlClient",
"LogConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_sys;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"LogConnectionPName": "MySql.Data.MySqlClient"
},
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"SettlementRate": "0.60",
"SellCommissionFFBL": "0.15",
"JwtSecretKey": "@VIITTOREBORN*2018",
"MallJwtSecretKey": "@VIITTOREBORN*2018123",
"JwtExpirTime": 86400,
"IsSendMsg": 2,
"AllowedHosts": "*",
"OpenValidation": "False",
"UploadSiteUrl": "http://192.168.1.36:8120",
"ViewFileSiteUrl": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com",
"ErpViewFileSiteUrl": "http://imgfile.oytour.com",
"Mongo": "mongodb://47.96.25.130:27017",
"MongoDBName": "Edu",
"WkHtmlToPdfPath": "D:/wkhtmltopdf/bin/",
"FinanceKey": "FinanceMallInsertToERPViitto2020",
"PaymentFinanceApi": "http://192.168.20.7:8083/api/Mall/InsertFinanceBatchForMallOut",
"IncomeFinanceApi": "http://192.168.20.7:8083/api/Mall/InsertFinanceBatchForMallIn",
"sTenpayNotifyUrl": "http://eduapi.oytour.com/api/WeChatPay/WxPayCallback", //下单回调地址
"sTenpayNotifyRefundUrl": "http://eduapi.oytour.com/api/WeChatPay/Refunds", //退款回调地址
"FinanceDateBase": "reborn_finance",
"EduDateBase": "uat_reborn_edu",
"JHTenantId": "15",
"JHMallBaseId": "5",
"Notice_BaseKey": "Notice_BaseKey",
"EducationContractSchool": "EducationContractSchool",
"EducationContractAdmin": "EducationContractAdmin",
"RabbitMqConfig": {
"HostName": "47.96.25.130",
"VirtualHost": "/",
"Port": 5672,
"UserName": "guest",
"Password": "viitto2019",
"QueenName": "vt_sys_message_test"
},
"RedisSetting": {
"RedisServer": "47.96.23.199",
"RedisPort": "6379",
"RedisPwd": "Viitto2018"
},
"VirtualDirectory": "WebFile",
//未填写 未打分 下降比例
"OKRMatterValue": "30,100,100",
//是否是线上环境
"IsOnline": false,
//退课流程编号
"BackClassFlowId": 1,
//分区校长岗位编号
"SchoolPostId": 3,
//教务长
"JiaoWuZhang": 8,
//留学就业部门主管审核编号[王涛]
"StudyAbroadDirectorId": 64,
//留学就业部门负责人审核编号[姚顺先]
"StudyAbroadManagerId": 52,
//合同默认抬头
"ContractDefaultTitle": "JH-DZ-CD-",
//消息推送AppId
"PushAppId": "JiaHeJiaoYu",
//是否推送消息
"IsPushMessage": "1",
//超过下班时间60分钟不能打卡
"MoreThanMinutes": 60,
//连续缺课课时
"AbsentHours": 12,
//值班时间验证日期
"DutyDate": "2021-06-30",
//调课流程编号
"ChangeClassFlowId": 2,
//停课流程编号
"StopClassFlowId": 3,
//临时上课邀请流程编号
"TempInvitationClassFlowId": 4,
//订单转班流程编号
"OrderTransClassFlowId": 5,
//订单分拆流程编号
"OrderSplitClassFlowId": 6
}
\ No newline at end of file
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