Skip to content

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

页面修改

parent 25b4727d
Hide whitespace changes
Inline Side-by-side
Showing with 116 additions and 17 deletions
Edu.Model/Entity/Duty/RB_Duty_Content.cs
View file @ 8aa6e9db
......@@ -95,5 +95,10 @@ namespace Edu.Model.Entity.Duty
/// 事项类型(1-选择，2-手动填写)
/// </summary>
public int ItemType { get; set; }
/// <summary>
/// 交接班次
/// </summary>
public string HandoverShift { get; set; }
}
}
Edu.Model/ViewModel/Duty/RB_Duty_PlanDetails_ViewModel.cs
View file @ 8aa6e9db
......@@ -36,6 +36,16 @@ namespace Edu.Model.ViewModel.Duty
/// </summary>
public string DutyManIcon { get; set; }
/// <summary>
/// 值班日期
/// </summary>
public DateTime DutyDate { get; set; }
/// <summary>
/// 查询开始时间
/// </summary>
public string QStartDate { get; set; }
/// <summary>
/// 工作清单列表
/// </summary>
......
Edu.Module.Course/ClassModule.cs
View file @ 8aa6e9db
......@@ -483,7 +483,7 @@ namespace Edu.Module.Course
if (FinishMinutes > 0)
{
//基础课时分钟数
var BasicMinutes = class_ConfigRepository.GetBasicMinutesRepository(classModel.Group_Id);
var BasicMinutes = GetBasicMinutesModule(classModel.Group_Id);
//完成课时数
var finishHours = FinishMinutes / BasicMinutes;
if (classModel.ClassHours > 0)
......@@ -502,6 +502,16 @@ namespace Edu.Module.Course
return classRepository.Update(fileds, new WhereHelper(nameof(RB_Class_ViewModel.ClassId), classId));
}
/// <summary>
/// 获取基础课时分钟数
/// </summary>
/// <param name="Group_Id"></param>
/// <returns></returns>
public int GetBasicMinutesModule(int Group_Id)
{
return class_ConfigRepository.GetBasicMinutesRepository(Group_Id);
}
/// <summary>
/// 更新班级结课日期
/// </summary>
......@@ -564,7 +574,7 @@ namespace Edu.Module.Course
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0)
{
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList);
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList,planModel.Group_Id);
totalHours += dayHours;
classPlanList.Add(planModel);
}
......@@ -576,7 +586,7 @@ namespace Edu.Module.Course
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0)
{
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList);
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, planModel.Group_Id);
totalHours += dayHours;
classPlanList.Add(planModel);
}
......@@ -588,7 +598,7 @@ namespace Edu.Module.Course
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0)
{
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList);
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, planModel.Group_Id);
totalHours += dayHours;
classPlanList.Add(planModel);
}
......@@ -600,7 +610,7 @@ namespace Edu.Module.Course
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0)
{
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList);
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, planModel.Group_Id);
totalHours += dayHours;
classPlanList.Add(planModel);
}
......@@ -612,7 +622,7 @@ namespace Edu.Module.Course
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0)
{
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList);
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, planModel.Group_Id);
totalHours += dayHours;
classPlanList.Add(planModel);
}
......@@ -624,7 +634,7 @@ namespace Edu.Module.Course
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0)
{
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList);
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, planModel.Group_Id);
totalHours += dayHours;
classPlanList.Add(planModel);
}
......@@ -636,7 +646,7 @@ namespace Edu.Module.Course
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0)
{
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList);
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, planModel.Group_Id);
totalHours += dayHours;
classPlanList.Add(planModel);
}
......@@ -651,7 +661,7 @@ namespace Edu.Module.Course
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0)
{
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList);
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, planModel.Group_Id);
totalHours += dayHours;
classPlanList.Add(planModel);
}
......@@ -680,7 +690,7 @@ namespace Edu.Module.Course
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0)
{
CalcDayClassHoursModule(timeList, planModel.PlanTimeList);
CalcDayClassHoursModule(timeList, planModel.PlanTimeList, planModel.Group_Id);
classPlanList.Add(planModel);
}
}
......@@ -699,7 +709,7 @@ namespace Edu.Module.Course
/// </summary>
/// <param name="timeList"></param>
/// <returns></returns>
private double CalcDayClassHoursModule(List<TimeItem> timeList, List<RB_Class_Time_ViewModel> classTimeList)
private double CalcDayClassHoursModule(List<TimeItem> timeList, List<RB_Class_Time_ViewModel> classTimeList,int Group_Id)
{
double dayMinutes = 0;
foreach (var sItem in timeList)
......@@ -717,7 +727,7 @@ namespace Edu.Module.Course
dayMinutes += span.TotalMinutes;
}
}
double dayClassHours = dayMinutes / 45.0;
double dayClassHours = dayMinutes / GetBasicMinutesModule(Group_Id);
return dayClassHours;
}
......
Edu.Module.Course/StudentBillModule.cs
View file @ 8aa6e9db
......@@ -121,7 +121,7 @@ namespace Edu.Module.Course
//班级实体类
var classModel = classRepository.GetEntity(backModel.ClassId);
//基础课时分钟数
var BasicMinutes = class_ConfigRepository.GetClassConfigRepository(new RB_Class_Config_ViewModel() { Group_Id = backModel.Group_Id })?.BasicMinutes ?? 45;
var BasicMinutes = class_ConfigRepository.GetBasicMinutesRepository(backModel.Group_Id);
var stuCheckList = class_CheckRepository.GetGuestFinishMinutesRepository(backModel.GuestId.ToString());
//总签到上课分钟数
var totalFinishMinutes = stuCheckList?.Sum(qitem => qitem.FinishMinutes) ?? 0;
......
Edu.Module.Duty/DutyPlanModule.cs
View file @ 8aa6e9db
......@@ -1254,6 +1254,32 @@ namespace Edu.Module.Duty
return result;
}
/// <summary>
/// 获取交接班列表
/// </summary>
/// <returns></returns>
public object GetHandoverShiftListModule()
{
List<object> result = new List<object>();
var list = GetDutyPlanDetailsListModule(new RB_Duty_PlanDetails_ViewModel() { QStartDate = Common.ConvertHelper.FormatDate(DateTime.Now) }, IsQueryDutyMan: true);
foreach (var item in list)
{
result.Add(new
{
item.Id,
item.PlanId,
item.Shift,
item.DutyMan,
item.ConfigStartTime,
item.ConfigEndTime,
item.ShiftName,
DutyDate=Common.ConvertHelper.FormatDate(item.DutyDate),
});
}
return result;
}
/// <summary>
/// 值班打卡/值班交接
/// </summary>
......@@ -1261,9 +1287,12 @@ namespace Edu.Module.Duty
/// <param name="Shift"></param>
/// <param name="DutyMan"></param>
/// <param name="Status">Status(1-值班中，2-已完成)</param>
/// <param name="worklist"></param>
/// <param name="HandoverShift"></param>
/// <param name="message"></param>
/// <returns></returns>
[TransactionCallHandler]
public virtual bool DutyCheckModule(int Id, int Shift, int DutyMan, int Status, List<RB_Duty_Content_ViewModel> worklist, out string message)
public virtual bool DutyCheckModule(int Id, int Shift, int DutyMan, int Status, List<RB_Duty_Content_ViewModel> worklist,string HandoverShift,out string message)
{
message = "";
Dictionary<string, object> fileds = new Dictionary<string, object>()
......@@ -1344,6 +1373,15 @@ namespace Edu.Module.Duty
{
flag = duty_ContentRepository.InsertBatch(worklist);
}
if (!string.IsNullOrEmpty(HandoverShift))
{
flag = duty_ContentRepository.UpdateHandoverShiftRepository(HandoverShift, new RB_Duty_Content_ViewModel()
{
PlanId = Id,
PlanShift = Shift,
CreateBy = DutyMan
});
}
return flag;
}
......
Edu.Repository/Duty/RB_Duty_ContentRepository.cs
View file @ 8aa6e9db
......@@ -54,5 +54,23 @@ WHERE 1=1
}
return Get<RB_Duty_Content_ViewModel>(builder.ToString()).ToList();
}
/// <summary>
/// 交接班次
/// </summary>
/// <param name="HandoverShift"></param>
/// <param name="query"></param>
/// <returns></returns>
public bool UpdateHandoverShiftRepository(string HandoverShift, RB_Duty_Content_ViewModel query)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
UPDATE RB_Duty_Content
SET HandoverShift='{0}'
", HandoverShift);
builder.AppendFormat(@" WHERE PlanId={0} AND PlanType=2 AND PlanShift={1} AND CreateBy={2} ", query.PlanId, query.PlanShift, query.CreateBy);
return base.Execute(builder.ToString()) > 0;
}
}
}
Edu.Repository/Duty/RB_Duty_PlanDetailsRepository.cs
View file @ 8aa6e9db
......@@ -22,7 +22,9 @@ namespace Edu.Repository.Duty
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.*,IFNULL(B.Name,'') AS ShiftName,IFNULL(B.StartTime,'') AS ConfigStartTime,IFNULL(B.EndTime,'') AS ConfigEndTime
,C.Date AS DutyDate
FROM RB_Duty_PlanDetails AS A LEFT JOIN rb_duty_frequency AS B ON A.Shift=B.Id
LEFT JOIN rb_duty_plan AS C ON A.PlanId=C.Id
WHERE 1=1
");
if (query == null)
......@@ -47,7 +49,6 @@ WHERE 1=1
{
builder.AppendFormat(@" AND A.{0} IN({1}) ", nameof(RB_Duty_PlanDetails_ViewModel.DutyMan), query.QDutyMan);
}
if (query.QDutyStatus > -1)
{
builder.AppendFormat(" AND A.Status={0} ", query.QDutyStatus);
......@@ -72,6 +73,10 @@ WHERE 1=1
{
builder.AppendFormat(" AND A.Status=2 AND A.FinishLateTime=0 AND A.CheckLateTime=0 ");
}
if (!string.IsNullOrEmpty(query.QStartDate))
{
builder.AppendFormat(@" AND C.Date>'{0}' ", query.QStartDate);
}
}
builder.AppendFormat(" ORDER BY B.{0} ASC ", nameof(RB_Duty_Frequency_ViewModel.StartTime));
return Get<RB_Duty_PlanDetails_ViewModel>(builder.ToString()).ToList();
......
Edu.WebApi/Controllers/Course/ClassController.cs
View file @ 8aa6e9db
......@@ -804,7 +804,7 @@ namespace Edu.WebApi.Controllers.Course
data.TeacherName,
data.RoomName,
TotalHour = Convert.ToDecimal(totalMinutes / 60.0),
ClassNum = Convert.ToInt32(totalMinutes / 45),
ClassNum = Convert.ToInt32(totalMinutes / classModule.GetBasicMinutesModule(base.UserInfo.Group_Id)),
DefaultMinutes = totalMinutes,
ClassDate = data.ClassDate.ToString("yyyy-MM-dd"),
GuestList = guestList
......
Edu.WebApi/Controllers/Duty/DutyPlanController.cs
View file @ 8aa6e9db
......@@ -338,6 +338,17 @@ namespace Edu.WebApi.Controllers.Duty
return ApiResult.Success(data: obj);
}
/// <summary>
/// 获取交接班次列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetHandoverShiftList()
{
var obj = dutyPlanModule.GetHandoverShiftListModule();
return ApiResult.Success(data: obj);
}
/// <summary>
/// 值班打卡/值班交接
/// </summary>
......@@ -352,6 +363,8 @@ namespace Edu.WebApi.Controllers.Duty
int IsBurst = base.ParmJObj.GetInt("IsBurst");
//工作交接说明
int IsHandover = base.ParmJObj.GetInt("IsHandover");
//交接班次
string HandoverShift = base.ParmJObj.GetStringValue("HandoverShift");
List<RB_Duty_Content_ViewModel> list = new List<RB_Duty_Content_ViewModel>();
if (Status == 2)
{
......@@ -398,7 +411,7 @@ namespace Edu.WebApi.Controllers.Duty
});
}
}
var flag = dutyPlanModule.DutyCheckModule(Id, Shift, base.UserInfo.Id, Status, list, out string message);
var flag = dutyPlanModule.DutyCheckModule(Id, Shift, base.UserInfo.Id, Status, list,HandoverShift,out string message);
return flag ? ApiResult.Success() : ApiResult.Failed(message: message);
}
......
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