Commit 7da18522 authored by liudong1993's avatar liudong1993

1

parent 69826cb1
...@@ -1390,6 +1390,22 @@ namespace Edu.Module.EduTask ...@@ -1390,6 +1390,22 @@ namespace Edu.Module.EduTask
} }
#endregion #endregion
#region 稿酬状态
if (receipt.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.Contribute && auditModel.SpecialNode == 1)
{
if (auditModel.AuditStatus == 2)
{
Dictionary<string, object> fileds1 = new Dictionary<string, object>()
{
{nameof(RB_Contribute_Info_ViewModel.RemunerationState),auditModel.RemunerationState}
};
flag = contribute_InfoRepository.Update(fileds1, new WhereHelper(nameof(RB_Contribute_Info_ViewModel.Id), receipt.RelationId));
}
}
#endregion
Dictionary<string, object> fileds = new Dictionary<string, object>() Dictionary<string, object> fileds = new Dictionary<string, object>()
{ {
{nameof(RB_Education_Receipt_ViewModel.VerifyStatus),(int)EduTaskRrocessStatus.AuditIng} {nameof(RB_Education_Receipt_ViewModel.VerifyStatus),(int)EduTaskRrocessStatus.AuditIng}
......
...@@ -305,6 +305,8 @@ namespace Edu.WebApi.Controllers.Course ...@@ -305,6 +305,8 @@ namespace Edu.WebApi.Controllers.Course
JoinType = base.ParmJObj.GetInt("JoinType", 0), JoinType = base.ParmJObj.GetInt("JoinType", 0),
EarlyWarning = (Common.Enum.Course.GuestClassHoursEarlyWarningEnum)base.ParmJObj.GetInt("EarlyWarning", 0), EarlyWarning = (Common.Enum.Course.GuestClassHoursEarlyWarningEnum)base.ParmJObj.GetInt("EarlyWarning", 0),
GuestState=(GuestStateEnum)base.ParmJObj.GetInt("GuestState"), GuestState=(GuestStateEnum)base.ParmJObj.GetInt("GuestState"),
StuChannelId = base.ParmJObj.GetInt("StuChannelId", 0),
CreateType = (Common.Enum.User.StuCreateTypeEnum)base.ParmJObj.GetInt("CreateType", 0),
}; };
model.School_Id = -1; model.School_Id = -1;
var schoolId = base.ParmJObj.GetStringValue("School_Id"); var schoolId = base.ParmJObj.GetStringValue("School_Id");
......
...@@ -145,6 +145,7 @@ namespace Edu.WebApi.Controllers.EduTask ...@@ -145,6 +145,7 @@ namespace Edu.WebApi.Controllers.EduTask
Description = base.ParmJObj.GetStringValue("Description"), Description = base.ParmJObj.GetStringValue("Description"),
RecipientIds = base.ParmJObj.GetStringValue("RecipientIds"), RecipientIds = base.ParmJObj.GetStringValue("RecipientIds"),
SpecialNode = base.ParmJObj.GetInt("SpecialNode"), SpecialNode = base.ParmJObj.GetInt("SpecialNode"),
RemunerationState = base.ParmJObj.GetInt("RemunerationState"),
}; };
var flag = educationReceiptModule.AduitEducationReceiptModule(auditModel, base.UserInfo, out string message); var flag = educationReceiptModule.AduitEducationReceiptModule(auditModel, base.UserInfo, out string message);
......
...@@ -869,7 +869,8 @@ namespace Edu.WebApi.Controllers.QYWeChat ...@@ -869,7 +869,8 @@ namespace Edu.WebApi.Controllers.QYWeChat
AuditStateName = x.AuditState.ToName(), AuditStateName = x.AuditState.ToName(),
x.UpdateBy, x.UpdateBy,
UpdateByName = Cache.User.UserReidsCache.GetUserLoginInfo(x.UpdateBy)?.AccountName ?? "", UpdateByName = Cache.User.UserReidsCache.GetUserLoginInfo(x.UpdateBy)?.AccountName ?? "",
UpdateTime = x.UpdateTime.ToString("yyyy-MM-dd HH:mm") UpdateTime = x.UpdateTime.ToString("yyyy-MM-dd HH:mm"),
x.RemunerationState
}); });
return ApiResult.Success("", pmodel); return ApiResult.Success("", pmodel);
} }
......
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