Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
Education
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄奎
Education
Commits
fd2f34e8
Commit
fd2f34e8
authored
Dec 08, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
83f5beaa
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
137 additions
and
1 deletion
+137
-1
RB_Student_OrderGuest.cs
Edu.Model/Entity/User/RB_Student_OrderGuest.cs
+59
-0
RB_Class_Plan_ViewModel.cs
Edu.Model/ViewModel/Course/RB_Class_Plan_ViewModel.cs
+5
-0
RB_Student_OrderGuest_ViewModel.cs
Edu.Model/ViewModel/User/RB_Student_OrderGuest_ViewModel.cs
+15
-0
ClassModule.cs
Edu.Module.Course/ClassModule.cs
+1
-0
RB_Class_PlanRepository.cs
Edu.Repository/Course/RB_Class_PlanRepository.cs
+1
-1
RB_Student_OrderGuestRepository.cs
Edu.Repository/User/RB_Student_OrderGuestRepository.cs
+56
-0
No files found.
Edu.Model/Entity/User/RB_Student_OrderGuest.cs
0 → 100644
View file @
fd2f34e8
using
Edu.Common.Enum
;
using
System
;
using
VT.FW.DB
;
namespace
Edu.Model.Entity.User
{
/// <summary>
/// 学生订单旅客关联实体类
/// </summary>
[
Serializable
]
[
DB
(
ConnectionName
=
"DefaultConnection"
)]
public
class
RB_Student_OrderGuest
{
/// <summary>
/// 主键编号
/// </summary>
public
int
Id
{
get
;
set
;
}
/// <summary>
/// 账号表(rb_account)编号
/// </summary>
public
int
Account_Id
{
get
;
set
;
}
/// <summary>
/// 学生表(rb_student)编号
/// </summary>
public
int
Student_Id
{
get
;
set
;
}
/// <summary>
/// 班级编号
/// </summary>
public
int
ClassId
{
get
;
set
;
}
/// <summary>
/// 订单编号
/// </summary>
public
int
OrderId
{
get
;
set
;
}
/// <summary>
/// 游客编号
/// </summary>
public
int
GuestId
{
get
;
set
;
}
/// <summary>
/// 状态
/// </summary>
public
DateStateEnum
Status
{
get
;
set
;
}
/// <summary>
/// 创建人
/// </summary>
public
int
CreateBy
{
get
;
set
;
}
/// <summary>
/// 创建时间
/// </summary>
public
DateTime
CreateTime
{
get
;
set
;
}
}
}
Edu.Model/ViewModel/Course/RB_Class_Plan_ViewModel.cs
View file @
fd2f34e8
...
...
@@ -33,6 +33,11 @@ namespace Edu.Model.ViewModel.Course
/// </summary>
public
string
TeacherName
{
get
;
set
;
}
/// <summary>
/// 老师头像
/// </summary>
public
string
UserIcon
{
get
;
set
;
}
/// <summary>
/// 周几
/// </summary>
...
...
Edu.Model/ViewModel/User/RB_Student_OrderGuest_ViewModel.cs
0 → 100644
View file @
fd2f34e8
using
Edu.Model.Entity.User
;
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
namespace
Edu.Model.ViewModel.User
{
/// <summary>
/// 学生订单旅客关联视图实体类
/// </summary>
public
class
RB_Student_OrderGuest_ViewModel
:
RB_Student_OrderGuest
{
}
}
Edu.Module.Course/ClassModule.cs
View file @
fd2f34e8
...
...
@@ -498,6 +498,7 @@ namespace Edu.Module.Course
item
.
RoomName
,
item
.
TeacherId
,
item
.
TeacherName
,
item
.
UserIcon
,
TimeList
=
item
?.
PlanTimeList
?.
Select
(
qitem
=>
new
{
qitem
.
ClassTimeId
,
qitem
.
StartTime
,
qitem
.
EndTime
})?.
OrderBy
(
qitem
=>
qitem
.
StartTime
)
});
}
...
...
Edu.Repository/Course/RB_Class_PlanRepository.cs
View file @
fd2f34e8
...
...
@@ -22,7 +22,7 @@ namespace Edu.Repository.Course
{
StringBuilder
builder
=
new
StringBuilder
();
builder
.
AppendFormat
(
@"
SELECT A.*,IFNULL(B.RoomName,'') AS RoomName,IFNULL(T.TeacherName,'') AS TeacherName
SELECT A.*,IFNULL(B.RoomName,'') AS RoomName,IFNULL(T.TeacherName,'') AS TeacherName
,IFNULL(T.TeacherHead,'') AS UserIcon
FROM RB_Class_Plan AS A LEFT JOIN rb_class_room AS B ON A.ClassRoomId=B.RoomId
LEFT JOIN rb_teacher AS T ON A.TeacherId=T.TId
WHERE 1=1
...
...
Edu.Repository/User/RB_Student_OrderGuestRepository.cs
0 → 100644
View file @
fd2f34e8
using
Edu.Common.Enum
;
using
Edu.Model.Entity.User
;
using
Edu.Model.ViewModel.User
;
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Text
;
namespace
Edu.Repository.User
{
/// <summary>
/// 学生订单旅客关联仓储层
/// </summary>
public
class
RB_Student_OrderGuestRepository
:
BaseRepository
<
RB_Student_OrderGuest
>
{
/// <summary>
/// 获取员工订单旅客关联列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public
List
<
RB_Student_OrderGuest_ViewModel
>
GetStrOrderGuestListRepository
(
RB_Student_OrderGuest_ViewModel
query
)
{
StringBuilder
builder
=
new
StringBuilder
();
builder
.
AppendFormat
(
@"
SELECT *
FROM RB_Student_OrderGuest
WHERE 1=1
"
);
builder
.
AppendFormat
(
" AND {0}={1} "
,
nameof
(
RB_Student_OrderGuest_ViewModel
.
Status
),
(
int
)
DateStateEnum
.
Normal
);
if
(
query
!=
null
)
{
if
(
query
.
ClassId
>
0
)
{
builder
.
AppendFormat
(
" AND {0}={1} "
,
nameof
(
RB_Student_OrderGuest_ViewModel
.
ClassId
),
query
.
ClassId
);
}
if
(
query
.
OrderId
>
0
)
{
builder
.
AppendFormat
(
" AND {0}={1} "
,
nameof
(
RB_Student_OrderGuest_ViewModel
.
OrderId
),
query
.
OrderId
);
}
if
(
query
.
GuestId
>
0
)
{
builder
.
AppendFormat
(
" AND {0}={1} "
,
nameof
(
RB_Student_OrderGuest_ViewModel
.
GuestId
),
query
.
GuestId
);
}
if
(
query
.
Student_Id
>
0
)
{
builder
.
AppendFormat
(
" AND {0}={1} "
,
nameof
(
RB_Student_OrderGuest_ViewModel
.
Student_Id
),
query
.
Student_Id
);
}
if
(
query
.
Account_Id
>
0
)
{
builder
.
AppendFormat
(
" AND {0}={1} "
,
nameof
(
RB_Student_OrderGuest_ViewModel
.
Account_Id
),
query
.
Account_Id
);
}
}
return
Get
<
RB_Student_OrderGuest_ViewModel
>(
builder
.
ToString
()).
ToList
();
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment