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
ab51663f
Commit
ab51663f
authored
Jan 14, 2022
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
2d6ebbe4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
39 additions
and
1 deletion
+39
-1
MarketConsultantModule.cs
Edu.Module.Customer/MarketConsultantModule.cs
+1
-0
RB_Student_OrderGuestRepository.cs
Edu.Repository/User/RB_Student_OrderGuestRepository.cs
+1
-1
UserCenterController.cs
Edu.WebApi/Controllers/User/UserCenterController.cs
+37
-0
No files found.
Edu.Module.Customer/MarketConsultantModule.cs
View file @
ab51663f
...
@@ -24,6 +24,7 @@ namespace Edu.Module.Customer
...
@@ -24,6 +24,7 @@ namespace Edu.Module.Customer
object
obj
=
new
object
();
object
obj
=
new
object
();
var
totalTotal
=
studentRepository
.
GetStudentClueRepository
(
EmpIds
,
StartTime
,
EndTime
);
var
totalTotal
=
studentRepository
.
GetStudentClueRepository
(
EmpIds
,
StartTime
,
EndTime
);
return
obj
;
return
obj
;
}
}
...
...
Edu.Repository/User/RB_Student_OrderGuestRepository.cs
View file @
ab51663f
...
@@ -79,7 +79,7 @@ FROM RB_Student_OrderGuest AS A INNER JOIN rb_order AS C ON A.OrderId=C.OrderId
...
@@ -79,7 +79,7 @@ FROM RB_Student_OrderGuest AS A INNER JOIN rb_order AS C ON A.OrderId=C.OrderId
INNER JOIN rb_order_guest AS D ON A.GuestId=D.Id
INNER JOIN rb_order_guest AS D ON A.GuestId=D.Id
LEFT JOIN rb_course AS E ON c.CourseId=E.CourseId
LEFT JOIN rb_course AS E ON c.CourseId=E.CourseId
LEFT JOIN rb_class AS B ON A.ClassId=B.ClassId
LEFT JOIN rb_class AS B ON A.ClassId=B.ClassId
WHERE 1=1
WHERE 1=1
AND C.OrderState<>3
"
);
"
);
builder
.
AppendFormat
(
" AND A.{0}={1} "
,
nameof
(
RB_Student_OrderGuest_ViewModel
.
Status
),
(
int
)
DateStateEnum
.
Normal
);
builder
.
AppendFormat
(
" AND A.{0}={1} "
,
nameof
(
RB_Student_OrderGuest_ViewModel
.
Status
),
(
int
)
DateStateEnum
.
Normal
);
if
(
query
!=
null
)
if
(
query
!=
null
)
...
...
Edu.WebApi/Controllers/User/UserCenterController.cs
View file @
ab51663f
...
@@ -15,6 +15,7 @@ using Edu.Model.CacheModel;
...
@@ -15,6 +15,7 @@ using Edu.Model.CacheModel;
using
Edu.Model.Public
;
using
Edu.Model.Public
;
using
Edu.Model.ViewModel.User
;
using
Edu.Model.ViewModel.User
;
using
Edu.Module.Course
;
using
Edu.Module.Course
;
using
Edu.Module.Customer
;
using
Edu.Module.User
;
using
Edu.Module.User
;
using
Edu.WebApi.Filter
;
using
Edu.WebApi.Filter
;
using
Microsoft.AspNetCore.Authorization
;
using
Microsoft.AspNetCore.Authorization
;
...
@@ -68,6 +69,11 @@ namespace Edu.WebApi.Controllers.User
...
@@ -68,6 +69,11 @@ namespace Edu.WebApi.Controllers.User
/// </summary>
/// </summary>
private
readonly
EmployeeBonusModule
employeeBonusModule
=
new
EmployeeBonusModule
();
private
readonly
EmployeeBonusModule
employeeBonusModule
=
new
EmployeeBonusModule
();
/// <summary>
/// 市场和课程顾问数据统计处理类对象
/// </summary>
private
readonly
MarketConsultantModule
marketConsultantModule
=
new
MarketConsultantModule
();
#
region
字典管理
#
region
字典管理
/// <summary>
/// <summary>
...
@@ -2514,5 +2520,36 @@ namespace Edu.WebApi.Controllers.User
...
@@ -2514,5 +2520,36 @@ namespace Edu.WebApi.Controllers.User
}
}
#
endregion
#
endregion
#
region
市场部数据统计
/// <summary>
/// 市场部数据统计
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
MarketStatic
()
{
string
employeeIds
=
""
;
string
startTime
=
""
;
string
endTime
=
""
;
var
obj
=
marketConsultantModule
.
MarketStaticModule
(
employeeIds
,
startTime
,
endTime
);
return
ApiResult
.
Success
(
data
:
obj
);
}
/// <summary>
/// 课程顾问部数据统计
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
ConsultantStatic
()
{
string
employeeIds
=
""
;
string
startTime
=
""
;
string
endTime
=
""
;
var
obj
=
marketConsultantModule
.
ConsultantStaticModule
(
employeeIds
,
startTime
,
endTime
);
return
ApiResult
.
Success
(
data
:
obj
);
}
#
endregion
}
}
}
}
\ No newline at end of file
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