Commit a9e6525f authored by 黄奎's avatar 黄奎

新增调课流程

parent aa7685d9
...@@ -356,6 +356,18 @@ namespace Edu.Common ...@@ -356,6 +356,18 @@ namespace Edu.Common
} }
} }
/// <summary>
/// 调课流程编号
/// </summary>
public static int ChangeClassFlowId
{
get
{
int.TryParse(ReadConfigKey("ChangeClassFlowId"), out int ChangeClassFlowId);
return ChangeClassFlowId;
}
}
/// <summary> /// <summary>
/// okr关注事项配置 /// okr关注事项配置
/// </summary> /// </summary>
......
...@@ -18,11 +18,18 @@ namespace Edu.Common.Enum.User ...@@ -18,11 +18,18 @@ namespace Edu.Common.Enum.User
[EnumField("指定成员")] [EnumField("指定成员")]
SpecifiedMember = 2, SpecifiedMember = 2,
/// <summary> /// <summary>
/// 角色 /// 指定角色
/// </summary> /// </summary>
[EnumField("角色")] [EnumField("指定角色")]
Role = 3 Role = 3,
/// <summary>
/// 系统角色
/// </summary>
[EnumField("系统角色")]
Post =4,
} }
/// <summary> /// <summary>
/// 审核方式 /// 审核方式
/// </summary> /// </summary>
......
...@@ -39,7 +39,7 @@ namespace Edu.Model.Entity.Flow ...@@ -39,7 +39,7 @@ namespace Edu.Model.Entity.Flow
public WFTAuditTypeEnum AuditType { get; set; } public WFTAuditTypeEnum AuditType { get; set; }
/// <summary> /// <summary>
/// 审核人员编号(AuditType为1时使用) /// 审核人员编号(AuditType为2时使用)
/// </summary> /// </summary>
public int UserId { get; set; } public int UserId { get; set; }
...@@ -49,7 +49,7 @@ namespace Edu.Model.Entity.Flow ...@@ -49,7 +49,7 @@ namespace Edu.Model.Entity.Flow
public int IsSpecNode { get; set; } public int IsSpecNode { get; set; }
/// <summary> /// <summary>
/// 1-班级教师,2-关联销售,3-分区校长,4-教务长 AuditType为2时使用 /// AuditType=3【1-班级教师,2-关联销售,3-分区校长,4-教务长】AuditType=4【系统角色】
/// </summary> /// </summary>
public int PostType { get; set; } public int PostType { get; set; }
......
...@@ -148,7 +148,7 @@ WHERE 1=1 ...@@ -148,7 +148,7 @@ WHERE 1=1
} }
else if (model.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.ChangeClass) else if (model.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.ChangeClass)
{ {
flowModel = flowRepository.GetFlowRepository(Common.Config.BackClassFlowId); flowModel = flowRepository.GetFlowRepository(Common.Config.ChangeClassFlowId);
if (flowModel == null) if (flowModel == null)
{ {
message = "未配置调课流程!"; message = "未配置调课流程!";
......
...@@ -3,6 +3,7 @@ using System.Collections.Generic; ...@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Edu.Common.API; using Edu.Common.API;
using Edu.Common.Enum.User;
using Edu.Common.Plugin; using Edu.Common.Plugin;
using Edu.Model.ViewModel.Flow; using Edu.Model.ViewModel.Flow;
using Edu.Module.System; using Edu.Module.System;
...@@ -10,6 +11,7 @@ using Edu.WebApi.Filter; ...@@ -10,6 +11,7 @@ using Edu.WebApi.Filter;
using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
namespace Edu.WebApi.Controllers.Public namespace Edu.WebApi.Controllers.Public
{ {
...@@ -58,6 +60,38 @@ namespace Edu.WebApi.Controllers.Public ...@@ -58,6 +60,38 @@ namespace Edu.WebApi.Controllers.Public
UpdateBy = base.UserInfo.Id, UpdateBy = base.UserInfo.Id,
UpdateTime = DateTime.Now, UpdateTime = DateTime.Now,
}; };
extModel.FlowNodeList = new List<RB_Flow_Node_ViewModel>();
JArray jArray = JArray.Parse(base.ParmJObj.GetStringValue("FlowNodeList"));
foreach (var jItem in jArray)
{
JObject jObj = JObject.Parse(jItem.ToString());
RB_Flow_Node_ViewModel model = new RB_Flow_Node_ViewModel()
{
FlowId=jObj.GetInt("FlowId"),
NodeId=jObj.GetInt("NodeId"),
NodeName=jObj.GetStringValue("NodeName"),
SortNum=jObj.GetInt("SortNum"),
};
model.FlowAduitList = new List<RB_Flow_AduitInfo_ViewModel>();
//审核人数组
JArray subArray= JArray.Parse(jObj.GetStringValue("FlowAduitList"));
foreach (var sItem in subArray)
{
JObject sObj = JObject.Parse(sItem.ToString());
model.FlowAduitList.Add(new RB_Flow_AduitInfo_ViewModel()
{
CheckId = sObj.GetInt("CheckId"),
NodeId=sObj.GetInt("NodeId"),
FlowId=sObj.GetInt("FlowId"),
AduitName=sObj.GetStringValue("AduitName"),
AuditType=(WFTAuditTypeEnum)sObj.GetInt("AuditType"),
UserId=sObj.GetInt("UserId"),
IsSpecNode=sObj.GetInt("IsSpecNode"),
PostType=sObj.GetInt("PostType"),
AuditWay=(WFTAuditWayEnum)sObj.GetInt("AuditWay"),
});
}
}
if (!string.IsNullOrEmpty(base.ParmJObj.GetStringValue("FlowNodeList"))) if (!string.IsNullOrEmpty(base.ParmJObj.GetStringValue("FlowNodeList")))
{ {
try try
......
...@@ -77,5 +77,7 @@ ...@@ -77,5 +77,7 @@
//连续缺课课时 //连续缺课课时
"AbsentHours": 12, "AbsentHours": 12,
//值班时间验证日期 //值班时间验证日期
"DutyDate": "2021-06-30" "DutyDate": "2021-06-30",
//调课流程编号
"ChangeClassFlowId": 2
} }
\ 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