Skip to content

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

页面修改

parent 217d7353
Hide whitespace changes
Inline Side-by-side
Showing with 235 additions and 23 deletions
Edu.Model/Entity/Duty/RB_Duty_Frequency.cs
View file @ b0ba828d
......@@ -63,6 +63,9 @@ namespace Edu.Model.Entity.Duty
/// </summary>
public string School_Ids { get; set; }
/// <summary>
/// 删除状态
/// </summary>
public int Status { get; set; }
}
}
Edu.Model/ViewModel/Duty/RB_Duty_Frequency_ViewModel.cs
View file @ b0ba828d
......@@ -16,5 +16,10 @@ namespace Edu.Model.ViewModel.Duty
/// 创建人
/// </summary>
public string CreateByName { get; set; }
/// <summary>
/// 校区列表
/// </summary>
public List<int> SchoolIdList { get; set; }
}
}
Edu.Model/ViewModel/Duty/RB_Duty_Item_ViewModel.cs
View file @ b0ba828d
......@@ -21,5 +21,10 @@ namespace Edu.Model.ViewModel.Duty
/// 班次
/// </summary>
public string ShiftsName { get; set; }
/// <summary>
/// 校区列表
/// </summary>
public List<int> ItemSchoolList { get; set; }
}
}
Edu.Module.Duty/DutyModule.cs
View file @ b0ba828d
......@@ -32,6 +32,7 @@ namespace Edu.Module.Duty
/// 账号管理处理类对象
/// </summary>
private readonly Repository.User.RB_AccountRepository accountRepository = new Repository.User.RB_AccountRepository();
#region 值班事项管理
/// <summary>
/// 获取值班事项设置列表
......@@ -120,7 +121,7 @@ namespace Edu.Module.Duty
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Duty_Config_ViewModel> GetDutyConfigRepository(RB_Duty_Config_ViewModel query)
public List<RB_Duty_Config_ViewModel> GetDutyConfigModule(RB_Duty_Config_ViewModel query)
{
var list = dutyConfigRepository.GetDutyConfigRepository(query);
if (list != null && list.Any())
......@@ -181,6 +182,16 @@ namespace Edu.Module.Duty
return dutyConfigRepository.Update(fileds, new WhereHelper(nameof(RB_Duty_Config_ViewModel.Id), Id));
}
/// <summary>
/// 检查值班设置是否存在
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public bool CheckDutyConfigModule(RB_Duty_Config_ViewModel model)
{
return dutyConfigRepository.CheckExistsConfigListRepository(model);
}
/// <summary>
/// 新增/修改班次信息
/// </summary>
......@@ -216,9 +227,22 @@ namespace Edu.Module.Duty
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Duty_Frequency_ViewModel> GetDutyFrequencyModule(RB_Duty_Frequency_ViewModel query)
public List<RB_Duty_Frequency_ViewModel> GetDutyFrequencyListModule(RB_Duty_Frequency_ViewModel query)
{
return dutyFrequencyRepository.GetDutyFrequencyListRepository(query);
}
/// <summary>
/// 获取班次设置分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Duty_Frequency_ViewModel> GetDutyFrequencyPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Duty_Frequency_ViewModel query)
{
return dutyFrequencyRepository.GetDutyFrequencyRepository(query);
return dutyFrequencyRepository.GetDutyFrequencyPageRepository(pageIndex, pageSize, out rowsCount, query);
}
/// <summary>
......
Edu.Repository/Duty/RB_Duty_ConfigRepository.cs
View file @ b0ba828d
......@@ -11,7 +11,7 @@ namespace Edu.Repository.Duty
/// <summary>
/// 值班设置配置仓储层
/// </summary>
public class RB_Duty_ConfigRepository:BaseRepository<RB_Duty_Config>
public class RB_Duty_ConfigRepository : BaseRepository<RB_Duty_Config>
{
/// <summary>
/// 获取值班设置分页列表
......@@ -77,8 +77,6 @@ namespace Edu.Repository.Duty
}
/// <summary>
/// 获取值班设置列表
/// </summary>
......@@ -114,5 +112,35 @@ namespace Edu.Repository.Duty
}
return Get<RB_Duty_Config_ViewModel>(builder.ToString(), parameters).ToList();
}
/// <summary>
/// 判断设置是否存在
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public bool CheckExistsConfigListRepository(RB_Duty_Config_ViewModel query)
{
int result = 0;
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" SELECT COUNT(1) FROM RB_Duty_Config AS A WHERE 1=1 AND Status=0 ");
if (query.Id > 0)
{
builder.AppendFormat(" AND A.{0}<>{1} ", nameof(RB_Duty_Config_ViewModel.Id), query.Id);
}
if (query.School_Id > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Duty_Config_ViewModel.School_Id), query.School_Id);
}
if (query.Group_Id > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Duty_Config_ViewModel.Group_Id), query.Group_Id);
}
var obj = base.ExecuteScalar(builder.ToString());
if (obj != null)
{
Int32.TryParse(obj.ToString(), out result);
}
return result > 0;
}
}
}
Edu.Repository/Duty/RB_Duty_FrequencyRepository.cs
View file @ b0ba828d
......@@ -3,6 +3,7 @@ using System.Linq;
using System.Text;
using Edu.Model.Entity.Duty;
using Edu.Model.ViewModel.Duty;
using VT.FW.DB.Dapper;
namespace Edu.Repository.Duty
{
......@@ -16,11 +17,13 @@ namespace Edu.Repository.Duty
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Duty_Frequency_ViewModel> GetDutyFrequencyRepository(RB_Duty_Frequency_ViewModel query)
public List<RB_Duty_Frequency_ViewModel> GetDutyFrequencyListRepository(RB_Duty_Frequency_ViewModel query)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" SELECT A.*,(SELECT GROUP_CONCAT(SName) from rb_school where `Status`=0 and FIND_IN_SET(SId,a.School_Ids) GROUP BY `Status`=0) as SchoolName FROM RB_Duty_Frequency AS A WHERE 1=1 ");
builder.AppendFormat(@"
SELECT A.*,(SELECT GROUP_CONCAT(SName) FROM rb_school WHERE `Status`=0 AND FIND_IN_SET(SId,a.School_Ids) GROUP BY `Status`=0) AS SchoolName
FROM RB_Duty_Frequency AS A
WHERE 1=1 AND A.Status=0 ");
if (query != null)
{
if (query.Group_Id > 0)
......@@ -31,15 +34,96 @@ namespace Edu.Repository.Duty
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Duty_Frequency_ViewModel.Id), query.Id);
}
if (query.Status >= 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Duty_Frequency_ViewModel.Status), (int)query.Status);
}
if (query.SchoolIdList != null && query.SchoolIdList.Count > 0)
{
string str = "";
if (query.SchoolIdList != null && query.SchoolIdList.Count > 0)
{
for (var i = 0; i < query.SchoolIdList.Count; i++)
{
if (i == 0)
{
str += string.Format(" FIND_IN_SET('{0}', A.School_Ids)>0 ", query.SchoolIdList[i]);
}
else
{
str += string.Format(" OR FIND_IN_SET('{0}', A.School_Ids)>0 ", query.SchoolIdList[i]);
}
}
}
if (!string.IsNullOrEmpty(str))
{
builder.AppendFormat(" AND ({0}) ", str);
}
}
}
return Get<RB_Duty_Frequency_ViewModel>(builder.ToString()).ToList();
}
/// <summary>
/// 获取班次设置分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Duty_Frequency_ViewModel> GetDutyFrequencyPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Duty_Frequency_ViewModel query)
{
var parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.*,(SELECT GROUP_CONCAT(SName) FROM rb_school WHERE `Status`=0 AND FIND_IN_SET(SId,a.School_Ids) GROUP BY `Status`=0) AS SchoolName
FROM RB_Duty_Frequency AS A
WHERE 1=1 ");
if (query != null)
{
if (query.Group_Id > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Duty_Frequency_ViewModel.Group_Id), query.Group_Id);
}
if (query.Id > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Duty_Frequency_ViewModel.Id), query.Id);
}
if (query.Status >= 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Duty_Frequency_ViewModel.Status), (int)query.Status);
}
if (!string.IsNullOrEmpty(query.Name))
{
builder.AppendFormat(" AND A.{0} LIKE @Name ", nameof(RB_Duty_Frequency_ViewModel.Name));
parameters.Add("Name", "%" + query.Name.Trim() + "%");
}
if (query.SchoolIdList != null && query.SchoolIdList.Count > 0)
{
string str = "";
if (query.SchoolIdList != null && query.SchoolIdList.Count > 0)
{
for (var i = 0; i < query.SchoolIdList.Count; i++)
{
if (i == 0)
{
str += string.Format(" FIND_IN_SET('{0}', A.School_Ids)>0 ", query.SchoolIdList[i]);
}
else
{
str += string.Format(" OR FIND_IN_SET('{0}', A.School_Ids)>0 ", query.SchoolIdList[i]);
}
}
}
if (!string.IsNullOrEmpty(str))
{
builder.AppendFormat(" AND ({0}) ", str);
}
}
}
return GetPage<RB_Duty_Frequency_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
}
/// <summary>
/// 获取班次设置列表
......@@ -49,8 +133,7 @@ namespace Edu.Repository.Duty
public List<RB_Duty_Frequency_ViewModel> GetDutyFrequencyBySchoolIdsRepository(int Group_Id, string SchoolIds)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" SELECT * from rb_duty_frequency where `Status`=0");
builder.AppendFormat(@" SELECT * FROM rb_duty_frequency WHERE `Status`=0");
if (Group_Id > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Duty_Frequency_ViewModel.Group_Id), Group_Id);
......@@ -61,10 +144,8 @@ namespace Edu.Repository.Duty
{
builder.AppendFormat($" and FIND_IN_SET({item},School_Ids) ");
}
}
return Get<RB_Duty_Frequency_ViewModel>(builder.ToString()).ToList();
}
}
}
Edu.Repository/Duty/RB_Duty_ItemRepository.cs
View file @ b0ba828d
......@@ -3,6 +3,7 @@ using System.Linq;
using System.Text;
using Edu.Model.Entity.Duty;
using Edu.Model.ViewModel.Duty;
using VT.FW.DB.Dapper;
namespace Edu.Repository.Duty
{
......@@ -53,6 +54,7 @@ WHERE 1=1 ");
/// <returns></returns>
public List<RB_Duty_Item_ViewModel> GetDutyItemPageRepository(int pageIndex,int pageSize,out long rowsCount, RB_Duty_Item_ViewModel query)
{
var parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.*,(SELECT GROUP_CONCAT(SName) FROM rb_school WHERE `Status`=0 AND FIND_IN_SET(SId,a.ItemSchools) GROUP BY `Status`=0) AS SchoolName
......@@ -73,8 +75,35 @@ WHERE 1=1 ");
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Duty_Item_ViewModel.Status), (int)query.Status);
}
if (!string.IsNullOrEmpty(query.ItemName))
{
builder.AppendFormat(" AND A.{0} LIKE @ItemName ", nameof(RB_Duty_Item_ViewModel.ItemName));
parameters.Add("ItemName", "%" + query.ItemName.Trim() + "%");
}
if (query.ItemSchoolList != null && query.ItemSchoolList.Count > 0)
{
string str = "";
if (query.ItemSchoolList != null && query.ItemSchoolList.Count > 0)
{
for (var i = 0; i < query.ItemSchoolList.Count; i++)
{
if (i == 0)
{
str += string.Format(" FIND_IN_SET('{0}', A.ItemSchools)>0 ", query.ItemSchoolList[i]);
}
else
{
str += string.Format(" OR FIND_IN_SET('{0}', A.ItemSchools)>0 ", query.ItemSchoolList[i]);
}
}
}
if (!string.IsNullOrEmpty(str))
{
builder.AppendFormat(" AND ({0}) ", str);
}
}
}
return GetPage<RB_Duty_Item_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
return GetPage<RB_Duty_Item_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
}
/// <summary>
......
Edu.WebApi/Controllers/Duty/DutyController.cs
View file @ b0ba828d
using System.Linq;
using System.Collections.Generic;
using System.Linq;
using Edu.Cache.User;
using Edu.Common.API;
using Edu.Common.Plugin;
......@@ -29,6 +30,35 @@ namespace Edu.WebApi.Controllers.Duty
#region 班次管理
/// <summary>
/// 获取班次分页列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetDutyFrequencyPage()
{
var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var query = new RB_Duty_Frequency_ViewModel()
{
Group_Id = base.UserInfo.Group_Id,
Name=base.ParmJObj.GetStringValue("Name"),
};
query.SchoolIdList = Common.Plugin.JsonHelper.DeserializeObject<List<int>>(base.ParmJObj.GetStringValue("School_Ids"));
var list = dutyModule.GetDutyFrequencyPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
foreach (var item in list)
{
if (item.CreateBy > 0)
{
item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
}
item.SchoolName = item.SchoolName.Replace(',', '|');
}
pageModel.PageData = list;
pageModel.Count = rowsCount;
return ApiResult.Success(data: pageModel);
}
/// <summary>
/// 获取班次列表
/// </summary>
......@@ -39,8 +69,10 @@ namespace Edu.WebApi.Controllers.Duty
var query = new RB_Duty_Frequency_ViewModel()
{
Group_Id = base.UserInfo.Group_Id,
Name = base.ParmJObj.GetStringValue("Name"),
};
var list = dutyModule.GetDutyFrequencyModule(query);
query.SchoolIdList = Common.Plugin.JsonHelper.DeserializeObject<List<int>>(base.ParmJObj.GetStringValue("School_Ids"));
var list = dutyModule.GetDutyFrequencyListModule(query);
foreach (var item in list)
{
if (item.CreateBy > 0)
......@@ -52,7 +84,6 @@ namespace Edu.WebApi.Controllers.Duty
return ApiResult.Success(data: list);
}
/// <summary>
/// 获取班次列表
/// </summary>
......@@ -69,7 +100,7 @@ namespace Edu.WebApi.Controllers.Duty
{
return ApiResult.Failed("请传入班次Id");
}
var model = dutyModule.GetDutyFrequencyModule(query).FirstOrDefault();
var model = dutyModule.GetDutyFrequencyListModule(query).FirstOrDefault();
if (model == null || model.Id <= 0)
{
return ApiResult.Failed("数据不存在");
......@@ -83,11 +114,11 @@ namespace Edu.WebApi.Controllers.Duty
}
/// <summary>
/// 获取班次列表
/// 新增修改班次
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetSetFrequencyModel()
public ApiResult GetSetFrequency()
{
var query = new RB_Duty_Frequency_ViewModel()
{
......@@ -122,7 +153,7 @@ namespace Edu.WebApi.Controllers.Duty
query.UpdateBy = base.UserInfo.Id;
query.UpdateTime = System.DateTime.Now;
bool retult = dutyModule.SetFrequencyModule(query);
return retult ? ApiResult.Success("新增/修改班次成功") : ApiResult.Failed("新增/修改班次失败");
return retult ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
......@@ -151,7 +182,9 @@ namespace Edu.WebApi.Controllers.Duty
var query = new RB_Duty_Item_ViewModel()
{
Group_Id = base.UserInfo.Group_Id,
ItemName=base.ParmJObj.GetStringValue("ItemName"),
};
query.ItemSchoolList = Common.Plugin.JsonHelper.DeserializeObject<List<int>>(base.ParmJObj.GetStringValue("ItemSchools"));
var list = dutyModule.GetDutyItemPageModule(pageModel.PageIndex,pageModel.PageSize,out long rowsCount, query);
foreach (var item in list)
{
......@@ -370,7 +403,7 @@ namespace Edu.WebApi.Controllers.Duty
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetSetDutyConfigModel()
public ApiResult SetDutyConfig()
{
var query = new RB_Duty_Config_ViewModel()
{
......@@ -410,6 +443,10 @@ namespace Edu.WebApi.Controllers.Duty
}
query.UpdateBy = base.UserInfo.Id;
query.UpdateTime = System.DateTime.Now;
if (dutyModule.CheckDutyConfigModule(query))
{
ApiResult.Failed("已经存在该校区的配置数据!");
}
bool retult = dutyModule.SetDutyConfigModule(query);
return retult ? ApiResult.Success("新增/修改值班设置成功") : ApiResult.Failed("新增/修改值班设置失败");
}
......
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