Skip to content

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

事务修改

parent fe95c38d
Expand all Hide 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
/// 报价单详情列表
/// </summary>
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
/// <returns></returns>
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>
......
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.API;
using Edu.Common.Enum;
......@@ -149,10 +150,10 @@ namespace Edu.Module.Course
/// <param name="deList"></param>
/// <param name="userInfo"></param>
/// <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 trans = teaching_Rewards_RateRepository.DbTransaction;
try
{
if (rlist.Any())
......@@ -161,8 +162,8 @@ namespace Edu.Module.Course
var xblist = rlist.Where(x => x.RateType == 2).OrderBy(x => x.StartValue).ToList();
string TackClassRateIds = string.Join(",", xblist.Select(x => x.Id));
var vlist = teaching_RewardsRepository.GetList(new RB_Teaching_Rewards_ViewModel() { TackClassRateIds = TackClassRateIds });
teaching_RewardsRepository.DeleteBatch(vlist, trans);
teaching_Rewards_RateRepository.DeleteBatch(rlist, trans);
teaching_RewardsRepository.DeleteBatch(vlist);
teaching_Rewards_RateRepository.DeleteBatch(rlist);
}
var FullClassList = deList.FirstOrDefault().FullClassList;
//先新增满班率
......@@ -179,7 +180,7 @@ namespace Edu.Module.Course
School_Id = userInfo.School_Id,
StartValue = item.StartValue,
Type = type
}, trans);
});
item.Id = Id;
}
foreach (var item in deList)
......@@ -196,7 +197,7 @@ namespace Edu.Module.Course
School_Id = userInfo.School_Id,
StartValue = item.StartValue,
Type = type
}, trans);
});
foreach (var qitem in item.FullClassList)
{
......@@ -211,18 +212,15 @@ namespace Edu.Module.Course
TackClassRateId = Id,
Money = qitem.ClassMoney,
PeopelNum = qitem.PeopelNum
}, trans);
});
}
}
}
teaching_Rewards_RateRepository.DBSession.Commit();
return true;
}
catch (Exception ex)
{
LogHelper.Write(ex, "SetTeachingRewardsInfo");
teaching_Rewards_RateRepository.DBSession.Rollback();
return false;
}
}
......
Edu.Module.User/AttendanceModule.cs
View file @ c3e7bfa8
This diff is collapsed.
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.Plugin;
using Edu.Model.CacheModel;
......@@ -672,25 +673,23 @@ namespace Edu.Module.User
/// <param name="tid"></param>
/// <param name="List"></param>
/// <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
{
visualrangeRepository.DeleteVisualrange(tid, trans);
visualrangeRepository.DeleteVisualrange(tid);
foreach (var item in List)
{
item.TemplateId = tid;
}
visualrangeRepository.InsertBatch(List, trans);
respository.DBSession.Commit();
visualrangeRepository.InsertBatch(List);
return true;
}
catch (Exception ex)
{
LogHelper.Write(ex, "AddTempleteEmployee");
respository.DBSession.Rollback("AddTempleteEmployee");
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.Text;
using Edu.Model.Entity.User;
using Edu.Model.ViewModel.User;
......@@ -17,12 +15,10 @@ namespace Edu.Repository.User
/// 获取列表
/// </summary>
/// <param name="demodel"></param>
/// <param name="orderIds"></param>
/// <returns></returns>
public List<RB_AccountRemark_ViewModel> GetList(RB_AccountRemark_ViewModel demodel)
{
string where = $@" 1=1";
if (demodel.Group_Id > 0)
{
where += $@" and {nameof(RB_AccountRemark_ViewModel.Group_Id)} ={demodel.Group_Id}";
......@@ -31,7 +27,6 @@ namespace Edu.Repository.User
{
where += $@" and {nameof(RB_AccountRemark_ViewModel.RemarkType)} ={(int)demodel.RemarkType}";
}
if (demodel.AccountType > 0)
{
where += $@" and {nameof(RB_AccountRemark_ViewModel.AccountType)} ={(int)demodel.AccountType}";
......@@ -135,9 +130,7 @@ ORDER BY DATE_FORMAT(CreateTime,'%Y-%m-%d') DESC
/// <returns></returns>
public List<RB_AccountRemark_ViewModel> GetListByWhere(RB_AccountRemark_ViewList demodel)
{
string where = $@" ";
if (demodel.Group_Id > 0)
{
where += $@" and {nameof(RB_AccountRemark_ViewModel.Group_Id)} ={demodel.Group_Id}";
......@@ -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' ) ";
}
string sql = $@" select * from RB_AccountRemark where `Status`=0 {where}";
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
/// 删除模版可见范围
/// </summary>
/// <param name="tid"></param>
/// <param name="tran"></param>
/// <returns></returns>
public bool DeleteVisualrange(int tid,IDbTransaction tran) {
return Execute($@" delete from Rb_Workflow_Visualrange where TemplateId={tid}", tran) >0;
public bool DeleteVisualrange(int tid)
{
return Execute($@" delete from Rb_Workflow_Visualrange where TemplateId={tid}") >0;
}
/// <summary>
/// 根据模版id获取可见范围的人
/// </summary>
/// <param name="tid"></param>
/// <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();
}
}
......
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.
/// <param name="aid"></param>
/// <param name="trans">事务对象</param>
/// <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 + ";";
sql += " delete from Rb_technicaldates where " + nameof(RB_Technicaldates_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;
}
......
Edu.WebApi/Controllers/Course/CourseOfferController.cs
View file @ c3e7bfa8
......@@ -46,7 +46,8 @@ namespace Edu.WebApi.Controllers.Course
CustomerSource = (CustomerSourceEnum)base.ParmJObj.GetInt("CustomerSource"),
CustomerType = (CustomerTypeEnum)base.ParmJObj.GetInt("CustomerType"),
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.School_Id = base.UserInfo.School_Id;
......@@ -86,6 +87,7 @@ namespace Edu.WebApi.Controllers.Course
qitem.UpdateBy,
qitem.UpdateByName,
qitem.UpdateTimeStr,
qitem.OfferDetails
});
return ApiResult.Success(data: pageModel);
}
......
Edu.WebApi/Controllers/Course/TeachingRewardsController.cs
View file @ c3e7bfa8
......@@ -24,7 +24,7 @@ namespace Edu.WebApi.Controllers.Course
/// <summary>
/// 教务奖励处理类对象
/// </summary>
private readonly TeachingRewardsModule teachingRewardsModule = new TeachingRewardsModule();
private readonly TeachingRewardsModule teachingRewardsModule = AOP.AOPHelper.CreateAOPObject<TeachingRewardsModule>();
#region 基础配置
......
Edu.WebApi/Controllers/User/UserCenterController.cs
View file @ c3e7bfa8
......@@ -33,7 +33,7 @@ namespace Edu.WebApi.Controllers.User
/// <summary>
/// 考勤处理类
/// </summary>
private readonly AttendanceModule attendancemodule = new AttendanceModule();
private readonly AttendanceModule attendancemodule = AOP.AOPHelper.CreateAOPObject<AttendanceModule>();
/// <summary>
/// 审核处理
/// </summary>
......@@ -105,7 +105,8 @@ namespace Edu.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetNoticeBaseInfo() {
public ApiResult SetNoticeBaseInfo()
{
var demodel = JsonHelper.DeserializeObject<RB_Notice_Base_ViewModel>(RequestParm.Msg.ToString());
demodel.Group_Id = base.UserInfo.Group_Id;
demodel.School_Id = base.UserInfo.School_Id;
......@@ -119,7 +120,8 @@ namespace Edu.WebApi.Controllers.User
{
return ApiResult.Success();
}
else {
else
{
return ApiResult.Failed();
}
}
......@@ -174,10 +176,12 @@ namespace Edu.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetNoticeInfo() {
public ApiResult GetNoticeInfo()
{
JObject parms = JObject.Parse(RequestParm.Msg.ToString());
int NoticeId = parms.GetInt("NoticeId", 0);
if (NoticeId <= 0) {
if (NoticeId <= 0)
{
return ApiResult.ParamIsNull("请传递公告id");
}
......@@ -239,12 +243,14 @@ namespace Edu.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetNoticeOperation() {
public ApiResult SetNoticeOperation()
{
UserInfo userInfo = base.UserInfo;
JObject parms = JObject.Parse(RequestParm.Msg.ToString());
int NoticeId = parms.GetInt("NoticeId", 0);
int Type = parms.GetInt("Type", 1);// 类型 1置顶 2取消置顶 3撤回 4删除 5公告阅读
if (NoticeId <= 0) {
if (NoticeId <= 0)
{
return ApiResult.ParamIsNull("公告id");
}
......@@ -253,7 +259,8 @@ namespace Edu.WebApi.Controllers.User
{
return ApiResult.Success();
}
else {
else
{
return ApiResult.Failed();
}
}
......@@ -263,7 +270,8 @@ namespace Edu.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetNoticeStateEnumList() {
public ApiResult GetNoticeStateEnumList()
{
var list = EnumHelper.EnumToList(typeof(NoticeStateEnum));
return ApiResult.Success("", list.Select(x => new
{
......@@ -408,7 +416,6 @@ namespace Edu.WebApi.Controllers.User
}
}
}
}
if (demodel.NottdList.Count != demodel.NottdList.Distinct().Count())
{
......@@ -420,14 +427,11 @@ namespace Edu.WebApi.Controllers.User
{
Count = demodel.NottdList.Where(x => x.Date == item.Date).ToList().Count();
if (Count > 0)
{//有两条这种数据
{
//有两条这种数据
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);
if (flag)
return ApiResult.Success();
......@@ -1794,14 +1798,8 @@ namespace Edu.WebApi.Controllers.User
//求销售收客数量
if (EmSaleList.Count() > 0)
{
//var GuestList = attendancemodule.GetMonthSaleGuestNum(string.Join(",", EmSaleList.Select(x => x.EmployeeId).ToList()), StartTime, EndTime);
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;
}
}
......@@ -1917,7 +1915,6 @@ namespace Edu.WebApi.Controllers.User
#endregion
#region APP考勤
/// <summary>
/// App获取今天打卡信息
......@@ -2012,8 +2009,8 @@ namespace Edu.WebApi.Controllers.User
{
return ApiResult.Failed(message: result);
}
}
/// <summary>
/// 不打卡wifi版本
/// </summary>
......@@ -2032,6 +2029,7 @@ namespace Edu.WebApi.Controllers.User
}
return isNotVerifyVifi;
}
/// <summary>
/// 获取修改后wifimac
/// </summary>
......@@ -2069,7 +2067,6 @@ namespace Edu.WebApi.Controllers.User
int empId = Convert.ToInt32(RequestParm.Uid);
List<JObject> result = attendRecodeModule.PunchCardStatistical(empId, date);
return ApiResult.Success("获取成功", data: result);
}
/// <summary>
......
Edu.WebApi/Controllers/User/WorkFlowManagementController.cs
View file @ c3e7bfa8
......@@ -28,7 +28,7 @@ namespace Edu.WebApi.Controllers.User
/// <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