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
fc756a33
Commit
fc756a33
authored
Dec 23, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
4d33d788
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
16 deletions
+7
-16
BonusController.cs
Edu.WebApi/Controllers/Bonus/BonusController.cs
+7
-16
No files found.
Edu.WebApi/Controllers/Bonus/BonusController.cs
View file @
fc756a33
using
Edu.Cache.User
;
using
Edu.Cache.User
;
using
Edu.Common.API
;
using
Edu.Common.API
;
using
Edu.Common.Plugin
;
using
Edu.Common.Plugin
;
using
Edu.Model.ViewModel.Bonus
;
using
Edu.Model.ViewModel.Sell
;
using
Edu.Model.ViewModel.Sell
;
using
Edu.Module.Course
;
using
Edu.Module.Course
;
using
Edu.WebApi.Filter
;
using
Edu.WebApi.Filter
;
...
@@ -193,7 +194,7 @@ namespace Edu.WebApi.Controllers.Bonus
...
@@ -193,7 +194,7 @@ namespace Edu.WebApi.Controllers.Bonus
public
ApiResult
GetPersonnelPeriodPage
()
public
ApiResult
GetPersonnelPeriodPage
()
{
{
var
pageModel
=
Common
.
Plugin
.
JsonHelper
.
DeserializeObject
<
ResultPageModel
>(
RequestParm
.
Msg
.
ToString
());
var
pageModel
=
Common
.
Plugin
.
JsonHelper
.
DeserializeObject
<
ResultPageModel
>(
RequestParm
.
Msg
.
ToString
());
var
query
=
new
RB_
Bonus_Plan
Extend
()
var
query
=
new
RB_
Personnel_Period_
Extend
()
{
{
};
};
...
@@ -206,23 +207,13 @@ namespace Edu.WebApi.Controllers.Bonus
...
@@ -206,23 +207,13 @@ namespace Edu.WebApi.Controllers.Bonus
result
.
Add
(
new
result
.
Add
(
new
{
{
item
.
Id
,
item
.
Id
,
item
.
PlanName
,
item
.
Name
,
item
.
BasicSalary
,
item
.
Periods
,
item
.
OpenBonus
,
item
.
SumPrice
,
item
.
WorkAgeSalary
,
item
.
Remark
,
item
.
ClueNumSalary
,
item
.
SaleIds
,
item
.
UseCourseIds
,
item
.
NotUseCourseIds
,
CreateByName
,
CreateByName
,
item
.
PlanType
,
item
.
Financials
,
item
.
PlanTypeStr
,
CreateTime
=
Common
.
ConvertHelper
.
FormatTime
(
item
.
CreateTime
),
CreateTime
=
Common
.
ConvertHelper
.
FormatTime
(
item
.
CreateTime
),
item
.
DetailList
,
item
.
SaleList
,
item
.
UseCourseList
,
item
.
NotUseCourseList
,
item
.
MonthGoalMoney
,
});
});
}
}
pageModel
.
Count
=
rowsCount
;
pageModel
.
Count
=
rowsCount
;
...
...
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