Skip to content

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

页面修改

parent c70e9a38
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 636 additions and 40 deletions
Edu.Model/Entity/Course/RB_Student_BackClass.cs
View file @ 094cf17d
......@@ -92,5 +92,10 @@ namespace Edu.Model.Entity.Course
/// 申请备注
/// </summary>
public string ApplyReason { get; set; }
/// <summary>
/// 流程编号
/// </summary>
public int FlowId { get; set; }
}
}
Edu.Model/Entity/Course/RB_Student_BackRecord.cs
View file @ 094cf17d
using System;
using Edu.Common.Enum.User;
using System;
using System.Collections.Generic;
using System.Text;
using VT.FW.DB;
......@@ -31,7 +32,7 @@ namespace Edu.Model.Entity.Course
/// <summary>
/// 1未审核 2审核通过 3 不通过 4 驳回 5他人已审核
/// </summary>
public int AuditStatus { get; set; }
public WFRrocessStatus AuditStatus { get; set; }
/// <summary>
/// 描述
......
Edu.Model/Entity/Course/RB_Student_BackRelevance.cs
View file @ 094cf17d
using System;
using Edu.Common.Enum.User;
using System;
using System.Collections.Generic;
using System.Text;
using VT.FW.DB;
......@@ -25,12 +26,12 @@ namespace Edu.Model.Entity.Course
/// <summary>
/// 审核人类型 1主管(指定一级) 2 指定成员 3角色
/// </summary>
public int AuditType { get; set; }
public WFTAuditTypeEnum AuditType { get; set; }
/// <summary>
/// 1依次审批（本环节内审批人依次审批） 2 会签（须所有审批人同意）3或签（一名审批人同意或拒绝即可）
/// </summary>
public int AuditWay { get; set; }
public WFTAuditWayEnum AuditWay { get; set; }
/// <summary>
/// 存发起人或者角色 发起人1 表示直属主管 2表示再上一级 依次类推
......@@ -60,7 +61,7 @@ namespace Edu.Model.Entity.Course
/// <summary>
/// 1未审核 2审核通过 3 不通过 4 驳回
/// </summary>
public int Stauts { get; set; }
public WFRrocessStatus Stauts { get; set; }
/// <summary>
/// 待审核人 1,2,3 以逗号分隔
......
Edu.Model/Entity/Flow/RB_Flow_AduitInfo.cs
View file @ 094cf17d
using System;
using Edu.Common.Enum.User;
using System;
using System.Collections.Generic;
using System.Text;
using VT.FW.DB;
......@@ -33,9 +34,9 @@ namespace Edu.Model.Entity.Flow
public string AduitName { get; set; }
/// <summary>
/// 审核类型(1-指定人员，2-指定角色)
/// 审核类型
/// </summary>
public int AuditType { get; set; }
public WFTAuditTypeEnum AuditType { get; set; }
/// <summary>
/// 审核人员编号(AuditType为1时使用）
......@@ -55,6 +56,6 @@ namespace Edu.Model.Entity.Flow
/// <summary>
/// 1依次审批（本环节内审批人依次审批） 2 会签（须所有审批人同意）3 或签（一名审批人同意或拒绝即可）
/// </summary>
public int AuditWay { get; set; }
public WFTAuditWayEnum AuditWay { get; set; }
}
}
Edu.Module.Course/OrderModule2.cs
View file @ 094cf17d
......@@ -132,12 +132,15 @@ namespace Edu.Module.Course
TeacherId = teacherId,
OrderId = OrderId,
ApplyReason = reason,
FlowId = Common.Config.BackClassFlowId,
};
var newBackId = student_BackClassRepository.Insert(backClassModel);
backClassModel.BackId = newBackId;
flag = newBackId > 0;
int index = 0;
foreach (var item in flowModel.FlowNodeList)
{
if (item.FlowAduitList != null && item.FlowAduitList.Count > 0)
{
string AuditDescription = "";//审核人名称
......@@ -194,36 +197,40 @@ namespace Edu.Module.Course
AuditDescription = AuditDescription,
AuditedId = "",
AuditWay = item.FlowAduitList[0].AuditWay,
AuditType = 0,
AuditType = item.FlowAduitList[0].AuditType,
OriginalAuditId = 0,
RoleOrInitiator = 0,
ToAuditId = AuditedId.TrimEnd(','),
Sort = item.SortNum,
SpecialNode = item.FlowAduitList[0].IsSpecNode,
Stauts = 1,
Stauts = Common.Enum.User.WFRrocessStatus.NotAudit,
WorkFlowId = Common.Config.BackClassFlowId,
};
var backLevanceId = student_BackRelevanceRepository.Insert(backLevance);
backLevance.Id = backLevanceId;
flag = backLevanceId > 0;
foreach (var subItem in item.FlowAduitList)
if (index == 0)
{
var recordModel = new RB_Student_BackRecord_ViewModel()
foreach (var subItem in item.FlowAduitList)
{
ConditionId= backClassModel.BackId,
AuditStatus = 1,
AuditId = subItem.UserId,
AuditEmId = subItem.UserId,
CreateBy = userinfo.Id,
CreateTime = DateTime.Now,
UpdateBy = userinfo.Id,
UpdateTime = DateTime.Now,
Description = "",
BackrelevanceId = backLevance.Id,
};
flag = student_BackRecordRepository.Insert(recordModel) > 0;
var recordModel = new RB_Student_BackRecord_ViewModel()
{
ConditionId = backClassModel.BackId,
AuditStatus = Common.Enum.User.WFRrocessStatus.NotAudit,
AuditId = subItem.UserId,
AuditEmId = subItem.UserId,
CreateBy = userinfo.Id,
CreateTime = DateTime.Now,
UpdateBy = userinfo.Id,
UpdateTime = DateTime.Now,
Description = "",
BackrelevanceId = backLevance.Id,
};
flag = student_BackRecordRepository.Insert(recordModel) > 0;
}
}
}
index++;
}
if (flag)
{
......
Edu.Module.Course/StudentBillModule.cs
View file @ 094cf17d
This diff is collapsed.
Edu.Repository/Course/RB_Student_BackClassRepository.cs
View file @ 094cf17d
......@@ -62,7 +62,6 @@ WHERE 1=1 ");
}
if (query.Conditon != null && query.Conditon>0)
{
switch (query.Conditon)
{
//待我审批
......@@ -82,7 +81,6 @@ WHERE 1=1 ");
builder.AppendFormat(" AND FIND_IN_SET({0},A.RecipientIds) ", query.CreateBy);
break;
}
}
}
builder.AppendFormat(" ORDER BY A.CreateTime DESC ");
......
Edu.Repository/Course/RB_Student_BackRecordRepository.cs
View file @ 094cf17d
......@@ -26,8 +26,15 @@ FROM RB_Student_BackRecord
WHERE 1=1
");
if (query != null)
{
{
if (query.ConditionId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Student_BackRecord_ViewModel.ConditionId), query.ConditionId);
}
if (query.AuditStatus > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Student_BackRecord_ViewModel.AuditStatus), query.AuditStatus);
}
}
return Get<RB_Student_BackRecord_ViewModel>(builder.ToString()).ToList();
}
......
Edu.Repository/Course/RB_Student_BackRelevanceRepository.cs
View file @ 094cf17d
......@@ -20,7 +20,19 @@ namespace Edu.Repository.Course
public List<RB_Student_BackRelevance_ViewModel> GetStudentBackRelevanceListRepository(RB_Student_BackRelevance_ViewModel query)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT *
FROM RB_Student_BackRelevance
WHERE 1=1
");
if (query != null)
{
if (query.ConditionId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Student_BackRelevance_ViewModel.ConditionId), query.ConditionId);
}
}
builder.AppendFormat(" ORDER BY Sort ASC ");
return Get<RB_Student_BackRelevance_ViewModel>(builder.ToString()).ToList();
}
}
......
Edu.WebApi/Controllers/Course/StuController.cs
View file @ 094cf17d
......@@ -27,7 +27,7 @@ namespace Edu.WebApi.Controllers.Course
/// <summary>
/// 学员单据处理类对象
/// </summary>
private readonly StudentBillModule studentBillModule = new StudentBillModule();
private readonly StudentBillModule studentBillModule = AOP.AOPHelper.CreateAOPObject<StudentBillModule>();
/// <summary>
/// 获取学员退课单据分页列表
......@@ -97,12 +97,18 @@ namespace Edu.WebApi.Controllers.Course
/// 获取退款单据审核信息
/// </summary>
/// <returns></returns>
public ApiResult GetBackBillAduit()
public ApiResult SetBackBillAduit()
{
//退课单据号
var BackId = base.ParmJObj.GetInt("BackId");
var data = new { };
return ApiResult.Success(data: data);
//审核状态
var AuditStatus = base.ParmJObj.GetInt("AuditStatus");
//审核备注
string Description = base.ParmJObj.GetStringValue("Description");
//退课金额
decimal BackMoney= base.ParmJObj.GetDecimal("BackMoney");
var flag = studentBillModule.SetBackBillAduitModule(BackId, AuditStatus, Description, base.UserInfo,out string message, BackMoney: BackMoney);
return flag ? ApiResult.Success(message: message) : ApiResult.Failed(message: message);
}
}
}
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