Skip to content

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

页面修改

parent abbcd0f4
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 14 deletions
Edu.Module.Course/StudentBillModule.cs
View file @ f049a7cb

using Edu.Cache.User;
using Edu.Common.Enum.Course;
using Edu.Common.Enum.User;
using Edu.Common.Plugin;
......@@ -176,7 +177,7 @@ namespace Edu.Module.Course
if (Notcount > 0)
{
message = "该退课申请单已被拒绝";
return false;
return false;
}
var ToAuditFlow = arList.Where(x => x.Stauts == WFRrocessStatus.NotAudit).OrderBy(x => x.Sort).ToList();
......@@ -286,7 +287,7 @@ namespace Edu.Module.Course
{nameof(RB_Student_BackClass_ViewModel.AuditStatus), (int)BackClassAuditStatusEnum.Pass }
};
flag = student_BackClassRepository.Update(backFileds, new WhereHelper(nameof(RB_Student_BackClass_ViewModel.BackId), backModel.BackId));
}
else
{
......@@ -325,7 +326,7 @@ namespace Edu.Module.Course
};
flag = student_BackClassRepository.Update(backFileds, new WhereHelper(nameof(RB_Student_BackClass_ViewModel.BackId), backModel.BackId));
}
//更新抄送人状态
//var CopyToPeopleList = copyToPeopleRepository.GetCopyToPeopleList(WorkFlowId, TemplateType);
//foreach (var item in CopyToPeopleList)
......@@ -353,7 +354,7 @@ namespace Edu.Module.Course
}
//审核记录状态
#region 更新审核记录表状态
flag = UpdateStuRecordModule(WFRrocessStatus.AuditThrough, Description, user.Id, amodel.Id);
#endregion
......@@ -482,7 +483,7 @@ namespace Edu.Module.Course
#endregion
//赋值下一步到审核记录中 并更新这一步的待审核人
var modelNext = ToAuditFlow[1];
flag = InsertAuditRelevanceNext(backModel.CreateBy, backModel.BackId,backModel.FlowId, modelNext);
flag = InsertAuditRelevanceNext(backModel.CreateBy, backModel.BackId, backModel.FlowId, modelNext);
if (flag == false)
{
message = "审核流程不完整无法审核，请联系相关负责人!";
......@@ -523,7 +524,7 @@ namespace Edu.Module.Course
/// <param name="AuditedId"></param>
/// <param name="Id"></param>
/// <returns></returns>
private bool UpdateStuRelevanceModule(int Id,WFRrocessStatus? status=null, string AuditedId="")
private bool UpdateStuRelevanceModule(int Id, WFRrocessStatus? status = null, string AuditedId = "")
{
var relevanceFileds = new Dictionary<string, object>();
if (!string.IsNullOrEmpty(AuditedId))
......@@ -545,7 +546,7 @@ namespace Edu.Module.Course
/// <param name="wfId"></param>
/// <param name="flowId">工作流id</param>
/// <param name="modelNext">审核关联</param>
private bool InsertAuditRelevanceNext(int empId, int sourceId,int flowId, RB_Student_BackRelevance_ViewModel modelNext)
private bool InsertAuditRelevanceNext(int empId, int sourceId, int flowId, RB_Student_BackRelevance_ViewModel modelNext)
{
if (empId <= 0)
{
......@@ -571,7 +572,7 @@ namespace Edu.Module.Course
/// <param name="wFTTemplateTypeEnum">工作流模板</param>
/// <param name="trans">事务</param>
/// <param name="auditRelevance">审核节点</param>
private void InsertBatcheAuditRecord(List<int> empIds, int wfId,RB_Student_BackRelevance_ViewModel auditRelevance)
private void InsertBatcheAuditRecord(List<int> empIds, int wfId, RB_Student_BackRelevance_ViewModel auditRelevance)
{
List<RB_Student_BackRecord_ViewModel> auditrecordList = new List<RB_Student_BackRecord_ViewModel>();
foreach (var item in empIds)
......@@ -585,15 +586,66 @@ namespace Edu.Module.Course
CreateTime = DateTime.Now,
UpdateBy = item,
UpdateTime = DateTime.Now,
ConditionId=wfId,
Description="",
BackrelevanceId= auditRelevance.Id
ConditionId = wfId,
Description = "",
BackrelevanceId = auditRelevance.Id
};
auditrecordList.Add(auditrecord);
}
student_BackRecordRepository.InsertBatch(auditrecordList);
auditRelevance.ToAuditId = string.Join(",", empIds);
student_BackRelevanceRepository.Update(auditRelevance);
student_BackRecordRepository.InsertBatch(auditrecordList);
auditRelevance.ToAuditId = string.Join(",", empIds);
student_BackRelevanceRepository.Update(auditRelevance);
}
/// <summary>
/// 获取退课单据信息
/// </summary>
/// <param name="backId"></param>
/// <returns></returns>
public object GetStuBackInfoModule(int backId)
{
var obj = new List<object>();
//获取单据实体类
var backModel = student_BackClassRepository.GetEntity(backId);
//获取审核记录
var aurList = student_BackRecordRepository.GetStudentBackRecordListRepository(new RB_Student_BackRecord_ViewModel()
{
ConditionId = backId,
});
//审核关联列表
var arList = student_BackRelevanceRepository.GetStudentBackRelevanceListRepository(new RB_Student_BackRelevance_ViewModel()
{
ConditionId = backId
});
obj.Add(new
{
NodeName = "发起人",
AduitStatus = 2,
SubList = new List<object>()
{
new{
AduitName= UserReidsCache.GetUserLoginInfo(backModel.CreateBy)?.AccountName ?? "",
Description=backModel.ApplyReason,
CreateTime=Common.ConvertHelper.FormatTime(backModel.CreateTime)
}
}
});
foreach (var item in arList)
{
obj.Add(new
{
NodeName = item.AuditDescription,
AduitStatus = item.Stauts,
SubList = aurList.Where(qitem => qitem.AuditId == item.Id).Select(qitem => new
{
AduitName = UserReidsCache.GetUserLoginInfo(qitem.AuditEmId)?.AccountName ?? "",
Description = qitem.Description,
CreateTime = Common.ConvertHelper.FormatTime(qitem.UpdateTime)
})
});
}
return obj;
}
}
}
Edu.WebApi/Controllers/Course/StuController.cs
View file @ f049a7cb
......@@ -110,5 +110,17 @@ namespace Edu.WebApi.Controllers.Course
var flag = studentBillModule.SetBackBillAduitModule(BackId, AuditStatus, Description, base.UserInfo,out string message, BackMoney: BackMoney);
return flag ? ApiResult.Success(message: message) : ApiResult.Failed(message: message);
}
/// <summary>
/// 获取单据详情
/// </summary>
/// <returns></returns>
public ApiResult GetBackBillAduitInfo()
{
//退课单据号
var BackId = base.ParmJObj.GetInt("BackId");
var extModel = studentBillModule.GetStuBackInfoModule(BackId);
return ApiResult.Success(data: extModel);
}
}
}
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