Skip to content

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

页面修改

parent 0a0edbb8
Show whitespace changes
Inline Side-by-side
Showing with 96 additions and 91 deletions
Edu.Model/Entity/Course/RB_Student_BackRelevance.cs
View file @ abbcd0f4
...@@ -77,5 +77,15 @@ namespace Edu.Model.Entity.Course ...@@ -77,5 +77,15 @@ namespace Edu.Model.Entity.Course
/// 是否是特殊节点 /// 是否是特殊节点
/// </summary> /// </summary>
public int SpecialNode { get; set; } public int SpecialNode { get; set; }
/// <summary>
/// 多个定角色编号
/// </summary>
public string PostIds { get; set; }
/// <summary>
/// 指定的人员编号
/// </summary>
public string UserIds { get; set; }
} }
} }
\ No newline at end of file
Edu.Module.Course/OrderModule2.cs
View file @ abbcd0f4
...@@ -143,7 +143,6 @@ namespace Edu.Module.Course ...@@ -143,7 +143,6 @@ namespace Edu.Module.Course
if (item.FlowAduitList != null && item.FlowAduitList.Count > 0) if (item.FlowAduitList != null && item.FlowAduitList.Count > 0)
{ {
string AuditDescription = "";//审核人名称
string AuditedId = "";//审核人 string AuditedId = "";//审核人
foreach (var subItem in item.FlowAduitList) foreach (var subItem in item.FlowAduitList)
{ {
...@@ -194,17 +193,20 @@ namespace Edu.Module.Course ...@@ -194,17 +193,20 @@ namespace Edu.Module.Course
var backLevance = new RB_Student_BackRelevance() var backLevance = new RB_Student_BackRelevance()
{ {
ConditionId = backClassModel.BackId, ConditionId = backClassModel.BackId,
AuditDescription = AuditDescription, AuditDescription = item.NodeName,
AuditedId = "", AuditedId = "",
AuditWay = item.FlowAduitList[0].AuditWay, AuditWay = item.FlowAduitList[0].AuditWay,
AuditType = item.FlowAduitList[0].AuditType, AuditType = item.FlowAduitList[0].AuditType,
OriginalAuditId = 0, OriginalAuditId = 0,
RoleOrInitiator = 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.PostType)),
ToAuditId = AuditedId.TrimEnd(','), ToAuditId = AuditedId.TrimEnd(','),
Sort = item.SortNum, Sort = item.SortNum,
SpecialNode = item.FlowAduitList[0].IsSpecNode, SpecialNode = item.FlowAduitList[0].IsSpecNode,
Stauts = Common.Enum.User.WFRrocessStatus.NotAudit, Stauts = Common.Enum.User.WFRrocessStatus.NotAudit,
WorkFlowId = Common.Config.BackClassFlowId, WorkFlowId = Common.Config.BackClassFlowId,
}; };
var backLevanceId = student_BackRelevanceRepository.Insert(backLevance); var backLevanceId = student_BackRelevanceRepository.Insert(backLevance);
backLevance.Id = backLevanceId; backLevance.Id = backLevanceId;
...@@ -217,7 +219,7 @@ namespace Edu.Module.Course ...@@ -217,7 +219,7 @@ namespace Edu.Module.Course
{ {
ConditionId = backClassModel.BackId, ConditionId = backClassModel.BackId,
AuditStatus = Common.Enum.User.WFRrocessStatus.NotAudit, AuditStatus = Common.Enum.User.WFRrocessStatus.NotAudit,
AuditId = subItem.UserId, AuditId = backLevance.Id,
AuditEmId = subItem.UserId, AuditEmId = subItem.UserId,
CreateBy = userinfo.Id, CreateBy = userinfo.Id,
CreateTime = DateTime.Now, CreateTime = DateTime.Now,
......
Edu.Module.Course/StudentBillModule.cs
View file @ abbcd0f4
...@@ -101,14 +101,63 @@ namespace Edu.Module.Course ...@@ -101,14 +101,63 @@ namespace Edu.Module.Course
//驳回处理 //驳回处理
if (AuditStatus == 3) if (AuditStatus == 3)
{ {
#region 更新订单旅客表未驳回状态 //找出当前审核
int Notcount = arList.Where(x => x.Stauts == WFRrocessStatus.AuditNotThrough).Count();
if (Notcount > 0)
{
message = "该申请单已被拒绝!";
return false;
}
var ToAuditFlow = arList.Where(x => x.Stauts == WFRrocessStatus.NotAudit).OrderBy(x => x.Sort).ToList();
if (ToAuditFlow.Count <= 0)
{
message = "该申请单审核已经完结!";
return false;
}
if (ToAuditFlow.Count > 0)
{
var model = ToAuditFlow[0];
var RecordList = aurList.Where(x => x.AuditId == model.Id).ToList();
var amodel = RecordList.Where(x => x.AuditStatus == WFRrocessStatus.NotAudit && x.AuditEmId == user.Id).FirstOrDefault();
if (amodel == null)
{
message = "尚未匹配到审核相关信息，请联系管理员!";
return false;
}
//同时 修改 审核记录状态 审核流程
model.Stauts = WFRrocessStatus.AuditNotThrough;
if (!string.IsNullOrWhiteSpace(model.AuditedId))
{
model.AuditedId += "," + user.Id;
}
else
{
model.AuditedId = user.Id.ToString();
}
#region 更新审核记录表状态
flag = UpdateStuRecordModule(WFRrocessStatus.AuditNotThrough, Description, user.Id, amodel.Id);
#endregion
#region 更新审核关联表状态
flag = UpdateStuRelevanceModule(model.Id, model.Stauts, model.AuditedId);
#endregion
var list = RecordList.Where(x => x.AuditStatus == WFRrocessStatus.NotAudit && x.AuditEmId != user.Id).ToList();
int AuditCount = list.Count();
if (AuditCount > 0)//表示最后一个人就是子集审核 申请单 通过
{
foreach (var item in list)
{
flag = UpdateStuRecordModule(WFRrocessStatus.OtherHaveAudit, Description, user.Id, item.Id);
}
}
}
#region 更新订单旅客表未驳回状态
Dictionary<string, object> guestFileds = new Dictionary<string, object>() Dictionary<string, object> guestFileds = new Dictionary<string, object>()
{ {
{nameof(RB_Order_Guest_ViewModel.GuestState),4 } {nameof(RB_Order_Guest_ViewModel.GuestState),4 }
}; };
flag = order_GuestRepository.Update(guestFileds, new WhereHelper(nameof(RB_Order_Guest_ViewModel.Id), backModel.StudentId)); flag = order_GuestRepository.Update(guestFileds, new WhereHelper(nameof(RB_Order_Guest_ViewModel.Id), backModel.StudentId));
#endregion #endregion
#region 更新退课单据为驳回状态 #region 更新退课单据为驳回状态
...@@ -170,7 +219,7 @@ namespace Edu.Module.Course ...@@ -170,7 +219,7 @@ namespace Edu.Module.Course
model.AuditedId = user.Id.ToString(); model.AuditedId = user.Id.ToString();
} }
#region 更新审核关联表状态 #region 更新审核关联表状态
flag = UpdateStuRelevanceModule(model.Stauts, model.AuditedId, model.Id); flag = UpdateStuRelevanceModule(model.Id, model.Stauts, model.AuditedId);
#endregion #endregion
//更新主表状态 //更新主表状态
...@@ -193,9 +242,7 @@ namespace Edu.Module.Course ...@@ -193,9 +242,7 @@ namespace Edu.Module.Course
model.AuditedId = user.Id.ToString(); model.AuditedId = user.Id.ToString();
} }
#region 更新审核关联表状态 #region 更新审核关联表状态
relevanceFileds = new Dictionary<string, object>(); flag = UpdateStuRelevanceModule(model.Id, null, model.AuditedId);
relevanceFileds.Add(nameof(RB_Student_BackRelevance_ViewModel.AuditedId), model.AuditedId);
flag= student_BackRelevanceRepository.Update(relevanceFileds, new WhereHelper(nameof(RB_Student_BackRelevance_ViewModel.Id), model.Id));
#endregion #endregion
} }
} }
...@@ -222,10 +269,7 @@ namespace Edu.Module.Course ...@@ -222,10 +269,7 @@ namespace Edu.Module.Course
#endregion #endregion
#region 更新审核关联表状态 #region 更新审核关联表状态
relevanceFileds = new Dictionary<string, object>(); flag = UpdateStuRelevanceModule(model.Id, model.Stauts, model.AuditedId);
relevanceFileds.Add(nameof(RB_Student_BackRelevance_ViewModel.Stauts), model.Stauts);
relevanceFileds.Add(nameof(RB_Student_BackRelevance_ViewModel.AuditedId), model.AuditedId);
flag = student_BackRelevanceRepository.Update(relevanceFileds, new WhereHelper(nameof(RB_Student_BackRelevance_ViewModel.Id), model.Id));
#endregion #endregion
var list = RecordList.Where(x => x.AuditStatus == WFRrocessStatus.NotAudit && x.AuditEmId != user.Id).ToList(); var list = RecordList.Where(x => x.AuditStatus == WFRrocessStatus.NotAudit && x.AuditEmId != user.Id).ToList();
...@@ -273,12 +317,7 @@ namespace Edu.Module.Course ...@@ -273,12 +317,7 @@ namespace Edu.Module.Course
flag = UpdateStuRecordModule(WFRrocessStatus.AuditThrough, Description, user.Id, amodel.Id); flag = UpdateStuRecordModule(WFRrocessStatus.AuditThrough, Description, user.Id, amodel.Id);
#endregion #endregion
#region 更新审核关联表状态 #region 更新审核关联表状态
relevanceFileds = new Dictionary<string, object> flag = UpdateStuRelevanceModule(model.Id, model.Stauts, model.AuditedId);
{
{ nameof(RB_Student_BackRelevance_ViewModel.Stauts), model.Stauts },
{ nameof(RB_Student_BackRelevance_ViewModel.AuditedId), model.AuditedId },
};
flag = student_BackRelevanceRepository.Update(relevanceFileds, new WhereHelper(nameof(RB_Student_BackRelevance_ViewModel.Id), model.Id));
#endregion #endregion
Dictionary<string, object> backFileds = new Dictionary<string, object>() Dictionary<string, object> backFileds = new Dictionary<string, object>()
{ {
...@@ -332,13 +371,7 @@ namespace Edu.Module.Course ...@@ -332,13 +371,7 @@ namespace Edu.Module.Course
model.AuditedId = user.Id.ToString(); model.AuditedId = user.Id.ToString();
} }
#region 更新审核关联表状态 #region 更新审核关联表状态
relevanceFileds = new Dictionary<string, object> flag = UpdateStuRelevanceModule(model.Id, model.Stauts, model.AuditedId);
{
{ nameof(RB_Student_BackRelevance_ViewModel.Stauts), model.Stauts },
{ nameof(RB_Student_BackRelevance_ViewModel.AuditedId), model.AuditedId },
};
flag = student_BackRelevanceRepository.Update(relevanceFileds, new WhereHelper(nameof(RB_Student_BackRelevance_ViewModel.Id), model.Id));
#endregion #endregion
//赋值下一步到审核记录中 并更新这一步的待审核人 //赋值下一步到审核记录中 并更新这一步的待审核人
var modelNext = ToAuditFlow[1]; var modelNext = ToAuditFlow[1];
...@@ -365,7 +398,6 @@ namespace Edu.Module.Course ...@@ -365,7 +398,6 @@ namespace Edu.Module.Course
{ {
{ nameof(RB_Student_BackRelevance_ViewModel.AuditedId), model.AuditedId }, { nameof(RB_Student_BackRelevance_ViewModel.AuditedId), model.AuditedId },
}; };
flag = student_BackRelevanceRepository.Update(relevanceFileds, new WhereHelper(nameof(RB_Student_BackRelevance_ViewModel.Id), model.Id)); flag = student_BackRelevanceRepository.Update(relevanceFileds, new WhereHelper(nameof(RB_Student_BackRelevance_ViewModel.Id), model.Id));
#endregion #endregion
} }
...@@ -394,13 +426,7 @@ namespace Edu.Module.Course ...@@ -394,13 +426,7 @@ namespace Edu.Module.Course
#endregion #endregion
#region 更新审核关联表状态 #region 更新审核关联表状态
flag = UpdateStuRelevanceModule(model.Id, model.Stauts, model.AuditedId);
relevanceFileds = new Dictionary<string, object>
{
{ nameof(RB_Student_BackRelevance_ViewModel.Stauts), model.Stauts },
{ nameof(RB_Student_BackRelevance_ViewModel.AuditedId), model.AuditedId },
};
flag = student_BackRelevanceRepository.Update(relevanceFileds, new WhereHelper(nameof(RB_Student_BackRelevance_ViewModel.Id), model.Id));
#endregion #endregion
var list = RecordList.Where(x => x.AuditStatus == WFRrocessStatus.NotAudit && x.AuditEmId != user.Id).ToList(); var list = RecordList.Where(x => x.AuditStatus == WFRrocessStatus.NotAudit && x.AuditEmId != user.Id).ToList();
...@@ -449,14 +475,9 @@ namespace Edu.Module.Course ...@@ -449,14 +475,9 @@ namespace Edu.Module.Course
#region 更新审核记录表状态 #region 更新审核记录表状态
flag = UpdateStuRecordModule(WFRrocessStatus.AuditThrough, Description, user.Id, amodel.Id); flag = UpdateStuRecordModule(WFRrocessStatus.AuditThrough, Description, user.Id, amodel.Id);
#endregion #endregion
#region 更新审核关联表状态
relevanceFileds = new Dictionary<string, object>
{
{ nameof(RB_Student_BackRelevance_ViewModel.Stauts), model.Stauts },
{ nameof(RB_Student_BackRelevance_ViewModel.AuditedId), model.AuditedId },
};
flag= student_BackRelevanceRepository.Update(relevanceFileds, new WhereHelper(nameof(RB_Student_BackRelevance_ViewModel.Id), model.Id)); #region 更新审核关联表状态
flag = UpdateStuRelevanceModule(model.Id, model.Stauts, model.AuditedId);
#endregion #endregion
//赋值下一步到审核记录中 并更新这一步的待审核人 //赋值下一步到审核记录中 并更新这一步的待审核人
...@@ -468,7 +489,6 @@ namespace Edu.Module.Course ...@@ -468,7 +489,6 @@ namespace Edu.Module.Course
return false; return false;
} }
} }
} }
} }
return flag; return flag;
...@@ -503,16 +523,17 @@ namespace Edu.Module.Course ...@@ -503,16 +523,17 @@ namespace Edu.Module.Course
/// <param name="AuditedId"></param> /// <param name="AuditedId"></param>
/// <param name="Id"></param> /// <param name="Id"></param>
/// <returns></returns> /// <returns></returns>
private bool UpdateStuRelevanceModule(WFRrocessStatus status, string AuditedId, int Id) private bool UpdateStuRelevanceModule(int Id,WFRrocessStatus? status=null, string AuditedId="")
{ {
var relevanceFileds = new Dictionary<string, object> var relevanceFileds = new Dictionary<string, object>();
{
{ nameof(RB_Student_BackRelevance_ViewModel.Stauts), status },
};
if (!string.IsNullOrEmpty(AuditedId)) if (!string.IsNullOrEmpty(AuditedId))
{ {
relevanceFileds.Add(nameof(RB_Student_BackRelevance_ViewModel.AuditedId), AuditedId); relevanceFileds.Add(nameof(RB_Student_BackRelevance_ViewModel.AuditedId), AuditedId);
} }
if (status != null)
{
relevanceFileds.Add(nameof(RB_Student_BackRelevance_ViewModel.Stauts), status);
}
bool flag = student_BackRelevanceRepository.Update(relevanceFileds, new WhereHelper(nameof(RB_Student_BackRelevance_ViewModel.Id), Id)); bool flag = student_BackRelevanceRepository.Update(relevanceFileds, new WhereHelper(nameof(RB_Student_BackRelevance_ViewModel.Id), Id));
return flag; return flag;
} }
...@@ -530,43 +551,14 @@ namespace Edu.Module.Course ...@@ -530,43 +551,14 @@ namespace Edu.Module.Course
{ {
return false; return false;
} }
if (modelNext != null)
{
RB_Student_BackRelevance_ViewModel auditRelevance = modelNext.RefMapperTo<RB_Student_BackRelevance_ViewModel>(); RB_Student_BackRelevance_ViewModel auditRelevance = modelNext.RefMapperTo<RB_Student_BackRelevance_ViewModel>();
//部门负责人审核 if (auditRelevance != null)
if (auditRelevance.AuditType == WFTAuditTypeEnum.Director)
{ {
return false; List<int> empList = Common.ConvertHelper.StringToList(auditRelevance.ToAuditId);
InsertBatcheAuditRecord(empList, sourceId, auditRelevance);
} }
else if (auditRelevance.AuditType == WFTAuditTypeEnum.Role)//角色审核
{
//switch(auditRelevance.p)
//var empModel = accountRepository.GetEmployeeInfo(empId);
//var empList = accountRepository.GetEmployeeListRepository(new Employee_ViewModel() { Post_Id = auditRelevance.RoleOrInitiator ?? 0, Group_Id = empModel.Group_Id });
//if (empList.Count > 0)
//{
// List<int> empIds = empList.Select(t => t.Id).ToList();
// AuditAccountList = empList.Select(t => new EmAccoutIdModel() { EmAccount = t.Account, EmployeeId = t.Id }).Distinct().ToList();
// InsertBatcheAuditRecord(empIds, wfId, wFTTemplateTypeEnum, trans, auditRelevance);
//}
//else
//{
// return false;
//}
}
else if (auditRelevance.AuditType == WFTAuditTypeEnum.SpecifiedMember)//指定人审核
{
//List<Rb_Workflow_Audituser_Extend> audituserList = auditUserRepository.GetConditionAuditUser(auditRelevance.OriginalAuditId.Value);
//if (audituserList.Count > 0)
//{
// AuditAccountList = audituserList.Select(x => new EmAccoutIdModel() { EmAccount = x.EmLoginMobile, EmployeeId = x.EmployeeId ?? 0 }).Distinct().ToList();
// List<int> empIds = audituserList.Select(t => t.EmployeeId.Value).ToList();
// InsertBatcheAuditRecord(empIds, wfId, wFTTemplateTypeEnum, trans, auditRelevance);
//}
//else
//{
// return false;
//}
} }
return true; return true;
} }
...@@ -595,6 +587,7 @@ namespace Edu.Module.Course ...@@ -595,6 +587,7 @@ namespace Edu.Module.Course
UpdateTime = DateTime.Now, UpdateTime = DateTime.Now,
ConditionId=wfId, ConditionId=wfId,
Description="", Description="",
BackrelevanceId= auditRelevance.Id
}; };
auditrecordList.Add(auditrecord); auditrecordList.Add(auditrecord);
} }
......
Edu.Repository/Course/RB_Student_BackClassRepository.cs
View file @ abbcd0f4
...@@ -70,7 +70,7 @@ WHERE 1=1 "); ...@@ -70,7 +70,7 @@ WHERE 1=1 ");
break; break;
//已审批的 //已审批的
case Common.Enum.Course.BackClassConditionEnum.Agree: case Common.Enum.Course.BackClassConditionEnum.Agree:
builder.AppendFormat(" AND EXISTS (SELECT 1 FROM rb_student_backrecord WHERE ConditionId=A.BackId AND AuditStatus=2 AND AuditEmId={0}) ", query.CreateBy); builder.AppendFormat(" AND EXISTS (SELECT 1 FROM rb_student_backrecord WHERE ConditionId=A.BackId AND AuditStatus IN(2,5) AND AuditEmId={0}) ", query.CreateBy);
break; break;
//我发起的 //我发起的
case Common.Enum.Course.BackClassConditionEnum.Launch: case Common.Enum.Course.BackClassConditionEnum.Launch:
......
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