Skip to content

E
Education
Commit 9a8b6f8b authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 803ba604 c3330d57
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2107 additions and 173 deletions
Edu.Common/Config.cs
View file @ 9a8b6f8b
...@@ -596,5 +596,17 @@ namespace Edu.Common ...@@ -596,5 +596,17 @@ namespace Edu.Common
return ReadConfigKey("MallJwtSecretKey"); return ReadConfigKey("MallJwtSecretKey");
} }
} }
/// <summary>
/// 值班日期验证
/// </summary>
public static DateTime DutyDate
{
get
{
DateTime.TryParse(ReadConfigKey("DutyDate"), out DateTime dt);
return dt;
}
}
} }
} }
\ No newline at end of file
Edu.Model/Entity/Advertising/Rb_Advertising.cs 0 → 100644
View file @ 9a8b6f8b
using System;
using System.Collections.Generic;
using System.Text;
using VT.FW.DB;
namespace Edu.Model.Entity.Advertising
{
/// <summary>
/// 广告基础信息
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class Rb_Advertising
{
/// <summary>
/// 编号
/// </summary>
public int ID
{
get;
set;
}
/// <summary>
/// 图片路径
/// </summary>
public string PictureUrl
{
get;
set;
}
/// <summary>
/// 示例图片
/// </summary>
public string SamplePicturesUrl
{
get;
set;
}
/// <summary>
/// 状态
/// </summary>
public int? Status
{
get;
set;
}
/// <summary>
/// 名称
/// </summary>
public string Title
{
get;
set;
}
/// <summary>
/// 标签
/// </summary>
public string Lable { get; set; }
/// <summary>
/// 集团编号
/// </summary>
public int Group_Id { get; set; }
/// <summary>
/// 学校编号
/// </summary>
// public int School_Id { get; set; }
/// <summary>
/// 收费金额
/// </summary>
public decimal? ChargeAmount
{
get;
set;
}
/// <summary>
/// 是否收费 1收2不收
/// </summary>
public int? IsFee
{
get;
set;
}
/// <summary>
/// 创建时间
/// </summary>
public DateTime? CreateDate { get; set; }
/// <summary>
/// 创建人
/// </summary>
public int? CreateBy { get; set; }
}
}
Edu.Model/Entity/Advertising/Rb_Advertising_Make.cs 0 → 100644
View file @ 9a8b6f8b
using System;
using System.Collections.Generic;
using System.Text;
using VT.FW.DB;
namespace Edu.Model.Entity.Advertising
{
/// <summary>
/// 广告制作
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class Rb_Advertising_Make
{
/// <summary>
/// 编号
/// </summary>
public int ID
{
get;
set;
}
/// <summary>
/// 操作时间
/// </summary>
public DateTime? UpdateDate
{
get;
set;
}
/// <summary>
/// 集团编号
/// </summary>
public int Group_Id { get; set; }
/// <summary>
/// 学校编号
/// </summary>
public int School_Id { get; set; }
/// <summary>
/// 状态
/// </summary>
public Common.Enum.DateStateEnum? Status
{
get;
set;
}
/// <summary>
/// 操作人
/// </summary>
public int? UpdateBy
{
get;
set;
}
/// <summary>
/// 关联广告id
/// </summary>
public int? AdvertisingID
{
get;
set;
}
/// <summary>
/// 内容
/// </summary>
public string Content
{
get;
set;
}
/// <summary>
/// 广告图片路径
/// </summary>
public string AdvertisingPicUrl { get; set; }
/// <summary>
/// 文件MD5
/// </summary>
public string SecretKey { get; set; }
}
}
Edu.Model/Entity/Course/RB_Class_Time.cs
View file @ 9a8b6f8b
...@@ -69,7 +69,5 @@ namespace Edu.Model.Entity.Course ...@@ -69,7 +69,5 @@ namespace Edu.Model.Entity.Course
/// 课堂视频 /// 课堂视频
/// </summary> /// </summary>
public string VideoUrl { get; set; } public string VideoUrl { get; set; }
} }
} }
Edu.Model/Entity/Duty/RB_Duty_Content.cs
View file @ 9a8b6f8b
...@@ -95,5 +95,10 @@ namespace Edu.Model.Entity.Duty ...@@ -95,5 +95,10 @@ namespace Edu.Model.Entity.Duty
/// 事项类型(1-选择，2-手动填写) /// 事项类型(1-选择，2-手动填写)
/// </summary> /// </summary>
public int ItemType { get; set; } public int ItemType { get; set; }
/// <summary>
/// 交接班次(rb_duty_plandetails表的Id)
/// </summary>
public string HandoverDlandetails { get; set; }
} }
} }
Edu.Model/Entity/Duty/RB_Duty_Item.cs
View file @ 9a8b6f8b
...@@ -70,5 +70,15 @@ namespace Edu.Model.Entity.Duty ...@@ -70,5 +70,15 @@ namespace Edu.Model.Entity.Duty
/// 值班标准图片 /// 值班标准图片
/// </summary> /// </summary>
public string ItemImg { get; set; } public string ItemImg { get; set; }
/// <summary>
/// 值班事项分类(1-工作清单，2-突发事项，3-交接说明)
/// </summary>
public int DutyCategory { get; set; }
/// <summary>
/// 值班类型(1-规则事项，2-值班事项)
/// </summary>
public int DutyType { get; set; }
} }
} }
Edu.Model/ViewModel/Advertising/Rb_Advertising_Extend.cs 0 → 100644
View file @ 9a8b6f8b
using System;
using System.Collections.Generic;
using System.Text;
using Edu.Model.Entity.Advertising;
namespace Edu.Model.ViewModel.Advertising
{
public class Rb_Advertising_Extend : Rb_Advertising
{
/// <summary>
/// 标签
/// </summary>
public List<string> LableList { get; set; }
/// <summary>
/// 广告数量
/// </summary>
public int AdvertisingCount { get; set; }
}
}
Edu.Model/ViewModel/Advertising/Rb_Advertising_Make_Extend.cs 0 → 100644
View file @ 9a8b6f8b
using System;
using System.Collections.Generic;
using System.Text;
using Edu.Model.Entity.Advertising;
namespace Edu.Model.ViewModel.Advertising
{
public class Rb_Advertising_Make_Extend: Rb_Advertising_Make
{
/// <summary>
/// 基础广告名称
/// </summary>
public string Title { get; set; }
/// <summary>
/// 图片路径
/// </summary>
public string PictureUrl
{
get;
set;
}
/// <summary>
/// 示例图片
/// </summary>
public string SamplePicturesUrl
{
get;
set;
}
/// <summary>
/// 收费金额
/// </summary>
public decimal? ChargeAmount
{
get;
set;
}
/// <summary>
/// 是否收费
/// </summary>
public int? IsFee
{
get;
set;
}
}
}
Edu.Model/ViewModel/Course/RB_Class_ViewModel.cs
View file @ 9a8b6f8b
...@@ -34,6 +34,11 @@ namespace Edu.Model.ViewModel.Course ...@@ -34,6 +34,11 @@ namespace Edu.Model.ViewModel.Course
/// </summary> /// </summary>
public string CourseName { get; set; } public string CourseName { get; set; }
/// <summary>
/// 课程特色
/// </summary>
public string CourseFeature { get; set; }
/// <summary> /// <summary>
/// 课程分类 /// 课程分类
/// </summary> /// </summary>
......
Edu.Model/ViewModel/Duty/RB_Duty_Content_ViewModel.cs
View file @ 9a8b6f8b
...@@ -35,5 +35,15 @@ namespace Edu.Model.ViewModel.Duty ...@@ -35,5 +35,15 @@ namespace Edu.Model.ViewModel.Duty
/// 创建时间 /// 创建时间
/// </summary> /// </summary>
public string CreateTimeStr { get { return Common.ConvertHelper.FormatTimeStr(this.CreateTime); } } public string CreateTimeStr { get { return Common.ConvertHelper.FormatTimeStr(this.CreateTime); } }
/// <summary>
/// 创建时间
/// </summary>
public string CreateTimeStr2 { get; set; }
/// <summary>
/// 值班事项名称
/// </summary>
public string ItemName { get; set; }
} }
} }
Edu.Model/ViewModel/Duty/RB_Duty_Item_ViewModel.cs
View file @ 9a8b6f8b
...@@ -39,5 +39,42 @@ namespace Edu.Model.ViewModel.Duty ...@@ -39,5 +39,42 @@ namespace Edu.Model.ViewModel.Duty
/// 值班项目图片列表 /// 值班项目图片列表
/// </summary> /// </summary>
public List<string> ItemImgList { get; set; } public List<string> ItemImgList { get; set; }
/// <summary>
/// 值班事项分类字符串
/// </summary>
public string DutyCategoryStr
{
get
{
string str = "";
switch (this.DutyCategory)
{
case 1: str = "工作清单"; break;
case 2: str = "突发事项"; break;
case 3: str = "交接说明"; break;
}
return str;
}
}
/// <summary>
/// 值班类型字符串
/// </summary>
public string DutyTypeStr
{
get
{
string str = "";
switch (this.DutyType)
{
case 1: str = "规则事项"; break;
case 2: str = "值班事项"; break;
}
return str;
}
}
} }
} }
Edu.Model/ViewModel/Duty/RB_Duty_PlanDetails_ViewModel.cs
View file @ 9a8b6f8b
...@@ -36,6 +36,16 @@ namespace Edu.Model.ViewModel.Duty ...@@ -36,6 +36,16 @@ namespace Edu.Model.ViewModel.Duty
/// </summary> /// </summary>
public string DutyManIcon { get; set; } public string DutyManIcon { get; set; }
/// <summary>
/// 值班日期
/// </summary>
public DateTime DutyDate { get; set; }
/// <summary>
/// 查询开始时间
/// </summary>
public string QStartDate { get; set; }
/// <summary> /// <summary>
/// 工作清单列表 /// 工作清单列表
/// </summary> /// </summary>
......
Edu.Module.Advertising/AdvertisingModule.cs 0 → 100644
View file @ 9a8b6f8b
using System;
using System.Collections.Generic;
using Edu.Common.Plugin;
using Edu.Model.Entity.Advertising;
using Edu.Model.ViewModel.Advertising;
using Edu.Repository.Advertising;
using VT.FW.DB;
namespace Edu.Module.Advertising
{
public class AdvertisingModule
{
private Rb_AdvertisingRepository repository = new Rb_AdvertisingRepository();
/// <summary>
/// 广告基础信息处理类
/// </summary>
private Rb_Advertising_MakeRepository advertisingMakeRepository = new Rb_Advertising_MakeRepository();
#region 广告制作
/// <summary>
/// 获取创建的广告信息
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="model"></param>
/// <param name="count"></param>
/// <returns></returns>
public List<Rb_Advertising_Make_Extend> GetPageList(int pageIndex, int pageSize, Rb_Advertising_Make_Extend model, out long count)
{
return advertisingMakeRepository.GetPage(pageIndex, pageSize, model, out count);
}
/// <summary>
/// 获取广告信息
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public List<Rb_Advertising_Make_Extend> GetList(Rb_Advertising_Make_Extend model)
{
return advertisingMakeRepository.Get(model);
}
/// <summary>
/// 添加修改
/// </summary>
/// <param name="model"></param>
/// <param name="fileName"></param>
/// <param name="fileSize"></param>
/// <returns></returns>
public int Set(Rb_Advertising_Make_Extend model, string fileName, long fileSize)
{
int Id = 0;
if (model.ID > 0)
{
Id = model.ID;
IDictionary<string, object> fileds = new Dictionary<string, object>()
{
{ nameof(Rb_Advertising_Make.SecretKey),model.SecretKey},
{ nameof(Rb_Advertising_Make.AdvertisingPicUrl),model.AdvertisingPicUrl},
{ nameof(Rb_Advertising_Make.Content),model.Content},
};
IList<WhereHelper> whereHelpers = new List<WhereHelper>()
{
new WhereHelper (){ FiledName=nameof(Rb_Advertising_Make.ID),FiledValue=model.ID,OperatorEnum=OperatorEnum.Equal}
};
advertisingMakeRepository.Update(fileds, whereHelpers);
}
else
{
Id = advertisingMakeRepository.Insert(model);
}
return Id;
}
/// <summary>
/// 删除
/// </summary>
/// <param name="ID"></param>
/// <param name="EmployeeId"></param>
/// <returns></returns>
public bool Remove(int ID, int EmployeeId)
{
IDictionary<string, object> fileds = new Dictionary<string, object>()
{
{ nameof(Rb_Advertising_Make_Extend.Status),(int) Common.Enum.DateStateEnum.Delete},
};
IList<WhereHelper> whereHelpers = new List<WhereHelper>()
{
new WhereHelper (){ FiledName=nameof(Rb_Advertising_Make_Extend.ID),FiledValue=ID,OperatorEnum=OperatorEnum.Equal}
};
bool flag = advertisingMakeRepository.Update(fileds, whereHelpers);
return flag;
}
#endregion
#region 广告管理
/// <summary>
/// 新增修改广告基础信息
/// </summary>
/// <param name="dmodel"></param>
public bool SetAdvertising(Rb_Advertising_Extend dmodel)
{
bool flag = false;
int ID = 0;
try
{
if (dmodel.ID > 0)
{
ID = dmodel.ID;
var bamodel = repository.GetEntity(dmodel.ID);
bamodel.ChargeAmount = dmodel.ChargeAmount;
bamodel.IsFee = dmodel.IsFee;
bamodel.Title = dmodel.Title;
bamodel.Lable = dmodel.Lable;
// bamodel.PictureUrl = dmodel.PictureUrl;
// bamodel.SamplePicturesUrl = dmodel.SamplePicturesUrl;
flag = repository.Update(bamodel);
}
else
{
Rb_Advertising model = dmodel.RefMapperTo<Rb_Advertising>();
model.Status = 0;
ID = repository.Insert(model);
}
}
catch (Exception ex)
{
LogHelper.Write(ex, "SetAdvertising");
return false;
}
return true;
}
/// <summary>
/// 获取广告列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="count"></param>
/// <param name="lineId"></param>
/// <param name="seriesId"></param>
/// <param name="countryId"></param>
/// <param name="advName"></param>
/// <param name="IsFee"></param>
/// <param name="RB_Group_id"></param>
/// <returns></returns>
public List<Rb_Advertising_Extend> GetAdvertisingList(int pageIndex, int pageSize, out long count, string advName, int IsFee, int RB_Group_id)
{
var list = repository.GetAdvertisingList(pageIndex, pageSize, out count, advName, IsFee, RB_Group_id);
return list;
}
/// <summary>
/// 根据where 查询列表
/// </summary>
/// <param name="lineId"></param>
/// <param name="seriesId"></param>
/// <param name="countryId"></param>
/// <param name="advName"></param>
/// <param name="RB_Group_id"></param>
/// <returns></returns>
public List<Rb_Advertising_Extend> GetAdvertsingListForComboBox( string advName, int RB_Group_id)
{
var list = repository.GetAdvertsingListForComboBox( advName, RB_Group_id);
return list;
}
/// <summary>
/// 删除广告
/// </summary>
/// <param name="bAID"></param>
public bool DelAdvertising(int bAID)
{
try
{
var fileds = new Dictionary<string, object>
{
{ nameof(Rb_Advertising.Status), 1},
};
var whereHelpers = new List<WhereHelper>
{
new WhereHelper()
{
FiledName = nameof(Rb_Advertising.ID),
FiledValue = bAID,
OperatorEnum = OperatorEnum.Equal
}
};
var flag = repository.Update(fileds, whereHelpers);
}
catch (Exception ex)
{
LogHelper.Write(ex, "DelAdvertising");
return false;
}
return true;
}
/// <summary>
/// 获取实体详情
/// </summary>
/// <param name="bAID"></param>
/// <returns></returns>
public Rb_Advertising GetAdvertsingInfo(int bAID)
{
return repository.GetEntity(bAID);
}
#endregion
}
}
Edu.Module.Advertising/Edu.Module.Advertising.csproj 0 → 100644
View file @ 9a8b6f8b
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Edu.Model\Edu.Model.csproj" />
<ProjectReference Include="..\Edu.Repository\Edu.Repository.csproj" />
</ItemGroup>
</Project>
Edu.Module.Course/ClassModule.cs
View file @ 9a8b6f8b
This diff is collapsed.
Edu.Module.Course/OrderModule2.cs
View file @ 9a8b6f8b
...@@ -106,7 +106,7 @@ namespace Edu.Module.Course ...@@ -106,7 +106,7 @@ namespace Edu.Module.Course
} }
var teacherId = teacherModel?.Id ?? 0; var teacherId = teacherModel?.Id ?? 0;
//基础课时分钟数 //基础课时分钟数
var BasicMinutes = class_ConfigRepository.GetClassConfigRepository(new RB_Class_Config_ViewModel() { Group_Id = userinfo.Group_Id })?.BasicMinutes ?? 45; var BasicMinutes = class_ConfigRepository.GetBasicMinutesRepository(userinfo.Group_Id);
var stuCheckList = class_CheckRepository.GetGuestFinishMinutesRepository(GuestId.ToString()); var stuCheckList = class_CheckRepository.GetGuestFinishMinutesRepository(GuestId.ToString());
//总签到上课分钟数 //总签到上课分钟数
var totalFinishMinutes = stuCheckList?.Sum(qitem => qitem.FinishMinutes) ?? 0; var totalFinishMinutes = stuCheckList?.Sum(qitem => qitem.FinishMinutes) ?? 0;
......
Edu.Module.Course/StudentBillModule.cs
View file @ 9a8b6f8b
...@@ -121,7 +121,7 @@ namespace Edu.Module.Course ...@@ -121,7 +121,7 @@ namespace Edu.Module.Course
//班级实体类 //班级实体类
var classModel = classRepository.GetEntity(backModel.ClassId); 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 stuCheckList = class_CheckRepository.GetGuestFinishMinutesRepository(backModel.GuestId.ToString());
//总签到上课分钟数 //总签到上课分钟数
var totalFinishMinutes = stuCheckList?.Sum(qitem => qitem.FinishMinutes) ?? 0; var totalFinishMinutes = stuCheckList?.Sum(qitem => qitem.FinishMinutes) ?? 0;
......
Edu.Module.Duty/DutyModule.cs
View file @ 9a8b6f8b
...@@ -78,6 +78,20 @@ namespace Edu.Module.Duty ...@@ -78,6 +78,20 @@ namespace Edu.Module.Duty
/// <returns></returns> /// <returns></returns>
public bool SetDutyItemModule(RB_Duty_Item_ViewModel model) public bool SetDutyItemModule(RB_Duty_Item_ViewModel model)
{ {
if (model.DutyCategory == 1)
{
}
else if (model.DutyCategory == 2)
{
model.DutyType = 1;
model.ItemType = 0;
}
else if (model.DutyCategory == 3)
{
model.DutyType = 1;
model.ItemType = 0;
}
if (model.Id == 0) if (model.Id == 0)
{ {
return dutyItemRepository.Insert(model) > 0; return dutyItemRepository.Insert(model) > 0;
...@@ -93,6 +107,8 @@ namespace Edu.Module.Duty ...@@ -93,6 +107,8 @@ namespace Edu.Module.Duty
{ nameof(RB_Duty_Item_ViewModel.UpdateBy),model.UpdateBy}, { nameof(RB_Duty_Item_ViewModel.UpdateBy),model.UpdateBy},
{ nameof(RB_Duty_Item_ViewModel.UpdateTime),model.UpdateTime}, { nameof(RB_Duty_Item_ViewModel.UpdateTime),model.UpdateTime},
{ nameof(RB_Duty_Item_ViewModel.ItemImg),model.ItemImg}, { nameof(RB_Duty_Item_ViewModel.ItemImg),model.ItemImg},
{ nameof(RB_Duty_Item_ViewModel.DutyCategory),model.DutyCategory},
{ nameof(RB_Duty_Item_ViewModel.DutyType),model.DutyType},
}; };
return dutyItemRepository.Update(fileds, new WhereHelper(nameof(RB_Duty_Item_ViewModel.Id), model.Id)); return dutyItemRepository.Update(fileds, new WhereHelper(nameof(RB_Duty_Item_ViewModel.Id), model.Id));
} }
......
Edu.Module.Duty/DutyPlanModule.cs
View file @ 9a8b6f8b
This diff is collapsed.
Edu.Module.Duty/VisitorReserveModule.cs
View file @ 9a8b6f8b
...@@ -287,9 +287,11 @@ namespace Edu.Module.Duty ...@@ -287,9 +287,11 @@ namespace Edu.Module.Duty
Platform = 2, Platform = 2,
ReceiveId = (teacherList.Where(qitem => qitem.AccountId == oldModel.TeacherId)?.FirstOrDefault()?.Id ?? 0).ToString(), ReceiveId = (teacherList.Where(qitem => qitem.AccountId == oldModel.TeacherId)?.FirstOrDefault()?.Id ?? 0).ToString(),
}; };
List<PushMessageModel> messageList = new List<PushMessageModel>(); List<PushMessageModel> messageList = new List<PushMessageModel>
messageList.Add(pushModel); {
messageList.Add(pushModel2); pushModel,
pushModel2
};
Common.Message.MessageHelper.SendMessage(messageList); Common.Message.MessageHelper.SendMessage(messageList);
} }
} }
......
Edu.Module.User/TeacherModule.cs
View file @ 9a8b6f8b
...@@ -267,9 +267,8 @@ namespace Edu.Module.User ...@@ -267,9 +267,8 @@ namespace Edu.Module.User
/// 教师端(新增修改讲师) /// 教师端(新增修改讲师)
/// </summary> /// </summary>
/// <param name="model"></param> /// <param name="model"></param>
/// <param name="isUpdateBasic">是否更新基础资料</param>
/// <returns></returns> /// <returns></returns>
public bool SetTeacherModule_V2(RB_Teacher_ViewModel model, bool isUpdateBasic = false) public bool SetTeacherModule_V2(RB_Teacher_ViewModel model)
{ {
bool flag; bool flag;
if (model.TId > 0) if (model.TId > 0)
......
Edu.Repository/Advertising/Rb_AdvertisingRepository.cs 0 → 100644
View file @ 9a8b6f8b
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Edu.Model.Entity.Advertising;
using Edu.Model.ViewModel.Advertising;
namespace Edu.Repository.Advertising
{
/// <summary>
/// 广告仓储层
/// </summary>
public class Rb_AdvertisingRepository : BaseRepository<Rb_Advertising>
{
/// <summary>
/// 广告列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="count"></param>
/// <param name="lineId"></param>
/// <param name="seriesId"></param>
/// <param name="countryId"></param>
/// <param name="advName"></param>
/// <param name="IsFee"></param>
/// <param name="RB_Group_id"></param>
/// <returns></returns>
public List<Rb_Advertising_Extend> GetAdvertisingList(int pageIndex, int pageSize, out long count, string advName, int IsFee, int RB_Group_id)
{
string where = $@" where 1=1 and A.{nameof(Rb_Advertising.Group_Id)}={RB_Group_id} and A.{nameof(Rb_Advertising.Status)}=0";
if (IsFee > 0)
{
where += $@" and A.{nameof(Rb_Advertising.IsFee)}={IsFee}";
}
if (!string.IsNullOrWhiteSpace(advName))
{
where += $@" and A.{nameof(Rb_Advertising.Title)} like '%{advName}%'";
}
string sql = $@"select *,(SELECT count(*) from Rb_Advertising_Make where `Status`=0 and AdvertisingID=A.ID) as AdvertisingCount from {nameof(Rb_Advertising)} AS A {where} order by A.{nameof(Rb_Advertising.CreateDate)} desc";
return GetPage<Rb_Advertising_Extend>(pageIndex, pageSize, out count, sql).ToList();
}
/// <summary>
/// 根据where 查询列表
/// </summary>
/// <param name="lineId"></param>
/// <param name="seriesId"></param>
/// <param name="countryId"></param>
/// <param name="advName"></param>
/// <param name="RB_Group_id"></param>
/// <returns></returns>
public List<Rb_Advertising_Extend> GetAdvertsingListForComboBox( string advName, int RB_Group_id)
{
string where = $@" where 1=1 and {nameof(Rb_Advertising.Group_Id)}={RB_Group_id} and {nameof(Rb_Advertising.Status)}=0";
if (!string.IsNullOrWhiteSpace(advName))
{
where += $@" and {nameof(Rb_Advertising.Title)} like '%{advName}%'";
}
return Get<Rb_Advertising_Extend>($@"select * from {nameof(Rb_Advertising)} {where} order by {nameof(Rb_Advertising.CreateDate)} desc").ToList();
}
}
}
Edu.Repository/Advertising/Rb_Advertising_MakeRepository.cs 0 → 100644
View file @ 9a8b6f8b
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Edu.Model.Entity.Advertising;
using Edu.Model.ViewModel.Advertising;
namespace Edu.Repository.Advertising
{
public class Rb_Advertising_MakeRepository : BaseRepository<Rb_Advertising_Make>
{
/// <summary>
/// 表名称
/// </summary>
public string TableName { get { return nameof(Rb_Advertising_Make); } }
/// <summary>
/// 获取创建的广告信息
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="model"></param>
/// <param name="count"></param>
/// <returns></returns>
public List<Rb_Advertising_Make_Extend> GetPage(int pageIndex, int pageSize, Rb_Advertising_Make_Extend model, out long count)
{
string where = $@" where 1=1 and {nameof(Rb_Advertising_Make.Status)}={(int)Common.Enum.DateStateEnum.Normal}";
if (model.School_Id > 0)
{
where += $@" and {nameof(Rb_Advertising_Make.School_Id)}={model.School_Id}";
}
if (model.Group_Id > 0)
{
where += $@" and {nameof(Rb_Advertising_Make.Group_Id)}={model.Group_Id}";
}
if (model.UpdateBy > 0)
{
where += $@" and {nameof(Rb_Advertising_Make.UpdateBy)}={model.UpdateBy}";
}
string sql = $@" select * from {TableName} {where} ";
return GetPage<Rb_Advertising_Make_Extend>(pageIndex, pageSize, out count, sql).ToList();
}
/// <summary>
/// 获取广告信息
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public List<Rb_Advertising_Make_Extend> Get(Rb_Advertising_Make_Extend model)
{
string where = $@" where 1=1 and A.{nameof(Rb_Advertising_Make.Status)}={(int)Common.Enum.DateStateEnum.Normal}";
if (model.School_Id > 0)
{
where += $@" and {nameof(Rb_Advertising_Make.School_Id)}={model.School_Id}";
}
if (model.Group_Id > 0)
{
where += $@" and {nameof(Rb_Advertising_Make.Group_Id)}={model.Group_Id}";
}
if (model.UpdateBy > 0)
{
where += $@" and A.{nameof(Rb_Advertising_Make.UpdateBy)}={model.UpdateBy}";
}
if (model.ID > 0)
{
where += $@" and A.{nameof(Rb_Advertising_Make.ID)}={model.ID}";
}
string sql = $@" SELECT A.*,B.Title,b.PictureUrl,b.SamplePicturesUrl,b.ChargeAmount,b.IsFee from {TableName} AS A LEFT JOIN rb_advertising as B
ON A.AdvertisingID = B.ID {where}";
return Get<Rb_Advertising_Make_Extend>(sql).ToList();
}
/// <summary>
/// 获取广告信息
/// </summary>
/// <param name="ids">广告id</param>
/// <returns></returns>
public List<Rb_Advertising_Make_Extend> GetListByIds(List<int> ids)
{
List<Rb_Advertising_Make_Extend> sellAdvertisingList = new List<Rb_Advertising_Make_Extend>();
if (ids.Count > 0)
{
string sql = $@" SELECT * from Rb_Advertising_Make a where a.ID in ({string.Join(",", ids)}) and a.`Status` = 0";
sellAdvertisingList = Get<Rb_Advertising_Make_Extend>(sql).ToList();
}
return sellAdvertisingList;
}
}
}
Edu.Repository/Course/RB_ClassRepository.cs
View file @ 9a8b6f8b
...@@ -280,7 +280,7 @@ WHERE A.ClassId={0} ...@@ -280,7 +280,7 @@ WHERE A.ClassId={0}
var parameters = new DynamicParameters(); var parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT A.*,B.CourseName,D.TeacherName,IFNULL(D.TeacherHead,'') AS TeacherHead,E.SName AS SchoolName,R.RoomName SELECT A.*,B.CourseName,B.CourseFeature,D.TeacherName,IFNULL(D.TeacherHead,'') AS TeacherHead,E.SName AS SchoolName,R.RoomName
,IFNULL(t.GuestNum,0) AS OrderStudentCount,IFNULL(B.SellPrice,0) AS CourseSellPrice,IFNULL(B.OriginalPrice,0) AS CourseOriginalPrice ,IFNULL(t.GuestNum,0) AS OrderStudentCount,IFNULL(B.SellPrice,0) AS CourseSellPrice,IFNULL(B.OriginalPrice,0) AS CourseOriginalPrice
FROM rb_class AS A LEFT JOIN rb_course AS B ON A.CouseId=B.CourseId FROM rb_class AS A LEFT JOIN rb_course AS B ON A.CouseId=B.CourseId
LEFT JOIN rb_teacher AS D ON A.Teacher_Id=D.TId LEFT JOIN rb_teacher AS D ON A.Teacher_Id=D.TId
......
Edu.Repository/Course/RB_Class_CheckRepository.cs
View file @ 9a8b6f8b
...@@ -273,6 +273,10 @@ GROUP BY B.OrderGuestId ...@@ -273,6 +273,10 @@ GROUP BY B.OrderGuestId
{ {
where += string.Format(" AND B.ClassDate='{0}' ", query.ClassDate); where += string.Format(" AND B.ClassDate='{0}' ", query.ClassDate);
} }
if (query.ClassTimeId > 0)
{
where += string.Format(" AND C.ClassTimeId='{0}' ", query.ClassTimeId);
}
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT SUM(FinishMinutes) SELECT SUM(FinishMinutes)
......
Edu.Repository/Course/RB_Order_GuestRepository.cs
View file @ 9a8b6f8b
...@@ -26,10 +26,10 @@ namespace Edu.Repository.Course ...@@ -26,10 +26,10 @@ namespace Edu.Repository.Course
{ {
where += $@" and A.{nameof(RB_Order_Guest_ViewModel.Group_Id)} ={demodel.Group_Id}"; where += $@" and A.{nameof(RB_Order_Guest_ViewModel.Group_Id)} ={demodel.Group_Id}";
} }
if (demodel.School_Id > 0) //if (demodel.School_Id > 0)
{ //{
where += $@" and A.{nameof(RB_Order_Guest_ViewModel.School_Id)} ={demodel.School_Id}"; // where += $@" and A.{nameof(RB_Order_Guest_ViewModel.School_Id)} ={demodel.School_Id}";
} //}
if (demodel.Id > 0) if (demodel.Id > 0)
{ {
where += $@" and A.{nameof(RB_Order_Guest_ViewModel.Id)} ={demodel.Id}"; where += $@" and A.{nameof(RB_Order_Guest_ViewModel.Id)} ={demodel.Id}";
......
Edu.Repository/Duty/RB_Duty_ContentRepository.cs
View file @ 9a8b6f8b
...@@ -21,8 +21,8 @@ namespace Edu.Repository.Duty ...@@ -21,8 +21,8 @@ namespace Edu.Repository.Duty
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT A.* SELECT A.* ,IFNULL(B.ItemName,'') AS ItemName
FROM RB_Duty_Content AS A FROM RB_Duty_Content AS A LEFT JOIN rb_duty_item AS B ON A.ItemId=B.Id
WHERE 1=1 WHERE 1=1
"); ");
if (query == null) if (query == null)
...@@ -51,8 +51,30 @@ WHERE 1=1 ...@@ -51,8 +51,30 @@ WHERE 1=1
{ {
builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Duty_Content_ViewModel.PlanType), query.PlanType); builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Duty_Content_ViewModel.PlanType), query.PlanType);
} }
if (!string.IsNullOrEmpty(query.HandoverDlandetails))
{
builder.AppendFormat(@" AND FIND_IN_SET('{0}', A.HandoverDlandetails)>0 ", query.HandoverDlandetails);
}
} }
return Get<RB_Duty_Content_ViewModel>(builder.ToString()).ToList(); return Get<RB_Duty_Content_ViewModel>(builder.ToString()).ToList();
} }
/// <summary>
/// 交接班次
/// </summary>
/// <param name="HandoverDlandetails"></param>
/// <param name="query"></param>
/// <returns></returns>
public bool UpdateHandoverShiftRepository(string HandoverDlandetails, RB_Duty_Content_ViewModel query)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
UPDATE RB_Duty_Content
SET HandoverDlandetails='{0}'
", HandoverDlandetails);
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_ItemRepository.cs
View file @ 9a8b6f8b
...@@ -80,6 +80,10 @@ WHERE 1=1 "); ...@@ -80,6 +80,10 @@ WHERE 1=1 ");
builder.AppendFormat(" AND A.{0} LIKE @ItemName ", nameof(RB_Duty_Item_ViewModel.ItemName)); builder.AppendFormat(" AND A.{0} LIKE @ItemName ", nameof(RB_Duty_Item_ViewModel.ItemName));
parameters.Add("ItemName", "%" + query.ItemName.Trim() + "%"); parameters.Add("ItemName", "%" + query.ItemName.Trim() + "%");
} }
if (query.DutyCategory > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Duty_Item_ViewModel.DutyCategory), query.DutyCategory);
}
if (query.ItemSchoolList != null && query.ItemSchoolList.Count > 0) if (query.ItemSchoolList != null && query.ItemSchoolList.Count > 0)
{ {
string str = ""; string str = "";
...@@ -103,6 +107,7 @@ WHERE 1=1 "); ...@@ -103,6 +107,7 @@ WHERE 1=1 ");
} }
} }
} }
builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Duty_Item_ViewModel.Id));
return GetPage<RB_Duty_Item_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList(); return GetPage<RB_Duty_Item_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
} }
......
Edu.Repository/Duty/RB_Duty_PlanDetailsRepository.cs
View file @ 9a8b6f8b
...@@ -22,7 +22,9 @@ namespace Edu.Repository.Duty ...@@ -22,7 +22,9 @@ namespace Edu.Repository.Duty
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT A.*,IFNULL(B.Name,'') AS ShiftName,IFNULL(B.StartTime,'') AS ConfigStartTime,IFNULL(B.EndTime,'') AS ConfigEndTime 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 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 WHERE 1=1
"); ");
if (query == null) if (query == null)
...@@ -47,7 +49,6 @@ WHERE 1=1 ...@@ -47,7 +49,6 @@ WHERE 1=1
{ {
builder.AppendFormat(@" AND A.{0} IN({1}) ", nameof(RB_Duty_PlanDetails_ViewModel.DutyMan), query.QDutyMan); builder.AppendFormat(@" AND A.{0} IN({1}) ", nameof(RB_Duty_PlanDetails_ViewModel.DutyMan), query.QDutyMan);
} }
if (query.QDutyStatus > -1) if (query.QDutyStatus > -1)
{ {
builder.AppendFormat(" AND A.Status={0} ", query.QDutyStatus); builder.AppendFormat(" AND A.Status={0} ", query.QDutyStatus);
...@@ -72,6 +73,10 @@ WHERE 1=1 ...@@ -72,6 +73,10 @@ WHERE 1=1
{ {
builder.AppendFormat(" AND A.Status=2 AND A.FinishLateTime=0 AND A.CheckLateTime=0 "); 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)); builder.AppendFormat(" ORDER BY B.{0} ASC ", nameof(RB_Duty_Frequency_ViewModel.StartTime));
return Get<RB_Duty_PlanDetails_ViewModel>(builder.ToString()).ToList(); return Get<RB_Duty_PlanDetails_ViewModel>(builder.ToString()).ToList();
......
Edu.Repository/Duty/RB_Duty_PlanRepository.cs
View file @ 9a8b6f8b
...@@ -25,14 +25,14 @@ namespace Edu.Repository.Duty ...@@ -25,14 +25,14 @@ namespace Edu.Repository.Duty
{ {
rowsCount = 0; rowsCount = 0;
string joinTable = ""; string joinTable = "";
if (query != null && (!string.IsNullOrEmpty(query.QDutyMan)||query.QDutyStatus>-1 || query.QAttendanceStatus>0 )) if (query != null && (!string.IsNullOrEmpty(query.QDutyMan) || query.QDutyStatus > -1 || query.QAttendanceStatus > 0))
{ {
string joinWhere = ""; string joinWhere = "";
if (!string.IsNullOrEmpty(query.QDutyMan)) if (!string.IsNullOrEmpty(query.QDutyMan))
{ {
joinWhere += string.Format(" AND DutyMan IN({0}) ", query.QDutyMan); joinWhere += string.Format(" AND DutyMan IN({0}) ", query.QDutyMan);
} }
if (query.QDutyStatus >-1) if (query.QDutyStatus > -1)
{ {
joinWhere += string.Format(" AND Status={0} ", query.QDutyStatus); joinWhere += string.Format(" AND Status={0} ", query.QDutyStatus);
} }
...@@ -66,7 +66,7 @@ SELECT A.* ,IFNULL(B.SName,'') AS SchoolName ...@@ -66,7 +66,7 @@ SELECT A.* ,IFNULL(B.SName,'') AS SchoolName
FROM RB_Duty_Plan AS A LEFT JOIN rb_school AS B ON A.School_Id=B.SId FROM RB_Duty_Plan AS A LEFT JOIN rb_school AS B ON A.School_Id=B.SId
{0} {0}
WHERE 1=1 WHERE 1=1
",joinTable); ", joinTable);
builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Duty_Plan_ViewModel.Status), (int)DateStateEnum.Normal); builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Duty_Plan_ViewModel.Status), (int)DateStateEnum.Normal);
if (query == null) if (query == null)
{ {
...@@ -162,7 +162,7 @@ WHERE 1=1 AND A.`Status`=0 ...@@ -162,7 +162,7 @@ WHERE 1=1 AND A.`Status`=0
{ {
builder.AppendFormat(@" AND B.{0}={1} ", nameof(RB_Duty_PlanDetails_ViewModel.DutyMan), query.QDutyMan); builder.AppendFormat(@" AND B.{0}={1} ", nameof(RB_Duty_PlanDetails_ViewModel.DutyMan), query.QDutyMan);
} }
if (query.QShift>0) if (query.QShift > 0)
{ {
builder.AppendFormat(@" AND B.{0}={1} ", nameof(RB_Duty_PlanDetails_ViewModel.Shift), query.QShift); builder.AppendFormat(@" AND B.{0}={1} ", nameof(RB_Duty_PlanDetails_ViewModel.Shift), query.QShift);
} }
......
Edu.WebApi/Controllers/Advertising/AdvertisingController.cs 0 → 100644
View file @ 9a8b6f8b
This diff is collapsed.
Edu.WebApi/Controllers/Course/ClassController.cs
View file @ 9a8b6f8b
...@@ -804,7 +804,7 @@ namespace Edu.WebApi.Controllers.Course ...@@ -804,7 +804,7 @@ namespace Edu.WebApi.Controllers.Course
data.TeacherName, data.TeacherName,
data.RoomName, data.RoomName,
TotalHour = Convert.ToDecimal(totalMinutes / 60.0), TotalHour = Convert.ToDecimal(totalMinutes / 60.0),
ClassNum = Convert.ToInt32(totalMinutes / 45), ClassNum = Convert.ToInt32(totalMinutes / classModule.GetBasicMinutesModule(base.UserInfo.Group_Id)),
DefaultMinutes = totalMinutes, DefaultMinutes = totalMinutes,
ClassDate = data.ClassDate.ToString("yyyy-MM-dd"), ClassDate = data.ClassDate.ToString("yyyy-MM-dd"),
GuestList = guestList GuestList = guestList
...@@ -909,7 +909,7 @@ namespace Edu.WebApi.Controllers.Course ...@@ -909,7 +909,7 @@ namespace Edu.WebApi.Controllers.Course
} }
if (list == null || !list.Any()) if (list == null || !list.Any())
{ {
return ApiResult.ParamIsNull(""); return ApiResult.ParamIsNull(message:"请选择签到学员!");
} }
//获取班级的学员信息 //获取班级的学员信息
var orderGuestList = classModule.GetOrderGuestListModule(new RB_Order_Guest_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = list.FirstOrDefault().ClassId ,QEffectStatus=1}); var orderGuestList = classModule.GetOrderGuestListModule(new RB_Order_Guest_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = list.FirstOrDefault().ClassId ,QEffectStatus=1});
...@@ -973,8 +973,9 @@ namespace Edu.WebApi.Controllers.Course ...@@ -973,8 +973,9 @@ namespace Edu.WebApi.Controllers.Course
/// <returns></returns> /// <returns></returns>
public ApiResult InitClassCheck() public ApiResult InitClassCheck()
{ {
bool result = classModule.InitClassCheckModule(); //bool result = classModule.InitClassCheckModule();
return result ? ApiResult.Success("初始化成功!") : ApiResult.Failed("初始化失败!"); //return result ? ApiResult.Success("初始化成功!") : ApiResult.Failed("初始化失败!");
return ApiResult.Failed("初始化失败!");
} }
/// <summary> /// <summary>
......
Edu.WebApi/Controllers/Course/ClassRoomController.cs
View file @ 9a8b6f8b
...@@ -230,6 +230,49 @@ namespace Edu.WebApi.Controllers.Course ...@@ -230,6 +230,49 @@ namespace Edu.WebApi.Controllers.Course
/// <summary>
/// 老师上课计划统计
/// </summary>
/// <returns></returns>
public ApiResult GetNewClassRoomTimeList()
{
var startDate = base.ParmJObj.GetStringValue("StartTime");
var endDate = base.ParmJObj.GetStringValue("EndTime");
DateTime now = DateTime.Now;
//获取当前月的第一天
DateTime d1 = new DateTime(now.Year, now.Month, 1);
//当月最后一天
DateTime d2 = d1.AddMonths(1).AddDays(-1);
if (string.IsNullOrEmpty(startDate))
{
startDate = Common.ConvertHelper.FormatDate(d1);
}
if (string.IsNullOrEmpty(endDate))
{
endDate = Common.ConvertHelper.FormatDate(d2);
}
else
{
}
RB_Class_Plan_ViewModel query = new RB_Class_Plan_ViewModel()
{
StartTime = startDate,
EndTime = endDate,
TeacherId = base.ParmJObj.GetInt("TeacherId"),
ClassRoomId = base.ParmJObj.GetInt("ClassRoomId"),
Group_Id = base.UserInfo.Group_Id,
ClassId = base.ParmJObj.GetInt("ClassId"),
};
//课程类型(0-全部,1-正常,2-试听课)
int ClassType = base.ParmJObj.GetInt("ClassType");
var obj = classModule.GetClassUseStatisticalModule(query, ClassType: ClassType);
return ApiResult.Success(data: obj);
}
/// <summary> /// <summary>
/// 教室使用记录 /// 教室使用记录
/// </summary> /// </summary>
......
Edu.WebApi/Controllers/Course/OrderController.cs
View file @ 9a8b6f8b
...@@ -67,6 +67,7 @@ namespace Edu.WebApi.Controllers.Course ...@@ -67,6 +67,7 @@ namespace Edu.WebApi.Controllers.Course
x.ClassId, x.ClassId,
x.ClassName, x.ClassName,
x.CourseName, x.CourseName,
x.CourseFeature,
x.ClassHours, x.ClassHours,
x.TeacherName, x.TeacherName,
x.TeacherHead, x.TeacherHead,
...@@ -260,7 +261,8 @@ namespace Edu.WebApi.Controllers.Course ...@@ -260,7 +261,8 @@ namespace Edu.WebApi.Controllers.Course
{ {
z.Id, z.Id,
z.GuestName, z.GuestName,
z.GuestState z.GuestState,
z.GuestStateStr,
}), }),
ContractList = x.ContractList.Select(z => new ContractList = x.ContractList.Select(z => new
{ {
...@@ -1258,6 +1260,7 @@ namespace Edu.WebApi.Controllers.Course ...@@ -1258,6 +1260,7 @@ namespace Edu.WebApi.Controllers.Course
z.ContractNo, z.ContractNo,
z.ContractStatus, z.ContractStatus,
z.ContractStatusStr, z.ContractStatusStr,
z.GuestStateStr,
}), }),
ContractList = x?.ContractList.Select(z => new ContractList = x?.ContractList.Select(z => new
{ {
...@@ -1408,6 +1411,7 @@ namespace Edu.WebApi.Controllers.Course ...@@ -1408,6 +1411,7 @@ namespace Edu.WebApi.Controllers.Course
z.ContractNo, z.ContractNo,
z.ContractStatus, z.ContractStatus,
z.ContractStatusStr, z.ContractStatusStr,
z.GuestStateStr,
}), }),
ContractList = x?.ContractList.Select(z => new ContractList = x?.ContractList.Select(z => new
{ {
......
Edu.WebApi/Controllers/Duty/DutyController.cs
View file @ 9a8b6f8b
...@@ -183,6 +183,7 @@ namespace Edu.WebApi.Controllers.Duty ...@@ -183,6 +183,7 @@ namespace Edu.WebApi.Controllers.Duty
{ {
Group_Id = base.UserInfo.Group_Id, Group_Id = base.UserInfo.Group_Id,
ItemName=base.ParmJObj.GetStringValue("ItemName"), ItemName=base.ParmJObj.GetStringValue("ItemName"),
DutyCategory=base.ParmJObj.GetInt("DutyCategory"),
}; };
query.ItemSchoolList = Common.Plugin.JsonHelper.DeserializeObject<List<int>>(base.ParmJObj.GetStringValue("ItemSchools")); query.ItemSchoolList = Common.Plugin.JsonHelper.DeserializeObject<List<int>>(base.ParmJObj.GetStringValue("ItemSchools"));
var list = dutyModule.GetDutyItemPageModule(pageModel.PageIndex,pageModel.PageSize,out long rowsCount, query); var list = dutyModule.GetDutyItemPageModule(pageModel.PageIndex,pageModel.PageSize,out long rowsCount, query);
...@@ -244,6 +245,8 @@ namespace Edu.WebApi.Controllers.Duty ...@@ -244,6 +245,8 @@ namespace Edu.WebApi.Controllers.Duty
Shifts = base.ParmJObj.GetStringValue("Shifts"), Shifts = base.ParmJObj.GetStringValue("Shifts"),
Group_Id = base.UserInfo.Group_Id, Group_Id = base.UserInfo.Group_Id,
Id = base.ParmJObj.GetInt("Id"), Id = base.ParmJObj.GetInt("Id"),
DutyCategory = base.ParmJObj.GetInt("DutyCategory"),
DutyType = base.ParmJObj.GetInt("DutyType"),
}; };
query.ItemImgList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(base.ParmJObj.GetStringValue("ItemImgList")); query.ItemImgList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(base.ParmJObj.GetStringValue("ItemImgList"));
if (query.ItemImgList != null && query.ItemImgList.Count > 0) if (query.ItemImgList != null && query.ItemImgList.Count > 0)
...@@ -254,27 +257,32 @@ namespace Edu.WebApi.Controllers.Duty ...@@ -254,27 +257,32 @@ namespace Edu.WebApi.Controllers.Duty
{ {
query.ItemImg = ""; query.ItemImg = "";
} }
if (string.IsNullOrWhiteSpace(query.ItemName)) if (string.IsNullOrWhiteSpace(query.Shifts))
{
return ApiResult.Failed("请输入值班事项名称");
}
if (!query.ItemType.HasValue || (int)query.ItemType.Value <= 0)
{ {
return ApiResult.Failed("请选择值班事项类型"); return ApiResult.Failed("请选择班次");
} }
if (string.IsNullOrWhiteSpace(query.ItemSchools)) if (string.IsNullOrWhiteSpace(query.ItemSchools))
{ {
return ApiResult.Failed("请选择值班事项对应的学校"); return ApiResult.Failed("请选择值班事项对应的学校");
} }
if (string.IsNullOrWhiteSpace(query.Shifts)) if (query.DutyCategory == 0)
{ {
return ApiResult.Failed("请选择班次"); return ApiResult.Failed("请选择分类!");
} }
if (query.Id == 0) if (query.DutyType == 0)
{ {
query.CreateBy = base.UserInfo.Id; return ApiResult.Failed("请选择类型!");
query.CreateTime = System.DateTime.Now; }
if (string.IsNullOrWhiteSpace(query.ItemName))
{
return ApiResult.Failed("请输入值班事项名称");
}
if (query.DutyCategory == 1 && query.DutyType == 2 && base.ParmJObj.GetInt("ItemType") == 0)
{
return ApiResult.Failed("请选择事项类型填写方式!");
} }
query.CreateBy = base.UserInfo.Id;
query.CreateTime = System.DateTime.Now;
query.UpdateBy = base.UserInfo.Id; query.UpdateBy = base.UserInfo.Id;
query.UpdateTime = System.DateTime.Now; query.UpdateTime = System.DateTime.Now;
bool retult = dutyModule.SetDutyItemModule(query); bool retult = dutyModule.SetDutyItemModule(query);
...@@ -318,7 +326,9 @@ namespace Edu.WebApi.Controllers.Duty ...@@ -318,7 +326,9 @@ namespace Edu.WebApi.Controllers.Duty
SchoolList, SchoolList,
model?.Shifts, model?.Shifts,
ShiftList, ShiftList,
ItemImgList= ImgList ItemImgList= ImgList,
model?.DutyType,
model?.DutyCategory,
}; };
} }
return ApiResult.Success(data: obj); return ApiResult.Success(data: obj);
......
Edu.WebApi/Controllers/Duty/DutyPlanController.cs
View file @ 9a8b6f8b
...@@ -7,6 +7,7 @@ using Edu.Module.Duty; ...@@ -7,6 +7,7 @@ using Edu.Module.Duty;
using Edu.WebApi.Filter; using Edu.WebApi.Filter;
using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
...@@ -283,7 +284,45 @@ namespace Edu.WebApi.Controllers.Duty ...@@ -283,7 +284,45 @@ namespace Edu.WebApi.Controllers.Duty
{ {
UserId = DutyMan; UserId = DutyMan;
} }
var obj = dutyPlanModule.OnDutyModule(Id, Shift, UserId, isQueryWork:true); var obj = dutyPlanModule.OnDutyModule(Id, Shift, UserId, isQueryWork: true);
return ApiResult.Success(data: obj);
}
/// <summary>
/// 用户值班【第二版】
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult OnDuty_V2()
{
var Id = base.ParmJObj.GetInt("Id");
var Shift = base.ParmJObj.GetInt("Shift");
int UserId = base.UserInfo.Id;
int DutyMan = base.ParmJObj.GetInt("DutyMan");
if (DutyMan > 0)
{
UserId = DutyMan;
}
var obj = dutyPlanModule.OnDutyModule_V2(Id, Shift, UserId);
return ApiResult.Success(data: obj);
}
/// <summary>
/// 用户值班【第二版】
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetDutyWork_V2()
{
var Id = base.ParmJObj.GetInt("Id");
var Shift = base.ParmJObj.GetInt("Shift");
int UserId = base.UserInfo.Id;
int DutyMan = base.ParmJObj.GetInt("DutyMan");
if (DutyMan > 0)
{
UserId = DutyMan;
}
var obj = dutyPlanModule.OnDutyModule_V2(Id, Shift, UserId, isQueryWork: true);
return ApiResult.Success(data: obj); return ApiResult.Success(data: obj);
} }
...@@ -299,6 +338,17 @@ namespace Edu.WebApi.Controllers.Duty ...@@ -299,6 +338,17 @@ namespace Edu.WebApi.Controllers.Duty
return ApiResult.Success(data: obj); return ApiResult.Success(data: obj);
} }
/// <summary>
/// 获取交接班次列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetHandoverShiftList()
{
var obj = dutyPlanModule.GetHandoverShiftListModule();
return ApiResult.Success(data: obj);
}
/// <summary> /// <summary>
/// 值班打卡/值班交接 /// 值班打卡/值班交接
/// </summary> /// </summary>
...@@ -309,7 +359,59 @@ namespace Edu.WebApi.Controllers.Duty ...@@ -309,7 +359,59 @@ namespace Edu.WebApi.Controllers.Duty
var Id = base.ParmJObj.GetInt("Id"); var Id = base.ParmJObj.GetInt("Id");
var Shift = base.ParmJObj.GetInt("Shift"); var Shift = base.ParmJObj.GetInt("Shift");
var Status = base.ParmJObj.GetInt("Status"); var Status = base.ParmJObj.GetInt("Status");
var flag = dutyPlanModule.DutyCheckModule(Id, Shift, base.UserInfo.Id, Status,out string message); //突发事件
int IsBurst = base.ParmJObj.GetInt("IsBurst");
//工作交接说明
int IsHandover = base.ParmJObj.GetInt("IsHandover");
//交接班次
string HandoverDlandetails = base.ParmJObj.GetStringValue("HandoverDlandetails");
List<RB_Duty_Content_ViewModel> list = new List<RB_Duty_Content_ViewModel>();
if (Status == 2)
{
if (IsBurst == 1)
{
list.Add(new RB_Duty_Content_ViewModel()
{
Id = 0,
PlanShift = Shift,
PlanType = 3,
PlanId = Id,
OtherContent = "无",
OtherRemark = "无",
WorkContent = "",
WorkIsFinish = 1,
ItemId = 0,
ItemType = 0,
CreateBy = base.UserInfo.Id,
CreateTime = DateTime.Now,
UpdateBy=base.UserInfo.Id,
UpdateTime=DateTime.Now,
Group_Id = base.UserInfo.Group_Id,
}); ;
}
if (IsHandover==1)
{
list.Add(new RB_Duty_Content_ViewModel()
{
Id = 0,
PlanShift = Shift,
PlanType = 2,
PlanId = Id,
OtherContent = "无",
OtherRemark = "无",
WorkContent = "",
WorkIsFinish = 1,
ItemId = 0,
ItemType = 0,
CreateBy = base.UserInfo.Id,
CreateTime = DateTime.Now,
UpdateBy = base.UserInfo.Id,
UpdateTime = DateTime.Now,
Group_Id = base.UserInfo.Group_Id,
});
}
}
var flag = dutyPlanModule.DutyCheckModule(Id, Shift, base.UserInfo.Id, Status, list, HandoverDlandetails, out string message);
return flag ? ApiResult.Success() : ApiResult.Failed(message: message); return flag ? ApiResult.Success() : ApiResult.Failed(message: message);
} }
...@@ -353,6 +455,10 @@ namespace Edu.WebApi.Controllers.Duty ...@@ -353,6 +455,10 @@ namespace Edu.WebApi.Controllers.Duty
{ {
model.FileURL = ""; model.FileURL = "";
} }
if (model.PlanType == 1 && model.ItemType==2 && string.IsNullOrEmpty(model.WorkContent))
{
return ApiResult.Failed(message: "请填写完成内容!");
}
model.Group_Id = base.UserInfo.Group_Id; model.Group_Id = base.UserInfo.Group_Id;
model.Status = Common.Enum.DateStateEnum.Normal; model.Status = Common.Enum.DateStateEnum.Normal;
model.CreateBy = base.UserInfo.Id; model.CreateBy = base.UserInfo.Id;
......
Edu.WebApi/Edu.WebApi.csproj
View file @ 9a8b6f8b
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
<ProjectReference Include="..\Edu.Cache\Edu.Cache.csproj" /> <ProjectReference Include="..\Edu.Cache\Edu.Cache.csproj" />
<ProjectReference Include="..\Edu.Common\Edu.Common.csproj" /> <ProjectReference Include="..\Edu.Common\Edu.Common.csproj" />
<ProjectReference Include="..\Edu.Model\Edu.Model.csproj" /> <ProjectReference Include="..\Edu.Model\Edu.Model.csproj" />
<ProjectReference Include="..\Edu.Module.Advertising\Edu.Module.Advertising.csproj" />
<ProjectReference Include="..\Edu.Module.Course\Edu.Module.Course.csproj" /> <ProjectReference Include="..\Edu.Module.Course\Edu.Module.Course.csproj" />
<ProjectReference Include="..\Edu.Module.Duty\Edu.Module.Duty.csproj" /> <ProjectReference Include="..\Edu.Module.Duty\Edu.Module.Duty.csproj" />
<ProjectReference Include="..\Edu.Module.Finance\Edu.Module.Finance.csproj" /> <ProjectReference Include="..\Edu.Module.Finance\Edu.Module.Finance.csproj" />
......
Edu.WebApi/appsettings.json
View file @ 9a8b6f8b
{ {
"ConnectionStrings": { "ConnectionStrings": {
"DefaultConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ", "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", "DefaultConnectionPName": "MySql.Data.MySqlClient",
"FinanceConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=test_reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ", "FinanceConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=test_reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"FinanceConnectionPName": "MySql.Data.MySqlClient", "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; ", "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", "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; ", "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" "LogConnectionPName": "MySql.Data.MySqlClient"
}, },
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {
"Default": "Information", "Default": "Information",
"Microsoft": "Warning", "Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information" "Microsoft.Hosting.Lifetime": "Information"
} }
}, },
"SettlementRate": "0.60", "SettlementRate": "0.60",
"SellCommissionFFBL": "0.15", "SellCommissionFFBL": "0.15",
"JwtSecretKey": "@VIITTOREBORN*2018", "JwtSecretKey": "@VIITTOREBORN*2018",
"MallJwtSecretKey": "@VIITTOREBORN*2018", "MallJwtSecretKey": "@VIITTOREBORN*2018",
"JwtExpirTime": 86400, "JwtExpirTime": 86400,
"IsSendMsg": 2, "IsSendMsg": 2,
"AllowedHosts": "*", "AllowedHosts": "*",
"OpenValidation": "False", "OpenValidation": "False",
"UploadSiteUrl": "http://192.168.1.36:8120", "UploadSiteUrl": "http://192.168.1.36:8120",
"ViewFileSiteUrl": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com", "ViewFileSiteUrl": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com",
"ErpViewFileSiteUrl": "http://imgfile.oytour.com", "ErpViewFileSiteUrl": "http://imgfile.oytour.com",
"Mongo": "mongodb://47.96.25.130:27017", "Mongo": "mongodb://47.96.25.130:27017",
"MongoDBName": "Edu", "MongoDBName": "Edu",
"WkHtmlToPdfPath": "D:/wkhtmltopdf/bin/", "WkHtmlToPdfPath": "D:/wkhtmltopdf/bin/",
"FinanceKey": "FinanceMallInsertToERPViitto2020", "FinanceKey": "FinanceMallInsertToERPViitto2020",
"PaymentFinanceApi": "http://192.168.1.13:8083/api/Mall/InsertFinanceBatchForMallIn", "PaymentFinanceApi": "http://192.168.1.13:8083/api/Mall/InsertFinanceBatchForMallIn",
"IncomeFinanceApi": "http://192.168.20.9:8083/api/Mall/InsertFinanceBatchForMallOut", "IncomeFinanceApi": "http://192.168.20.9:8083/api/Mall/InsertFinanceBatchForMallOut",
"sTenpayNotifyUrl": "http://eduapi.oytour.com/api/WeChatPay/WxPayCallback", //下单回调地址 "sTenpayNotifyUrl": "http://eduapi.oytour.com/api/WeChatPay/WxPayCallback", //下单回调地址
"sTenpayNotifyRefundUrl": "http://eduapi.oytour.com/api/WeChatPay/Refunds", //退款回调地址 "sTenpayNotifyRefundUrl": "http://eduapi.oytour.com/api/WeChatPay/Refunds", //退款回调地址
"FinanceDateBase": "reborn_finance", "FinanceDateBase": "reborn_finance",
"JHTenantId": "15", "JHTenantId": "15",
"JHMallBaseId": "5", "JHMallBaseId": "5",
"RabbitMqConfig": { "RabbitMqConfig": {
"HostName": "47.96.25.130", "HostName": "47.96.25.130",
"VirtualHost": "/", "VirtualHost": "/",
"Port": 5672, "Port": 5672,
"UserName": "guest", "UserName": "guest",
"Password": "viitto2019", "Password": "viitto2019",
"QueenName": "vt_sys_message_test" "QueenName": "vt_sys_message_test"
}, },
"RedisSetting": { "RedisSetting": {
"RedisServer": "47.96.23.199", "RedisServer": "47.96.23.199",
"RedisPort": "6379", "RedisPort": "6379",
"RedisPwd": "Viitto2018" "RedisPwd": "Viitto2018"
}, },
"VirtualDirectory": "WebFile", "VirtualDirectory": "WebFile",
//未填写 未打分 下降比例 //未填写 未打分 下降比例
"OKRMatterValue": "30,100,100", "OKRMatterValue": "30,100,100",
//是否是线上环境 //是否是线上环境
"IsOnline": false, "IsOnline": false,
//退课流程编号 //退课流程编号
"BackClassFlowId": 1, "BackClassFlowId": 1,
//分区校长岗位编号 //分区校长岗位编号
"SchoolPostId": 3, "SchoolPostId": 3,
//教务长 //教务长
"JiaoWuZhang": 8, "JiaoWuZhang": 8,
//留学就业部门主管审核编号[王涛] //留学就业部门主管审核编号[王涛]
"StudyAbroadDirectorId": 64, "StudyAbroadDirectorId": 64,
//留学就业部门负责人审核编号[姚顺先] //留学就业部门负责人审核编号[姚顺先]
"StudyAbroadManagerId": 52, "StudyAbroadManagerId": 52,
//合同默认抬头 //合同默认抬头
"ContractDefaultTitle": "JH-DZ-CD-", "ContractDefaultTitle": "JH-DZ-CD-",
//消息推送AppId //消息推送AppId
"PushAppId": "JiaHeJiaoYu", "PushAppId": "JiaHeJiaoYu",
//是否推送消息 //是否推送消息
"IsPushMessage": "1", "IsPushMessage": "1",
//超过下班时间60分钟不能打卡 //超过下班时间60分钟不能打卡
"MoreThanMinutes": 60, "MoreThanMinutes": 60,
//连续缺课课时 //连续缺课课时
"AbsentHours": 12 "AbsentHours": 12,
//值班时间验证日期
"DutyDate": "2021-06-30"
} }
\ No newline at end of file
education.sln
View file @ 9a8b6f8b
...@@ -62,6 +62,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Edu.Module.Web", "Edu.Modul ...@@ -62,6 +62,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Edu.Module.Web", "Edu.Modul
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Edu.Module.Duty", "Edu.Module.Duty\Edu.Module.Duty.csproj", "{3C354B2B-8706-49A6-A12A-5A64F28E7CDC}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Edu.Module.Duty", "Edu.Module.Duty\Edu.Module.Duty.csproj", "{3C354B2B-8706-49A6-A12A-5A64F28E7CDC}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Edu.Module.Advertising", "Edu.Module.Advertising\Edu.Module.Advertising.csproj", "{43408243-8E36-4F9E-84C0-998CE383EC53}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
...@@ -148,6 +150,10 @@ Global ...@@ -148,6 +150,10 @@ Global
{3C354B2B-8706-49A6-A12A-5A64F28E7CDC}.Debug|Any CPU.Build.0 = Debug|Any CPU {3C354B2B-8706-49A6-A12A-5A64F28E7CDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3C354B2B-8706-49A6-A12A-5A64F28E7CDC}.Release|Any CPU.ActiveCfg = Release|Any CPU {3C354B2B-8706-49A6-A12A-5A64F28E7CDC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3C354B2B-8706-49A6-A12A-5A64F28E7CDC}.Release|Any CPU.Build.0 = Release|Any CPU {3C354B2B-8706-49A6-A12A-5A64F28E7CDC}.Release|Any CPU.Build.0 = Release|Any CPU
{43408243-8E36-4F9E-84C0-998CE383EC53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{43408243-8E36-4F9E-84C0-998CE383EC53}.Debug|Any CPU.Build.0 = Debug|Any CPU
{43408243-8E36-4F9E-84C0-998CE383EC53}.Release|Any CPU.ActiveCfg = Release|Any CPU
{43408243-8E36-4F9E-84C0-998CE383EC53}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
...@@ -171,6 +177,7 @@ Global ...@@ -171,6 +177,7 @@ Global
{2ED4527A-351A-49C0-94E0-D926F6EE2844} = {7AC0A4EC-3215-4FF2-96DC-DE8325ED6915} {2ED4527A-351A-49C0-94E0-D926F6EE2844} = {7AC0A4EC-3215-4FF2-96DC-DE8325ED6915}
{380ACD87-3D6C-474C-A0ED-A91BD8E26081} = {7AC0A4EC-3215-4FF2-96DC-DE8325ED6915} {380ACD87-3D6C-474C-A0ED-A91BD8E26081} = {7AC0A4EC-3215-4FF2-96DC-DE8325ED6915}
{3C354B2B-8706-49A6-A12A-5A64F28E7CDC} = {7AC0A4EC-3215-4FF2-96DC-DE8325ED6915} {3C354B2B-8706-49A6-A12A-5A64F28E7CDC} = {7AC0A4EC-3215-4FF2-96DC-DE8325ED6915}
{43408243-8E36-4F9E-84C0-998CE383EC53} = {7AC0A4EC-3215-4FF2-96DC-DE8325ED6915}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {8763B446-FAB1-46BF-9743-F2628533241B} SolutionGuid = {8763B446-FAB1-46BF-9743-F2628533241B}
......
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