Skip to content

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

页面修改

parent d7d340b6
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 120 deletions
Edu.Module.Course/OrderModule2.cs
View file @ 1132ff20
...@@ -209,8 +209,8 @@ namespace Edu.Module.Course ...@@ -209,8 +209,8 @@ namespace Edu.Module.Course
OldSaleMan= saleMan?.AccountName??"", OldSaleMan= saleMan?.AccountName??"",
OldCourseName=courseModel?.CourseName??"", OldCourseName=courseModel?.CourseName??"",
OldSellPrice=courseModel?.SellPrice??0, OldSellPrice=courseModel?.SellPrice??0,
OldDiscountMoney=orderModel?.DiscountMoney??0, OldDiscountMoney=orderModel?.PerDiscountMoney??0,
OldIncome=(orderModel?.Income??0) +(orderModel?.PlatformTax??0) -(orderModel?.Refund??0), OldIncome=((orderModel?.Income ?? 0) + (orderModel?.PlatformTax ?? 0) - (orderModel?.Refund ?? 0))/orderModel.GuestNum,
OldFinaceNum= FinaceNum, OldFinaceNum= FinaceNum,
OldReceiveMan=saleMan?.AccountName??"", OldReceiveMan=saleMan?.AccountName??"",
TotalClassHours=guestModel.TotalHours, TotalClassHours=guestModel.TotalHours,
......
Edu.Module.EduTask/EducationReceiptModule.cs
View file @ 1132ff20
...@@ -694,10 +694,6 @@ namespace Edu.Module.EduTask ...@@ -694,10 +694,6 @@ namespace Edu.Module.EduTask
return flag; return flag;
} }
/// <summary> /// <summary>
/// 修改审核人员 /// 修改审核人员
/// </summary> /// </summary>
......
Edu.Module.Exam/PaperModule.cs
View file @ 1132ff20
...@@ -283,9 +283,9 @@ namespace Edu.Module.Exam ...@@ -283,9 +283,9 @@ namespace Edu.Module.Exam
/// <param name="model"></param> /// <param name="model"></param>
/// <returns></returns> /// <returns></returns>
[TransactionCallHandler] [TransactionCallHandler]
public virtual bool SetExaminationPaperModule(RB_Examination_Paper_ViewModel model, RB_Examination_Configure_ViewModel obj) public virtual bool SetExaminationPaperModule(RB_Examination_Paper_ViewModel model)
{ {
bool flag = SetExaminationPaperFolderModule(model, obj); bool flag = SetExaminationPaperFolderModule(model);
if (model.GroupList != null && model.GroupList.Count > 0) if (model.GroupList != null && model.GroupList.Count > 0)
{ {
foreach (var gitem in model.GroupList) foreach (var gitem in model.GroupList)
...@@ -413,11 +413,6 @@ namespace Edu.Module.Exam ...@@ -413,11 +413,6 @@ namespace Edu.Module.Exam
var newPaperId = examination_PaperRepository.Insert(paperModel); var newPaperId = examination_PaperRepository.Insert(paperModel);
paperModel.PaperId = newPaperId; paperModel.PaperId = newPaperId;
flag = newPaperId > 0; flag = newPaperId > 0;
var configureModel = new RB_Examination_Configure_ViewModel()
{
Group_Id = model.Group_Id,
};
var obj = GetExaminationConfigureModel(configureModel);
if (paperModel.CreateNum > 0) if (paperModel.CreateNum > 0)
{ {
for (var i = 0; i < paperModel.CreateNum; i++) for (var i = 0; i < paperModel.CreateNum; i++)
...@@ -439,48 +434,11 @@ namespace Edu.Module.Exam ...@@ -439,48 +434,11 @@ namespace Edu.Module.Exam
ParentId = newPaperId, ParentId = newPaperId,
IsOpen=model.IsOpen, IsOpen=model.IsOpen,
}; };
if (obj.IsOpenZuJuan == 0)
{
subModel.Reviewer = 0;
subModel.ExamineStatus = Edu.Common.Enum.EduTask.EduTaskRrocessStatus.AuditThrough;
}
else
{
subModel.Reviewer = obj.ZuJuanReviewer;
subModel.ExamineStatus = Edu.Common.Enum.EduTask.EduTaskRrocessStatus.AuditIng;
}
var newSubPaperId = examination_PaperRepository.Insert(subModel); var newSubPaperId = examination_PaperRepository.Insert(subModel);
subModel.PaperId = newSubPaperId; subModel.PaperId = newSubPaperId;
flag = newSubPaperId > 0; flag = newSubPaperId > 0;
if (flag && obj.IsOpenZuJuan == 1) if (flag&& model.TempDataList != null && model.TempDataList.Count > 0)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Examination_Paper_ViewModel.ExamineStatus),Common.Enum.EduTask.EduTaskRrocessStatus.AuditIng },
{nameof(RB_Examination_Paper_ViewModel.Reviewer),obj.ZuJuanReviewer }
};
flag = examination_PaperRepository.Update(fileds, new WhereHelper(nameof(RB_Examination_Paper_ViewModel.PaperId), subModel.PaperId));
var educationReceipt = new Model.Entity.EduTask.RB_Education_Receipt()
{
Id = 0,
Title = "组卷审批",
ReceiptType = Common.Enum.Finance.ReceiptTypeEnum.ZuJuan,
RelationId = subModel.PaperId,
ClassId = 0,
Group_Id = subModel.Group_Id,
School_Id = subModel.School_Id,
CreateBy = subModel.CreateBy,
CreateTime = subModel.CreateTime,
UpdateBy = subModel.CreateBy,
UpdateTime = subModel.CreateTime,
VerifyStatus = Common.Enum.EduTask.EduTaskRrocessStatus.AuditIng,
ReceiptFile = ""
};
flag = education_ReceiptRepository.SetEducationReceiptRepository(educationReceipt, out string message);
}
if (model.TempDataList != null && model.TempDataList.Count > 0)
{ {
int G_Sort = 1; int G_Sort = 1;
foreach (var item in model.TempDataList) foreach (var item in model.TempDataList)
...@@ -568,9 +526,9 @@ namespace Edu.Module.Exam ...@@ -568,9 +526,9 @@ namespace Edu.Module.Exam
/// </summary> /// </summary>
/// <param name="model"></param> /// <param name="model"></param>
/// <returns></returns> /// <returns></returns>
public virtual bool SetExaminationPaperFolderModule(RB_Examination_Paper_ViewModel model, RB_Examination_Configure_ViewModel obj) public virtual bool SetExaminationPaperFolderModule(RB_Examination_Paper_ViewModel model)
{ {
return SetExaminationPaperCommonModule(model, obj); return SetExaminationPaperCommonModule(model);
} }
/// <summary> /// <summary>
...@@ -578,7 +536,7 @@ namespace Edu.Module.Exam ...@@ -578,7 +536,7 @@ namespace Edu.Module.Exam
/// </summary> /// </summary>
/// <param name="model"></param> /// <param name="model"></param>
/// <returns></returns> /// <returns></returns>
public bool SetExaminationPaperCommonModule(RB_Examination_Paper_ViewModel model, RB_Examination_Configure_ViewModel obj) public bool SetExaminationPaperCommonModule(RB_Examination_Paper_ViewModel model)
{ {
bool flag; bool flag;
if (model.PaperId > 0) if (model.PaperId > 0)
...@@ -592,7 +550,6 @@ namespace Edu.Module.Exam ...@@ -592,7 +550,6 @@ namespace Edu.Module.Exam
{nameof(RB_Examination_Paper_ViewModel.CreateNum),model.CreateNum }, {nameof(RB_Examination_Paper_ViewModel.CreateNum),model.CreateNum },
{nameof(RB_Examination_Paper_ViewModel.PaperType),model.PaperType }, {nameof(RB_Examination_Paper_ViewModel.PaperType),model.PaperType },
{nameof(RB_Examination_Paper_ViewModel.ParentId),model.ParentId }, {nameof(RB_Examination_Paper_ViewModel.ParentId),model.ParentId },
{nameof(RB_Examination_Paper_ViewModel.ExamineStatus),model.ExamineStatus },
{nameof(RB_Examination_Paper_ViewModel.IsOpen),model.IsOpen } {nameof(RB_Examination_Paper_ViewModel.IsOpen),model.IsOpen }
}; };
flag = examination_PaperRepository.Update(fileds, new WhereHelper(nameof(RB_Examination_Paper_ViewModel.PaperId), model.PaperId)); flag = examination_PaperRepository.Update(fileds, new WhereHelper(nameof(RB_Examination_Paper_ViewModel.PaperId), model.PaperId));
...@@ -602,17 +559,6 @@ namespace Edu.Module.Exam ...@@ -602,17 +559,6 @@ namespace Edu.Module.Exam
var newPaperId = examination_PaperRepository.Insert(model); var newPaperId = examination_PaperRepository.Insert(model);
model.PaperId = newPaperId; model.PaperId = newPaperId;
flag = newPaperId > 0; flag = newPaperId > 0;
model.IsExamine = 1;
}
if (flag && obj.IsOpenZuJuan == 1 && model.IsExamine == 1)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Examination_Paper_ViewModel.ExamineStatus),Common.Enum.EduTask.EduTaskRrocessStatus.AuditIng },
{nameof(RB_Examination_Paper_ViewModel.Reviewer),obj.ZuJuanReviewer }
};
flag = examination_PaperRepository.Update(fileds, new WhereHelper(nameof(RB_Examination_Paper_ViewModel.PaperId), model.PaperId));
} }
return flag; return flag;
} }
...@@ -626,6 +572,26 @@ namespace Edu.Module.Exam ...@@ -626,6 +572,26 @@ namespace Edu.Module.Exam
{ {
bool flag = false; bool flag = false;
var model = GetExaminationPaperModule(PaperId); var model = GetExaminationPaperModule(PaperId);
var configureModel = new RB_Examination_Configure_ViewModel()
{
Group_Id = model.Group_Id,
};
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Examination_Paper_ViewModel.ExamineRemark),"" },
{nameof(RB_Examination_Paper_ViewModel.ExamineStatus),Common.Enum.EduTask.EduTaskRrocessStatus.AuditIng },
};
if (configureModel.IsOpenZuJuan == 0)
{
fileds.Add(nameof(RB_Examination_Paper_ViewModel.Reviewer), 0);
fileds.Add(nameof(RB_Examination_Paper_ViewModel.ExamineStatus), Edu.Common.Enum.EduTask.EduTaskRrocessStatus.AuditThrough);
}
else
{
fileds.Add(nameof(RB_Examination_Paper_ViewModel.Reviewer), configureModel.ZuJuanReviewer);
fileds.Add(nameof(RB_Examination_Paper_ViewModel.ExamineStatus), Edu.Common.Enum.EduTask.EduTaskRrocessStatus.AuditIng);
}
var obj = GetExaminationConfigureModel(configureModel);
var educationReceipt = new Model.Entity.EduTask.RB_Education_Receipt() var educationReceipt = new Model.Entity.EduTask.RB_Education_Receipt()
{ {
Id = 0, Id = 0,
...@@ -642,11 +608,6 @@ namespace Edu.Module.Exam ...@@ -642,11 +608,6 @@ namespace Edu.Module.Exam
VerifyStatus = Common.Enum.EduTask.EduTaskRrocessStatus.AuditIng, VerifyStatus = Common.Enum.EduTask.EduTaskRrocessStatus.AuditIng,
ReceiptFile = "" ReceiptFile = ""
}; };
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Examination_Paper_ViewModel.ExamineRemark),"" },
{nameof(RB_Examination_Paper_ViewModel.ExamineStatus),Common.Enum.EduTask.EduTaskRrocessStatus.AuditIng },
};
flag = examination_PaperRepository.Update(fileds, new WhereHelper(nameof(RB_Examination_Paper_ViewModel.PaperId), model.PaperId)); flag = examination_PaperRepository.Update(fileds, new WhereHelper(nameof(RB_Examination_Paper_ViewModel.PaperId), model.PaperId));
if (flag) if (flag)
{ {
...@@ -870,22 +831,9 @@ namespace Edu.Module.Exam ...@@ -870,22 +831,9 @@ namespace Edu.Module.Exam
} }
} }
model.ExamineRemark = ""; model.ExamineRemark = "";
var configureModel = new RB_Examination_Configure_ViewModel() model.Reviewer = 0;
{ model.ExamineStatus = 0;
Group_Id = model.Group_Id, flag = SetExaminationPaperModule(model);
};
var obj = GetExaminationConfigureModel(configureModel);
if (obj.IsOpenZuJuan == 0)
{
model.Reviewer = 0;
model.ExamineStatus = Common.Enum.EduTask.EduTaskRrocessStatus.AuditThrough;
}
else
{
model.Reviewer = obj.ZuJuanReviewer;
model.ExamineStatus = Common.Enum.EduTask.EduTaskRrocessStatus.AuditIng;
}
flag = SetExaminationPaperModule(model, obj);
return flag; return flag;
} }
......
Edu.WebApi/Controllers/Exam/ExamController.cs
View file @ 1132ff20
...@@ -207,22 +207,7 @@ namespace Edu.WebApi.Controllers.Exam ...@@ -207,22 +207,7 @@ namespace Edu.WebApi.Controllers.Exam
} }
} }
} }
var configureModel = new RB_Examination_Configure_ViewModel() bool flag = paperModule.SetExaminationPaperModule(extModel);
{
Group_Id = base.UserInfo.Group_Id,
};
var obj = paperModule.GetExaminationConfigureModel(configureModel);
if (obj.IsOpenZuJuan == 0)
{
extModel.Reviewer = 0;
extModel.ExamineStatus = Edu.Common.Enum.EduTask.EduTaskRrocessStatus.AuditThrough;
}
else
{
extModel.Reviewer = obj.ZuJuanReviewer;
extModel.ExamineStatus = Edu.Common.Enum.EduTask.EduTaskRrocessStatus.AuditIng;
}
bool flag = paperModule.SetExaminationPaperModule(extModel, obj);
return flag ? ApiResult.Success(data: extModel) : ApiResult.Failed(); return flag ? ApiResult.Success(data: extModel) : ApiResult.Failed();
} }
...@@ -348,22 +333,7 @@ namespace Edu.WebApi.Controllers.Exam ...@@ -348,22 +333,7 @@ namespace Edu.WebApi.Controllers.Exam
PaperType = base.ParmJObj.GetInt("PaperType"), PaperType = base.ParmJObj.GetInt("PaperType"),
ParentId = base.ParmJObj.GetInt("ParentId"), ParentId = base.ParmJObj.GetInt("ParentId"),
}; };
var configureModel = new RB_Examination_Configure_ViewModel() bool flag = paperModule.SetExaminationPaperFolderModule(extModel);
{
Group_Id = base.UserInfo.Group_Id,
};
var obj = paperModule.GetExaminationConfigureModel(configureModel);
if (obj.IsOpenZuJuan == 0)
{
extModel.Reviewer = 0;
extModel.ExamineStatus = Common.Enum.EduTask.EduTaskRrocessStatus.AuditThrough;
}
else
{
extModel.Reviewer = obj.ZuJuanReviewer;
extModel.ExamineStatus = Common.Enum.EduTask.EduTaskRrocessStatus.AuditIng;
}
bool flag = paperModule.SetExaminationPaperFolderModule(extModel, obj);
return flag ? ApiResult.Success(data: extModel) : ApiResult.Failed(); return flag ? ApiResult.Success(data: extModel) : ApiResult.Failed();
} }
......
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