Skip to content

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

流程修改

parent 4d7b31e4
Hide whitespace changes
Inline Side-by-side
Showing with 143 additions and 58 deletions
Edu.Model/Entity/EduTask/RB_Education_Relevance.cs
View file @ fddbaf09
......@@ -24,7 +24,7 @@ namespace Edu.Model.Entity.EduTask
public int ConditionId { get; set; }
/// <summary>
/// 审核人类型 1主管(指定一级) 2 指定成员 3角色
/// 审核人类型【1主管(指定一级),2-指定成员,3-指定角色,4-系统角色】
/// </summary>
public WFTAuditTypeEnum AuditType { get; set; }
......@@ -49,7 +49,7 @@ namespace Edu.Model.Entity.EduTask
public string AuditDescription { get; set; }
/// <summary>
/// 工作流id
/// 审核流程编号
/// </summary>
public int WorkFlowId { get; set; }
......
Edu.Module.Course/OrderModule2.cs
View file @ fddbaf09
......@@ -139,7 +139,7 @@ namespace Edu.Module.Course
Title="退课单据",
ClassId=orderModel.ClassId,
OrderId=orderModel.OrderId,
ReceiptType= Common.Enum.Finance.ReceiptTypeEnum.BackClass,
ReceiptType= Common.Enum.Finance.ReceiptTypeEnum.ChangeClass,
RelationId= backClassModel.BackId,
Group_Id=orderModel.Group_Id,
School_Id=orderModel.School_Id,
......
Edu.Module.EduTask/EducationReceiptModule.cs
View file @ fddbaf09
......@@ -765,46 +765,34 @@ namespace Edu.Module.EduTask
//本班教师审核
if (item == 1)
{
//班级实体类
var classModel = classRepository.GetEntity(receiptModel.ClassId);
//获取教师实体信息
var teacherModel = accountRepository.GetAccountListExtRepository(new Model.ViewModel.User.RB_Account_ViewModel()
var teacherId = education_ReceiptRepository.GetTeacherIdRepository(receiptModel.ClassId);
if (teacherId > 0)
{
AccountId = (classModel?.Teacher_Id ?? 0),
AccountType = Common.Enum.User.AccountTypeEnum.Teacher
})?.FirstOrDefault();
var teacherId = teacherModel?.Id ?? 0;
empList.Add(teacherId);
empList.Add(teacherId);
}
}
//关联销售审核
else if (item == 2)
{
var orderModel = orderRepository.GetEntity(receiptModel.OrderId);
empList.Add(orderModel.EnterID);
var saleId= education_ReceiptRepository.GetOrderSaleIdRepository(receiptModel.OrderId);
empList.Add(saleId);
}
//分区校长审核
else if (item == 3)
{
var headmaster = accountRepository.GetAccountListExtRepository(new Model.ViewModel.User.RB_Account_ViewModel()
{
Post_Id = Common.Config.SchoolPostId,
Group_Id = receiptModel.Group_Id
})?.FirstOrDefault();
if (headmaster != null && headmaster.Id > 0)
var schoolMasterId = education_ReceiptRepository.GetSchoolMasterIdRepository(receiptModel.Group_Id);
if (schoolMasterId > 0)
{
empList.Add(headmaster.Id);
empList.Add(schoolMasterId);
}
}
//教务长审核
else if (item == 4)
{
var headmaster = accountRepository.GetAccountListExtRepository(new Model.ViewModel.User.RB_Account_ViewModel()
{
Post_Id = Common.Config.JiaoWuZhang,
Group_Id = receiptModel.Group_Id
})?.FirstOrDefault();
if (headmaster != null && headmaster.Id > 0)
var schoolJiaoWuZhangId = education_ReceiptRepository.GetSchoolJiaoWuZhangIdRepository(receiptModel.Group_Id);
if (schoolJiaoWuZhangId > 0)
{
empList.Add(headmaster.Id);
empList.Add(schoolJiaoWuZhangId);
}
}
}
......
Edu.Repository/EduTask/RB_Education_ReceiptRepository.cs
View file @ fddbaf09
......@@ -48,6 +48,11 @@ namespace Edu.Repository.EduTask
/// </summary>
private readonly RB_OrderRepository orderRepository = new RB_OrderRepository();
/// <summary>
/// 角色仓储层对象
/// </summary>
private readonly RB_PostRepository postRepository = new RB_PostRepository();
/// <summary>
/// 获取教务单据分页列表
/// </summary>
......@@ -179,51 +184,45 @@ WHERE 1=1
//本班教师审核
if (subItem.PostType == 1)
{
//班级实体类
var classModel = classRepository.GetEntity(model.ClassId);
if (classModel == null)
var teacherId = GetTeacherIdRepository(model.ClassId);
if (teacherId <= 0)
{
message = "未找到对应的班级信息!";
message = "未找到此班级的配置的教师信息!";
return false;
}
//获取教师实体信息
var teacherModel = accountRepository.GetAccountListExtRepository(new Model.ViewModel.User.RB_Account_ViewModel()
{
AccountId = classModel.Teacher_Id,
AccountType = Common.Enum.User.AccountTypeEnum.Teacher
})?.FirstOrDefault();
var teacherId = teacherModel?.Id ?? 0;
AuditedId += teacherId + ",";
subItem.UserId = teacherId;
}
//关联销售审核
else if (subItem.PostType == 2)
{
var orderModel = orderRepository.GetEntity(model.OrderId);
AuditedId += (orderModel?.EnterID ?? 0) + ",";
subItem.UserId = (orderModel?.EnterID ?? 0);
var EnterId = GetOrderSaleIdRepository(model.OrderId);
AuditedId += EnterId + ",";
subItem.UserId = EnterId;
}
//分区校长审核
else if (subItem.PostType == 3)
{
var headmaster = accountRepository.GetAccountListExtRepository(new Model.ViewModel.User.RB_Account_ViewModel()
{
Post_Id = Common.Config.SchoolPostId,
Group_Id = model.Group_Id
})?.FirstOrDefault();
AuditedId += (headmaster?.Id ?? 0) + ",";
subItem.UserId = (headmaster?.Id ?? 0);
var headmasterId = GetSchoolMasterIdRepository(model.Group_Id);
AuditedId += headmasterId + ",";
subItem.UserId = headmasterId;
}
//教务长审核
else if (subItem.PostType == 4)
{
var headmaster = accountRepository.GetAccountListExtRepository(new Model.ViewModel.User.RB_Account_ViewModel()
{
Post_Id = Common.Config.JiaoWuZhang,
Group_Id = model.Group_Id
})?.FirstOrDefault();
AuditedId += (headmaster?.Id ?? 0) + ",";
subItem.UserId = (headmaster?.Id ?? 0);
var jiaoWuZhangId = GetSchoolJiaoWuZhangIdRepository(model.Group_Id);
AuditedId += jiaoWuZhangId + ",";
subItem.UserId = jiaoWuZhangId;
}
}
//系统角色
else if (subItem.AuditType == Common.Enum.User.WFTAuditTypeEnum.Post)
{
var postIds= GetPostIdsRepository(model.Group_Id, subItem.PostType);
if (postIds!=null && postIds.Count>0)
{
AuditedId += string.Join(",", postIds) + ",";
subItem.UserId = postIds[0];
}
}
}
......@@ -243,8 +242,15 @@ WHERE 1=1
Sort = item.SortNum,
SpecialNode = item.FlowAduitList[0].IsSpecNode,
Stauts = Common.Enum.User.WFRrocessStatus.NotAudit,
WorkFlowId = Common.Config.BackClassFlowId,
};
if (model.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.BackClass)
{
levance.WorkFlowId = Common.Config.BackClassFlowId;
}
if (model.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.ChangeClass)
{
levance.WorkFlowId = Common.Config.ChangeClassFlowId;
}
var backLevanceId = student_BackRelevanceRepository.Insert(levance);
levance.Id = backLevanceId;
flag = backLevanceId > 0;
......@@ -273,5 +279,96 @@ WHERE 1=1
}
return flag;
}
/// <summary>
/// 获取班级教师编号
/// </summary>
/// <param name="classId"></param>
/// <returns></returns>
public int GetTeacherIdRepository(int classId)
{
var teacherId = 0;
//班级实体类
var classModel = classRepository.GetEntity(classId);
if (classModel != null && classModel.Teacher_Id > 0)
{
//获取教师实体信息
var teacherModel = accountRepository.GetAccountListExtRepository(new Model.ViewModel.User.RB_Account_ViewModel()
{
AccountId = (classModel?.Teacher_Id ?? 0),
AccountType = Common.Enum.User.AccountTypeEnum.Teacher
})?.FirstOrDefault();
teacherId = teacherModel?.Id ?? 0;
}
return teacherId;
}
/// <summary>
/// 获取订单销售人员编号
/// </summary>
/// <param name="orderId"></param>
/// <returns></returns>
public int GetOrderSaleIdRepository(int orderId)
{
var orderModel = orderRepository.GetEntity(orderId);
var enterId = (orderModel?.EnterID ?? 0);
return enterId;
}
/// <summary>
/// 获取学校校长编号
/// </summary>
/// <param name="GroupId"></param>
/// <returns></returns>
public int GetSchoolMasterIdRepository(int GroupId)
{
var headmaster = accountRepository.GetAccountListExtRepository(new Model.ViewModel.User.RB_Account_ViewModel()
{
Post_Id = Common.Config.SchoolPostId,
Group_Id = GroupId
})?.FirstOrDefault();
var headmasterId = (headmaster?.Id ?? 0);
return headmasterId;
}
/// <summary>
/// 获取教务长编号
/// </summary>
/// <param name="GroupId"></param>
/// <returns></returns>
public int GetSchoolJiaoWuZhangIdRepository(int GroupId)
{
var headmaster = accountRepository.GetAccountListExtRepository(new Model.ViewModel.User.RB_Account_ViewModel()
{
Post_Id = Common.Config.JiaoWuZhang,
Group_Id = GroupId
})?.FirstOrDefault();
var jiaoWuZhangId = (headmaster?.Id ?? 0);
return jiaoWuZhangId;
}
/// <summary>
/// 根据岗位编号获取人员
/// </summary>
/// <param name="GroupId"></param>
/// <param name="PostId"></param>
/// <returns></returns>
public List<int> GetPostIdsRepository(int GroupId, int PostId)
{
List<int> result = new List<int> ();
var list = accountRepository.GetAccountListExtRepository(new Model.ViewModel.User.RB_Account_ViewModel()
{
Group_Id = GroupId,
Post_Id = PostId
});
if (list!=null &&list.Count > 0)
{
foreach (var item in list)
{
result.Add(item.Id);
}
}
return result;
}
}
}
education.sln
View file @ fddbaf09
......@@ -64,7 +64,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Edu.Module.Duty", "Edu.Modu
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Edu.Module.Advertising", "Edu.Module.Advertising\Edu.Module.Advertising.csproj", "{43408243-8E36-4F9E-84C0-998CE383EC53}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Edu.Module.EduTask", "Edu.Module.EduTask\Edu.Module.EduTask.csproj", "{FEDB8D19-2C7E-4393-8D91-332256EC89CC}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Edu.Module.EduTask", "Edu.Module.EduTask\Edu.Module.EduTask.csproj", "{FEDB8D19-2C7E-4393-8D91-332256EC89CC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
......
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