Skip to content

E
Education
Commit b8678149 authored by liudong1993's avatar liudong1993
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

parents d4086266 a63b4b59
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 670 additions and 346 deletions
Edu.Common/Config.cs
View file @ b8678149
......@@ -629,5 +629,16 @@ namespace Edu.Common
return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
}
}
/// <summary>
/// 公告字典中的key
/// </summary>
public static string Notice_BaseKey
{
get
{
return ReadConfigKey("Notice_BaseKey");
}
}
}
}
\ No newline at end of file
Edu.Common/Enum/Course/BackClassEnum.cs
View file @ b8678149
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 @ b8678149
......@@ -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/NoticeStateEnum.cs
View file @ b8678149
......@@ -22,5 +22,10 @@ namespace Edu.Common.Enum.User
/// </summary>
[EnumField("撤回")]
Cancel = 3,
/// <summary>
/// 待审核
/// </summary>
[EnumField("待审核")]
Review = 4,
}
}
Edu.Common/Enum/User/WFAuditStatus.cs → Edu.Common/Enum/User/UserWFAuditStatus.cs
View file @ b8678149
......@@ -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>
......@@ -63,8 +64,13 @@ namespace Edu.Common.Enum.User
/// 他人已审核（仅限审核记录表）
/// </summary>
[EnumField("他人已审核")]
OtherHaveAudit = 5
OtherHaveAudit = 5,
/// <summary>
/// 作废【HK2021-07-13新增】
/// </summary>
[EnumField("作废")]
Invalid =6,
}
/// <summary>
......@@ -110,42 +116,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_Class_Time_UnKnowUser.cs 0 → 100644
View file @ b8678149
using System;
using System.Collections.Generic;
using System.Text;
using VT.FW.DB;
namespace Edu.Model.Entity.Course
{
/// <summary>
/// 未知的用户信息
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_Class_Time_UnKnowUser
{
/// <summary>
/// 编号
/// </summary>
public int Id { get; set; }
/// <summary>
/// 上课计划ID
/// </summary>
public int ClassTimeId { get; set; }
/// <summary>
/// 用户头像
/// </summary>
public string UserAvatar { get; set; }
/// <summary>
/// 发生的FaceID
/// </summary>
public int FaceId { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateDate { get; set; }
/// <summary>
/// 创建人
/// </summary>
public int CreateBy { get; set; }
}
}
Edu.Model/Entity/Course/RB_Student_BackClass.cs
View file @ b8678149
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 @ b8678149
using Edu.Common.Enum.Finance;
using System;
using System.Collections.Generic;
using System.Text;
using VT.FW.DB;
namespace Edu.Model.Entity.EduTask
......@@ -81,6 +79,6 @@ namespace Edu.Model.Entity.EduTask
/// <summary>
/// 审核状态(见枚举)
/// </summary>
public WFRrocessStatus VerifyStatus { get; set; }
public Edu.Common.Enum.User.WFRrocessStatus VerifyStatus { get; set; }
}
}
Edu.Model/Entity/User/Rb_Workflow_Askforleave.cs
View file @ b8678149
......@@ -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 @ b8678149
......@@ -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 @ b8678149
......@@ -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 @ b8678149
......@@ -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/Course/Class_LessonPlan_ViewModel.cs
View file @ b8678149
......@@ -84,6 +84,23 @@ namespace Edu.Model.ViewModel.Course
#region 展示无逻辑
/// <summary>
/// 0-未备课，1-已备课
/// </summary>
public int BeiKeStatus { get; set; }
/// <summary>
/// 0-未反馈，1-已反馈
/// </summary>
public int FanKuiStatus { get; set; }
/// <summary>
/// 总评分
/// </summary>
public decimal TotalScore { get; set; }
/// <summary>
/// 老师名称
/// </summary>
......
Edu.Model/ViewModel/Course/RB_Class_Time_UnKnowUser_ViewModel.cs 0 → 100644
View file @ b8678149
using Edu.Model.Entity.Course;
using System;
using System.Collections.Generic;
using System.Text;
namespace Edu.Model.ViewModel.Course
{
public class RB_Class_Time_UnKnowUser_ViewModel:RB_Class_Time_UnKnowUser
{
/// <summary>
/// 创建时间字符串
/// </summary>
public string CreateTimeStr { get { return Common.ConvertHelper.FormatTime(this.CreateDate); } }
/// <summary>
/// 创建人
/// </summary>
public string CreateByName { get; set; }
}
}
Edu.Model/ViewModel/EduTask/RB_Education_Record_ViewModel.cs
View file @ b8678149
......@@ -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 @ b8678149
......@@ -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 @ b8678149
......@@ -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/CourseModule.cs
View file @ b8678149
......@@ -105,6 +105,11 @@ namespace Edu.Module.Course
/// </summary>
private readonly RB_Class_ConfigRepository class_ConfigRepository = new RB_Class_ConfigRepository();
/// <summary>
/// 非法用户信息
/// </summary>
private readonly RB_Class_Time_UnKnowRepository unKnowRepository = new RB_Class_Time_UnKnowRepository();
#region 课程管理
public List<RB_Course_ViewModel> GetAllCourseChapterCountModule(int groupId,int courseId)
......@@ -1493,5 +1498,46 @@ namespace Edu.Module.Course
}
#endregion
#region 非法访问用户
/// <summary>
/// 保存非法访问用信息
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public bool SetUnKnownUserModule(RB_Class_Time_UnKnowUser_ViewModel model)
{
bool flag;
if (model.Id > 0)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Class_Time_UnKnowUser_ViewModel.ClassTimeId) ,model.ClassTimeId},
{nameof(RB_Class_Time_UnKnowUser_ViewModel.UserAvatar) ,model.UserAvatar}
};
flag = chapterRepository.Update(fileds, new WhereHelper(nameof(RB_Class_Time_UnKnowUser_ViewModel.Id), model.Id));
}
else
{
var newId = unKnowRepository.Insert(model);
model.Id = newId;
flag = newId > 0;
}
return flag;
}
/// <summary>
/// 查询指定课程的非法访问用户数据
/// </summary>
/// <returns></returns>
public List<RB_Class_Time_UnKnowUser_ViewModel> GetUnKnowUserByClassTimeModule(int classId)
{
var list = unKnowRepository.GetUnKnowUsersByClassIdRepository(classId);
return list;
}
#endregion
}
}
\ No newline at end of file
Edu.Module.Course/OrderModule2.cs
View file @ b8678149
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,
......@@ -148,7 +145,7 @@ namespace Edu.Module.Course
UpdateBy=userinfo.Id,
UpdateTime=DateTime.Now,
RecipientIds="",
VerifyStatus= Common.Enum.Finance.WFRrocessStatus.NotAudit
VerifyStatus= Common.Enum.User.WFRrocessStatus.NotAudit
}, out message);
if (flag)
{
......
Edu.Module.Course/StudentBillModule.cs
View file @ b8678149
......@@ -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/ChangeClassPlanModule.cs
View file @ b8678149
......@@ -82,7 +82,7 @@ namespace Edu.Module.EduTask
CreateTime=extModel.CreateTime,
UpdateBy=extModel.UpdateBy,
UpdateTime=extModel.UpdateTime,
VerifyStatus= Common.Enum.Finance.WFRrocessStatus.NotAudit
VerifyStatus= Common.Enum.User.WFRrocessStatus.NotAudit
};
flag= education_ReceiptRepository.SetEducationReceiptRepository(educationReceipt,out string message);
}
......
Edu.Module.EduTask/EducationReceiptModule.cs
View file @ b8678149
......@@ -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();
......@@ -150,7 +139,7 @@ namespace Edu.Module.EduTask
ReceiptTypeName = item.ReceiptType.ToName(),
CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName,
CreateTime = Common.ConvertHelper.FormatTime(item.CreateTime),
AuditStatusName = item.VerifyStatus == Common.Enum.Finance.WFRrocessStatus.NotAudit ? "审核中" : item.VerifyStatus.ToName(),
AuditStatusName = item.VerifyStatus == Common.Enum.User.WFRrocessStatus.NotAudit ? "审核中" : item.VerifyStatus.ToName(),
};
result.Add(obj);
}
......@@ -158,15 +147,95 @@ namespace Edu.Module.EduTask
return result;
}
[TransactionCallHandler]
public virtual bool EditAuditManModule(int Id)
/// <summary>
/// 获取单据当前审核人列表
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
public virtual object GetCurrentAuditManModule(int Id)
{
bool flag = false;
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;
}
return flag;
/// <summary>
/// 作废教务单据
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
public bool InvalidReceiptModule(int Id)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Education_Receipt_ViewModel.VerifyStatus),(int)Edu.Common.Enum.User.WFRrocessStatus.Invalid}
};
return education_ReceiptRepository.Update(fileds, new WhereHelper(nameof(RB_Education_Receipt_ViewModel.Id), Id));
}
/// <summary>
/// 修改审核人员
/// </summary>
/// <param name="list"></param>
/// <returns></returns>
[TransactionCallHandler]
public virtual bool EditAuditManModule(List<RB_Education_Record_ViewModel> list)
{
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>
/// 获取单据详情
......@@ -662,12 +731,13 @@ namespace Edu.Module.EduTask
{
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;
}
return statusName;
}
......
Edu.Module.User/AttendanceModule.cs
View file @ b8678149
......@@ -52,6 +52,20 @@ namespace Edu.Module.User
return dictvalueRepository.GetList(new RB_Dictvalue_Extend() { RB_Group_id = group_Id, DictKey = key });
}
/// <summary>
/// 更新公告审核人
/// </summary>
/// <param name="Content"></param>
/// <returns></returns>
public bool SetContent(string Content)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Dictvalue_Extend.Content),Content }
};
return dictvalueRepository.Update(fileds, new WhereHelper(nameof(RB_Dictvalue_Extend.DictKey), Edu.Common.Config.Notice_BaseKey));
}
#endregion
/// <summary>
......
Edu.Module.User/WorkFlowModule.cs
View file @ b8678149
This diff is collapsed.
Edu.Repository/Course/RB_Class_PlanRepository.cs
View file @ b8678149
......@@ -410,7 +410,7 @@ LEFT JOIN rb_class as class on a.ClassId=class.ClassId
LEFT JOIN rb_teacher AS T ON A.TeacherId=T.TId
LEFT JOIN (SELECT ClassPlanId,COUNT(*) as LessonPlanNum from rb_class_lessonplan where `Status`=0 GROUP BY ClassPlanId)as lp on a.ClassPlanId=lp.ClassPlanId
LEFT JOIN (SELECT ClassPlanId,COUNT(*) as LessonPlanSummaryNum from rb_class_lessonplan where `Status`=0 and ISNULL(Summary)=0 and LENGTH(trim(Summary))>0 GROUP BY ClassPlanId)as lps on a.ClassPlanId=lps.ClassPlanId
WHERE 1=1 and class.ClassStatus=2 and t.`Status`=0 and a.`Status`=0 ORDER BY a.ClassId,a.ClassDate) as a where 1=1
WHERE 1=1 and class.ClassStatus in(1,2) and t.`Status`=0 and a.`Status`=0 ORDER BY a.ClassId,a.ClassDate) as a where 1=1
");
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Status), (int)DateStateEnum.Normal);
if (query != null)
......@@ -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/Course/RB_Class_RoomRepository.cs
View file @ b8678149
......@@ -68,7 +68,8 @@ WHERE 1=1
SELECT A.*
FROM RB_Class_Room AS A
WHERE 1=1
");
");
builder.AppendFormat(" AND A.{0}<>{1} ", nameof(RB_Class_Room_ViewModel.Status), (int)(DateStateEnum.Delete));
if (query != null)
{
if (query.Group_Id > 0)
......
Edu.Repository/Course/RB_Class_Time_UnKnowRepository.cs 0 → 100644
View file @ b8678149
using Edu.Model.Entity.Course;
using Edu.Model.ViewModel.Course;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Edu.Repository.Course
{
public class RB_Class_Time_UnKnowRepository : BaseRepository<RB_Class_Time_UnKnowUser>
{
/// <summary>
/// 跟进课时编号查询非法用户
/// </summary>
/// <param name="classId"></param>
/// <returns></returns>
public List<RB_Class_Time_UnKnowUser_ViewModel> GetUnKnowUsersByClassIdRepository(int classId)
{
StringBuilder sql = new StringBuilder();
sql.Append("select * from RB_Class_Time_UnKnowUser where ");
sql.AppendFormat("{0}={1}",nameof(RB_Class_Time_UnKnowUser_ViewModel.ClassTimeId),classId);
return Get<RB_Class_Time_UnKnowUser_ViewModel>(sql.ToString()).ToList();
}
}
}
Edu.Repository/EduTask/RB_Education_RecordRepository.cs
View file @ b8678149
......@@ -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 @ b8678149
......@@ -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 @ b8678149
......@@ -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 @ b8678149
......@@ -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 @ b8678149
......@@ -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 @ b8678149
......@@ -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>();
......@@ -637,7 +635,7 @@ namespace Edu.WebApi.Controllers.Course
public ApiResult RemoveClassPlan()
{
var ClassPlanId = base.ParmJObj.GetInt("ClassPlanId");
var flag = classModule.RemoveClassPlanModule(ClassPlanId, base.UserInfo,out string message);
var flag = classModule.RemoveClassPlanModule(ClassPlanId, base.UserInfo, out string message);
return flag ? ApiResult.Success() : ApiResult.Failed(message: message);
}
......@@ -916,7 +914,8 @@ namespace Edu.WebApi.Controllers.Course
string MonthStr = list.FirstOrDefault().ClassDate.ToString("yyyy-MM");
int schoolId = list.FirstOrDefault().School_Id;
string ValidateMsg = classModule.ValidateClassCheckFinance(MonthStr, schoolId, base.UserInfo.Group_Id);
if (ValidateMsg != "") {
if (ValidateMsg != "")
{
return ApiResult.Failed(ValidateMsg);
}
#endregion
......@@ -1306,6 +1305,21 @@ namespace Edu.WebApi.Controllers.Course
var planTiemList = classModule.GetClassTimeListModule(new RB_Class_Time_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = extModel.ClassId, ClassPlanId = extModel.ClassPlanId });
model.TeacherName = planDate.TeacherName;
model.WorkDate = planDate.ClassDate.ToString("yyyy年MM月dd日");
model.BeiKeStatus = planDate.BeiKeStatus;
model.FanKuiStatus = planDate.FanKuiStatus;
#region 查询备课评分信息
var query = new RB_Class_LessonComment_ViewModel()
{
ClassPlanId = base.ParmJObj.GetInt("ClassPlanId"),
ClassId = base.ParmJObj.GetInt("ClassId"),
Group_Id = base.UserInfo.Group_Id,
//School_Id = base.ParmJObj.GetInt("School_Id"),
};
query.Group_Id = base.UserInfo.Group_Id;
var list = classModule.GetLessonCommentList(query);
model.TotalScore = (list != null && list.Any()) ? list.Where(x => x.Score > 0).Sum(x => x.Score) : 0;
#endregion
model.WeekStr = StringHelper.GetJapanWeekChar(planDate.ClassDate);
DateTime startTime = System.DateTime.Now;
DateTime endTime = System.DateTime.Now;
......@@ -1376,18 +1390,9 @@ namespace Edu.WebApi.Controllers.Course
}
if (item.LessonPlanDetailsList != null && item.LessonPlanDetailsList.Any())
{
foreach (var itemDetails in item.LessonPlanDetailsList)
{
//if (lessPlanDetailsId == itemDetails.LessonPlanId)
//{
tempDuration += itemDetails.Duration;
//}
//else
//{
// tempDuration += (itemDetails.Duration + jiangeTime);
//}
itemDetails.DurationEndTime = startTime.AddMinutes(tempDuration).ToString("HH:mm");
}
}
......@@ -1397,11 +1402,8 @@ namespace Edu.WebApi.Controllers.Course
// item.LessonPlanProjectsList.ForEach(x => x.ProjectContentList = (string.IsNullOrWhiteSpace(x.ProjectContent) ? new List<string>() : Common.Plugin.JsonHelper.DeserializeObject<List<string>>(x.ProjectContent)));
model.IsEditSummary += item.LessonPlanDetailsList.Where(x => !string.IsNullOrWhiteSpace(x.Summary)).Count();
}
}
}
else
{
......
Edu.WebApi/Controllers/Course/ClassRoomController.cs
View file @ b8678149
......@@ -548,7 +548,8 @@ namespace Edu.WebApi.Controllers.Course
{
var query = new RB_Class_Room_ViewModel()
{
Group_Id = 100000
Group_Id = 100000,
Status = DateStateEnum.Normal,
};
var list = classRoomModule.GetClassRoomListRepository(query);
var result = list.Select(x => new
......
Edu.WebApi/Controllers/Course/CourseController.cs
View file @ b8678149
......@@ -1131,5 +1131,48 @@ namespace Edu.WebApi.Controllers.Course
return flag ? ApiResult.Success() : ApiResult.Failed();
}
#endregion
#region 非法用户管理
/// <summary>
/// 保存非法用户信息
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetUnKnowUser()
{
RB_Class_Time_UnKnowUser_ViewModel model = JsonHelper.DeserializeObject<RB_Class_Time_UnKnowUser_ViewModel>(RequestParm.Msg.ToString());
model.CreateBy = base.UserInfo.Id;
model.CreateDate = DateTime.Now;
var flag = courseModule.SetUnKnownUserModule(model);
if (flag)
{
return ApiResult.Success();
}
else
{
return ApiResult.Failed();
}
}
/// <summary>
/// 跟进课程编号查询非法用户
/// </summary>
/// <returns></returns>
public ApiResult GetUnKnowUserByClassId()
{
int classId = ParmJObj.GetInt("classId",0);
var list = courseModule.GetUnKnowUserByClassTimeModule(classId);
var result = list.Select(x => new {
x.Id,
x.UserAvatar,
x.CreateTimeStr,
x.FaceId
});
return ApiResult.Success(data:result);
}
#endregion
}
}
\ No newline at end of file
Edu.WebApi/Controllers/Course/StuController.cs
View file @ b8678149
......@@ -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 @ b8678149
......@@ -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,59 @@ 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 InvalidReceipt()
{
var Id = base.ParmJObj.GetInt("Id");
var flag = educationReceiptModule.InvalidReceiptModule(Id);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <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/UserCenterController.cs
View file @ b8678149
......@@ -91,6 +91,40 @@ namespace Edu.WebApi.Controllers.User
}
return ApiResult.Success("请求成功!", objlist);
}
/// <summary>
/// 获取字典列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetContent()
{
UserInfo userInfo = base.UserInfo; ;
JObject parm = JObject.Parse(RequestParm.Msg.ToString());
string Content = parm.GetStringValue("Content");
bool result = attendancemodule.SetContent(Content);
return result ? ApiResult.Success("请求成功!") : ApiResult.Failed("请求失败!");
}
/// <summary>
/// 获取公告设置字典实体
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetNoticeBaseKeyDictValue()
{
UserInfo userInfo = base.UserInfo;
var model = attendancemodule.GetDictValueList(userInfo.Group_Id, Config.Notice_BaseKey).FirstOrDefault();
var result = new
{
model.DictKey,
model.Content
};
return ApiResult.Success("请求成功!", result);
}
#endregion
#region 公告管理
......@@ -115,6 +149,10 @@ namespace Edu.WebApi.Controllers.User
return ApiResult.Success("", obj);
}
/// <summary>
/// 新增修改公告基础
/// </summary>
......@@ -124,11 +162,11 @@ namespace Edu.WebApi.Controllers.User
{
var demodel = new RB_Notice_Base_ViewModel()
{
Id=base.ParmJObj.GetInt("Id"),
Image=base.ParmJObj.GetStringValue("Image"),
From=base.ParmJObj.GetStringValue("From"),
NumberRule= (NoticeRuleEnum)base.ParmJObj.GetInt("NumberRule"),
CopyPeople=base.ParmJObj.GetStringValue("CopyPeople"),
Id = base.ParmJObj.GetInt("Id"),
Image = base.ParmJObj.GetStringValue("Image"),
From = base.ParmJObj.GetStringValue("From"),
NumberRule = (NoticeRuleEnum)base.ParmJObj.GetInt("NumberRule"),
CopyPeople = base.ParmJObj.GetStringValue("CopyPeople"),
};
demodel.Group_Id = base.UserInfo.Group_Id;
demodel.School_Id = base.UserInfo.School_Id;
......@@ -174,10 +212,10 @@ namespace Edu.WebApi.Controllers.User
var pageModel = JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var query = new RB_Notice_ViewModel()
{
Is_Top=base.ParmJObj.GetInt("Is_Top"),
NoticeState=(NoticeStateEnum)base.ParmJObj.GetInt("NoticeState"),
Number=base.ParmJObj.GetStringValue("Number"),
Title=base.ParmJObj.GetStringValue("Title"),
Is_Top = base.ParmJObj.GetInt("Is_Top"),
NoticeState = (NoticeStateEnum)base.ParmJObj.GetInt("NoticeState"),
Number = base.ParmJObj.GetStringValue("Number"),
Title = base.ParmJObj.GetStringValue("Title"),
UpdateBy = base.ParmJObj.GetInt("UpdateBy"),
};
query.Group_Id = base.UserInfo.Group_Id;
......@@ -226,14 +264,14 @@ namespace Edu.WebApi.Controllers.User
UserInfo userInfo = base.UserInfo;
RB_Notice_ViewModel demodel = new RB_Notice_ViewModel()
{
Id=base.ParmJObj.GetInt("Id"),
Content=base.ParmJObj.GetStringValue("Content"),
CopyPeople=base.ParmJObj.GetStringValue("CopyPeople"),
From=base.ParmJObj.GetStringValue("From"),
Is_Top=base.ParmJObj.GetInt("Is_Top"),
NoticeState=(NoticeStateEnum)base.ParmJObj.GetInt("NoticeState"),
Title=base.ParmJObj.GetStringValue("Title"),
To=base.ParmJObj.GetStringValue("To")
Id = base.ParmJObj.GetInt("Id"),
Content = base.ParmJObj.GetStringValue("Content"),
CopyPeople = base.ParmJObj.GetStringValue("CopyPeople"),
From = base.ParmJObj.GetStringValue("From"),
Is_Top = base.ParmJObj.GetInt("Is_Top"),
NoticeState = (NoticeStateEnum)base.ParmJObj.GetInt("NoticeState"),
Title = base.ParmJObj.GetStringValue("Title"),
To = base.ParmJObj.GetStringValue("To")
};
if (demodel.To == "0")
{
......@@ -336,7 +374,7 @@ namespace Edu.WebApi.Controllers.User
query.Group_Id = base.UserInfo.Group_Id;
query.DeptId = base.UserInfo.DeptId;
query.NoticeState = NoticeStateEnum.Publish;
var noticeBaseModel=noticeModule.GetNoticeBaseInfo(base.UserInfo.Group_Id);
var noticeBaseModel = noticeModule.GetNoticeBaseInfo(base.UserInfo.Group_Id);
var list = noticeModule.GetMyNoticePageList(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
List<object> result = new List<object>();
foreach (var item in list)
......@@ -346,7 +384,7 @@ namespace Edu.WebApi.Controllers.User
{
try
{
fileList= Common.Plugin.JsonHelper.DeserializeObject<List<FileModel>>(item.File);
fileList = Common.Plugin.JsonHelper.DeserializeObject<List<FileModel>>(item.File);
}
catch (Exception ex)
{
......
Edu.WebApi/Controllers/User/WorkFlowController.cs
View file @ b8678149
......@@ -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 @ b8678149
......@@ -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()
});
......
Edu.WebApi/appsettings.json
View file @ b8678149
{
"ConnectionStrings": {
"DefaultConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"DefaultConnectionPName": "MySql.Data.MySqlClient",
"FinanceConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"FinanceConnectionPName": "MySql.Data.MySqlClient",
"DataStatisticsConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_datastatistics;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"DataStatisticsConnectionPName": "MySql.Data.MySqlClient",
"LogConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_sys;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"LogConnectionPName": "MySql.Data.MySqlClient"
},
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"SettlementRate": "0.60",
"SellCommissionFFBL": "0.15",
"JwtSecretKey": "@VIITTOREBORN*2018",
"MallJwtSecretKey": "@VIITTOREBORN*2018",
"JwtExpirTime": 86400,
"IsSendMsg": 2,
"AllowedHosts": "*",
"OpenValidation": "False",
"UploadSiteUrl": "http://192.168.1.36:8120",
"ViewFileSiteUrl": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com",
"ErpViewFileSiteUrl": "http://imgfile.oytour.com",
"Mongo": "mongodb://47.96.25.130:27017",
"MongoDBName": "Edu",
"WkHtmlToPdfPath": "D:/wkhtmltopdf/bin/",
"FinanceKey": "FinanceMallInsertToERPViitto2020",
"PaymentFinanceApi": "http://192.168.1.13:8083/api/Mall/InsertFinanceBatchForMallIn",
"IncomeFinanceApi": "http://192.168.20.9:8083/api/Mall/InsertFinanceBatchForMallOut",
"sTenpayNotifyUrl": "http://eduapi.oytour.com/api/WeChatPay/WxPayCallback", //下单回调地址
"sTenpayNotifyRefundUrl": "http://eduapi.oytour.com/api/WeChatPay/Refunds", //退款回调地址
"FinanceDateBase": "reborn_finance",
"EduDateBase": "uat_reborn_edu",
"JHTenantId": "15",
"JHMallBaseId": "5",
"RabbitMqConfig": {
"HostName": "47.96.25.130",
"VirtualHost": "/",
"Port": 5672,
"UserName": "guest",
"Password": "viitto2019",
"QueenName": "vt_sys_message_test"
},
"RedisSetting": {
"RedisServer": "47.96.23.199",
"RedisPort": "6379",
"RedisPwd": "Viitto2018"
},
"VirtualDirectory": "WebFile",
//未填写 未打分 下降比例
"OKRMatterValue": "30,100,100",
//是否是线上环境
"IsOnline": false,
//退课流程编号
"BackClassFlowId": 1,
//分区校长岗位编号
"SchoolPostId": 3,
//教务长
"JiaoWuZhang": 8,
//留学就业部门主管审核编号[王涛]
"StudyAbroadDirectorId": 64,
//留学就业部门负责人审核编号[姚顺先]
"StudyAbroadManagerId": 52,
//合同默认抬头
"ContractDefaultTitle": "JH-DZ-CD-",
//消息推送AppId
"PushAppId": "JiaHeJiaoYu",
//是否推送消息
"IsPushMessage": "1",
//超过下班时间60分钟不能打卡
"MoreThanMinutes": 60,
//连续缺课课时
"AbsentHours": 12,
//值班时间验证日期
"DutyDate": "2021-06-30",
//调课流程编号
"ChangeClassFlowId": 2
"ConnectionStrings": {
"DefaultConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"DefaultConnectionPName": "MySql.Data.MySqlClient",
"FinanceConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"FinanceConnectionPName": "MySql.Data.MySqlClient",
"DataStatisticsConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_datastatistics;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"DataStatisticsConnectionPName": "MySql.Data.MySqlClient",
"LogConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_sys;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"LogConnectionPName": "MySql.Data.MySqlClient"
},
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"SettlementRate": "0.60",
"SellCommissionFFBL": "0.15",
"JwtSecretKey": "@VIITTOREBORN*2018",
"MallJwtSecretKey": "@VIITTOREBORN*2018",
"JwtExpirTime": 86400,
"IsSendMsg": 2,
"AllowedHosts": "*",
"OpenValidation": "False",
"UploadSiteUrl": "http://192.168.1.36:8120",
"ViewFileSiteUrl": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com",
"ErpViewFileSiteUrl": "http://imgfile.oytour.com",
"Mongo": "mongodb://47.96.25.130:27017",
"MongoDBName": "Edu",
"WkHtmlToPdfPath": "D:/wkhtmltopdf/bin/",
"FinanceKey": "FinanceMallInsertToERPViitto2020",
"PaymentFinanceApi": "http://192.168.1.13:8083/api/Mall/InsertFinanceBatchForMallIn",
"IncomeFinanceApi": "http://192.168.20.9:8083/api/Mall/InsertFinanceBatchForMallOut",
"sTenpayNotifyUrl": "http://eduapi.oytour.com/api/WeChatPay/WxPayCallback", //下单回调地址
"sTenpayNotifyRefundUrl": "http://eduapi.oytour.com/api/WeChatPay/Refunds", //退款回调地址
"FinanceDateBase": "reborn_finance",
"EduDateBase": "uat_reborn_edu",
"JHTenantId": "15",
"JHMallBaseId": "5",
"Notice_BaseKey": "Notice_BaseKey",
"RabbitMqConfig": {
"HostName": "47.96.25.130",
"VirtualHost": "/",
"Port": 5672,
"UserName": "guest",
"Password": "viitto2019",
"QueenName": "vt_sys_message_test"
},
"RedisSetting": {
"RedisServer": "47.96.23.199",
"RedisPort": "6379",
"RedisPwd": "Viitto2018"
},
"VirtualDirectory": "WebFile",
//未填写 未打分 下降比例
"OKRMatterValue": "30,100,100",
//是否是线上环境
"IsOnline": false,
//退课流程编号
"BackClassFlowId": 1,
//分区校长岗位编号
"SchoolPostId": 3,
//教务长
"JiaoWuZhang": 8,
//留学就业部门主管审核编号[王涛]
"StudyAbroadDirectorId": 64,
//留学就业部门负责人审核编号[姚顺先]
"StudyAbroadManagerId": 52,
//合同默认抬头
"ContractDefaultTitle": "JH-DZ-CD-",
//消息推送AppId
"PushAppId": "JiaHeJiaoYu",
//是否推送消息
"IsPushMessage": "1",
//超过下班时间60分钟不能打卡
"MoreThanMinutes": 60,
//连续缺课课时
"AbsentHours": 12,
//值班时间验证日期
"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