Skip to content

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

页面修改

parent 457ebe8a
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 64 deletions
Edu.Repository/EduTask/RB_Education_ReceiptRepository.cs
View file @ 9f882e8c
...@@ -126,6 +126,9 @@ WHERE 1=1 ...@@ -126,6 +126,9 @@ WHERE 1=1
{ {
message = ""; message = "";
bool flag = false; bool flag = false;
var newId = base.Insert(model);
model.Id = newId;
flag = newId > 0;
//审核流程 //审核流程
var flowModel = new RB_Flow_ViewModel(); var flowModel = new RB_Flow_ViewModel();
//退课流程 //退课流程
...@@ -209,7 +212,7 @@ WHERE 1=1 ...@@ -209,7 +212,7 @@ WHERE 1=1
var levance = new RB_Education_Relevance() var levance = new RB_Education_Relevance()
{ {
ConditionId = model.RelationId, ConditionId = model.Id,
AuditDescription = item.NodeName, AuditDescription = item.NodeName,
AuditedId = "", AuditedId = "",
AuditWay = item.FlowAduitList[0].AuditWay, AuditWay = item.FlowAduitList[0].AuditWay,
...@@ -233,7 +236,7 @@ WHERE 1=1 ...@@ -233,7 +236,7 @@ WHERE 1=1
{ {
var recordModel = new RB_Education_Record_ViewModel() var recordModel = new RB_Education_Record_ViewModel()
{ {
ConditionId = model.RelationId, ConditionId = model.Id,
AuditStatus = Common.Enum.User.WFRrocessStatus.NotAudit, AuditStatus = Common.Enum.User.WFRrocessStatus.NotAudit,
AuditId = levance.Id, AuditId = levance.Id,
AuditEmId = subItem.UserId, AuditEmId = subItem.UserId,
...@@ -250,9 +253,6 @@ WHERE 1=1 ...@@ -250,9 +253,6 @@ WHERE 1=1
} }
index++; index++;
} }
var newId = base.Insert(model);
model.Id = newId;
flag = newId > 0;
return flag; return flag;
} }
} }
......
Edu.Repository/Log/RB_MsgLogRepository.cs
View file @ 9f882e8c
...@@ -51,6 +51,7 @@ WHERE 1=1 ...@@ -51,6 +51,7 @@ WHERE 1=1
builder.AppendFormat(" AND {0}={1} ", nameof(RB_MsgLog.IsRead), query.IsRead); builder.AppendFormat(" AND {0}={1} ", nameof(RB_MsgLog.IsRead), query.IsRead);
} }
} }
builder.AppendFormat(" ORDER BY {0} DESC ", nameof(RB_MsgLog.Id));
return Get<RB_MsgLog>(builder.ToString()).ToList(); return Get<RB_MsgLog>(builder.ToString()).ToList();
} }
......
Edu.WebApi/Controllers/Course/StuController.cs
View file @ 9f882e8c
...@@ -37,62 +37,6 @@ namespace Edu.WebApi.Controllers.Course ...@@ -37,62 +37,6 @@ namespace Edu.WebApi.Controllers.Course
public ApiResult GetStudentBackClassPage() public ApiResult GetStudentBackClassPage()
{ {
var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString()); var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var query = new RB_Student_BackClass_ViewModel()
{
ClassName = base.ParmJObj.GetStringValue("ClassName"),
//QStartTime=base.ParmJObj.GetStringValue("QStartTime"),
//QEndTime=base.ParmJObj.GetStringValue("QEndTime"),
AuditStatus=(BackClassAuditStatusEnum)base.ParmJObj.GetInt("AuditStatus"),
};
query.CreateBy = base.UserInfo.Id;
//var Conditon = base.ParmJObj.GetInt("Conditon");
//if (Conditon > 0)
//{
// query.Conditon = (BackClassConditionEnum)Conditon;
//}
//query.Group_Id = base.UserInfo.Group_Id;
//List<object> result = new List<object>();
//var list = studentBillModule.GetStudentBackClassPageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
//foreach (var item in list)
//{
// if (item.CreateBy > 0)
// {
// item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
// }
// if (item.EnterID > 0)
// {
// item.EnterName = UserReidsCache.GetUserLoginInfo(item.EnterID)?.AccountName ?? "";
// }
// result.Add(new
// {
// item.BackId,
// item.BackNum,
// item.GuestId,
// item.GuestName,
// item.SchoolId,
// item.SchoolName,
// item.ClassId,
// item.ClassName,
// item.TeacherId,
// item.TeacherName,
// item.FinishHours,
// item.BackMoney,
// item.CreateTimeStr,
// item.CreateByName,
// item.AuditStatus,
// item.EnterID,
// item.EnterName,
// item.CourseName,
// item.ApplyReason,
// item.OrderId,
// AuditStatusName=item.AuditStatus.ToName(),
// item.SpecialNode,
// item.RealityBackMoney,
// item.FinanceId,
// });
//}
//pageModel.Count = rowsCount;
//pageModel.PageData = result;
return ApiResult.Success(data: pageModel); return ApiResult.Success(data: pageModel);
} }
......
Edu.WebApi/Controllers/EduTask/EducationReceiptController.cs
View file @ 9f882e8c
...@@ -64,6 +64,29 @@ namespace Edu.WebApi.Controllers.EduTask ...@@ -64,6 +64,29 @@ namespace Edu.WebApi.Controllers.EduTask
return ApiResult.Success(data: Info); return ApiResult.Success(data: Info);
} }
/// <summary>
/// 教务单据审核
/// </summary>
/// <param name="model">审核信息</param>
/// <param name="user">登录用户信息</param>
/// <param name="message">返回提示信息</param>
/// <returns></returns>
public ApiResult AduitEducationReceipt()
{
var auditModel = new EduReceiptAudit()
{
Id = base.ParmJObj.GetInt("Id"),
AuditStatus = base.ParmJObj.GetInt("AuditStatus"),
BackMoney = base.ParmJObj.GetDecimal("BackMoney"),
Description = base.ParmJObj.GetStringValue("Description"),
RecipientIds = base.ParmJObj.GetStringValue("RecipientIds"),
SpecialNode = base.ParmJObj.GetInt("SpecialNode"),
};
var flag = educationReceiptModule.AduitEducationReceiptModule(auditModel, base.UserInfo, out string message);
return flag?ApiResult.Success():ApiResult.Failed(message: message);
}
/// <summary> /// <summary>
/// 获取单据类型 /// 获取单据类型
/// </summary> /// </summary>
...@@ -75,6 +98,4 @@ namespace Edu.WebApi.Controllers.EduTask ...@@ -75,6 +98,4 @@ namespace Edu.WebApi.Controllers.EduTask
return ApiResult.Success(data: list); return ApiResult.Success(data: list);
} }
} }
}
\ No newline at end of file
}
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