Skip to content

E
Education
Commit 8c121015 authored by liudong1993's avatar liudong1993
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

parents 9a7387ad 46a5c297
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 938 additions and 766 deletions
Edu.Common/Enum/Course/ContractTypeEnum.cs
View file @ 8c121015
......@@ -17,9 +17,9 @@ namespace Edu.Common.Enum.Course
Train = 1,
/// <summary>
/// 留学
/// 留学就业
/// </summary>
[EnumField("留学")]
[EnumField("留学就业")]
StudyAbroad = 2
}
}
Edu.Common/Plugin/StringHelper.cs
View file @ 8c121015
......@@ -55,18 +55,7 @@ namespace Edu.Common.Plugin
{
//TimeSpan表示时间间隔
TimeSpan span = (DateTime.Now - dt).Duration();//表示取timespan绝对值
//if (span.TotalDays > 60)
//{
// return dt.ToString("yyyy-MM-dd");
//}
//else if (span.TotalDays > 30)
//{
// return "1个月前";
//}
//else if (span.TotalDays > 14)
//{
// return "2周前";
//}
if (dt.Year == DateTime.Now.Year)
{
if (span.TotalDays > 7)
......
Edu.Model/Entity/User/RB_Notice.cs
View file @ 8c121015
......@@ -23,7 +23,7 @@ namespace Edu.Model.Entity.User
public string From { get; set; }
/// <summary>
/// 发送
/// 抄送部门(-1全公司)
/// </summary>
public string To { get; set; }
......
Edu.Model/Entity/User/RB_School.cs
View file @ 8c121015
......@@ -26,7 +26,6 @@ namespace Edu.Model.Entity.User
/// </summary>
public string SAddress { get; set; }
/// <summary>
/// 联系电话
/// </summary>
......@@ -86,5 +85,10 @@ namespace Edu.Model.Entity.User
/// 负责人编号
/// </summary>
public int ManagerId { get; set; }
/// <summary>
/// 合同抬头
/// </summary>
public string ContractTitle { get; set; }
}
}
\ No newline at end of file
Edu.Model/Entity/Web/RB_Web_RecruitmentType.cs
View file @ 8c121015
......@@ -26,6 +26,11 @@ namespace Edu.Model.Entity.Web
/// </summary>
public string ImgCover { get; set; }
/// <summary>
/// 选中图片
/// </summary>
public string CheckImg { get; set; }
/// <summary>
/// 删除状态
/// </summary>
......
Edu.Model/ViewModel/Course/RB_Class_ViewModel.cs
View file @ 8c121015
......@@ -74,6 +74,11 @@ namespace Edu.Model.ViewModel.Course
/// </summary>
public string SchoolName { get; set; }
/// <summary>
/// 校区负责人编号
/// </summary>
public int ManagerId { get; set; }
/// <summary>
/// 班级阶梯价列表
/// </summary>
......
Edu.Model/ViewModel/Course/RB_Education_Contract_ViewModel.cs
View file @ 8c121015
......@@ -18,36 +18,6 @@ namespace Edu.Model.ViewModel.Course
/// </summary>
public string CreateByPhoto { get; set; }
/// <summary>
/// 公司章
/// </summary>
public string CompanySealImage { get; set; }
/// <summary>
/// 合同公司名称
/// </summary>
public string ContractBranch { get; set; }
/// <summary>
/// 合同电话
/// </summary>
public string ContractTel { get; set; }
/// <summary>
/// 公司名称
/// </summary>
public string BranchName { get; set; }
/// <summary>
/// 法人代表
/// </summary>
public string LegalPerson { get; set; }
/// <summary>
/// 公司列表
/// </summary>
public List<string> BranchNList { get; set; }
/// <summary>
/// 学生名单ids
/// </summary>
......
Edu.Model/ViewModel/User/RB_Notice_ViewModel.cs
View file @ 8c121015
......@@ -29,5 +29,10 @@ namespace Edu.Model.ViewModel.User
/// 部门id
/// </summary>
public int DeptId { get; set; }
/// <summary>
/// 查看时间
/// </summary>
public string LookTime { get; set; }
}
}
\ No newline at end of file
Edu.Module.Course/OrderModule.cs
View file @ 8c121015
......@@ -1646,85 +1646,6 @@ namespace Edu.Module.Course
{
return orderRepository.GetMyOrderStatistics(demodel);
}
/// <summary>
/// 订单领取合同
/// </summary>
/// <param name="orderId"></param>
/// <param name="guestId"></param>
/// <param name="userInfo"></param>
/// <returns></returns>
public bool SetOrderReceiveContract(int orderId, int guestId, UserInfo userInfo)
{
var glist = order_GuestRepository.GetList(new RB_Order_Guest_ViewModel() { Group_Id = userInfo.Group_Id, Id = guestId, OrderId = orderId, GuestState = 1 });
if (glist.Any())
{
//订单信息
var omodel = orderRepository.GetEntity(orderId);
decimal Money = (omodel.PreferPrice - omodel.DiscountMoney) / glist.Count();//平均每人费用 （看是否根据订单单价）
string dxMoney = StringHelper.MoneyToUpper(Money.ToString());
//班级信息
var classmodel = classRepository.GetClassAndCourseListRepository(new RB_Class_ViewModel() { ClassId = omodel.ClassId }).FirstOrDefault();
string newContractNum = "JH-CD0018";
var totalCount = education_ContractRepository.GetContractCount(new RB_Education_Contract_ViewModel() { Group_Id = userInfo.Group_Id });
//查询已有合同的
string guestIds = string.Join(",", glist.Select(x => x.Id));
var clist = education_ContractRepository.GetList(new RB_Education_Contract_ViewModel() { Group_Id = userInfo.Group_Id, OrderId = orderId, GuestIds = guestIds, Status = -1 }).Where(x => x.Status != 4).ToList();
foreach (var item in glist) {
var cmodel = clist.Where(x => x.GuestId == item.Id).FirstOrDefault();
if (cmodel == null) {
totalCount += 1;
string num = totalCount.ToString();
switch (num.Length)
{
case 1:
num = "00000" + num; break;
case 2:
num = "0000" + num; break;
case 3:
num = "000" + num; break;
case 4:
num = "00" + num; break;
case 5:
num = "0" + num; break;
}
string ContractNo = newContractNum + num;
education_ContractRepository.Insert(new Model.Entity.Course.RB_Education_Contract()
{
Id = 0,
GuestId = item.Id,
ContractNo = ContractNo,
CreateBy = userInfo.Id,
CreateTime = DateTime.Now,
CType = ContractTypeEnum.Train,
Exam = "",
Group_Id = userInfo.Group_Id,
IsCompanySeal = 0,
CNYCaps = dxMoney,
Money = Money.ToString(),
OrderId = orderId,
CourseName = classmodel.CateName,
CourseContent = classmodel.CourseName,
SchoolName = classmodel.SchoolName,
School_Id = classmodel.School_Id,
Sign = "",
Status = 0,
StudentName = item.GuestName,
UpdateBy = userInfo.Id,
UpdateTime = DateTime.Now,
ContactAddress = item.ContactAddress,
Domicile = item.Domicile,
IDCard = item.IDCard,
ContactMobile = item.Mobile,
EmergencyContact = item.Contact,
EmergencyMobile = item.ContactMobile,
Sex = item.Sex
});
}
}
}
return true;
}
#endregion
#region 订单操作
......
Edu.Module.User/NoticeModule.cs
View file @ 8c121015
This diff is collapsed.
Edu.Module.User/SchoolModule.cs
View file @ 8c121015
......@@ -107,6 +107,7 @@ namespace Edu.Module.User
{nameof(RB_School_ViewModel.Status),model.Status },
{nameof(RB_School_ViewModel.Dept_Id),model.Dept_Id },
{nameof(RB_School_ViewModel.ManagerId),model.ManagerId },
{nameof(RB_School_ViewModel.ContractTitle),model.ContractTitle },
};
flag = schoolRepository.Update(fileds, new WhereHelper(nameof(RB_School_ViewModel.SId), model.SId));
}
......
Edu.Module.Web/WebRecruitmentModule.cs
View file @ 8c121015
......@@ -66,6 +66,7 @@ namespace Edu.Module.Web
{
{nameof(RB_Web_RecruitmentType_ViewModel.TypeName),model.TypeName },
{nameof(RB_Web_RecruitmentType_ViewModel.ImgCover),model.ImgCover },
{nameof(RB_Web_RecruitmentType_ViewModel.CheckImg),model.CheckImg },
};
flag = web_RecruitmentTypeRepository.Update(fileds, new WhereHelper(nameof(RB_Web_RecruitmentType_ViewModel.Id), model.Id));
}
......
Edu.Repository/Course/RB_ClassRepository.cs
View file @ 8c121015
......@@ -67,12 +67,12 @@ WHERE 1=1
var parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.*,B.CourseName,D.TeacherName,IFNULL(D.TeacherHead,'') AS TeacherHead ,E.SName AS SchoolName,c.CateName
FROM rb_class AS A LEFT JOIN rb_course AS B ON A.CouseId=B.CourseId
left join rb_course_category c on b.CateId = c.CateId
SELECT A.*,B.CourseName,D.TeacherName,IFNULL(D.TeacherHead,'') AS TeacherHead ,E.SName AS SchoolName,c.CateName,E.ManagerId
FROM rb_class AS A LEFT JOIN rb_course AS B ON A.CouseId=B.CourseId
LEFT JOIN rb_course_category c on b.CateId = c.CateId
LEFT JOIN rb_teacher AS D ON A.Teacher_Id=D.TId
LEFT JOIN rb_school AS E ON A.School_Id=E.SId
WHERE 1=1
LEFT JOIN rb_school AS E ON A.School_Id=E.SId
WHERE 1=1
");
if (query != null)
{
......@@ -134,7 +134,6 @@ left join rb_course_category c on b.CateId = c.CateId
/// <returns></returns>
public List<RB_Class_ViewModel> GetClassPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_Class_ViewModel query)
{
var parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
......@@ -346,10 +345,10 @@ FROM (
/// <param name="GroupId"></param>
/// <returns></returns>
public List<RB_Class_ViewModel> GetTeachingPerfClassList(int GroupId) {
string sql = $@"SELECT c.* FROM rb_class c
LEFT JOIN rb_teaching_perf t on (c.ClassId = t.ClassId AND t.`Status`=0)
string sql = $@"
SELECT c.*
FROM rb_class c LEFT JOIN rb_teaching_perf t on (c.ClassId = t.ClassId AND t.`Status`=0)
WHERE c.`Status`=0 and c.Group_Id ={GroupId} and c.ClassStatus =3 and c.EndClassDate <='2030-12-16' AND t.Id IS NULL";
return Get<RB_Class_ViewModel>(sql).ToList();
}
......@@ -381,19 +380,15 @@ GROUP BY Teacher_Id
{
var parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"SELECT c.*,cp.ClassPlanId,cp.ClassDate from rb_class as c
LEFT JOIN rb_student_orderguest as sog on sog.ClassId=c.ClassId
LEFT JOIN (SELECT ClassId,MIN(ClassDate) as ClassDate,MIN(ClassPlanId) as ClassPlanId from rb_class_plan where `Status`=0 and DATE_FORMAT(ClassDate,'%y-%M-%d')>=DATE_FORMAT(now(),'%y-%M-%d') GROUP BY ClassId) as cp
on c.ClassId=cp.ClassId
where c.`Status`=0 and sog.`Status`=0 ");
builder.AppendFormat(@"
SELECT c.*,cp.ClassPlanId,cp.ClassDate
FROM rb_class as c LEFT JOIN rb_student_orderguest as sog on sog.ClassId=c.ClassId
LEFT JOIN (SELECT ClassId,MIN(ClassDate) as ClassDate,MIN(ClassPlanId) as ClassPlanId from rb_class_plan where `Status`=0 and DATE_FORMAT(ClassDate,'%y-%M-%d')>=DATE_FORMAT(now(),'%y-%M-%d') GROUP BY ClassId) as cp
on c.ClassId=cp.ClassId
WHERE c.`Status`=0 and sog.`Status`=0 ");
builder.AppendFormat(" AND sog.Student_Id={0} ", Student_Id);
builder.AppendFormat(" AND c.{0}={1} ", nameof(RB_Class_ViewModel.Group_Id), Group_Id);
return Get<RB_Class_ViewModel>(builder.ToString(), parameters).ToList();
}
}
}
}
\ No newline at end of file
Edu.Repository/Course/RB_Education_ContractRepository.cs
View file @ 8c121015
......@@ -14,7 +14,6 @@ namespace Edu.Repository.Course
/// </summary>
public class RB_Education_ContractRepository : BaseRepository<RB_Education_Contract>
{
/// <summary>
/// 获取分页列表
/// </summary>
......@@ -24,40 +23,42 @@ namespace Edu.Repository.Course
/// <param name="demodel"></param>
/// <param name="orderIds"></param>
/// <returns></returns>
public List<RB_Education_Contract_ViewModel> GetPageList(int pageIndex, int pageSize, out long rowsCount, RB_Education_Contract_ViewModel demodel)
public List<RB_Education_Contract_ViewModel> GetEducationContractPageListRepository(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}";
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}";
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}";
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}";
where += $@" AND {nameof(RB_Education_Contract_ViewModel.CType)} ={(int)demodel.CType}";
}
if (demodel.Status >= 0)
{
where += $@" and {nameof(RB_Education_Contract_ViewModel.Status)} ={demodel.Status}";
where += $@" AND {nameof(RB_Education_Contract_ViewModel.Status)} ={demodel.Status}";
}
if (!string.IsNullOrEmpty(demodel.ContractNo))
{
where += $@" and {nameof(RB_Education_Contract_ViewModel.ContractNo)} like '%{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 '%{demodel.StudentName}%'";
where += $@" AND {nameof(RB_Education_Contract_ViewModel.StudentName)} LIKE @StudentName ";
parameters.Add("StudentName", "%" + demodel.StudentName.Trim() + "%");
}
string sql = $@" select * from RB_Education_Contract where {where} order by Id desc";
return GetPage<RB_Education_Contract_ViewModel>(pageIndex, pageSize, out rowsCount, sql).ToList();
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();
}
/// <summary>
......@@ -68,49 +69,50 @@ namespace Edu.Repository.Course
/// <returns></returns>
public List<RB_Education_Contract_ViewModel> GetList(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}";
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}";
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}";
where += $@" AND {nameof(RB_Education_Contract_ViewModel.OrderId)} ={demodel.OrderId}";
}
if (!string.IsNullOrEmpty(demodel.OrderIds))
{
where += $@" and {nameof(RB_Education_Contract_ViewModel.OrderId)} in({demodel.OrderIds})";
where += $@" AND {nameof(RB_Education_Contract_ViewModel.OrderId)} IN({demodel.OrderIds})";
}
if (!string.IsNullOrEmpty(demodel.GuestIds))
{
where += $@" and {nameof(RB_Education_Contract_ViewModel.GuestId)} in({demodel.GuestIds})";
where += $@" AND {nameof(RB_Education_Contract_ViewModel.GuestId)} IN({demodel.GuestIds})";
}
if (demodel.CType > 0)
{
where += $@" and {nameof(RB_Education_Contract_ViewModel.CType)} ={(int)demodel.CType}";
where += $@" AND {nameof(RB_Education_Contract_ViewModel.CType)} ={(int)demodel.CType}";
}
if (demodel.Status >= 0)
{
where += $@" and {nameof(RB_Education_Contract_ViewModel.Status)} ={demodel.Status}";
where += $@" AND {nameof(RB_Education_Contract_ViewModel.Status)} ={demodel.Status}";
}
if (!string.IsNullOrEmpty(demodel.ContractNo))
{
where += $@" and {nameof(RB_Education_Contract_ViewModel.ContractNo)} like '%{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 '%{demodel.StudentName}%'";
where += $@" AND {nameof(RB_Education_Contract_ViewModel.StudentName)} LIKE @StudentName ";
parameters.Add("StudentName", "%" + demodel.StudentName.Trim() + "%");
}
string sql = $@" select * from RB_Education_Contract where {where} order by Id desc";
return Get<RB_Education_Contract_ViewModel>(sql).ToList();
string sql = $@" SELECT * FROM RB_Education_Contract WHERE {where} ORDER BY Id DESC";
return Get<RB_Education_Contract_ViewModel>(sql, parameters).ToList();
}
/// <summary>
/// 根据查询条件获取合同的总条数
/// </summary>
......@@ -118,24 +120,23 @@ namespace Edu.Repository.Course
/// <returns></returns>
public int GetContractCount(RB_Education_Contract_ViewModel where)
{
DynamicParameters parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT COUNT(1) FROM RB_Education_Contract WHERE 1=1
");
builder.AppendFormat(@"SELECT COUNT(1) FROM RB_Education_Contract WHERE 1=1 ");
if (where != null)
{
if (where.Group_Id > 0)
{
builder.AppendFormat($" and {nameof(RB_Education_Contract_ViewModel.Group_Id)} ={where.Group_Id}");
builder.AppendFormat($" AND {nameof(RB_Education_Contract_ViewModel.Group_Id)} ={where.Group_Id}");
}
if (where.ContractNo != null && !string.IsNullOrEmpty(where.ContractNo.Trim()))
{
builder.AppendFormat(" AND ContractNo LIKE '%{0}%' ", where.ContractNo.Trim());
builder.AppendFormat($@" AND {nameof(RB_Education_Contract_ViewModel.ContractNo)} LIKE @ContractNo ");
parameters.Add("ContractNo", "%" + where.ContractNo.Trim() + "%");
}
}
var obj = base.ExecuteScalar(builder.ToString());
var obj = base.ExecuteScalar(builder.ToString(), parameters);
return obj == null ? 0 : Convert.ToInt32(obj);
}
}
}
Edu.Repository/StudyAbroad/RB_StudyAbroadRepository.cs
View file @ 8c121015
......@@ -162,6 +162,10 @@ WHERE 1=1
{
builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_StudyAbroad_ViewModel.Id), query.QIds);
}
if (query.Type > 0)
{
builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_StudyAbroad_ViewModel.Type), query.Type);
}
return Get<RB_StudyAbroad_ViewModel>(builder.ToString(), parameters).ToList();
}
}
......
Edu.Repository/User/RB_NoticeRepository.cs
View file @ 8c121015
......@@ -25,7 +25,8 @@ namespace Edu.Repository.User
/// <returns></returns>
public List<RB_Notice_ViewModel> GetPageList(int pageIndex,int pageSize, out long count,RB_Notice_ViewModel demodel)
{
string where = $@" 1=1 and {nameof(RB_Notice.Status)}=0 ";
var parameters = new DynamicParameters();
string where = $@" 1=1 AND {nameof(RB_Notice.Status)}=0 ";
if (demodel.Group_Id > 0)
{
where += $@" and {nameof(RB_Notice.Group_Id)} ={demodel.Group_Id}";
......@@ -36,11 +37,13 @@ namespace Edu.Repository.User
}
if (!string.IsNullOrEmpty(demodel.Title))
{
where += $@" and {nameof(RB_Notice.Title)} like '%{demodel.Title}%'";
where += $@" AND {nameof(RB_Notice.Title)} LIKE @Title ";
parameters.Add("Title", "%" + demodel.Title.Trim() + "%");
}
if (!string.IsNullOrEmpty(demodel.Number))
{
where += $@" and {nameof(RB_Notice.Number)} like '%{demodel.Number}%'";
where += $@" and {nameof(RB_Notice.Number)} LIKE @Number ";
parameters.Add("Number", "%" + demodel.Number.Trim() + "%");
}
if (demodel.NoticeState > 0)
{
......@@ -50,7 +53,8 @@ namespace Edu.Repository.User
{
where += $@" and {nameof(RB_Notice.Is_Top)} ={demodel.Is_Top}";
}
if (demodel.UpdateBy > 0) {
if (demodel.UpdateBy > 0)
{
where += $@" and {nameof(RB_Notice.UpdateBy)} ={demodel.UpdateBy}";
}
......@@ -59,12 +63,12 @@ namespace Edu.Repository.User
{
OrderBy = " UpdateTime desc";
}
else if (demodel.OrderBy == 2) {
else if (demodel.OrderBy == 2)
{
OrderBy = " Is_Top asc,UpdateTime desc";
}
string sql = $@" select * from RB_Notice where {where} order by {OrderBy}";
return GetPage<RB_Notice_ViewModel>(pageIndex, pageSize, out count, sql).ToList();
return GetPage<RB_Notice_ViewModel>(pageIndex, pageSize, out count, sql,parameters).ToList();
}
/// <summary>
......@@ -158,6 +162,10 @@ namespace Edu.Repository.User
if (!string.IsNullOrEmpty(demodel.To)) {
where += $@" and (FIND_IN_SET(d.DeptId,'{demodel.To}') or d.DeptId =-1)";
}
if (!string.IsNullOrEmpty(demodel.LookTime))
{
where += $@" and n.{nameof(RB_Notice.UpdateTime)} >'{demodel.LookTime}'";
}
string OrderBy = " n.Id desc";
if (demodel.OrderBy == 1)
......@@ -169,9 +177,12 @@ namespace Edu.Repository.User
OrderBy = " n.Is_Top asc,n.UpdateTime desc";
}
string sql = $@" select n.* from RB_Notice n
left join rb_notice_dept d on n.Id = d.NoticeId
where {where} group by n.Id order by {OrderBy}";
string sql = $@"
SELECT n.*
FROM RB_Notice n LEFT JOIN rb_notice_dept d on n.Id = d.NoticeId
WHERE {where}
GROUP BY n.Id
ORDER BY {OrderBy}";
return GetPage<RB_Notice_ViewModel>(pageIndex, pageSize, out count, sql).ToList();
}
}
......
Edu.Repository/User/RB_Notice_ReadRepository.cs
View file @ 8c121015
......@@ -16,7 +16,7 @@ namespace Edu.Repository.User
{
public List<RB_Notice_Read_ViewModel> GetList(RB_Notice_Read_ViewModel demodel)
{
string where = $@" 1=1 and Status=0 ";
string where = $@" 1=1 ";
if (demodel.NoticeId > 0)
{
where += $@" and {nameof(RB_Notice_Read.NoticeId)} ={demodel.NoticeId}";
......@@ -25,7 +25,6 @@ namespace Edu.Repository.User
{
where += $@" and {nameof(RB_Notice_Read.AccountId)} ={demodel.AccountId}";
}
string sql = $@" select * from RB_Notice_Read where {where}";
return Get<RB_Notice_Read_ViewModel>(sql).ToList();
}
......@@ -37,7 +36,7 @@ namespace Edu.Repository.User
/// <returns></returns>
public List<RB_Notice_Read_ViewModel> GetNoticeReadNumList(string noticeIds)
{
string sql = $@" select NoticeId,count(0) as ReadNum from RB_Notice_Read where NoticeId in ({noticeIds}) group by NoticeId";
string sql = $@" select NoticeId,count(0) as ReadNum from RB_Notice_Read where NoticeId in ({noticeIds}) group by NoticeId ";
return Get<RB_Notice_Read_ViewModel>(sql).ToList();
}
}
......
Edu.Repository/Web/RB_Web_RecruitmentRepository.cs
View file @ 8c121015
......@@ -48,6 +48,10 @@ WHERE 1=1
builder.AppendFormat(" AND A.{0} LIKE @PositionName ", nameof(RB_Web_Recruitment_ViewModel.PositionName));
parameters.Add("PositionName", "%" + query.PositionName.Trim() + "%");
}
if (query.TypeId > 0)
{
builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Web_Recruitment_ViewModel.TypeId), query.TypeId);
}
}
builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Web_Recruitment_ViewModel.Id));
return GetPage<RB_Web_Recruitment_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
......
Edu.WebApi/Controllers/Course/OrderController.cs
View file @ 8c121015
......@@ -1171,33 +1171,6 @@ namespace Edu.WebApi.Controllers.Course
return ApiResult.Failed();
}
}
/// <summary>
/// 订单领取合同
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetOrderReceiveContract() {
var userInfo = base.UserInfo;
JObject prams = JObject.Parse(RequestParm.Msg.ToString());
int OrderId = prams.GetInt("OrderId", 0);
int GuestId = prams.GetInt("GuestId", 0);
if (OrderId <= 0)
{
return ApiResult.ParamIsNull("请传递订单id");
}
bool flag = orderModule.SetOrderReceiveContract(OrderId, GuestId, userInfo);
if (flag)
{
return ApiResult.Success();
}
else
{
return ApiResult.Failed();
}
}
#endregion
#region 退课申请
......
Edu.WebApi/Controllers/User/UserController.cs
View file @ 8c121015
......@@ -267,8 +267,8 @@ namespace Edu.WebApi.Controllers.User
SLogo=base.ParmJObj.GetStringValue("SLogo"),
SName = base.ParmJObj.GetStringValue("SName"),
Status=(DateStateEnum)base.ParmJObj.GetInt("Status"),
ContractTitle=base.ParmJObj.GetStringValue("ContractTitle"),
};
extModel.CreateBy = base.UserInfo.Id;
extModel.CreateTime = DateTime.Now;
extModel.UpdateBy = base.UserInfo.Id;
......
Edu.WebApi/Controllers/Web/WebController.cs
View file @ 8c121015
......@@ -598,7 +598,7 @@ namespace Edu.WebApi.Controllers.Web
query.Group_Id = groupId;
}
var list = webRecruitmentModule.GetWebRecruitmentTypeListModule(query);
return ApiResult.Success(data: list.Select(qitem => new { qitem.Id, qitem.TypeName, qitem.ImgCover }));
return ApiResult.Success(data: list.Select(qitem => new { qitem.Id, qitem.TypeName, qitem.CheckImg,qitem.ImgCover }));
}
/// <summary>
......
Edu.WebApi/Controllers/Web/WebManagerController.cs
View file @ 8c121015
......@@ -778,6 +778,7 @@ namespace Edu.WebApi.Controllers.Web
Id = base.ParmJObj.GetInt("Id"),
TypeName = base.ParmJObj.GetStringValue("TypeName"),
ImgCover = base.ParmJObj.GetStringValue("ImgCover"),
CheckImg=base.ParmJObj.GetStringValue("CheckImg"),
};
extModel.School_Id = base.UserInfo.School_Id;
extModel.Group_Id = base.UserInfo.Group_Id;
......
Edu.WebApi/Startup.cs
View file @ 8c121015
......@@ -52,6 +52,10 @@ namespace Edu.WebApi
"http://testmall.oytour.com",
"http://yx.oytour.com",
"http://edu.oytour.com",
"http://jiahe.oytour.com",
"http://jiahe.oytour.com",
"http://www.kookaku.com",
"http://www.kookaku.cn"
};
services.AddCors(options => options.AddPolicy("AllowCors", policy => policy.AllowAnyHeader().AllowAnyMethod().AllowCredentials().WithOrigins(corsArray.ToArray())));
}
......
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