Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
8b323242
Commit
8b323242
authored
4 years ago
by
mobh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改问题
parent
1e3f2013
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
+2
-2
No files found.
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
View file @
8b323242
...
...
@@ -1338,7 +1338,7 @@ public class SalaryManagementController {
*/
@GetMapping
(
value
=
"/payrulegroupitem/{id}"
)
@ApiOperation
(
value
=
"获取计薪规则组项"
,
httpMethod
=
"GET"
,
notes
=
"接口发布说明"
)
public
ResponseResult
Payrulegroupitem
(
@CurrentUser
UserBean
userBean
,
@PathVariable
Integer
id
,
@PathVariable
String
xzyf
)
{
public
ResponseResult
Payrulegroupitem
(
@CurrentUser
UserBean
userBean
,
@PathVariable
Integer
id
)
{
SalaryFieldDto
salfie
=
new
SalaryFieldDto
();
List
<
XcglAssoJsgzzx
>
jsgzzxlist
=
new
LambdaQueryChainWrapper
<
XcglAssoJsgzzx
>(
xcglassojsgzzxmapper
).
eq
(
XcglAssoJsgzzx:
:
getXzzid
,
id
).
eq
(
XcglAssoJsgzzx:
:
getType
,
2
).
list
();
List
<
CalculatedFieldDto
>
fielist
=
new
ArrayList
<
CalculatedFieldDto
>();
...
...
@@ -1373,7 +1373,7 @@ public class SalaryManagementController {
// List<CalculationDto> jswsj = xcglassoxzbmapper.CalculationResults(id,userBean.getOrgCode());
CheckSalaryStaffDto
checksalary
=
new
CheckSalaryStaffDto
();
checksalary
.
setPaygroupid
(
id
);
checksalary
.
setXzyf
(
xzyf
);
//
checksalary.setXzyf(xzyf);
checksalary
.
setOrgcode
(
userBean
.
getOrgCode
());
List
<
CalculationDto
>
jswsj
=
xcglassoxzbmapper
.
CalculationResults
(
checksalary
);
salfie
.
setComuser
(
jswsj
);
...
...
This diff is collapsed.
Click to expand it.
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