Skip to content

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

页面修改

parent 4b582289
Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 22 deletions
Edu.EducationCore/Helper/QuarzHelper.cs
View file @ 7a323319
......@@ -385,12 +385,14 @@ namespace Edu.Education.Helper
{
{ "quartz.serializer.type", "binary" }
};
StdSchedulerFactory factory = new StdSchedulerFactory(props);
IScheduler scheduler = await factory.GetScheduler();
await scheduler.Start();
IJobDetail job = JobBuilder.Create<PushStuFollowUpJob>()
.WithIdentity("job12", "group12")
.WithIdentity("stuFollow", "stuFollowGroup")
.StoreDurably(true)
.Build();
// 创建每天 9:00 点执行的任务触发器
......@@ -398,8 +400,9 @@ namespace Edu.Education.Helper
.WithDailyTimeIntervalSchedule(s =>
s.WithIntervalInHours(24)
.OnEveryDay()
.StartingDailyAt(TimeOfDay.HourAndMinuteOfDay(9, 0))
.StartingDailyAt(TimeOfDay.HourAndMinuteOfDay(9, 00))
)
.ForJob(job)
.Build();
// 创建每天13:30 点执行的任务触发器
......@@ -409,6 +412,7 @@ namespace Edu.Education.Helper
.OnEveryDay()
.StartingDailyAt(TimeOfDay.HourAndMinuteOfDay(13, 30))
)
.ForJob(job)
.Build();
// 创建每天17:50 点执行的任务触发器
......@@ -418,10 +422,13 @@ namespace Edu.Education.Helper
.OnEveryDay()
.StartingDailyAt(TimeOfDay.HourAndMinuteOfDay(17, 50))
)
.ForJob(job)
.Build();
await scheduler.ScheduleJob(job, trigger1);
await scheduler.ScheduleJob(job, trigger2);
await scheduler.ScheduleJob(job, trigger3);
await scheduler.AddJob(job, true);
await scheduler.ScheduleJob(trigger1);
await scheduler.ScheduleJob(trigger2);
await scheduler.ScheduleJob(trigger3);
await scheduler.Start();
}
}
......
Edu.EducationCore/appsettings.json
View file @ 7a323319
{
"ConnectionStrings": {
"DefaultConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"DefaultConnection": "server=192.168.5.214;user id=reborn;password=Reborn@2018;database=reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"DefaultConnectionPName": "MySql.Data.MySqlClient",
"FinanceConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=test_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"FinanceConnection": "server=192.168.5.214;user id=reborn;password=Reborn@2018;database=test_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"FinanceConnectionPName": "MySql.Data.MySqlClient",
"DataStatisticsConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=reborn_datastatistics;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"DataStatisticsConnection": "server=192.168.5.214;user id=reborn;password=Reborn@2018;database=reborn_datastatistics;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"DataStatisticsConnectionPName": "MySql.Data.MySqlClient",
"LogConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=reborn_sys;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"LogConnection": "server=192.168.5.214;user id=reborn;password=Reborn@2018;database=reborn_sys;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"LogConnectionPName": "MySql.Data.MySqlClient",
"MallConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=reborn_mall;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"MallConnection": "server=192.168.5.214;user id=reborn;password=Reborn@2018;database=reborn_mall;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"MallConnectionPName": "MySql.Data.MySqlClient"
//"DefaultConnection": "server=rm-bp1tj77h6kp0d02fb.mysql.rds.aliyuncs.com;user id=reborn;password=Reborn@2018;database=uat_reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ",
//"DefaultConnectionPName": "MySql.Data.MySqlClient",
......@@ -40,10 +40,10 @@
"TeachingBonusTemplete": 141,
"BonusCostTypeId": 540,
"EduDateBase": "uat_reborn_edu",
//消息推送AppId
//��Ϣ����AppId
"PushAppId": "JiaHeJiaoYu",
"RabbitMqConfig": {
"HostName": "47.96.25.130",
"HostName": "192.168.5.214",
"VirtualHost": "/",
"Port": 5672,
"UserName": "guest",
......@@ -56,8 +56,8 @@
"RedisPwd": "Viitto2018"
},
"VirtualDirectory": "WebFile",
//是否是本地服务
//�Ƿ��DZ��ط���
"IsLocal": "1",
//是否是线上环境
//�Ƿ������ϻ���
"IsOnline": false
}
\ No newline at end of file
Edu.Model/Entity/Grade/RB_Class_Check.cs
View file @ 7a323319
......@@ -105,5 +105,9 @@ namespace Edu.Model.Entity.Grade
/// </summary>
public AttendanceMethodEnum AttendanceMethod { get; set; }
/// <summary>
/// 是否计算老师课时费(1-计算,0-不计算)
/// </summary>
public int IsCalcTeacFee { get; set; }
}
}
Edu.Module.Course/PlanAppoimentModule.cs
View file @ 7a323319
......@@ -3,6 +3,7 @@ using Edu.Model.ViewModel.Scroll;
using Edu.Model.ViewModel.User;
using Edu.Repository.Scroll;
using Edu.Repository.User;
using Senparc.Weixin.Annotations;
using System;
using System.Collections.Generic;
using System.Linq;
......@@ -334,5 +335,40 @@ namespace Edu.Module.Course
}
return list;
}
/// <summary>
/// 获取学员预约统计
/// </summary>
/// <param name="startDate"></param>
/// <param name="endDate"></param>
/// <param name="StuId"></param>
/// <returns></returns>
public List<object> GetStuAppointPlanModule(string startDate, string endDate, int Group_Id ,int StuId)
{
List<object> list = new List<object>();
var timeList = GetScrollCourseTimeList(Group_Id);
var dataList = GetPlanAppointmentStatic(new RB_Plan_Appointment_Details_ViewModel()
{
QStartDate = startDate,
QEndDate = endDate,
Group_Id = Group_Id,
StuId=StuId,
});
foreach (var item in dataList.OrderBy(qitem=>qitem.Date))
{
var tempTime = timeList?.FirstOrDefault(qitem => qitem.StartTime == item.StartTime && qitem.EndTime == item.EndTime);
list.Add(new
{
Date = Common.ConvertHelper.FormatDate(item.Date),
item.StuName,
item.StuId,
item.StartTime,
item.EndTime,
TimeId = tempTime?.Sort ?? 0
});
}
return list;
}
}
}
Edu.Module.Customer/CustomerStudentModule.cs
View file @ 7a323319
......@@ -1780,7 +1780,7 @@ namespace Edu.Module.Customer
{
empList = accountRepository.GetEmployeeListRepository(new Employee_ViewModel() { QIds = string.Join(",", empIdList) });
}
List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>();
foreach (var item in list)
{
string markdownContent = $"`学员回访通知` \n>**概要信息** \n>学员名称：{item?.StuName ?? ""}\n>内容：今日需要回访,请跟进. \n>";
......@@ -1802,16 +1802,18 @@ namespace Edu.Module.Customer
if (tempCreate != null && tempCreate.Id > 0 && !string.IsNullOrEmpty(tempCreate.WorkUserId))
{
modelWork.ReceiveId = tempCreate.WorkUserId;
List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
pushList.Add(modelWork);
}
if (tempStuCreate != null && tempStuCreate.Id > 0 && !string.IsNullOrEmpty(tempStuCreate.WorkUserId) && tempStuCreate.Id != tempCreate.Id)
{
modelWork.ReceiveId = tempStuCreate.WorkUserId;
List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
pushList.Add(modelWork);
}
}
if (pushList != null && pushList.Count > 0)
{
new Common.Message.MessageHelper().SendMessage(pushList);
}
}
return flag;
}
......
Edu.Repository/Customer/RB_Student_FollowRepository.cs
View file @ 7a323319
......@@ -491,7 +491,6 @@ SELECT Avg(FollowCount) AS FollowEffectiveCount FROM
public List<RB_Student_Follow_Extend> GetTodayFollowUpRepository()
{
string todayStr = Common.ConvertHelper.FormatDate(DateTime.Now);
todayStr = "2024-08-29";
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.StuId,IFNULL(B.StuName,'') AS StuName,A.CreateBy,B.CreateBy AS StuCreateBy
......
Edu.Repository/Grade/RB_Class_CheckRepository.cs
View file @ 7a323319
......@@ -1015,6 +1015,7 @@ WHERE 1=1 AND A.Status=0 {1} ", builderMakeUp.ToString(), builderWhere.ToString
}
else
{
item.IsCalcTeacFee = 1;
item.CurrentDeductionHours = currentDeductionHours;
item.MakeUpStatus = 1;
var newId = base.Insert(item);
......@@ -1435,7 +1436,8 @@ WHERE 1=1 AND A.Status=0 {1} ", builderMakeUp.ToString(), builderWhere.ToString
MakeUpStatus = 1,
CurrentDeductionHours = ccModel.ClassHours,
IsAbsentHours = 0,
ClassTimeId = qitem.ClassTimeId
ClassTimeId = qitem.ClassTimeId,
IsCalcTeacFee=1,
});
}
}
......
Edu.Repository/Scroll/RB_Plan_Appointment_DetailsRepository.cs
View file @ 7a323319
......@@ -83,6 +83,10 @@ WHERE 1=1 ");
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Plan_Appointment_Details_ViewModel.PlanAppointmentId), query.PlanAppointmentId);
}
if (query.StuId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Plan_Appointment_Details_ViewModel.StuId), query.StuId);
}
}
var list = Get<RB_Plan_Appointment_Details_ViewModel>(builder.ToString()).ToList();
return list;
......
Edu.WebApi/Controllers/Course/PlanAppoimentController.cs
View file @ 7a323319
......@@ -92,6 +92,27 @@ namespace Edu.WebApi.Controllers.Course
return ApiResult.Success(data: data);
}
/// <summary>
/// 获取学员预约计划
/// </summary>
/// <returns></returns>
public ApiResult GetStuAppointPlan()
{
string startDate = base.ParmJObj.GetStringValue("StartTime");
string endDate = base.ParmJObj.GetStringValue("EndTime");
if (string.IsNullOrEmpty(startDate))
{
startDate = Common.ConvertHelper.FormatDate(DateTime.Now);
}
if (string.IsNullOrEmpty(endDate))
{
endDate = Common.ConvertHelper.FormatDate(Convert.ToDateTime(startDate).AddMonths(1));
}
int StuId = base.ParmJObj.GetInt("StuId");
var data = planAppoiment.GetStuAppointPlanModule(startDate, endDate, base.UserInfo.Group_Id, StuId);
return ApiResult.Success(data: data);
}
/// <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