Skip to content

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

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

parents 9fd75126 c6850bdd
Hide whitespace changes
Inline Side-by-side
Showing with 116 additions and 36 deletions
Edu.Common/Enum/User/NoticeStateEnum.cs
View file @ e7015cdd
......@@ -22,5 +22,10 @@ namespace Edu.Common.Enum.User
/// </summary>
[EnumField("撤回")]
Cancel = 3,
/// <summary>
/// 待审核
/// </summary>
[EnumField("待审核")]
Review = 4,
}
}
Edu.Model/ViewModel/Course/Class_LessonPlan_ViewModel.cs
View file @ e7015cdd
......@@ -84,6 +84,23 @@ namespace Edu.Model.ViewModel.Course
#region 展示无逻辑
/// <summary>
/// 0-未备课，1-已备课
/// </summary>
public int BeiKeStatus { get; set; }
/// <summary>
/// 0-未反馈，1-已反馈
/// </summary>
public int FanKuiStatus { get; set; }
/// <summary>
/// 总评分
/// </summary>
public decimal TotalScore { get; set; }
/// <summary>
/// 老师名称
/// </summary>
......
Edu.Module.User/AttendanceModule.cs
View file @ e7015cdd
......@@ -52,6 +52,20 @@ namespace Edu.Module.User
return dictvalueRepository.GetList(new RB_Dictvalue_Extend() { RB_Group_id = group_Id, DictKey = key });
}
/// <summary>
/// 更新公告审核人
/// </summary>
/// <param name="Content"></param>
/// <returns></returns>
public bool SetContent(string Content)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Dictvalue_Extend.Content),Content }
};
return dictvalueRepository.Update(fileds, new WhereHelper(nameof(RB_Dictvalue_Extend.DictKey), Edu.Common.Config.Notice_BaseKey));
}
#endregion
/// <summary>
......
Edu.Repository/Course/RB_Class_PlanRepository.cs
View file @ e7015cdd
......@@ -410,7 +410,7 @@ LEFT JOIN rb_class as class on a.ClassId=class.ClassId
LEFT JOIN rb_teacher AS T ON A.TeacherId=T.TId
LEFT JOIN (SELECT ClassPlanId,COUNT(*) as LessonPlanNum from rb_class_lessonplan where `Status`=0 GROUP BY ClassPlanId)as lp on a.ClassPlanId=lp.ClassPlanId
LEFT JOIN (SELECT ClassPlanId,COUNT(*) as LessonPlanSummaryNum from rb_class_lessonplan where `Status`=0 and ISNULL(Summary)=0 and LENGTH(trim(Summary))>0 GROUP BY ClassPlanId)as lps on a.ClassPlanId=lps.ClassPlanId
WHERE 1=1 and class.ClassStatus=2 and t.`Status`=0 and a.`Status`=0 ORDER BY a.ClassId,a.ClassDate) as a where 1=1
WHERE 1=1 and class.ClassStatus in(1,2) and t.`Status`=0 and a.`Status`=0 ORDER BY a.ClassId,a.ClassDate) as a where 1=1
");
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Status), (int)DateStateEnum.Normal);
if (query != null)
......
Edu.Repository/Course/RB_Class_RoomRepository.cs
View file @ e7015cdd
......@@ -68,7 +68,8 @@ WHERE 1=1
SELECT A.*
FROM RB_Class_Room AS A
WHERE 1=1
");
");
builder.AppendFormat(" AND A.{0}<>{1} ", nameof(RB_Class_Room_ViewModel.Status), (int)(DateStateEnum.Delete));
if (query != null)
{
if (query.Group_Id > 0)
......
Edu.WebApi/Controllers/Course/ClassController.cs
View file @ e7015cdd
......@@ -635,7 +635,7 @@ namespace Edu.WebApi.Controllers.Course
public ApiResult RemoveClassPlan()
{
var ClassPlanId = base.ParmJObj.GetInt("ClassPlanId");
var flag = classModule.RemoveClassPlanModule(ClassPlanId, base.UserInfo,out string message);
var flag = classModule.RemoveClassPlanModule(ClassPlanId, base.UserInfo, out string message);
return flag ? ApiResult.Success() : ApiResult.Failed(message: message);
}
......@@ -914,7 +914,8 @@ namespace Edu.WebApi.Controllers.Course
string MonthStr = list.FirstOrDefault().ClassDate.ToString("yyyy-MM");
int schoolId = list.FirstOrDefault().School_Id;
string ValidateMsg = classModule.ValidateClassCheckFinance(MonthStr, schoolId, base.UserInfo.Group_Id);
if (ValidateMsg != "") {
if (ValidateMsg != "")
{
return ApiResult.Failed(ValidateMsg);
}
#endregion
......@@ -1304,6 +1305,21 @@ namespace Edu.WebApi.Controllers.Course
var planTiemList = classModule.GetClassTimeListModule(new RB_Class_Time_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = extModel.ClassId, ClassPlanId = extModel.ClassPlanId });
model.TeacherName = planDate.TeacherName;
model.WorkDate = planDate.ClassDate.ToString("yyyy年MM月dd日");
model.BeiKeStatus = planDate.BeiKeStatus;
model.FanKuiStatus = planDate.FanKuiStatus;
#region 查询备课评分信息
var query = new RB_Class_LessonComment_ViewModel()
{
ClassPlanId = base.ParmJObj.GetInt("ClassPlanId"),
ClassId = base.ParmJObj.GetInt("ClassId"),
Group_Id = base.UserInfo.Group_Id,
//School_Id = base.ParmJObj.GetInt("School_Id"),
};
query.Group_Id = base.UserInfo.Group_Id;
var list = classModule.GetLessonCommentList(query);
model.TotalScore = (list != null && list.Any()) ? list.Where(x => x.Score > 0).Sum(x => x.Score) : 0;
#endregion
model.WeekStr = StringHelper.GetJapanWeekChar(planDate.ClassDate);
DateTime startTime = System.DateTime.Now;
DateTime endTime = System.DateTime.Now;
......@@ -1374,18 +1390,9 @@ namespace Edu.WebApi.Controllers.Course
}
if (item.LessonPlanDetailsList != null && item.LessonPlanDetailsList.Any())
{
foreach (var itemDetails in item.LessonPlanDetailsList)
{
//if (lessPlanDetailsId == itemDetails.LessonPlanId)
//{
tempDuration += itemDetails.Duration;
//}
//else
//{
// tempDuration += (itemDetails.Duration + jiangeTime);
//}
itemDetails.DurationEndTime = startTime.AddMinutes(tempDuration).ToString("HH:mm");
}
}
......@@ -1395,11 +1402,8 @@ namespace Edu.WebApi.Controllers.Course
// item.LessonPlanProjectsList.ForEach(x => x.ProjectContentList = (string.IsNullOrWhiteSpace(x.ProjectContent) ? new List<string>() : Common.Plugin.JsonHelper.DeserializeObject<List<string>>(x.ProjectContent)));
model.IsEditSummary += item.LessonPlanDetailsList.Where(x => !string.IsNullOrWhiteSpace(x.Summary)).Count();
}
}
}
else
{
......
Edu.WebApi/Controllers/Course/ClassRoomController.cs
View file @ e7015cdd
......@@ -548,7 +548,8 @@ namespace Edu.WebApi.Controllers.Course
{
var query = new RB_Class_Room_ViewModel()
{
Group_Id = 100000
Group_Id = 100000,
Status = DateStateEnum.Normal,
};
var list = classRoomModule.GetClassRoomListRepository(query);
var result = list.Select(x => new
......
Edu.WebApi/Controllers/User/UserCenterController.cs
View file @ e7015cdd
......@@ -91,6 +91,40 @@ namespace Edu.WebApi.Controllers.User
}
return ApiResult.Success("请求成功!", objlist);
}
/// <summary>
/// 获取字典列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetContent()
{
UserInfo userInfo = base.UserInfo; ;
JObject parm = JObject.Parse(RequestParm.Msg.ToString());
string Content = parm.GetStringValue("Content");
bool result = attendancemodule.SetContent(Content);
return result ? ApiResult.Success("请求成功!") : ApiResult.Failed("请求失败!");
}
/// <summary>
/// 获取公告设置字典实体
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetNoticeBaseKeyDictValue()
{
UserInfo userInfo = base.UserInfo;
var model = attendancemodule.GetDictValueList(userInfo.Group_Id, Config.Notice_BaseKey).FirstOrDefault();
var result = new
{
model.DictKey,
model.Content
};
return ApiResult.Success("请求成功!", result);
}
#endregion
#region 公告管理
......@@ -115,6 +149,10 @@ namespace Edu.WebApi.Controllers.User
return ApiResult.Success("", obj);
}
/// <summary>
/// 新增修改公告基础
/// </summary>
......@@ -124,11 +162,11 @@ namespace Edu.WebApi.Controllers.User
{
var demodel = new RB_Notice_Base_ViewModel()
{
Id=base.ParmJObj.GetInt("Id"),
Image=base.ParmJObj.GetStringValue("Image"),
From=base.ParmJObj.GetStringValue("From"),
NumberRule= (NoticeRuleEnum)base.ParmJObj.GetInt("NumberRule"),
CopyPeople=base.ParmJObj.GetStringValue("CopyPeople"),
Id = base.ParmJObj.GetInt("Id"),
Image = base.ParmJObj.GetStringValue("Image"),
From = base.ParmJObj.GetStringValue("From"),
NumberRule = (NoticeRuleEnum)base.ParmJObj.GetInt("NumberRule"),
CopyPeople = base.ParmJObj.GetStringValue("CopyPeople"),
};
demodel.Group_Id = base.UserInfo.Group_Id;
demodel.School_Id = base.UserInfo.School_Id;
......@@ -174,10 +212,10 @@ namespace Edu.WebApi.Controllers.User
var pageModel = JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var query = new RB_Notice_ViewModel()
{
Is_Top=base.ParmJObj.GetInt("Is_Top"),
NoticeState=(NoticeStateEnum)base.ParmJObj.GetInt("NoticeState"),
Number=base.ParmJObj.GetStringValue("Number"),
Title=base.ParmJObj.GetStringValue("Title"),
Is_Top = base.ParmJObj.GetInt("Is_Top"),
NoticeState = (NoticeStateEnum)base.ParmJObj.GetInt("NoticeState"),
Number = base.ParmJObj.GetStringValue("Number"),
Title = base.ParmJObj.GetStringValue("Title"),
UpdateBy = base.ParmJObj.GetInt("UpdateBy"),
};
query.Group_Id = base.UserInfo.Group_Id;
......@@ -226,14 +264,14 @@ namespace Edu.WebApi.Controllers.User
UserInfo userInfo = base.UserInfo;
RB_Notice_ViewModel demodel = new RB_Notice_ViewModel()
{
Id=base.ParmJObj.GetInt("Id"),
Content=base.ParmJObj.GetStringValue("Content"),
CopyPeople=base.ParmJObj.GetStringValue("CopyPeople"),
From=base.ParmJObj.GetStringValue("From"),
Is_Top=base.ParmJObj.GetInt("Is_Top"),
NoticeState=(NoticeStateEnum)base.ParmJObj.GetInt("NoticeState"),
Title=base.ParmJObj.GetStringValue("Title"),
To=base.ParmJObj.GetStringValue("To")
Id = base.ParmJObj.GetInt("Id"),
Content = base.ParmJObj.GetStringValue("Content"),
CopyPeople = base.ParmJObj.GetStringValue("CopyPeople"),
From = base.ParmJObj.GetStringValue("From"),
Is_Top = base.ParmJObj.GetInt("Is_Top"),
NoticeState = (NoticeStateEnum)base.ParmJObj.GetInt("NoticeState"),
Title = base.ParmJObj.GetStringValue("Title"),
To = base.ParmJObj.GetStringValue("To")
};
if (demodel.To == "0")
{
......@@ -336,7 +374,7 @@ namespace Edu.WebApi.Controllers.User
query.Group_Id = base.UserInfo.Group_Id;
query.DeptId = base.UserInfo.DeptId;
query.NoticeState = NoticeStateEnum.Publish;
var noticeBaseModel=noticeModule.GetNoticeBaseInfo(base.UserInfo.Group_Id);
var noticeBaseModel = noticeModule.GetNoticeBaseInfo(base.UserInfo.Group_Id);
var list = noticeModule.GetMyNoticePageList(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
List<object> result = new List<object>();
foreach (var item in list)
......@@ -346,7 +384,7 @@ namespace Edu.WebApi.Controllers.User
{
try
{
fileList= Common.Plugin.JsonHelper.DeserializeObject<List<FileModel>>(item.File);
fileList = Common.Plugin.JsonHelper.DeserializeObject<List<FileModel>>(item.File);
}
catch (Exception ex)
{
......
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