Skip to content

E
Education
Commit 91d1b8b2 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 5dcaa356
Show whitespace changes
Inline Side-by-side
Showing with 114 additions and 51 deletions
Edu.Common/Enum/EduTask/EduTaskRrocessStatus.cs 0 → 100644
View file @ 91d1b8b2
using Edu.Common.Plugin;
using System;
using System.Collections.Generic;
using System.Text;
namespace Edu.Common.Enum.EduTask
{
/// <summary>
/// 教务单据审核流程
/// </summary>
public enum EduTaskRrocessStatus
{
/// <summary>
/// 未审核
/// </summary>
[EnumField("未审核")]
NotAudit = 0,
/// <summary>
/// 审核中
/// </summary>
[EnumField("审核中")]
AuditIng = 1,
/// <summary>
/// 通过
/// </summary>
[EnumField("审核通过")]
AuditThrough = 2,
/// <summary>
/// 不通过
/// </summary>
[EnumField("审核不通过")]
AuditNotThrough = 3,
/// <summary>
/// 驳回
/// </summary>
[EnumField("驳回")]
Rejected = 4,
/// <summary>
/// 他人已审核（仅限审核记录表）
/// </summary>
[EnumField("他人已审核")]
OtherHaveAudit = 5,
/// <summary>
/// 作废【HK2021-07-13新增】
/// </summary>
[EnumField("作废")]
Invalid = 6,
}
}
Edu.Model/Entity/EduTask/RB_Education_Receipt.cs
View file @ 91d1b8b2
......@@ -79,6 +79,6 @@ namespace Edu.Model.Entity.EduTask
/// <summary>
/// 审核状态(见枚举)
/// </summary>
public Edu.Common.Enum.User.WFRrocessStatus VerifyStatus { get; set; }
public Edu.Common.Enum.EduTask.EduTaskRrocessStatus VerifyStatus { get; set; }
}
}
Edu.Model/Entity/EduTask/RB_Education_Record.cs
View file @ 91d1b8b2
using Edu.Common.Enum.User;
using Edu.Common.Enum.EduTask;
using Edu.Common.Enum.User;
using System;
using System.Collections.Generic;
using System.Text;
......@@ -32,7 +33,7 @@ namespace Edu.Model.Entity.EduTask
/// <summary>
/// 1未审核 2审核通过 3 不通过 4 驳回 5他人已审核
/// </summary>
public WFRrocessStatus AuditStatus { get; set; }
public EduTaskRrocessStatus AuditStatus { get; set; }
/// <summary>
/// 描述
......
Edu.Model/Entity/EduTask/RB_Education_Relevance.cs
View file @ 91d1b8b2
using Edu.Common.Enum.User;
using Edu.Common.Enum.EduTask;
using Edu.Common.Enum.User;
using System;
using System.Collections.Generic;
using System.Text;
......@@ -61,7 +62,7 @@ namespace Edu.Model.Entity.EduTask
/// <summary>
/// 1未审核 2审核通过 3 不通过 4 驳回
/// </summary>
public WFRrocessStatus Stauts { get; set; }
public EduTaskRrocessStatus Stauts { get; set; }
/// <summary>
/// 待审核人 1,2,3 以逗号分隔
......
Edu.Module.Course/OrderModule2.cs
View file @ 91d1b8b2
......@@ -145,7 +145,7 @@ namespace Edu.Module.Course
UpdateBy=userinfo.Id,
UpdateTime=DateTime.Now,
RecipientIds="",
VerifyStatus= Common.Enum.User.WFRrocessStatus.NotAudit
VerifyStatus= Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit
}, out message);
if (flag)
{
......
Edu.Module.EduTask/ChangeClassPlanModule.cs
View file @ 91d1b8b2
......@@ -82,7 +82,7 @@ namespace Edu.Module.EduTask
CreateTime=extModel.CreateTime,
UpdateBy=extModel.UpdateBy,
UpdateTime=extModel.UpdateTime,
VerifyStatus= Common.Enum.User.WFRrocessStatus.NotAudit
VerifyStatus= Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit
};
flag= education_ReceiptRepository.SetEducationReceiptRepository(educationReceipt,out string message);
}
......
Edu.Module.EduTask/EducationReceiptModule.cs
View file @ 91d1b8b2
using Edu.AOP.CustomerAttribute;
using Edu.Cache.User;
using Edu.Common.Enum.Course;
using Edu.Common.Enum.EduTask;
using Edu.Common.Enum.User;
using Edu.Common.Plugin;
using Edu.Model.CacheModel;
......@@ -87,7 +88,7 @@ namespace Edu.Module.EduTask
var recordList = education_RecordRepository.GetEducationRecordListRepository(new RB_Education_Record_ViewModel()
{
QConditionIds = Ids,
AuditStatus = WFRrocessStatus.NotAudit
AuditStatus = EduTaskRrocessStatus.AuditIng
});
foreach (var subItem in groupList)
{
......@@ -219,7 +220,7 @@ namespace Edu.Module.EduTask
DataObj = tempModel;
}
object AuditObj =new object();
if (item.VerifyStatus == WFRrocessStatus.NotAudit)
if (item.VerifyStatus == EduTaskRrocessStatus.NotAudit|| item.VerifyStatus == EduTaskRrocessStatus.AuditIng)
{
var tempRecordList = recordList?.Where(qitem => qitem.ConditionId == item.Id)?.ToList();
if (tempRecordList != null && tempRecordList.Count > 0)
......@@ -254,7 +255,8 @@ namespace Edu.Module.EduTask
item.SchoolName,
item.CourseName,
AuditObj,
AuditStatusName = item.VerifyStatus == Common.Enum.User.WFRrocessStatus.NotAudit ? "审核中" : item.VerifyStatus.ToName(),
item.VerifyStatus,
AuditStatusName = item.VerifyStatus == Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit ? "待审" : item.VerifyStatus.ToName(),
};
result.Add(obj);
}
......@@ -273,7 +275,7 @@ namespace Edu.Module.EduTask
var recordList = education_RecordRepository.GetEducationRecordListRepository(new RB_Education_Record_ViewModel()
{
QConditionIds = Id.ToString(),
AuditStatus= WFRrocessStatus.NotAudit
AuditStatus= EduTaskRrocessStatus.AuditIng
});
if (recordList != null && recordList.Count > 0)
{
......@@ -346,7 +348,7 @@ namespace Edu.Module.EduTask
{
{nameof(RB_Education_Relevance_ViewModel.ToAuditId),audits.TrimStart(',').TrimEnd(',') }
};
flag = education_RecordRepository.Update(fileds, new WhereHelper(nameof(RB_Education_Relevance_ViewModel.Id), relevance.Id));
flag = education_RelevanceRepository.Update(fileds, new WhereHelper(nameof(RB_Education_Relevance_ViewModel.Id), relevance.Id));
}
}
return flag;
......@@ -464,13 +466,13 @@ namespace Edu.Module.EduTask
if (auditModel.AuditStatus == 3)
{
//找出当前审核
int Notcount = arList.Where(x => x.Stauts == WFRrocessStatus.AuditNotThrough).Count();
int Notcount = arList.Where(x => x.Stauts == EduTaskRrocessStatus.AuditNotThrough).Count();
if (Notcount > 0)
{
message = "该申请单已被拒绝!";
return false;
}
var ToAuditFlow = arList.Where(x => x.Stauts == WFRrocessStatus.NotAudit).OrderBy(x => x.Sort).ToList();
var ToAuditFlow = arList.Where(x => x.Stauts == EduTaskRrocessStatus.AuditIng).OrderBy(x => x.Sort).ToList();
if (ToAuditFlow.Count <= 0)
{
message = "该申请单审核已经完结!";
......@@ -480,14 +482,14 @@ namespace Edu.Module.EduTask
{
var model = ToAuditFlow[0];
var RecordList = aurList.Where(x => x.AuditId == model.Id).ToList();
var amodel = RecordList.Where(x => x.AuditStatus == WFRrocessStatus.NotAudit && x.AuditEmId == user.Id).FirstOrDefault();
var amodel = RecordList.Where(x => x.AuditStatus == EduTaskRrocessStatus.AuditIng && x.AuditEmId == user.Id).FirstOrDefault();
if (amodel == null)
{
message = "尚未匹配到审核相关信息，请联系管理员!";
return false;
}
//同时 修改 审核记录状态 审核流程
model.Stauts = WFRrocessStatus.AuditNotThrough;
model.Stauts = EduTaskRrocessStatus.AuditNotThrough;
if (!string.IsNullOrWhiteSpace(model.AuditedId))
{
model.AuditedId += "," + user.Id;
......@@ -505,7 +507,7 @@ namespace Edu.Module.EduTask
flag = UpdateEduRelevanceModule(model.Id, model.Stauts, model.AuditedId);
#endregion
var list = RecordList.Where(x => x.AuditStatus == WFRrocessStatus.NotAudit && x.AuditEmId != user.Id).ToList();
var list = RecordList.Where(x => x.AuditStatus == EduTaskRrocessStatus.AuditIng && x.AuditEmId != user.Id).ToList();
int AuditCount = list.Count();
if (AuditCount > 0)//表示最后一个人就是子集审核 申请单 通过
{
......@@ -518,7 +520,7 @@ namespace Edu.Module.EduTask
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Education_Receipt_ViewModel.VerifyStatus),(int)WFRrocessStatus.Rejected}
{nameof(RB_Education_Receipt_ViewModel.VerifyStatus),(int)EduTaskRrocessStatus.Rejected}
};
flag = education_ReceiptRepository.Update(fileds, new WhereHelper(nameof(RB_Education_Receipt_ViewModel.Id), receipt.Id));
flag = UpdateOtherModule(receipt, auditModel);
......@@ -527,14 +529,14 @@ namespace Edu.Module.EduTask
else
{
//找出当前审核
int Notcount = arList.Where(x => x.Stauts == WFRrocessStatus.AuditNotThrough).Count();
int Notcount = arList.Where(x => x.Stauts == EduTaskRrocessStatus.AuditNotThrough).Count();
if (Notcount > 0)
{
message = "该申请单已被拒绝";
return false;
}
var ToAuditFlow = arList.Where(x => x.Stauts == WFRrocessStatus.NotAudit).OrderBy(x => x.Sort).ToList();
var ToAuditFlow = arList.Where(x => x.Stauts == EduTaskRrocessStatus.AuditIng).OrderBy(x => x.Sort).ToList();
if (ToAuditFlow.Count <= 0)
{
message = "该申请单审核已经完结";
......@@ -550,7 +552,7 @@ namespace Edu.Module.EduTask
if (model.AuditWay == WFTAuditWayEnum.Countersign)
{
//会签 所有人必须审核完该流程才算完成
var amodel = RecordList.Where(x => x.AuditStatus == WFRrocessStatus.NotAudit && x.AuditEmId == user.Id).FirstOrDefault();
var amodel = RecordList.Where(x => x.AuditStatus == EduTaskRrocessStatus.AuditIng && x.AuditEmId == user.Id).FirstOrDefault();
if (amodel == null)
{
message = "尚未匹配到审核相关信息，请联系管理员!";
......@@ -561,11 +563,11 @@ namespace Edu.Module.EduTask
flag = UpdateEduRecordModule(WFRrocessStatus.AuditThrough, auditModel.Description, user.Id, amodel.Id);
#endregion
int AuditCount = RecordList.Where(x => x.AuditStatus == WFRrocessStatus.NotAudit && x.AuditEmId != user.Id).Count();
int AuditCount = RecordList.Where(x => x.AuditStatus == EduTaskRrocessStatus.AuditIng && x.AuditEmId != user.Id).Count();
if (AuditCount <= 0)//表示最后一个人就是子集审核 申请单 通过
{
//同时 修改 审核记录状态 审核流程
model.Stauts = WFRrocessStatus.AuditThrough;
model.Stauts = EduTaskRrocessStatus.AuditThrough;
if (!string.IsNullOrWhiteSpace(model.AuditedId))
{
model.AuditedId += "," + user.Id;
......@@ -585,7 +587,7 @@ namespace Edu.Module.EduTask
else
{
//同时 修改 审核记录状态 审核流程
model.Stauts = WFRrocessStatus.AuditThrough;
model.Stauts = EduTaskRrocessStatus.AuditThrough;
if (!string.IsNullOrWhiteSpace(model.AuditedId))
{
model.AuditedId += "," + user.Id;
......@@ -602,14 +604,14 @@ namespace Edu.Module.EduTask
}
else if (model.AuditWay == WFTAuditWayEnum.OrSign)
{
var amodel = RecordList.Where(x => x.AuditStatus == WFRrocessStatus.NotAudit && x.AuditEmId == user.Id).FirstOrDefault();
var amodel = RecordList.Where(x => x.AuditStatus == EduTaskRrocessStatus.AuditIng && x.AuditEmId == user.Id).FirstOrDefault();
if (amodel == null)
{
message = "尚未匹配到审核相关信息，请联系管理员!";
return false;
}
//同时 修改 审核记录状态 审核流程
model.Stauts = WFRrocessStatus.AuditThrough;
model.Stauts = EduTaskRrocessStatus.AuditThrough;
if (!string.IsNullOrWhiteSpace(model.AuditedId))
{
model.AuditedId += "," + user.Id;
......@@ -627,7 +629,7 @@ namespace Edu.Module.EduTask
flag = UpdateEduRelevanceModule(model.Id, model.Stauts, model.AuditedId);
#endregion
var list = RecordList.Where(x => x.AuditStatus == WFRrocessStatus.NotAudit && x.AuditEmId != user.Id).ToList();
var list = RecordList.Where(x => x.AuditStatus == EduTaskRrocessStatus.AuditIng && x.AuditEmId != user.Id).ToList();
int AuditCount = list.Count();
if (AuditCount > 0)//表示最后一个人就是子集审核 申请单 通过
{
......@@ -640,13 +642,13 @@ namespace Edu.Module.EduTask
}
else
{
var amodel = RecordList.Where(x => x.AuditStatus == WFRrocessStatus.NotAudit && x.AuditEmId == user.Id).FirstOrDefault();
var amodel = RecordList.Where(x => x.AuditStatus == EduTaskRrocessStatus.AuditIng && x.AuditEmId == user.Id).FirstOrDefault();
if (amodel == null)
{
message = "尚未匹配到审核相关信息，请联系管理员!";
return false;
}
var list = RecordList.Where(x => x.AuditStatus == WFRrocessStatus.NotAudit && x.AuditEmId != user.Id).ToList();
var list = RecordList.Where(x => x.AuditStatus == EduTaskRrocessStatus.AuditIng && x.AuditEmId != user.Id).ToList();
int AuditCount = list.Count();
if (AuditCount > 0)
{
......@@ -654,7 +656,7 @@ namespace Edu.Module.EduTask
return false;
}
//同时 修改 审核记录状态 审核流程
model.Stauts = WFRrocessStatus.AuditThrough;
model.Stauts = EduTaskRrocessStatus.AuditThrough;
if (!string.IsNullOrWhiteSpace(model.AuditedId))
{
model.AuditedId += "," + user.Id;
......@@ -675,7 +677,7 @@ namespace Edu.Module.EduTask
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Education_Receipt_ViewModel.VerifyStatus),(int)WFRrocessStatus.AuditThrough}
{nameof(RB_Education_Receipt_ViewModel.VerifyStatus),(int)EduTaskRrocessStatus.AuditThrough}
};
flag = education_ReceiptRepository.Update(fileds, new WhereHelper(nameof(RB_Education_Receipt_ViewModel.Id), receipt.Id));
}
......@@ -688,7 +690,7 @@ namespace Edu.Module.EduTask
//会签 所有人必须审核完该流程才算完成
if (model.AuditWay == WFTAuditWayEnum.Countersign)
{
var amodel = RecordList.Where(x => x.AuditStatus == WFRrocessStatus.NotAudit && x.AuditEmId == user.Id).FirstOrDefault();
var amodel = RecordList.Where(x => x.AuditStatus == EduTaskRrocessStatus.AuditIng && x.AuditEmId == user.Id).FirstOrDefault();
if (amodel == null)
{
message = "尚未匹配到审核相关信息，请联系管理员!";
......@@ -700,11 +702,11 @@ namespace Edu.Module.EduTask
flag = UpdateEduRecordModule(WFRrocessStatus.AuditThrough, auditModel.Description, user.Id, amodel.Id);
#endregion
int AuditCount = RecordList.Where(x => x.AuditStatus == WFRrocessStatus.NotAudit && x.AuditEmId != user.Id).Count();
int AuditCount = RecordList.Where(x => x.AuditStatus == EduTaskRrocessStatus.AuditIng && x.AuditEmId != user.Id).Count();
if (AuditCount <= 0)//表示最后一个人就是子集审核 申请单 通过
{
//同时 修改 审核流程
model.Stauts = WFRrocessStatus.AuditThrough;
model.Stauts = EduTaskRrocessStatus.AuditThrough;
if (!string.IsNullOrWhiteSpace(model.AuditedId))
{
model.AuditedId += "," + user.Id;
......@@ -747,14 +749,14 @@ namespace Edu.Module.EduTask
}
else if (model.AuditWay == WFTAuditWayEnum.OrSign)
{
var amodel = RecordList.Where(x => x.AuditStatus == WFRrocessStatus.NotAudit && x.AuditEmId == user.Id).FirstOrDefault();
var amodel = RecordList.Where(x => x.AuditStatus == EduTaskRrocessStatus.AuditIng && x.AuditEmId == user.Id).FirstOrDefault();
if (amodel == null)
{
message = "尚未匹配到审核相关信息，请联系管理员!";
return false;
}
//同时 修改 审核记录状态 审核流程
model.Stauts = WFRrocessStatus.AuditThrough;
model.Stauts = EduTaskRrocessStatus.AuditThrough;
if (!string.IsNullOrWhiteSpace(model.AuditedId))
{
model.AuditedId += "," + user.Id;
......@@ -772,7 +774,7 @@ namespace Edu.Module.EduTask
flag = UpdateEduRelevanceModule(model.Id, model.Stauts, model.AuditedId);
#endregion
var list = RecordList.Where(x => x.AuditStatus == WFRrocessStatus.NotAudit && x.AuditEmId != user.Id).ToList();
var list = RecordList.Where(x => x.AuditStatus == EduTaskRrocessStatus.AuditIng && x.AuditEmId != user.Id).ToList();
int AuditCount = list.Count();
if (AuditCount > 0)//表示最后一个人就是子集审核 申请单 通过
{
......@@ -792,13 +794,13 @@ namespace Edu.Module.EduTask
}
else
{
var amodel = RecordList.Where(x => x.AuditStatus == WFRrocessStatus.NotAudit && x.AuditEmId == user.Id).FirstOrDefault();
var amodel = RecordList.Where(x => x.AuditStatus == EduTaskRrocessStatus.AuditIng && x.AuditEmId == user.Id).FirstOrDefault();
if (amodel == null)
{
message = "尚未匹配到审核相关信息，请联系管理员!";
return false;
}
var list = RecordList.Where(x => x.AuditStatus == WFRrocessStatus.NotAudit && x.AuditEmId != user.Id).ToList();
var list = RecordList.Where(x => x.AuditStatus == EduTaskRrocessStatus.AuditIng && x.AuditEmId != user.Id).ToList();
int AuditCount = list.Count();
if (AuditCount > 0)
{
......@@ -806,7 +808,7 @@ namespace Edu.Module.EduTask
return false;
}
//同时 修改 审核记录状态 审核流程
model.Stauts = WFRrocessStatus.AuditThrough;
model.Stauts = EduTaskRrocessStatus.AuditThrough;
if (!string.IsNullOrWhiteSpace(model.AuditedId))
{
model.AuditedId += "," + user.Id;
......@@ -832,6 +834,11 @@ namespace Edu.Module.EduTask
return false;
}
}
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Education_Receipt_ViewModel.VerifyStatus),(int)EduTaskRrocessStatus.AuditIng}
};
flag = education_ReceiptRepository.Update(fileds, new WhereHelper(nameof(RB_Education_Receipt_ViewModel.Id), receipt.Id));
}
}
return flag;
......@@ -842,17 +849,17 @@ namespace Edu.Module.EduTask
/// </summary>
/// <param name="status"></param>
/// <returns></returns>
private string GetWFRrocessStatusStrModule(WFRrocessStatus status)
private string GetWFRrocessStatusStrModule(EduTaskRrocessStatus status)
{
var statusName = "待审";
switch (status)
{
case WFRrocessStatus.AuditNotThrough: statusName = "拒绝"; break;
case WFRrocessStatus.AuditThrough: statusName = "通过"; break;
case WFRrocessStatus.NotAudit: statusName = "待审"; break;
case WFRrocessStatus.OtherHaveAudit: statusName = "通过"; break;
case WFRrocessStatus.Rejected: statusName = "驳回"; break;
case WFRrocessStatus.Invalid: statusName = "作废"; break;
case EduTaskRrocessStatus.AuditNotThrough: statusName = "拒绝"; break;
case EduTaskRrocessStatus.AuditThrough: statusName = "通过"; break;
case EduTaskRrocessStatus.NotAudit: statusName = "待审"; break;
case EduTaskRrocessStatus.OtherHaveAudit: statusName = "通过"; break;
case EduTaskRrocessStatus.Rejected: statusName = "驳回"; break;
case EduTaskRrocessStatus.Invalid: statusName = "作废"; break;
}
return statusName;
}
......@@ -918,7 +925,7 @@ namespace Edu.Module.EduTask
/// <param name="AuditedId"></param>
/// <param name="Id"></param>
/// <returns></returns>
private bool UpdateEduRelevanceModule(int Id, WFRrocessStatus? status = null, string AuditedId = "")
private bool UpdateEduRelevanceModule(int Id, EduTaskRrocessStatus? status = null, string AuditedId = "")
{
var relevanceFileds = new Dictionary<string, object>();
if (!string.IsNullOrEmpty(AuditedId))
......@@ -1037,7 +1044,7 @@ namespace Edu.Module.EduTask
{
AuditEmId = item,
AuditId = auditRelevance.Id,
AuditStatus = WFRrocessStatus.NotAudit,
AuditStatus = EduTaskRrocessStatus.AuditIng,
CreateBy = item,
CreateTime = DateTime.Now,
UpdateBy = item,
......
Edu.Repository/EduTask/RB_Education_ReceiptRepository.cs
View file @ 91d1b8b2
......@@ -245,7 +245,7 @@ WHERE 1=1
ToAuditId = AuditedId.TrimEnd(','),
Sort = item.SortNum,
SpecialNode = item.FlowAduitList[0].IsSpecNode,
Stauts = Common.Enum.User.WFRrocessStatus.NotAudit,
Stauts = Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit,
};
//指定人员审核
if (levance.AuditType == Common.Enum.User.WFTAuditTypeEnum.SpecifiedMember)
......@@ -282,7 +282,7 @@ WHERE 1=1
var recordModel = new RB_Education_Record_ViewModel()
{
ConditionId = model.Id,
AuditStatus = Common.Enum.User.WFRrocessStatus.NotAudit,
AuditStatus = Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit,
AuditId = levance.Id,
CreateBy = model.CreateBy,
CreateTime = DateTime.Now,
......
Edu.Repository/EduTask/RB_Education_RecordRepository.cs
View file @ 91d1b8b2
......@@ -31,6 +31,10 @@ WHERE 1=1
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_Record_ViewModel.ConditionId), query.ConditionId);
}
if (query.AuditId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_Record_ViewModel.AuditId), query.AuditId);
}
if (!string.IsNullOrEmpty(query.QConditionIds))
{
builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Education_Record_ViewModel.ConditionId), query.QConditionIds);
......
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