Commit 10b09886 authored by 黄奎's avatar 黄奎

页面修改

parent d3c9ed88
......@@ -548,6 +548,10 @@ namespace Edu.Module.Course
{
foreach (var item in extModel.PlanTimeList)
{
item.ClassId = extModel.ClassId;
item.ClassPlanId = extModel.ClassPlanId;
item.Group_Id = extModel.Group_Id;
item.School_Id = extModel.School_Id;
flag = class_TimeRepository.Insert(item) > 0;
}
}
......
......@@ -119,7 +119,12 @@ namespace Edu.Repository.User
{
where += $@" and DATE_FORMAT({nameof(RB_AccountRemark_ViewModel.CreateTime)},'%Y-%m-%d' )<= DATE_FORMAT('{demodel.EndDate}','%Y-%m-%d' ) ";
}
string sql = $@" SELECT DATE_FORMAT(CreateTime,'%Y-%m-%d') as CreateStr from rb_accountremark where `Status`=0 {where} GROUP BY DATE_FORMAT(CreateTime,'%Y-%m-%d') ";
string sql = $@"
SELECT DATE_FORMAT(CreateTime,'%Y-%m-%d') as CreateStr from rb_accountremark where `Status`=0
{where}
GROUP BY DATE_FORMAT(CreateTime,'%Y-%m-%d')
ORDER BY DATE_FORMAT(CreateTime,'%Y-%m-%d') DESC
";
return GetPage<RB_AccountRemark_ViewList>(pageIndex, pageSize, out rowsCount, sql).ToList();
}
/// <summary>
......
......@@ -42,7 +42,6 @@ namespace Edu.WebApi.Controllers.Course
School_Id = base.ParmJObj.GetInt("School_Id")
};
query.Group_Id = base.UserInfo.Group_Id;
//query.School_Id = base.UserInfo.School_Id;
List<object> result = new List<object>();
var list = classModule.GetClassPageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
foreach (var item in list)
......@@ -61,6 +60,7 @@ namespace Edu.WebApi.Controllers.Course
item.ClassName,
item.SchoolName,
item.CourseName,
item.Teacher_Id,
item.TeacherName,
item.ClassPersion,
item.OrderStudentCount,
......
......@@ -822,7 +822,45 @@ namespace Edu.WebApi.Controllers.User
var AccountId = base.ParmJObj.GetInt("AccountId", 0);
var AccountType = base.ParmJObj.GetInt("AccountType", 0);
var extModel = employeeModule.GetEmployeeModule(Id, AccountId, AccountType);
return ApiResult.Success(data: extModel);
var obj = new
{
Account = extModel?.Account ?? "",
AccountId = extModel?.AccountId ?? 0,
AccountRemark = extModel?.AccountRemark ?? "",
AccountType = extModel?.AccountType ?? 0,
AccountTypeStr = (extModel?.AccountType ?? 0).ToName(),
Address = extModel?.Address ?? "",
AnnualLeaveDay = extModel?.AnnualLeaveDay ?? 0,
extModel?.BirthDate,
BirthDateStr = (extModel?.BirthDate != null ? Convert.ToDateTime(extModel.BirthDate).ToString("MM-dd") : ""),
CreateBy = extModel?.CreateBy ?? 0,
CreateTime = extModel?.CreateTime,
DeptName = extModel?.DeptName ?? "",
DeptTier = extModel?.DeptTier ?? 0,
Dept_Id = extModel?.Dept_Id ?? 0,
Education = extModel?.Education ?? 0,
EducationStr = (extModel?.Education ?? 0).ToName(),
EmployeeName = extModel?.EmployeeName ?? "",
EmployeeTel = extModel?.EmployeeTel ?? "",
EntryTime = extModel?.EntryTime,
GroupName = extModel?.GroupName ?? "",
Group_Id = extModel?.Group_Id ?? 0,
IDCard = extModel?.IDCard ?? "",
Id = extModel?.Id ?? 0,
IsBirth = extModel?.IsBirth ?? 0,
LeaveStatus = extModel?.LeaveStatus ?? 0,
LeaveStatusStr = (extModel?.LeaveStatus ?? 0).ToName(),
LeaveTime = extModel?.LeaveTime,
PostName = extModel?.PostName,
Post_Id = extModel?.Post_Id ?? 0,
SchoolName = extModel?.SchoolName ?? "",
School_Id = extModel?.School_Id ?? 0,
Sex = extModel?.Sex ?? 0,
SexStr = (extModel?.Sex ?? 0) == 0 ? "男" : "女",
UserIcon = extModel?.UserIcon ?? "",
Status = extModel?.Status ?? 0,
};
return ApiResult.Success(data: obj);
}
/// <summary>
......
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