Skip to content

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

事务修改

parent fe95c38d
Show whitespace changes
Inline Side-by-side
Showing with 106 additions and 91 deletions
Edu.Model/ViewModel/Course/RB_Course_Offer_ViewModel.cs
View file @ c3e7bfa8
...@@ -70,5 +70,10 @@ namespace Edu.Model.ViewModel.Course ...@@ -70,5 +70,10 @@ namespace Edu.Model.ViewModel.Course
/// 报价单详情列表 /// 报价单详情列表
/// </summary> /// </summary>
public List<RB_Course_OfferDetails_ViewModel> OfferDetails { get; set; } public List<RB_Course_OfferDetails_ViewModel> OfferDetails { get; set; }
/// <summary>
/// 是否获取报价单详情
/// </summary>
public int IsGetDetails { get; set; }
} }
} }
Edu.Module.Course/CourseOfferModule.cs
View file @ c3e7bfa8
...@@ -32,7 +32,21 @@ namespace Edu.Module.Course ...@@ -32,7 +32,21 @@ namespace Edu.Module.Course
/// <returns></returns> /// <returns></returns>
public List<RB_Course_Offer_ViewModel> GetCourseOfferPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Course_Offer_ViewModel query) public List<RB_Course_Offer_ViewModel> GetCourseOfferPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Course_Offer_ViewModel query)
{ {
return course_OfferRepository.GetCourseOfferPageRepository(pageIndex, pageSize, out rowsCount, query); var list= course_OfferRepository.GetCourseOfferPageRepository(pageIndex, pageSize, out rowsCount, query);
if (query.IsGetDetails == 1 && list != null && list.Count > 0)
{
string ids = string.Join(",", list.Select(qitem => qitem.Id));
var detailsList = new List<RB_Course_OfferDetails_ViewModel>();
if (!string.IsNullOrEmpty(ids))
{
detailsList = GetCourseOfferDetailsListModule(new RB_Course_OfferDetails_ViewModel() { QOfferIds = ids });
}
foreach (var item in list)
{
item.OfferDetails = detailsList?.Where(qitem => qitem.OfferId == item.Id)?.ToList() ?? new List<RB_Course_OfferDetails_ViewModel>();
}
}
return list;
} }
/// <summary> /// <summary>
......
Edu.Module.Course/TeachingRewardsModule.cs
View file @ c3e7bfa8
using Edu.Cache.User; using Edu.AOP.CustomerAttribute;
using Edu.Cache.User;
using Edu.Common; using Edu.Common;
using Edu.Common.API; using Edu.Common.API;
using Edu.Common.Enum; using Edu.Common.Enum;
...@@ -149,10 +150,10 @@ namespace Edu.Module.Course ...@@ -149,10 +150,10 @@ namespace Edu.Module.Course
/// <param name="deList"></param> /// <param name="deList"></param>
/// <param name="userInfo"></param> /// <param name="userInfo"></param>
/// <returns></returns> /// <returns></returns>
public bool SetTeachingRewardsInfo(int type, List<RB_Teaching_Rewards_Rate_ViewModel> deList, UserInfo userInfo) [TransactionCallHandler]
public virtual bool SetTeachingRewardsInfo(int type, List<RB_Teaching_Rewards_Rate_ViewModel> deList, UserInfo userInfo)
{ {
var rlist = teaching_Rewards_RateRepository.GetList(new RB_Teaching_Rewards_Rate_ViewModel() { Group_Id = userInfo.Group_Id, Type = type }); var rlist = teaching_Rewards_RateRepository.GetList(new RB_Teaching_Rewards_Rate_ViewModel() { Group_Id = userInfo.Group_Id, Type = type });
var trans = teaching_Rewards_RateRepository.DbTransaction;
try try
{ {
if (rlist.Any()) if (rlist.Any())
...@@ -161,8 +162,8 @@ namespace Edu.Module.Course ...@@ -161,8 +162,8 @@ namespace Edu.Module.Course
var xblist = rlist.Where(x => x.RateType == 2).OrderBy(x => x.StartValue).ToList(); var xblist = rlist.Where(x => x.RateType == 2).OrderBy(x => x.StartValue).ToList();
string TackClassRateIds = string.Join(",", xblist.Select(x => x.Id)); string TackClassRateIds = string.Join(",", xblist.Select(x => x.Id));
var vlist = teaching_RewardsRepository.GetList(new RB_Teaching_Rewards_ViewModel() { TackClassRateIds = TackClassRateIds }); var vlist = teaching_RewardsRepository.GetList(new RB_Teaching_Rewards_ViewModel() { TackClassRateIds = TackClassRateIds });
teaching_RewardsRepository.DeleteBatch(vlist, trans); teaching_RewardsRepository.DeleteBatch(vlist);
teaching_Rewards_RateRepository.DeleteBatch(rlist, trans); teaching_Rewards_RateRepository.DeleteBatch(rlist);
} }
var FullClassList = deList.FirstOrDefault().FullClassList; var FullClassList = deList.FirstOrDefault().FullClassList;
//先新增满班率 //先新增满班率
...@@ -179,7 +180,7 @@ namespace Edu.Module.Course ...@@ -179,7 +180,7 @@ namespace Edu.Module.Course
School_Id = userInfo.School_Id, School_Id = userInfo.School_Id,
StartValue = item.StartValue, StartValue = item.StartValue,
Type = type Type = type
}, trans); });
item.Id = Id; item.Id = Id;
} }
foreach (var item in deList) foreach (var item in deList)
...@@ -196,7 +197,7 @@ namespace Edu.Module.Course ...@@ -196,7 +197,7 @@ namespace Edu.Module.Course
School_Id = userInfo.School_Id, School_Id = userInfo.School_Id,
StartValue = item.StartValue, StartValue = item.StartValue,
Type = type Type = type
}, trans); });
foreach (var qitem in item.FullClassList) foreach (var qitem in item.FullClassList)
{ {
...@@ -211,18 +212,15 @@ namespace Edu.Module.Course ...@@ -211,18 +212,15 @@ namespace Edu.Module.Course
TackClassRateId = Id, TackClassRateId = Id,
Money = qitem.ClassMoney, Money = qitem.ClassMoney,
PeopelNum = qitem.PeopelNum PeopelNum = qitem.PeopelNum
}, trans); });
} }
} }
} }
teaching_Rewards_RateRepository.DBSession.Commit();
return true; return true;
} }
catch (Exception ex) catch (Exception ex)
{ {
LogHelper.Write(ex, "SetTeachingRewardsInfo"); LogHelper.Write(ex, "SetTeachingRewardsInfo");
teaching_Rewards_RateRepository.DBSession.Rollback();
return false; return false;
} }
} }
......
Edu.Module.User/AttendanceModule.cs
View file @ c3e7bfa8
using Edu.Common.API; using Edu.AOP.CustomerAttribute;
using Edu.Common.API;
using Edu.Common.Enum.User; using Edu.Common.Enum.User;
using Edu.Common.Plugin; using Edu.Common.Plugin;
using Edu.Model.CacheModel; using Edu.Model.CacheModel;
...@@ -173,9 +174,9 @@ namespace Edu.Module.User ...@@ -173,9 +174,9 @@ namespace Edu.Module.User
/// <param name="eid"></param> /// <param name="eid"></param>
/// <param name="groupId"></param> /// <param name="groupId"></param>
/// <returns></returns> /// <returns></returns>
public bool Set(int attendanceId, int Status, int BranchId, List<RB_WorkdaySeting_Extend> WorkDayList, List<RB_Technicaldates_Extend> ClockDateList, List<RB_Technicaldates_Extend> NotClockDateList, List<RB_Attendance_Way_Extend> AddressWayList, List<RB_Attendance_Way_Extend> WifiWayList, int eid, int groupId) [TransactionCallHandler]
public virtual bool Set(int attendanceId, int Status, int BranchId, List<RB_WorkdaySeting_Extend> WorkDayList, List<RB_Technicaldates_Extend> ClockDateList, List<RB_Technicaldates_Extend> NotClockDateList, List<RB_Attendance_Way_Extend> AddressWayList, List<RB_Attendance_Way_Extend> WifiWayList, int eid, int groupId)
{ {
var trans = respository.DbTransaction;
try try
{ {
if (attendanceId > 0)//修改 if (attendanceId > 0)//修改
...@@ -185,13 +186,14 @@ namespace Edu.Module.User ...@@ -185,13 +186,14 @@ namespace Edu.Module.User
amodel.Status = Status; amodel.Status = Status;
amodel.UpdateBy = eid; amodel.UpdateBy = eid;
amodel.UpdateTime = DateTime.Now; amodel.UpdateTime = DateTime.Now;
bool flag = respository.Update(amodel, trans); bool flag = respository.Update(amodel);
if (flag) if (flag)
{ {
//删除全部的工作日数据 //删除全部的工作日数据
respository.DelAllList(attendanceId, trans); respository.DelAllList(attendanceId);
foreach (var item in WorkDayList) foreach (var item in WorkDayList)
{//获取单条工作日数据 {
//获取单条工作日数据
RB_WorkdaySeting_Extend wmodel = new RB_WorkdaySeting_Extend RB_WorkdaySeting_Extend wmodel = new RB_WorkdaySeting_Extend
{ {
AttendanceId = attendanceId, AttendanceId = attendanceId,
...@@ -199,10 +201,11 @@ namespace Edu.Module.User ...@@ -199,10 +201,11 @@ namespace Edu.Module.User
BeOnDutyTime = item.BeOnDutyTime, BeOnDutyTime = item.BeOnDutyTime,
OffDutyTime = item.OffDutyTime OffDutyTime = item.OffDutyTime
}; };
WDrespository.Insert(wmodel, trans); WDrespository.Insert(wmodel);
} }
foreach (var item in ClockDateList) foreach (var item in ClockDateList)
{//获取特殊日期 需打卡 {
//获取特殊日期 需打卡
RB_Technicaldates tdmodel = new RB_Technicaldates RB_Technicaldates tdmodel = new RB_Technicaldates
{ {
AttendanceId = attendanceId, AttendanceId = attendanceId,
...@@ -213,10 +216,11 @@ namespace Edu.Module.User ...@@ -213,10 +216,11 @@ namespace Edu.Module.User
RB_Department_Id = item.RB_Department_Id,//2019-09-23 Add By:W 可设置某一个部门或者人打卡 RB_Department_Id = item.RB_Department_Id,//2019-09-23 Add By:W 可设置某一个部门或者人打卡
EmployeeId = item.EmployeeId //2019-09-23 Add By:W EmployeeId = item.EmployeeId //2019-09-23 Add By:W
}; };
TDrespository.Insert(tdmodel, trans); TDrespository.Insert(tdmodel);
} }
foreach (var item in NotClockDateList) foreach (var item in NotClockDateList)
{//获取特殊日期 无需打卡 {
//获取特殊日期 无需打卡
RB_Technicaldates tdmodel = new RB_Technicaldates RB_Technicaldates tdmodel = new RB_Technicaldates
{ {
AttendanceId = attendanceId, AttendanceId = attendanceId,
...@@ -225,10 +229,11 @@ namespace Edu.Module.User ...@@ -225,10 +229,11 @@ namespace Edu.Module.User
RB_Department_Id = item.RB_Department_Id,//2019-09-23 Add By:W RB_Department_Id = item.RB_Department_Id,//2019-09-23 Add By:W
EmployeeId = item.EmployeeId//2019-09-23 Add By:W EmployeeId = item.EmployeeId//2019-09-23 Add By:W
}; };
TDrespository.Insert(tdmodel, trans); TDrespository.Insert(tdmodel);
} }
foreach (var item in AddressWayList) foreach (var item in AddressWayList)
{//1.根据办公地点考勤（可添加多个考勤地点） {
//1.根据办公地点考勤（可添加多个考勤地点）
RB_Attendance_Way wdmodel = new RB_Attendance_Way RB_Attendance_Way wdmodel = new RB_Attendance_Way
{ {
Attendance_Id = attendanceId, Attendance_Id = attendanceId,
...@@ -238,10 +243,11 @@ namespace Edu.Module.User ...@@ -238,10 +243,11 @@ namespace Edu.Module.User
TargetAddress = item.TargetAddress, TargetAddress = item.TargetAddress,
Scope = item.Scope ?? 0 Scope = item.Scope ?? 0
}; };
AWrespository.Insert(wdmodel, trans); AWrespository.Insert(wdmodel);
} }
foreach (var item in WifiWayList) foreach (var item in WifiWayList)
{//2.根据WiFi考勤 {
//2.根据WiFi考勤
RB_Attendance_Way wdmodel = new RB_Attendance_Way RB_Attendance_Way wdmodel = new RB_Attendance_Way
{ {
Attendance_Id = attendanceId, Attendance_Id = attendanceId,
...@@ -249,13 +255,14 @@ namespace Edu.Module.User ...@@ -249,13 +255,14 @@ namespace Edu.Module.User
Name = item.Name, Name = item.Name,
TargetAddress = item.TargetAddress TargetAddress = item.TargetAddress
}; };
AWrespository.Insert(wdmodel, trans); AWrespository.Insert(wdmodel);
} }
} }
#endregion #endregion
} }
else else
{//新增 {
//新增
#region 新增 #region 新增
RB_Attendance_Extend amodel = new RB_Attendance_Extend RB_Attendance_Extend amodel = new RB_Attendance_Extend
{ {
...@@ -267,11 +274,12 @@ namespace Edu.Module.User ...@@ -267,11 +274,12 @@ namespace Edu.Module.User
UpdateBy = eid, UpdateBy = eid,
UpdateTime = DateTime.Now UpdateTime = DateTime.Now
}; };
int aid = respository.Insert(amodel, trans); int aid = respository.Insert(amodel);
if (aid > 0) if (aid > 0)
{ {
foreach (var item in WorkDayList) foreach (var item in WorkDayList)
{//获取单条工作日数据 {
//获取单条工作日数据
RB_WorkdaySeting wmodel = new RB_WorkdaySeting RB_WorkdaySeting wmodel = new RB_WorkdaySeting
{ {
AttendanceId = aid, AttendanceId = aid,
...@@ -279,10 +287,11 @@ namespace Edu.Module.User ...@@ -279,10 +287,11 @@ namespace Edu.Module.User
BeOnDutyTime = item.BeOnDutyTime, BeOnDutyTime = item.BeOnDutyTime,
OffDutyTime = item.OffDutyTime OffDutyTime = item.OffDutyTime
}; };
WDrespository.Insert(wmodel, trans); WDrespository.Insert(wmodel);
} }
foreach (var item in ClockDateList) foreach (var item in ClockDateList)
{//获取特殊日期 需打卡 {
//获取特殊日期 需打卡
RB_Technicaldates tdmodel = new RB_Technicaldates RB_Technicaldates tdmodel = new RB_Technicaldates
{ {
AttendanceId = aid, AttendanceId = aid,
...@@ -293,10 +302,11 @@ namespace Edu.Module.User ...@@ -293,10 +302,11 @@ namespace Edu.Module.User
RB_Department_Id = item.RB_Department_Id,//2019-09-23 Add By:W 可设置某一个部门或者人打卡 RB_Department_Id = item.RB_Department_Id,//2019-09-23 Add By:W 可设置某一个部门或者人打卡
EmployeeId = item.EmployeeId //2019-09-23 Add By:W EmployeeId = item.EmployeeId //2019-09-23 Add By:W
}; };
TDrespository.Insert(tdmodel, trans); TDrespository.Insert(tdmodel);
} }
foreach (var item in NotClockDateList) foreach (var item in NotClockDateList)
{//获取特殊日期 无需打卡 {
//获取特殊日期 无需打卡
RB_Technicaldates tdmodel = new RB_Technicaldates RB_Technicaldates tdmodel = new RB_Technicaldates
{ {
AttendanceId = aid, AttendanceId = aid,
...@@ -305,7 +315,7 @@ namespace Edu.Module.User ...@@ -305,7 +315,7 @@ namespace Edu.Module.User
RB_Department_Id = item.RB_Department_Id,//2019-09-23 Add By:W 可设置某一个部门或者人打卡 RB_Department_Id = item.RB_Department_Id,//2019-09-23 Add By:W 可设置某一个部门或者人打卡
EmployeeId = item.EmployeeId //2019-09-23 Add By:W EmployeeId = item.EmployeeId //2019-09-23 Add By:W
}; };
TDrespository.Insert(tdmodel, trans); TDrespository.Insert(tdmodel);
} }
foreach (var item in AddressWayList) foreach (var item in AddressWayList)
{//1.根据办公地点考勤（可添加多个考勤地点） {//1.根据办公地点考勤（可添加多个考勤地点）
...@@ -318,7 +328,7 @@ namespace Edu.Module.User ...@@ -318,7 +328,7 @@ namespace Edu.Module.User
TargetAddress = item.TargetAddress, TargetAddress = item.TargetAddress,
Scope = item.Scope ?? 0 Scope = item.Scope ?? 0
}; };
AWrespository.Insert(wdmodel, trans); AWrespository.Insert(wdmodel);
} }
foreach (var item in WifiWayList) foreach (var item in WifiWayList)
{//2.根据WiFi考勤 {//2.根据WiFi考勤
...@@ -329,17 +339,15 @@ namespace Edu.Module.User ...@@ -329,17 +339,15 @@ namespace Edu.Module.User
Name = item.Name, Name = item.Name,
TargetAddress = item.TargetAddress TargetAddress = item.TargetAddress
}; };
AWrespository.Insert(wdmodel, trans); AWrespository.Insert(wdmodel);
} }
} }
#endregion #endregion
} }
respository.DBSession.Commit();
} }
catch (Exception ex) catch (Exception ex)
{ {
LogHelper.Write(ex, "AttendanceModule_Set"); LogHelper.Write(ex, "AttendanceModule_Set");
respository.DBSession.Rollback("AttendanceModule_Set");
return false; return false;
} }
return true; return true;
...@@ -591,6 +599,5 @@ namespace Edu.Module.User ...@@ -591,6 +599,5 @@ namespace Edu.Module.User
} }
return RecordRepository.Update(model); return RecordRepository.Update(model);
} }
} }
} }
Edu.Module.User/WorkFlowManagementModule.cs
View file @ c3e7bfa8
using Edu.Common.API; using Edu.AOP.CustomerAttribute;
using Edu.Common.API;
using Edu.Common.Enum.User; using Edu.Common.Enum.User;
using Edu.Common.Plugin; using Edu.Common.Plugin;
using Edu.Model.CacheModel; using Edu.Model.CacheModel;
...@@ -672,25 +673,23 @@ namespace Edu.Module.User ...@@ -672,25 +673,23 @@ namespace Edu.Module.User
/// <param name="tid"></param> /// <param name="tid"></param>
/// <param name="List"></param> /// <param name="List"></param>
/// <returns></returns> /// <returns></returns>
public bool AddTempleteEmployee(int tid, List<Rb_Workflow_Visualrange> List) [TransactionCallHandler]
public virtual bool AddTempleteEmployee(int tid, List<Rb_Workflow_Visualrange> List)
{ {
//删除原有 //删除原有
var trans = respository.DbTransaction;
try try
{ {
visualrangeRepository.DeleteVisualrange(tid, trans); visualrangeRepository.DeleteVisualrange(tid);
foreach (var item in List) foreach (var item in List)
{ {
item.TemplateId = tid; item.TemplateId = tid;
} }
visualrangeRepository.InsertBatch(List, trans); visualrangeRepository.InsertBatch(List);
respository.DBSession.Commit();
return true; return true;
} }
catch (Exception ex) catch (Exception ex)
{ {
LogHelper.Write(ex, "AddTempleteEmployee"); LogHelper.Write(ex, "AddTempleteEmployee");
respository.DBSession.Rollback("AddTempleteEmployee");
return false; return false;
} }
} }
......
Edu.Repository/User/RB_AccountRemarkRepository.cs
View file @ c3e7bfa8
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
using Edu.Model.Entity.User; using Edu.Model.Entity.User;
using Edu.Model.ViewModel.User; using Edu.Model.ViewModel.User;
...@@ -17,12 +15,10 @@ namespace Edu.Repository.User ...@@ -17,12 +15,10 @@ namespace Edu.Repository.User
/// 获取列表 /// 获取列表
/// </summary> /// </summary>
/// <param name="demodel"></param> /// <param name="demodel"></param>
/// <param name="orderIds"></param>
/// <returns></returns> /// <returns></returns>
public List<RB_AccountRemark_ViewModel> GetList(RB_AccountRemark_ViewModel demodel) public List<RB_AccountRemark_ViewModel> GetList(RB_AccountRemark_ViewModel demodel)
{ {
string where = $@" 1=1"; string where = $@" 1=1";
if (demodel.Group_Id > 0) if (demodel.Group_Id > 0)
{ {
where += $@" and {nameof(RB_AccountRemark_ViewModel.Group_Id)} ={demodel.Group_Id}"; where += $@" and {nameof(RB_AccountRemark_ViewModel.Group_Id)} ={demodel.Group_Id}";
...@@ -31,7 +27,6 @@ namespace Edu.Repository.User ...@@ -31,7 +27,6 @@ namespace Edu.Repository.User
{ {
where += $@" and {nameof(RB_AccountRemark_ViewModel.RemarkType)} ={(int)demodel.RemarkType}"; where += $@" and {nameof(RB_AccountRemark_ViewModel.RemarkType)} ={(int)demodel.RemarkType}";
} }
if (demodel.AccountType > 0) if (demodel.AccountType > 0)
{ {
where += $@" and {nameof(RB_AccountRemark_ViewModel.AccountType)} ={(int)demodel.AccountType}"; where += $@" and {nameof(RB_AccountRemark_ViewModel.AccountType)} ={(int)demodel.AccountType}";
...@@ -135,9 +130,7 @@ ORDER BY DATE_FORMAT(CreateTime,'%Y-%m-%d') DESC ...@@ -135,9 +130,7 @@ ORDER BY DATE_FORMAT(CreateTime,'%Y-%m-%d') DESC
/// <returns></returns> /// <returns></returns>
public List<RB_AccountRemark_ViewModel> GetListByWhere(RB_AccountRemark_ViewList demodel) public List<RB_AccountRemark_ViewModel> GetListByWhere(RB_AccountRemark_ViewList demodel)
{ {
string where = $@" "; string where = $@" ";
if (demodel.Group_Id > 0) if (demodel.Group_Id > 0)
{ {
where += $@" and {nameof(RB_AccountRemark_ViewModel.Group_Id)} ={demodel.Group_Id}"; where += $@" and {nameof(RB_AccountRemark_ViewModel.Group_Id)} ={demodel.Group_Id}";
...@@ -166,10 +159,8 @@ ORDER BY DATE_FORMAT(CreateTime,'%Y-%m-%d') DESC ...@@ -166,10 +159,8 @@ ORDER BY DATE_FORMAT(CreateTime,'%Y-%m-%d') DESC
{ {
where += $@" and DATE_FORMAT({nameof(RB_AccountRemark_ViewModel.CreateTime)},'%Y-%m-%d' )<= DATE_FORMAT('{demodel.EndDate}','%Y-%m-%d' ) "; where += $@" and DATE_FORMAT({nameof(RB_AccountRemark_ViewModel.CreateTime)},'%Y-%m-%d' )<= DATE_FORMAT('{demodel.EndDate}','%Y-%m-%d' ) ";
} }
string sql = $@" select * from RB_AccountRemark where `Status`=0 {where}"; string sql = $@" select * from RB_AccountRemark where `Status`=0 {where}";
return Get<RB_AccountRemark_ViewModel>(sql).ToList(); return Get<RB_AccountRemark_ViewModel>(sql).ToList();
} }
} }
} }
Edu.Repository/User/Rb_Workflow_VisualrangeRepository.cs
View file @ c3e7bfa8
...@@ -18,17 +18,19 @@ namespace Edu.Repository.User ...@@ -18,17 +18,19 @@ namespace Edu.Repository.User
/// 删除模版可见范围 /// 删除模版可见范围
/// </summary> /// </summary>
/// <param name="tid"></param> /// <param name="tid"></param>
/// <param name="tran"></param>
/// <returns></returns> /// <returns></returns>
public bool DeleteVisualrange(int tid,IDbTransaction tran) { public bool DeleteVisualrange(int tid)
return Execute($@" delete from Rb_Workflow_Visualrange where TemplateId={tid}", tran) >0; {
return Execute($@" delete from Rb_Workflow_Visualrange where TemplateId={tid}") >0;
} }
/// <summary> /// <summary>
/// 根据模版id获取可见范围的人 /// 根据模版id获取可见范围的人
/// </summary> /// </summary>
/// <param name="tid"></param> /// <param name="tid"></param>
/// <returns></returns> /// <returns></returns>
public List<Rb_Workflow_Visualrange_Extend> GetList(int tid) { public List<Rb_Workflow_Visualrange_Extend> GetList(int tid)
{
return Get<Rb_Workflow_Visualrange_Extend>($@" select * from Rb_Workflow_Visualrange where TemplateId={tid}").ToList(); return Get<Rb_Workflow_Visualrange_Extend>($@" select * from Rb_Workflow_Visualrange where TemplateId={tid}").ToList();
} }
} }
......
Edu.Repository/User/Rb_attendanceRepository.cs
View file @ c3e7bfa8
...@@ -100,12 +100,12 @@ left join rb_employee e on a.UpdateBy=e.EmployeeId )t " + where + " order by t. ...@@ -100,12 +100,12 @@ left join rb_employee e on a.UpdateBy=e.EmployeeId )t " + where + " order by t.
/// <param name="aid"></param> /// <param name="aid"></param>
/// <param name="trans">事务对象</param> /// <param name="trans">事务对象</param>
/// <returns></returns> /// <returns></returns>
public bool DelAllList(int aid, IDbTransaction trans) public bool DelAllList(int aid)
{ {
string sql = " delete from Rb_attendance_way where " + nameof(RB_Attendance_Way_Extend.Attendance_Id) + "=" + aid + ";"; string sql = " delete from Rb_attendance_way where " + nameof(RB_Attendance_Way_Extend.Attendance_Id) + "=" + aid + ";";
sql += " delete from Rb_technicaldates where " + nameof(RB_Technicaldates_Extend.AttendanceId) + "=" + aid + ";"; sql += " delete from Rb_technicaldates where " + nameof(RB_Technicaldates_Extend.AttendanceId) + "=" + aid + ";";
sql += " delete from Rb_workdayseting where " + nameof(RB_WorkdaySeting_Extend.AttendanceId) + "=" + aid + ";"; sql += " delete from Rb_workdayseting where " + nameof(RB_WorkdaySeting_Extend.AttendanceId) + "=" + aid + ";";
int count = Execute(sql, trans); int count = Execute(sql);
return count > 0; return count > 0;
} }
......
Edu.WebApi/Controllers/Course/CourseOfferController.cs
View file @ c3e7bfa8
...@@ -46,7 +46,8 @@ namespace Edu.WebApi.Controllers.Course ...@@ -46,7 +46,8 @@ namespace Edu.WebApi.Controllers.Course
CustomerSource = (CustomerSourceEnum)base.ParmJObj.GetInt("CustomerSource"), CustomerSource = (CustomerSourceEnum)base.ParmJObj.GetInt("CustomerSource"),
CustomerType = (CustomerTypeEnum)base.ParmJObj.GetInt("CustomerType"), CustomerType = (CustomerTypeEnum)base.ParmJObj.GetInt("CustomerType"),
CustomerStatus = (CustomerStatusEnum)base.ParmJObj.GetInt("CustomerStatus"), CustomerStatus = (CustomerStatusEnum)base.ParmJObj.GetInt("CustomerStatus"),
SerialNum=base.ParmJObj.GetStringValue("SerialNum") SerialNum=base.ParmJObj.GetStringValue("SerialNum"),
IsGetDetails=base.ParmJObj.GetInt("IsGetDetails")
}; };
query.Group_Id = base.UserInfo.Group_Id; query.Group_Id = base.UserInfo.Group_Id;
query.School_Id = base.UserInfo.School_Id; query.School_Id = base.UserInfo.School_Id;
...@@ -86,6 +87,7 @@ namespace Edu.WebApi.Controllers.Course ...@@ -86,6 +87,7 @@ namespace Edu.WebApi.Controllers.Course
qitem.UpdateBy, qitem.UpdateBy,
qitem.UpdateByName, qitem.UpdateByName,
qitem.UpdateTimeStr, qitem.UpdateTimeStr,
qitem.OfferDetails
}); });
return ApiResult.Success(data: pageModel); return ApiResult.Success(data: pageModel);
} }
......
Edu.WebApi/Controllers/Course/TeachingRewardsController.cs
View file @ c3e7bfa8
...@@ -24,7 +24,7 @@ namespace Edu.WebApi.Controllers.Course ...@@ -24,7 +24,7 @@ namespace Edu.WebApi.Controllers.Course
/// <summary> /// <summary>
/// 教务奖励处理类对象 /// 教务奖励处理类对象
/// </summary> /// </summary>
private readonly TeachingRewardsModule teachingRewardsModule = new TeachingRewardsModule(); private readonly TeachingRewardsModule teachingRewardsModule = AOP.AOPHelper.CreateAOPObject<TeachingRewardsModule>();
#region 基础配置 #region 基础配置
......
Edu.WebApi/Controllers/User/UserCenterController.cs
View file @ c3e7bfa8
...@@ -33,7 +33,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -33,7 +33,7 @@ namespace Edu.WebApi.Controllers.User
/// <summary> /// <summary>
/// 考勤处理类 /// 考勤处理类
/// </summary> /// </summary>
private readonly AttendanceModule attendancemodule = new AttendanceModule(); private readonly AttendanceModule attendancemodule = AOP.AOPHelper.CreateAOPObject<AttendanceModule>();
/// <summary> /// <summary>
/// 审核处理 /// 审核处理
/// </summary> /// </summary>
...@@ -105,7 +105,8 @@ namespace Edu.WebApi.Controllers.User ...@@ -105,7 +105,8 @@ namespace Edu.WebApi.Controllers.User
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult SetNoticeBaseInfo() { public ApiResult SetNoticeBaseInfo()
{
var demodel = JsonHelper.DeserializeObject<RB_Notice_Base_ViewModel>(RequestParm.Msg.ToString()); var demodel = JsonHelper.DeserializeObject<RB_Notice_Base_ViewModel>(RequestParm.Msg.ToString());
demodel.Group_Id = base.UserInfo.Group_Id; demodel.Group_Id = base.UserInfo.Group_Id;
demodel.School_Id = base.UserInfo.School_Id; demodel.School_Id = base.UserInfo.School_Id;
...@@ -119,7 +120,8 @@ namespace Edu.WebApi.Controllers.User ...@@ -119,7 +120,8 @@ namespace Edu.WebApi.Controllers.User
{ {
return ApiResult.Success(); return ApiResult.Success();
} }
else { else
{
return ApiResult.Failed(); return ApiResult.Failed();
} }
} }
...@@ -174,10 +176,12 @@ namespace Edu.WebApi.Controllers.User ...@@ -174,10 +176,12 @@ namespace Edu.WebApi.Controllers.User
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult GetNoticeInfo() { public ApiResult GetNoticeInfo()
{
JObject parms = JObject.Parse(RequestParm.Msg.ToString()); JObject parms = JObject.Parse(RequestParm.Msg.ToString());
int NoticeId = parms.GetInt("NoticeId", 0); int NoticeId = parms.GetInt("NoticeId", 0);
if (NoticeId <= 0) { if (NoticeId <= 0)
{
return ApiResult.ParamIsNull("请传递公告id"); return ApiResult.ParamIsNull("请传递公告id");
} }
...@@ -239,12 +243,14 @@ namespace Edu.WebApi.Controllers.User ...@@ -239,12 +243,14 @@ namespace Edu.WebApi.Controllers.User
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult SetNoticeOperation() { public ApiResult SetNoticeOperation()
{
UserInfo userInfo = base.UserInfo; UserInfo userInfo = base.UserInfo;
JObject parms = JObject.Parse(RequestParm.Msg.ToString()); JObject parms = JObject.Parse(RequestParm.Msg.ToString());
int NoticeId = parms.GetInt("NoticeId", 0); int NoticeId = parms.GetInt("NoticeId", 0);
int Type = parms.GetInt("Type", 1);// 类型 1置顶 2取消置顶 3撤回 4删除 5公告阅读 int Type = parms.GetInt("Type", 1);// 类型 1置顶 2取消置顶 3撤回 4删除 5公告阅读
if (NoticeId <= 0) { if (NoticeId <= 0)
{
return ApiResult.ParamIsNull("公告id"); return ApiResult.ParamIsNull("公告id");
} }
...@@ -253,7 +259,8 @@ namespace Edu.WebApi.Controllers.User ...@@ -253,7 +259,8 @@ namespace Edu.WebApi.Controllers.User
{ {
return ApiResult.Success(); return ApiResult.Success();
} }
else { else
{
return ApiResult.Failed(); return ApiResult.Failed();
} }
} }
...@@ -263,7 +270,8 @@ namespace Edu.WebApi.Controllers.User ...@@ -263,7 +270,8 @@ namespace Edu.WebApi.Controllers.User
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult GetNoticeStateEnumList() { public ApiResult GetNoticeStateEnumList()
{
var list = EnumHelper.EnumToList(typeof(NoticeStateEnum)); var list = EnumHelper.EnumToList(typeof(NoticeStateEnum));
return ApiResult.Success("", list.Select(x => new return ApiResult.Success("", list.Select(x => new
{ {
...@@ -408,7 +416,6 @@ namespace Edu.WebApi.Controllers.User ...@@ -408,7 +416,6 @@ namespace Edu.WebApi.Controllers.User
} }
} }
} }
} }
if (demodel.NottdList.Count != demodel.NottdList.Distinct().Count()) if (demodel.NottdList.Count != demodel.NottdList.Distinct().Count())
{ {
...@@ -420,14 +427,11 @@ namespace Edu.WebApi.Controllers.User ...@@ -420,14 +427,11 @@ namespace Edu.WebApi.Controllers.User
{ {
Count = demodel.NottdList.Where(x => x.Date == item.Date).ToList().Count(); Count = demodel.NottdList.Where(x => x.Date == item.Date).ToList().Count();
if (Count > 0) if (Count > 0)
{//有两条这种数据 {
//有两条这种数据
return ApiResult.Failed("特殊日期考勤:" + Convert.ToDateTime(item.Date).ToString("yyyy-MM-dd") + "重复！"); return ApiResult.Failed("特殊日期考勤:" + Convert.ToDateTime(item.Date).ToString("yyyy-MM-dd") + "重复！");
} }
} }
bool flag = attendancemodule.Set(attendanceId, Status, demodel.RB_BranchId, demodel.WdList, demodel.TdList, demodel.NottdList, demodel.AwList, demodel.AwWifiList, userInfo.Id, userInfo.Group_Id); bool flag = attendancemodule.Set(attendanceId, Status, demodel.RB_BranchId, demodel.WdList, demodel.TdList, demodel.NottdList, demodel.AwList, demodel.AwWifiList, userInfo.Id, userInfo.Group_Id);
if (flag) if (flag)
return ApiResult.Success(); return ApiResult.Success();
...@@ -1794,14 +1798,8 @@ namespace Edu.WebApi.Controllers.User ...@@ -1794,14 +1798,8 @@ namespace Edu.WebApi.Controllers.User
//求销售收客数量 //求销售收客数量
if (EmSaleList.Count() > 0) if (EmSaleList.Count() > 0)
{ {
//var GuestList = attendancemodule.GetMonthSaleGuestNum(string.Join(",", EmSaleList.Select(x => x.EmployeeId).ToList()), StartTime, EndTime);
foreach (var item in EmSaleList) foreach (var item in EmSaleList)
{ {
//var model = GuestList.Where(x => x.EnterID == item.EmployeeId).FirstOrDefault();
//if (model != null)
//{
// item.GuestNum = model.GuestNum ?? 0;
//}
item.GuestNum = 0; item.GuestNum = 0;
} }
} }
...@@ -1917,7 +1915,6 @@ namespace Edu.WebApi.Controllers.User ...@@ -1917,7 +1915,6 @@ namespace Edu.WebApi.Controllers.User
#endregion #endregion
#region APP考勤 #region APP考勤
/// <summary> /// <summary>
/// App获取今天打卡信息 /// App获取今天打卡信息
...@@ -2012,8 +2009,8 @@ namespace Edu.WebApi.Controllers.User ...@@ -2012,8 +2009,8 @@ namespace Edu.WebApi.Controllers.User
{ {
return ApiResult.Failed(message: result); return ApiResult.Failed(message: result);
} }
} }
/// <summary> /// <summary>
/// 不打卡wifi版本 /// 不打卡wifi版本
/// </summary> /// </summary>
...@@ -2032,6 +2029,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -2032,6 +2029,7 @@ namespace Edu.WebApi.Controllers.User
} }
return isNotVerifyVifi; return isNotVerifyVifi;
} }
/// <summary> /// <summary>
/// 获取修改后wifimac /// 获取修改后wifimac
/// </summary> /// </summary>
...@@ -2069,7 +2067,6 @@ namespace Edu.WebApi.Controllers.User ...@@ -2069,7 +2067,6 @@ namespace Edu.WebApi.Controllers.User
int empId = Convert.ToInt32(RequestParm.Uid); int empId = Convert.ToInt32(RequestParm.Uid);
List<JObject> result = attendRecodeModule.PunchCardStatistical(empId, date); List<JObject> result = attendRecodeModule.PunchCardStatistical(empId, date);
return ApiResult.Success("获取成功", data: result); return ApiResult.Success("获取成功", data: result);
} }
/// <summary> /// <summary>
......
Edu.WebApi/Controllers/User/WorkFlowManagementController.cs
View file @ c3e7bfa8
...@@ -28,7 +28,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -28,7 +28,7 @@ namespace Edu.WebApi.Controllers.User
/// <summary> /// <summary>
/// 流程管理处理类 /// 流程管理处理类
/// </summary> /// </summary>
public WorkFlowManagementModule WorkflowManagementmodule = new WorkFlowManagementModule(); public WorkFlowManagementModule WorkflowManagementmodule = AOP.AOPHelper.CreateAOPObject<WorkFlowManagementModule>();
......
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