Skip to content

E
Education
Commit 8c8ad268 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 20038fdb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 246 additions and 222 deletions
Edu.Common/Enum/Course/BackClassEnum.cs
View file @ 8c8ad268
using Edu.Common.Plugin;
using System;
using System.Collections.Generic;
using System.Text;
namespace Edu.Common.Enum.Course
{
/// <summary>
/// 退课状态枚举
/// </summary>
public enum BackClassAuditStatusEnum
{
/// <summary>
/// 审核中
/// </summary>
[EnumField("审核中")]
InReview = 1,
/// <summary>
/// 通过
/// </summary>
[EnumField("通过")]
Pass = 2,
/// <summary>
/// 驳回
/// </summary>
[EnumField("驳回")]
Rejected = 3,
/// <summary>
/// 作废
/// </summary>
[EnumField("作废")]
Delete = 4,
}
/// <summary>
/// 教务单据切换枚举
......
Edu.Common/Enum/Finance/WFRrocessStatus.cs
View file @ 8c8ad268
......@@ -15,26 +15,30 @@ namespace Edu.Common.Enum.Finance
/// </summary>
[EnumField("未审核")]
NotAudit = 1,
/// <summary>
/// 通过
/// </summary>
[EnumField("审核通过")]
AuditThrough = 2,
/// <summary>
/// 不通过
/// </summary>
[EnumField("审核不通过")]
AuditNotThrough = 3,
/// <summary>
/// 驳回
/// </summary>
[EnumField("驳回")]
Rejected = 4,
/// <summary>
/// 他人已审核（仅限审核记录表）
/// </summary>
[EnumField("他人已审核")]
OtherHaveAudit = 5
}
}
Edu.Common/Enum/User/WFAuditStatus.cs → Edu.Common/Enum/User/UserWFAuditStatus.cs
View file @ 8c8ad268
......@@ -6,7 +6,7 @@ namespace Edu.Common.Enum.User
/// <summary>
/// 工作申请流审核状态
/// </summary>
public enum WFAuditStatus
public enum UserWFAuditStatus
{
/// <summary>
/// 审核中
......@@ -34,6 +34,7 @@ namespace Edu.Common.Enum.User
[EnumField("通过")]
Through = 5
}
/// <summary>
/// 流程审核状态
/// </summary>
......@@ -110,42 +111,5 @@ namespace Edu.Common.Enum.User
Cancel = 2
}
#endregion
#region 财务
/// <summary>
/// 财务审核状态
/// </summary>
public enum FinanceAuditStatus
{
/// <summary>
/// 暂存
/// </summary>
[EnumField("制单人暂存")]
Temporary = 0,
/// <summary>
/// 审核中
/// </summary>
[EnumField("审核中")]
InReview = 1,
/// <summary>
/// 通过
/// </summary>
[EnumField("通过")]
Pass = 2,
/// <summary>
/// 驳回
/// </summary>
[EnumField("驳回")]
Rejected = 3,
/// <summary>
/// 作废
/// </summary>
[EnumField("作废")]
Delete = 4,
/// <summary>
/// 出纳暂存
/// </summary>
[EnumField("出纳暂存")]
CTemporary = 5
}
#endregion
}
Edu.Model/Entity/Course/RB_Student_BackClass.cs
View file @ 8c8ad268
using Edu.Common.Enum.Course;
using Edu.Common.Enum.User;
using System;
using System.Collections.Generic;
using System.Text;
using VT.FW.DB;
namespace Edu.Model.Entity.Course
......@@ -76,7 +74,7 @@ namespace Edu.Model.Entity.Course
/// <summary>
/// 审核状态
/// </summary>
public BackClassAuditStatusEnum AuditStatus { get; set; }
public WFRrocessStatus AuditStatus { get; set; }
/// <summary>
/// 抄送人(多个逗号分隔)
......
Edu.Model/Entity/EduTask/RB_Education_Receipt.cs
View file @ 8c8ad268
using Edu.Common.Enum.Finance;
using System;
using System.Collections.Generic;
using System.Text;
using VT.FW.DB;
namespace Edu.Model.Entity.EduTask
......
Edu.Model/Entity/User/Rb_Workflow_Askforleave.cs
View file @ 8c8ad268
......@@ -72,7 +72,7 @@ namespace Edu.Model.Entity.User
/// <summary>
/// 1审核中 2 撤回 3 驳回 4 不通过 5 通过
/// </summary>
public WFAuditStatus? Status
public UserWFAuditStatus? Status
{
get;
set;
......
Edu.Model/Entity/User/Rb_Workflow_Evection.cs
View file @ 8c8ad268
......@@ -48,7 +48,7 @@ namespace Edu.Model.Entity.User
/// <summary>
/// 1审核中 2 撤回 3 驳回 4 不通过 5 通过
/// </summary>
public WFAuditStatus? Status
public UserWFAuditStatus? Status
{
get;
set;
......
Edu.Model/Entity/User/Rb_Workflow_GoOut.cs
View file @ 8c8ad268
......@@ -64,7 +64,7 @@ namespace Edu.Model.Entity.User
/// <summary>
/// 1审核中 2 撤回 3 驳回 4 不通过 5 通过
/// </summary>
public WFAuditStatus? Status
public UserWFAuditStatus? Status
{
get;
set;
......
Edu.Model/Entity/User/Rb_Workflow_Reissuecard.cs
View file @ 8c8ad268
......@@ -48,7 +48,7 @@ namespace Edu.Model.Entity.User
/// <summary>
/// 1审核中 2 撤回 3 驳回 4 不通过 5 通过
/// </summary>
public WFAuditStatus? Status
public UserWFAuditStatus? Status
{
get;
set;
......
Edu.Model/ViewModel/EduTask/RB_Education_Record_ViewModel.cs
View file @ 8c8ad268
......@@ -11,6 +11,19 @@ namespace Edu.Model.ViewModel.EduTask
/// </summary>
public class RB_Education_Record_ViewModel : RB_Education_Record
{
/// <summary>
/// 查询单号【逗号分隔】
/// </summary>
public string QConditionIds { get; set; }
/// <summary>
/// 审核节点名称
/// </summary>
public string AuditNode { get; set; }
/// <summary>
/// 新审核人员编号
/// </summary>
public int NewAuditEmId { get; set; }
}
}
\ No newline at end of file
Edu.Model/ViewModel/User/Rb_Workflow_Auditrecord_Extend.cs
View file @ 8c8ad268
......@@ -55,7 +55,7 @@ namespace Edu.Model.ViewModel.User
/// <summary>
/// 申请状态 1审核中 2 撤回 3 驳回 4 不通过 5 通过
/// </summary>
public WFAuditStatus? Status
public UserWFAuditStatus? Status
{
get;
set;
......
Edu.Model/ViewModel/User/Rb_Workflow_MyAuditRelation_Extend.cs
View file @ 8c8ad268
......@@ -36,7 +36,7 @@ namespace Edu.Model.ViewModel.User
/// <summary>
/// 审批 申请状态 1审核中 2 撤回 3 驳回 4 不通过 5 通过
/// </summary>
public WFAuditStatus? Status
public UserWFAuditStatus? Status
{
get;
set;
......
Edu.Module.Course/OrderModule2.cs
View file @ 8c8ad268
using Edu.Model.CacheModel;
using Edu.Model.ViewModel.Course;
using Edu.Repository.Course;
using Edu.Repository.Flow;
using Edu.Repository.User;
using System;
using System.Collections.Generic;
using System.Text;
using System.Linq;
using Edu.Model.Entity.Course;
using VT.FW.DB;
using Edu.Model.Entity.EduTask;
using Edu.Repository.EduTask;
using Edu.Common.Enum.User;
namespace Edu.Module.Course
{
......@@ -112,7 +109,7 @@ namespace Edu.Module.Course
var backClassModel = new RB_Student_BackClass_ViewModel()
{
BackId = 0,
AuditStatus = Common.Enum.Course.BackClassAuditStatusEnum.InReview,
AuditStatus = WFRrocessStatus.NotAudit,
BackMoney = Math.Round(backMoney, 2),
BackNum = "T" + backNum,
ClassId = orderModel.ClassId,
......
Edu.Module.Course/StudentBillModule.cs
View file @ 8c8ad268
......@@ -83,7 +83,6 @@ namespace Edu.Module.Course
/// </summary>
private readonly RB_Course_PreferentialRepository course_PreferentialRepository = new RB_Course_PreferentialRepository();
/// <summary>
/// 计算学员退课金额
/// </summary>
......@@ -119,20 +118,6 @@ namespace Edu.Module.Course
return obj;
}
/// <summary>
/// 获取退课单据信息
/// </summary>
/// <param name="backId"></param>
/// <returns></returns>
public object GetStuBackInfoModule(int backId)
{
var obj = new List<object>();
return obj;
}
/// <summary>
/// 退课一键制单
/// </summary>
......@@ -146,7 +131,7 @@ namespace Edu.Module.Course
public string SetStudentBackFinance(int backClassId, int IsPublic, int CurrencyId, int clientType, int clientId, UserInfo userInfo)
{
var backModel = student_BackClassRepository.GetEntity(backClassId);
if (backModel == null || backModel.AuditStatus != BackClassAuditStatusEnum.Pass) { return "退课流程未审核通过"; }
if (backModel == null || backModel.AuditStatus != WFRrocessStatus.AuditThrough) { return "退课流程未审核通过"; }
if (backModel.FinanceId > 0) { return "已制单，无法再次生成财务单据"; }
var guestModel = order_GuestRepository.GetEntity(backModel.GuestId);
if (guestModel == null || guestModel.GuestState != 2) { return "客人名单状态不正确"; }
......
Edu.Module.EduTask/EducationReceiptModule.cs
View file @ 8c8ad268
......@@ -39,16 +39,6 @@ namespace Edu.Module.EduTask
/// </summary>
private readonly RB_Education_RelevanceRepository education_RelevanceRepository = new RB_Education_RelevanceRepository();
/// <summary>
/// 订单仓储层对象
/// </summary>
private readonly RB_OrderRepository orderRepository = new RB_OrderRepository();
/// <summary>
/// 订单旅客
/// </summary>
private readonly RB_Order_GuestRepository order_GuestRepository = new RB_Order_GuestRepository();
/// <summary>
/// 学员退课仓储层对象
/// </summary>
......@@ -102,7 +92,6 @@ namespace Edu.Module.EduTask
});
}
}
foreach (var item in list)
{
object DataObj = new object();
......@@ -158,16 +147,82 @@ namespace Edu.Module.EduTask
return result;
}
/// <summary>
/// 获取单据当前审核人列表
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
public virtual object GetCurrentAuditManModule(int Id)
{
List<object> list = new List<object>();
var recordList = education_RecordRepository.GetEducationRecordListRepository(new RB_Education_Record_ViewModel()
{
QConditionIds = Id.ToString(),
AuditStatus= WFRrocessStatus.NotAudit
});
if (recordList != null && recordList.Count > 0)
{
foreach (var item in recordList)
{
var obj = new
{
item.Id,
item.ConditionId,
item.AuditId,
item.AuditEmId,
item.NewAuditEmId
};
list.Add(obj);
}
}
return list;
}
/// <summary>
/// 修改审核人员
/// </summary>
/// <param name="list"></param>
/// <returns></returns>
[TransactionCallHandler]
public virtual bool EditAuditManModule(int Id)
public virtual bool EditAuditManModule(List<RB_Education_Record_ViewModel> list)
{
bool flag = false;
bool flag = true;
foreach (var item in list)
{
if (flag&&item.NewAuditEmId > 0)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Education_Record_ViewModel.AuditEmId),item.NewAuditEmId }
};
flag = education_RecordRepository.Update(fileds, new WhereHelper(nameof(RB_Education_Record_ViewModel.Id), item.Id));
}
}
if (flag)
{
var recordList = education_RecordRepository.GetEducationRecordListRepository(new RB_Education_Record_ViewModel()
{
AuditId = list[0].AuditId
});
var relevance = education_RelevanceRepository.GetEducationRelevanceListRepository(new RB_Education_Relevance_ViewModel()
{
ConditionId = list[0].ConditionId,
})?.FirstOrDefault();
if (recordList != null && recordList.Count > 0 && relevance!=null)
{
string audits = string.Join(",", recordList.Select(qitem => qitem.AuditEmId));
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Education_Relevance_ViewModel.ToAuditId),audits.TrimStart(',').TrimEnd(',') }
};
flag = education_RecordRepository.Update(fileds, new WhereHelper(nameof(RB_Education_Relevance_ViewModel.Id), relevance.Id));
}
}
return flag;
}
/// <summary>
/// 获取单据详情
/// </summary>
......
Edu.Module.User/WorkFlowModule.cs
View file @ 8c8ad268
This diff is collapsed.
Edu.Repository/Course/RB_Class_PlanRepository.cs
View file @ 8c8ad268
......@@ -590,7 +590,7 @@ SELECT A.ClassPlanId, A.ClassId,A.ClassDate,A.ClassRoomId,B.ClassName,C.CourseNa
,TIMESTAMPDIFF(MINUTE, CONCAT('2020-12-16',' ',F.StartTime), CONCAT('2020-12-16',' ',F.EndTime)) AS minNum,F.StartTime,F.EndTime,B.CompleteProgress,plan.TotalPlanNum
FROM rb_class_plan AS A INNER JOIN rb_class AS B ON A.ClassId=B.ClassId
LEFT JOIN rb_course AS C ON B.CouseId=C.CourseId
LEFT JOIN rb_teacher AS D ON B.Teacher_Id=D.TId
LEFT JOIN rb_teacher AS D ON A.TeacherId=D.TId
LEFT JOIN rb_class_room AS E ON A.ClassRoomId=E.RoomId
LEFT JOIN rb_class_time F on A.ClassPlanId = F.ClassPlanId
LEFT JOIN ((SELECT ClassId,COUNT(*) as TotalPlanNum from rb_class_plan where `Status`=0 GROUP BY ClassId)) as plan on plan.ClassId=a.ClassId
......
Edu.Repository/EduTask/RB_Education_RecordRepository.cs
View file @ 8c8ad268
......@@ -21,19 +21,23 @@ namespace Edu.Repository.EduTask
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT *
FROM RB_Education_Record
SELECT A.*,IFNULL(B.AuditDescription,'') AS AuditNode
FROM RB_Education_Record AS A LEFT JOIN rb_education_relevance AS B ON A.AuditId=B.Id
WHERE 1=1
");
if (query != null)
{
if (query.ConditionId > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_Record_ViewModel.ConditionId), query.ConditionId);
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_Record_ViewModel.ConditionId), query.ConditionId);
}
if (!string.IsNullOrEmpty(query.QConditionIds))
{
builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Education_Record_ViewModel.ConditionId), query.QConditionIds);
}
if (query.AuditStatus > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_Record_ViewModel.AuditStatus), query.AuditStatus);
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_Record_ViewModel.AuditStatus), query.AuditStatus);
}
}
return Get<RB_Education_Record_ViewModel>(builder.ToString()).ToList();
......
Edu.Repository/EduTask/RB_Education_RelevanceRepository.cs
View file @ 8c8ad268
......@@ -33,6 +33,10 @@ WHERE 1=1
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_Relevance_ViewModel.ConditionId), query.ConditionId);
}
if (query.Id > 0)
{
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_Relevance_ViewModel.Id), query.Id);
}
if (!string.IsNullOrEmpty(query.QConditionIds))
{
builder.AppendFormat(" AND {0} IN({1}) ", nameof(RB_Education_Relevance_ViewModel.ConditionId), query.QConditionIds);
......
Edu.Repository/User/Rb_Workflow_AskforleaveRepository.cs
View file @ 8c8ad268
......@@ -105,11 +105,11 @@ ELSE '' END as ToAuditIdStr,
/// <returns>true 有重复数据，fasle没有重复数据</returns>
public List<Rb_Workflow_Askforleave_Extend> AllAuditValverifyTime(int empId, string startTime, string endTime)
{
return Get<Rb_Workflow_Askforleave_Extend>($@"select t.Id,t.TemplateType from ((SELECT Id, {(int)WFTTemplateTypeEnum.AskForLeave} as TemplateType from rb_workflow_askforleave where CreateBy = {empId} and (('{startTime}'>=StartTime and '{startTime}'<=EndTime) or ('{endTime}'>=StartTime and '{endTime}'<=EndTime)) and (((`Status` = {(int)WFAuditStatus.InReview} or `Status` = {(int)WFAuditStatus.Through}) AND IsCancel = {(int)WFAuditCancelStatus.Normal}) or ((`Status` = {(int)WFAuditStatus.InReview} or `Status` = {(int)WFAuditStatus.NotThrough} ) AND IsCancel = {(int)WFAuditCancelStatus.Cancel})))
return Get<Rb_Workflow_Askforleave_Extend>($@"select t.Id,t.TemplateType from ((SELECT Id, {(int)WFTTemplateTypeEnum.AskForLeave} as TemplateType from rb_workflow_askforleave where CreateBy = {empId} and (('{startTime}'>=StartTime and '{startTime}'<=EndTime) or ('{endTime}'>=StartTime and '{endTime}'<=EndTime)) and (((`Status` = {(int)UserWFAuditStatus.InReview} or `Status` = {(int)UserWFAuditStatus.Through}) AND IsCancel = {(int)WFAuditCancelStatus.Normal}) or ((`Status` = {(int)UserWFAuditStatus.InReview} or `Status` = {(int)UserWFAuditStatus.NotThrough} ) AND IsCancel = {(int)WFAuditCancelStatus.Cancel})))
union
(SELECT e.Id, {(int)WFTTemplateTypeEnum.Evection} as TemplateType from rb_workflow_evection e INNER JOIN rb_workflow_travel t on e.Id = t.EvectionId where e.CreateBy = {empId} and (('{startTime}'>=t.StartTime and '{startTime}'<=t.EndTime) or ('{endTime}'>=t.StartTime and '{endTime}'<=t.EndTime)) and (((e.`Status` = {(int)WFAuditStatus.InReview} or e.`Status` = {(int)WFAuditStatus.Through}) AND e.IsCancel = {(int)WFAuditCancelStatus.Normal}) or ((e.`Status` = {(int)WFAuditStatus.InReview} or e.`Status` = {(int)WFAuditStatus.NotThrough} ) AND e.IsCancel = {(int)WFAuditCancelStatus.Cancel})))
(SELECT e.Id, {(int)WFTTemplateTypeEnum.Evection} as TemplateType from rb_workflow_evection e INNER JOIN rb_workflow_travel t on e.Id = t.EvectionId where e.CreateBy = {empId} and (('{startTime}'>=t.StartTime and '{startTime}'<=t.EndTime) or ('{endTime}'>=t.StartTime and '{endTime}'<=t.EndTime)) and (((e.`Status` = {(int)UserWFAuditStatus.InReview} or e.`Status` = {(int)UserWFAuditStatus.Through}) AND e.IsCancel = {(int)WFAuditCancelStatus.Normal}) or ((e.`Status` = {(int)UserWFAuditStatus.InReview} or e.`Status` = {(int)UserWFAuditStatus.NotThrough} ) AND e.IsCancel = {(int)WFAuditCancelStatus.Cancel})))
union
(SELECT Id,{(int)WFTTemplateTypeEnum.Goout} as TemplateType from rb_workflow_goout where CreateBy = {empId} and (('{startTime}'>=StartTime and '{startTime}'<=EndTime) or ('{endTime}'>=StartTime and '{endTime}'<=EndTime)) and (((`Status` = {(int)WFAuditStatus.InReview} or `Status` = {(int)WFAuditStatus.Through}) AND IsCancel = {(int)WFAuditCancelStatus.Normal}) or ((`Status` = {(int)WFAuditStatus.InReview} or `Status` = {(int)WFAuditStatus.NotThrough} ) AND IsCancel = {(int)WFAuditCancelStatus.Cancel})))) as t").ToList();
(SELECT Id,{(int)WFTTemplateTypeEnum.Goout} as TemplateType from rb_workflow_goout where CreateBy = {empId} and (('{startTime}'>=StartTime and '{startTime}'<=EndTime) or ('{endTime}'>=StartTime and '{endTime}'<=EndTime)) and (((`Status` = {(int)UserWFAuditStatus.InReview} or `Status` = {(int)UserWFAuditStatus.Through}) AND IsCancel = {(int)WFAuditCancelStatus.Normal}) or ((`Status` = {(int)UserWFAuditStatus.InReview} or `Status` = {(int)UserWFAuditStatus.NotThrough} ) AND IsCancel = {(int)WFAuditCancelStatus.Cancel})))) as t").ToList();
}
/// <summary>
/// 月度统计请假时长详情
......@@ -120,7 +120,7 @@ ELSE '' END as ToAuditIdStr,
/// <param name="AskLeaveType"></param>
/// <returns></returns>
public List<Rb_Workflow_Askforleave_Extend> GetAskLeaveInfo(string StartTime, string EndTime, int eid, int AskLeaveType) {
string where = $@" where 1=1 and IsCancel=1 and {nameof(Rb_Workflow_Askforleave.Status)}={(int)WFAuditStatus.Through}";
string where = $@" where 1=1 and IsCancel=1 and {nameof(Rb_Workflow_Askforleave.Status)}={(int)UserWFAuditStatus.Through}";
where += $@" and (({nameof(Rb_Workflow_Askforleave.StartTime)}>='{StartTime}' and {nameof(Rb_Workflow_Askforleave.EndTime)}<='{EndTime}')
or ({nameof(Rb_Workflow_Askforleave.StartTime)}<'{StartTime}' and {nameof(Rb_Workflow_Askforleave.EndTime)}>'{StartTime}')
or ({nameof(Rb_Workflow_Askforleave.StartTime)}<'{EndTime}' and {nameof(Rb_Workflow_Askforleave.EndTime)}>'{EndTime}'))";
......
Edu.Repository/User/Rb_Workflow_AuditrecordRepository.cs
View file @ 8c8ad268
......@@ -70,15 +70,15 @@ namespace Edu.Repository.User
}
if (appAuditStatus == AppAuditStatusEnum.AuditComplete)
{
sb.Append($" AND (`Status`={(int)WFAuditStatus.Through} Or `Status`={(int)WFAuditStatus.NotThrough})");
sb.Append($" AND (`Status`={(int)UserWFAuditStatus.Through} Or `Status`={(int)UserWFAuditStatus.NotThrough})");
}
else if (appAuditStatus == AppAuditStatusEnum.InComplete)
{
sb.Append($" AND `Status`={(int)WFAuditStatus.InReview}");
sb.Append($" AND `Status`={(int)UserWFAuditStatus.InReview}");
}
else if (appAuditStatus == AppAuditStatusEnum.ToWithdraw)
{
sb.Append($" AND `Status`={(int)WFAuditStatus.ToWithdraw}");
sb.Append($" AND `Status`={(int)UserWFAuditStatus.ToWithdraw}");
}
}
sb.Append($" ORDER BY AuditCreateTime DESC");
......@@ -125,15 +125,15 @@ namespace Edu.Repository.User
}
if (appAuditStatus == AppAuditStatusEnum.AuditComplete)
{
sb.Append($" AND (`Status`={(int)WFAuditStatus.Through} Or `Status`={(int)WFAuditStatus.NotThrough})");
sb.Append($" AND (`Status`={(int)UserWFAuditStatus.Through} Or `Status`={(int)UserWFAuditStatus.NotThrough})");
}
else if (appAuditStatus == AppAuditStatusEnum.InComplete)
{
sb.Append($" AND `Status`={(int)WFAuditStatus.InReview}");
sb.Append($" AND `Status`={(int)UserWFAuditStatus.InReview}");
}
else if (appAuditStatus == AppAuditStatusEnum.ToWithdraw)
{
sb.Append($" AND `Status`={(int)WFAuditStatus.ToWithdraw}");
sb.Append($" AND `Status`={(int)UserWFAuditStatus.ToWithdraw}");
}
sb.Append($" ORDER BY AuditCreateTime DESC");
......@@ -234,15 +234,15 @@ namespace Edu.Repository.User
{
if (appAuditStatus == AppAuditStatusEnum.AuditComplete)
{
sb.Append($" AND (`Status`={(int)WFAuditStatus.Through} Or `Status`={(int)WFAuditStatus.NotThrough})");
sb.Append($" AND (`Status`={(int)UserWFAuditStatus.Through} Or `Status`={(int)UserWFAuditStatus.NotThrough})");
}
else if (appAuditStatus == AppAuditStatusEnum.InComplete)
{
sb.Append($" AND `Status`={(int)WFAuditStatus.InReview}");
sb.Append($" AND `Status`={(int)UserWFAuditStatus.InReview}");
}
else if (appAuditStatus == AppAuditStatusEnum.ToWithdraw)
{
sb.Append($" AND `Status`={(int)WFAuditStatus.ToWithdraw}");
sb.Append($" AND `Status`={(int)UserWFAuditStatus.ToWithdraw}");
}
if (applyType != 0)
{
......@@ -281,15 +281,15 @@ namespace Edu.Repository.User
{
if (appAuditStatus == AppAuditStatusEnum.AuditComplete)
{
sb.Append($" AND (`Status`={(int)WFAuditStatus.Through} Or `Status`={(int)WFAuditStatus.NotThrough})");
sb.Append($" AND (`Status`={(int)UserWFAuditStatus.Through} Or `Status`={(int)UserWFAuditStatus.NotThrough})");
}
else if (appAuditStatus == AppAuditStatusEnum.InComplete)
{
sb.Append($" AND `Status`={(int)WFAuditStatus.InReview}");
sb.Append($" AND `Status`={(int)UserWFAuditStatus.InReview}");
}
else if (appAuditStatus == AppAuditStatusEnum.ToWithdraw)
{
sb.Append($" AND `Status`={(int)WFAuditStatus.ToWithdraw}");
sb.Append($" AND `Status`={(int)UserWFAuditStatus.ToWithdraw}");
}
if (applyType != 0)
{
......@@ -335,15 +335,15 @@ namespace Edu.Repository.User
{
if (appAuditStatus == AppAuditStatusEnum.AuditComplete)
{
sb.Append($" AND (`Status`={(int)WFAuditStatus.Through} Or `Status`={(int)WFAuditStatus.NotThrough})");
sb.Append($" AND (`Status`={(int)UserWFAuditStatus.Through} Or `Status`={(int)UserWFAuditStatus.NotThrough})");
}
else if (appAuditStatus == AppAuditStatusEnum.InComplete)
{
sb.Append($" AND `Status`={(int)WFAuditStatus.InReview}");
sb.Append($" AND `Status`={(int)UserWFAuditStatus.InReview}");
}
else if (appAuditStatus == AppAuditStatusEnum.ToWithdraw)
{
sb.Append($" AND `Status`={(int)WFAuditStatus.ToWithdraw}");
sb.Append($" AND `Status`={(int)UserWFAuditStatus.ToWithdraw}");
}
if (applyType != 0)
{
......
Edu.Repository/User/Rb_Workflow_CopyToPeopleRepository.cs
View file @ 8c8ad268
......@@ -61,15 +61,15 @@ namespace Edu.Repository.User
}
if (appAuditStatus == AppAuditStatusEnum.AuditComplete)
{
sb.Append($" AND (`Status`={(int)WFAuditStatus.Through} Or `Status`={(int)WFAuditStatus.NotThrough})");
sb.Append($" AND (`Status`={(int)UserWFAuditStatus.Through} Or `Status`={(int)UserWFAuditStatus.NotThrough})");
}
else if (appAuditStatus == AppAuditStatusEnum.InComplete)
{
sb.Append($" AND `Status`={(int)WFAuditStatus.InReview}");
sb.Append($" AND `Status`={(int)UserWFAuditStatus.InReview}");
}
else if (appAuditStatus == AppAuditStatusEnum.ToWithdraw)
{
sb.Append($" AND `Status`={(int)WFAuditStatus.ToWithdraw}");
sb.Append($" AND `Status`={(int)UserWFAuditStatus.ToWithdraw}");
}
}
sb.Append($" ORDER BY AuditCreateTime DESC");
......
Edu.WebApi/Controllers/Course/ClassController.cs
View file @ 8c8ad268
......@@ -129,16 +129,14 @@ namespace Edu.WebApi.Controllers.Course
{
CouseId = base.ParmJObj.GetInt("CourseId", 0),
IsQuerySurplus = base.ParmJObj.GetInt("IsQuerySurplus"),
School_Id = base.ParmJObj.GetInt("SchoolId", -1),
MoreStatus = base.ParmJObj.GetStringValue("MoreStatus"),
Teacher_Id = base.ParmJObj.GetInt("Teacher_Id"),
IsQuerySurplusPlan = base.ParmJObj.GetInt("IsQuerySurplusPlan")
};
query.School_Id= base.ParmJObj.GetInt("SchoolId", -1);
query.Group_Id = base.UserInfo.Group_Id;
//if (query.School_Id == -1)
//{
// query.School_Id = base.UserInfo.School_Id;
//}
var list = classModule.GetClassListModule(query);
List<object> result = new List<object>();
......
Edu.WebApi/Controllers/Course/StuController.cs
View file @ 8c8ad268
......@@ -80,18 +80,6 @@ namespace Edu.WebApi.Controllers.Course
return ApiResult.Success(data: data);
}
/// <summary>
/// 获取单据详情
/// </summary>
/// <returns></returns>
public ApiResult GetBackBillAduitInfo()
{
//退课单据号
var BackId = base.ParmJObj.GetInt("BackId");
var extModel = studentBillModule.GetStuBackInfoModule(BackId);
return ApiResult.Success(data: extModel);
}
/// <summary>
/// 退学 一键生成财务单据
/// </summary>
......
Edu.WebApi/Controllers/EduTask/EducationReceiptController.cs
View file @ 8c8ad268
......@@ -7,6 +7,7 @@ using Edu.Module.EduTask;
using Edu.WebApi.Filter;
using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Linq;
......@@ -57,6 +58,50 @@ namespace Edu.WebApi.Controllers.EduTask
return ApiResult.Success(data: pageModel);
}
/// <summary>
/// 获取教务单据当前审核人列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetCurrentAuditMan()
{
var Id = base.ParmJObj.GetInt("Id");
var Info = educationReceiptModule.GetCurrentAuditManModule(Id);
return ApiResult.Success(data: Info);
}
/// <summary>
/// 修改教务单据当前审核人
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult EditAuditMan()
{
List<RB_Education_Record_ViewModel> list = new List<RB_Education_Record_ViewModel>();
JArray jArray = JArray.Parse(base.ParmJObj.GetStringValue("Info"));
if (jArray != null && jArray.Count > 0)
{
foreach (var item in jArray)
{
JObject jObj = JObject.Parse(item.ToString());
RB_Education_Record_ViewModel model = new RB_Education_Record_ViewModel()
{
Id=jObj.GetInt("Id"),
ConditionId=jObj.GetInt("ConditionId"),
AuditId=jObj.GetInt("AuditId"),
AuditEmId=jObj.GetInt("AuditEmId"),
NewAuditEmId=jObj.GetInt("NewAuditEmId"),
};
list.Add(model);
}
}
var flag = educationReceiptModule.EditAuditManModule(list);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 获取教务单据类型
/// </summary>
......
Edu.WebApi/Controllers/User/WorkFlowController.cs
View file @ 8c8ad268
......@@ -1215,11 +1215,11 @@ namespace Edu.WebApi.Controllers.User
int IsAudit = 2;
int IsUpdate = 2;
List<Rb_Workflow_AuditRelevance_Extend> arList = workFlowModule.GetAuditRecordList(WorkFlowId, TemplateType);
if (empId == CreateBy && !TempleteTypeName.Contains("撤回") && Status != (int)WFAuditStatus.ToWithdraw && Status != (int)WFAuditStatus.NotThrough)
if (empId == CreateBy && !TempleteTypeName.Contains("撤回") && Status != (int)UserWFAuditStatus.ToWithdraw && Status != (int)UserWFAuditStatus.NotThrough)
{//第一个审核 并且审核人是自己 可以有撤回 /如果是撤回状态就不行了
IsCancel = 1;
}
if (Status == (int)WFAuditStatus.InReview)
if (Status == (int)UserWFAuditStatus.InReview)
{
if (empId == CreateBy && !TempleteTypeName.Contains("撤回"))
{
......@@ -1238,7 +1238,7 @@ namespace Edu.WebApi.Controllers.User
}
//获取抄送人列表
List<Rb_Workflow_CopyToPeople_Extend> CopyToPeopleList = new List<Rb_Workflow_CopyToPeople_Extend>();
if (Status == (int)WFAuditStatus.Through)
if (Status == (int)UserWFAuditStatus.Through)
{
CopyToPeopleList = workFlowModule.GetCopyToPeopleList(WorkFlowId, TemplateType);
}
......
Edu.WebApi/Controllers/User/WorkFlowManagementController.cs
View file @ 8c8ad268
......@@ -581,7 +581,7 @@ namespace Edu.WebApi.Controllers.User
x.EmName,
x.BName,
ToAuditName = GetEmNameStr(x.ToAuditIdStr),
AuditedName = x.Status == WFAuditStatus.Through ? "" : GetEmNameStr(x.AuditedIdStr),
AuditedName = x.Status == UserWFAuditStatus.Through ? "" : GetEmNameStr(x.AuditedIdStr),
CreateTime = x.CreateTime != null ? x.CreateTime.Value.ToString("yyyy-MM-dd") : "",
Status = x.Status.ToName()
});
......
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