Skip to content

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

流程测试修改

parent fddbaf09
Expand all Show whitespace changes
Inline Side-by-side
Showing with 129 additions and 1744 deletions
Edu.Model/Entity/EduTask/RB_Education_Relevance.cs
View file @ bb9cf165
......@@ -79,7 +79,7 @@ namespace Edu.Model.Entity.EduTask
public int SpecialNode { get; set; }
/// <summary>
/// 多个定角色编号
/// 指定角色编号
/// </summary>
public string PostIds { get; set; }
......@@ -87,5 +87,10 @@ namespace Edu.Model.Entity.EduTask
/// 指定的人员编号
/// </summary>
public string UserIds { get; set; }
/// <summary>
/// 系统角色编号
/// </summary>
public string SysPostIds { get; set; }
}
}
\ No newline at end of file
Edu.Model/ViewModel/Flow/RB_Flow_AduitInfo_ViewModel.cs
View file @ bb9cf165
......@@ -19,5 +19,10 @@ namespace Edu.Model.ViewModel.Flow
/// 流程编号【查询使用】
/// </summary>
public string QFlowIds { get; set; }
/// <summary>
/// 系统角色对应人员编号【逗号分割】
/// </summary>
public string PostUserIds { get; set; }
}
}
Edu.Model/ViewModel/User/RB_Account_ViewModel.cs
View file @ bb9cf165
......@@ -68,6 +68,11 @@ namespace Edu.Model.ViewModel.User
/// </summary>
public int Post_Id { get; set; }
/// <summary>
/// 岗位编号
/// </summary>
public string QPostIds { get; set; }
/// <summary>
/// 部门名称
/// </summary>
......
Edu.Module.Course/OrderModule2.cs
View file @ bb9cf165
......@@ -139,7 +139,7 @@ namespace Edu.Module.Course
Title="退课单据",
ClassId=orderModel.ClassId,
OrderId=orderModel.OrderId,
ReceiptType= Common.Enum.Finance.ReceiptTypeEnum.ChangeClass,
ReceiptType= Common.Enum.Finance.ReceiptTypeEnum.BackClass,
RelationId= backClassModel.BackId,
Group_Id=orderModel.Group_Id,
School_Id=orderModel.School_Id,
......
Edu.Module.EduTask/EducationReceiptModule.cs
View file @ bb9cf165
......@@ -39,16 +39,6 @@ namespace Edu.Module.EduTask
/// </summary>
private readonly RB_Education_RelevanceRepository education_RelevanceRepository = new RB_Education_RelevanceRepository();
/// <summary>
/// 账号仓储层对象
/// </summary>
private readonly RB_AccountRepository accountRepository = new RB_AccountRepository();
/// <summary>
/// 班级仓储层对象
/// </summary>
private readonly RB_ClassRepository classRepository = new RB_ClassRepository();
/// <summary>
/// 订单仓储层对象
/// </summary>
......@@ -128,7 +118,7 @@ namespace Edu.Module.EduTask
public object GetEducationReceiptInfoModule(object Id)
{
var obj = new List<object>();
var receipt= education_ReceiptRepository.GetEntity(Id);
var receipt = education_ReceiptRepository.GetEntity(Id);
string ApplyReason = "";
if (receipt.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.BackClass)
{
......@@ -143,7 +133,7 @@ namespace Edu.Module.EduTask
ConditionId = receipt.Id,
});
//审核关联列表
var arList =education_RelevanceRepository.GetStudentBackRelevanceListRepository(new RB_Education_Relevance_ViewModel()
var arList = education_RelevanceRepository.GetEducationRelevanceListRepository(new RB_Education_Relevance_ViewModel()
{
ConditionId = receipt.Id
});
......@@ -219,7 +209,7 @@ namespace Edu.Module.EduTask
ConditionId = auditModel.Id,
});
//审核关联列表
var arList = education_RelevanceRepository.GetStudentBackRelevanceListRepository(new RB_Education_Relevance_ViewModel()
var arList = education_RelevanceRepository.GetEducationRelevanceListRepository(new RB_Education_Relevance_ViewModel()
{
ConditionId = auditModel.Id
});
......@@ -283,7 +273,7 @@ namespace Edu.Module.EduTask
{nameof(RB_Education_Receipt_ViewModel.VerifyStatus),(int)WFRrocessStatus.Rejected}
};
flag = education_ReceiptRepository.Update(fileds, new WhereHelper(nameof(RB_Education_Receipt_ViewModel.Id), receipt.Id));
UpdateOtherModule(receipt, auditModel);
flag = UpdateOtherModule(receipt, auditModel);
}
//审核通过
else
......@@ -292,7 +282,7 @@ namespace Edu.Module.EduTask
int Notcount = arList.Where(x => x.Stauts == WFRrocessStatus.AuditNotThrough).Count();
if (Notcount > 0)
{
message = "该退课申请单已被拒绝";
message = "该申请单已被拒绝";
return false;
}
......@@ -339,7 +329,7 @@ namespace Edu.Module.EduTask
flag = UpdateEduRelevanceModule(model.Id, model.Stauts, model.AuditedId);
#endregion
UpdateOtherModule(receipt, auditModel);
flag = UpdateOtherModule(receipt, auditModel);
}
else
......@@ -394,7 +384,7 @@ namespace Edu.Module.EduTask
flag = UpdateEduRecordModule(WFRrocessStatus.OtherHaveAudit, auditModel.Description, user.Id, item.Id);
}
}
UpdateOtherModule(receipt, auditModel);
flag = UpdateOtherModule(receipt, auditModel);
}
else
{
......@@ -428,14 +418,14 @@ namespace Edu.Module.EduTask
flag = UpdateEduRelevanceModule(model.Id, model.Stauts, model.AuditedId);
#endregion
UpdateOtherModule(receipt, auditModel);
flag = UpdateOtherModule(receipt, auditModel);
}
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Education_Receipt_ViewModel.VerifyStatus),(int)WFRrocessStatus.AuditThrough}
};
flag= education_ReceiptRepository.Update(fileds, new WhereHelper(nameof(RB_Education_Receipt_ViewModel.Id),receipt.Id));
flag = education_ReceiptRepository.Update(fileds, new WhereHelper(nameof(RB_Education_Receipt_ViewModel.Id), receipt.Id));
}
//同时创建下一步审核 复制审核人到审核关联表 创建审核记录表
else
......@@ -637,6 +627,10 @@ namespace Edu.Module.EduTask
flag = UpdateOrderGuestStatusModule(4, backModel.StudentId);
flag = UpdateStuBackBillStatusModule(BackClassAuditStatusEnum.Rejected, auditModel.RecipientIds, backModel, SpecialNode: auditModel.SpecialNode, BackMoney: auditModel.BackMoney);
}
}
if (receiptModel.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.ChangeClass)
{
}
return flag;
}
......@@ -754,6 +748,23 @@ namespace Edu.Module.EduTask
if (auditRelevance != null)
{
List<int> empList = new List<int>();
if (auditRelevance.AuditType == WFTAuditTypeEnum.SpecifiedMember)
{
//添加指定用户
if (!string.IsNullOrEmpty(auditRelevance.UserIds))
{
var userList = Common.ConvertHelper.StringToList(auditRelevance.UserIds);
foreach (var item in userList)
{
if (item > 0)
{
empList.Add(item);
}
}
}
}
else if (auditRelevance.AuditType == WFTAuditTypeEnum.Role)
{
//添加角色对应的人员
if (!string.IsNullOrEmpty(auditRelevance.PostIds))
{
......@@ -774,7 +785,7 @@ namespace Edu.Module.EduTask
//关联销售审核
else if (item == 2)
{
var saleId= education_ReceiptRepository.GetOrderSaleIdRepository(receiptModel.OrderId);
var saleId = education_ReceiptRepository.GetOrderSaleIdRepository(receiptModel.OrderId);
empList.Add(saleId);
}
//分区校长审核
......@@ -798,16 +809,13 @@ namespace Edu.Module.EduTask
}
}
}
//添加指定用户
if (!string.IsNullOrEmpty(auditRelevance.UserIds))
{
var userList = Common.ConvertHelper.StringToList(auditRelevance.UserIds);
foreach (var item in userList)
}
else if (auditRelevance.AuditType == WFTAuditTypeEnum.Post)
{
if (item > 0)
var postUserIdList = education_ReceiptRepository.GetPostIdsRepository(receiptModel.Group_Id, auditRelevance.SysPostIds);
if (postUserIdList != null && postUserIdList.Count > 0)
{
empList.Add(item);
}
empList.AddRange(postUserIdList);
}
}
InsertBatcheAuditRecord(empList, receiptModel.Id, auditRelevance);
......
Edu.Repository/EduTask/RB_Education_ReceiptRepository.cs
View file @ bb9cf165
......@@ -48,11 +48,6 @@ 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>
......@@ -108,7 +103,7 @@ WHERE 1=1
break;
//已审批的
case Common.Enum.Course.EduReceiptConditionEnum.Agree:
builder.AppendFormat(" AND EXISTS (SELECT 1 FROM rb_education_record WHERE ConditionId=A.Id AND AuditStatus IN(2,5) AND AuditEmId={0}) ", query.CreateBy);
builder.AppendFormat(" AND EXISTS (SELECT 1 FROM rb_education_record WHERE ConditionId=A.Id AND AuditStatus NOT IN(1,5) AND AuditEmId={0}) ", query.CreateBy);
break;
//我发起的
case Common.Enum.Course.EduReceiptConditionEnum.Launch:
......@@ -218,11 +213,11 @@ WHERE 1=1
//系统角色
else if (subItem.AuditType == Common.Enum.User.WFTAuditTypeEnum.Post)
{
var postIds= GetPostIdsRepository(model.Group_Id, subItem.PostType);
var postIds= GetPostIdsRepository(model.Group_Id, subItem.PostType.ToString());
if (postIds!=null && postIds.Count>0)
{
AuditedId += string.Join(",", postIds) + ",";
subItem.UserId = postIds[0];
subItem.PostUserIds = string.Join(",", postIds);
}
}
}
......@@ -236,13 +231,31 @@ WHERE 1=1
AuditType = item.FlowAduitList[0].AuditType,
OriginalAuditId = 0,
RoleOrInitiator = 0,
PostIds = string.Join(",", item.FlowAduitList.Where(qitem => qitem.AuditType == Common.Enum.User.WFTAuditTypeEnum.Role).Select(qitem => qitem.PostType)),
UserIds = string.Join(",", item.FlowAduitList.Where(qitem => qitem.AuditType == Common.Enum.User.WFTAuditTypeEnum.SpecifiedMember).Select(qitem => qitem.UserId)),
PostIds ="",
UserIds = "",
SysPostIds="",
ToAuditId = AuditedId.TrimEnd(','),
Sort = item.SortNum,
SpecialNode = item.FlowAduitList[0].IsSpecNode,
Stauts = Common.Enum.User.WFRrocessStatus.NotAudit,
};
//指定人员审核
if (levance.AuditType == Common.Enum.User.WFTAuditTypeEnum.SpecifiedMember)
{
levance.UserIds = string.Join(",", item.FlowAduitList.Where(qitem => qitem.AuditType == Common.Enum.User.WFTAuditTypeEnum.SpecifiedMember).Select(qitem => qitem.UserId));
}
//指定角色审核
else if (levance.AuditType == Common.Enum.User.WFTAuditTypeEnum.Role)
{
levance.PostIds = string.Join(",", item.FlowAduitList.Where(qitem => qitem.AuditType == Common.Enum.User.WFTAuditTypeEnum.Role).Select(qitem => qitem.PostType));
}
//系统角色审核
else if (levance.AuditType == Common.Enum.User.WFTAuditTypeEnum.Post)
{
//系统角色编号
levance.SysPostIds = string.Join(",", item.FlowAduitList.Where(qitem => qitem.AuditType == Common.Enum.User.WFTAuditTypeEnum.Post).Select(qitem => qitem.PostType));
}
if (model.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.BackClass)
{
levance.WorkFlowId = Common.Config.BackClassFlowId;
......@@ -263,7 +276,6 @@ WHERE 1=1
ConditionId = model.Id,
AuditStatus = Common.Enum.User.WFRrocessStatus.NotAudit,
AuditId = levance.Id,
AuditEmId = subItem.UserId,
CreateBy = model.CreateBy,
CreateTime = DateTime.Now,
UpdateBy = model.CreateBy,
......@@ -271,10 +283,25 @@ WHERE 1=1
Description = "",
BackrelevanceId = levance.Id,
};
//系统岗位审核;
if (!string.IsNullOrEmpty(subItem.PostUserIds))
{
var userList = Common.ConvertHelper.StringToList(subItem.PostUserIds);
foreach (var tItem in userList)
{
recordModel.Id = 0;
recordModel.AuditEmId = tItem;
flag = student_BackRecordRepository.Insert(recordModel) > 0;
}
}
else
{
recordModel.AuditEmId = subItem.UserId;
flag = student_BackRecordRepository.Insert(recordModel) > 0;
}
}
}
}
index++;
}
return flag;
......@@ -353,13 +380,13 @@ WHERE 1=1
/// <param name="GroupId"></param>
/// <param name="PostId"></param>
/// <returns></returns>
public List<int> GetPostIdsRepository(int GroupId, int PostId)
public List<int> GetPostIdsRepository(int GroupId, string PostId)
{
List<int> result = new List<int> ();
var list = accountRepository.GetAccountListExtRepository(new Model.ViewModel.User.RB_Account_ViewModel()
{
Group_Id = GroupId,
Post_Id = PostId
QPostIds = PostId
});
if (list!=null &&list.Count > 0)
{
......
Edu.Repository/EduTask/RB_Education_RelevanceRepository.cs
View file @ bb9cf165
......@@ -19,7 +19,7 @@ namespace Edu.Repository.EduTask
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Education_Relevance_ViewModel> GetStudentBackRelevanceListRepository(RB_Education_Relevance_ViewModel query)
public List<RB_Education_Relevance_ViewModel> GetEducationRelevanceListRepository(RB_Education_Relevance_ViewModel query)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
......
Edu.Repository/User/RB_AccountRepository.cs
View file @ bb9cf165
......@@ -115,6 +115,10 @@ WHERE 1=1
{
where.AppendFormat(" AND B.{0}={1} ", nameof(RB_Account_ViewModel.Post_Id), query.Post_Id);
}
if (!string.IsNullOrEmpty(query.QPostIds))
{
where.AppendFormat(" AND B.{0} IN({1}) ", nameof(RB_Account_ViewModel.Post_Id), query.QPostIds);
}
if (query.Dept_Id > 0)
{
where.AppendFormat(" AND B.{0}={1} ", nameof(RB_Account_ViewModel.Dept_Id), query.Dept_Id);
......
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