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
493cda44
Commit
493cda44
authored
4 years ago
by
ilal
Committed by
chenzg
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
64b074e2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
36 additions
and
0 deletions
+36
-0
src/main/java/cn/timer/api/bean/xcgl/XcglAdminXzz.java
+6
-0
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
+14
-0
src/main/java/cn/timer/api/dto/xcgl/SalaryRulesDto.java
+13
-0
src/main/resources/mapping/xcgl/XcglAdminXzzMapper.xml
+3
-0
No files found.
src/main/java/cn/timer/api/bean/xcgl/XcglAdminXzz.java
View file @
493cda44
...
...
@@ -77,5 +77,10 @@ public class XcglAdminXzz extends Model<XcglAdminXzz> {
@ApiModelProperty
(
value
=
"算薪月份"
,
example
=
"2019-12"
)
private
String
xzyf
;
@ApiModelProperty
(
value
=
"薪资规则确定(0:未确定;1:已确定)"
,
example
=
"2019-12"
)
private
Integer
isXzgz
;
@ApiModelProperty
(
value
=
"薪资锁定(0:未锁定;1:已锁定)"
,
example
=
"2019-12"
)
private
Integer
isXzsd
;
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
View file @
493cda44
...
...
@@ -1305,6 +1305,20 @@ public class SalaryManagementController {
}
@PostMapping
(
value
=
"/determinesalaryrules"
)
@ApiOperation
(
value
=
"是否确定薪资规则"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
public
Result
<
Object
>
DetermineSalaryRules
(
@CurrentUser
UserBean
userBean
,
@RequestBody
SalaryRulesDto
salaryrulesdto
)
{
XcglAdminXzz
.
builder
().
id
(
salaryrulesdto
.
getXzzid
()).
isXzgz
(
salaryrulesdto
.
getState
()).
build
().
updateById
();
return
ResultUtil
.
success
(
"操作成功!"
);
}
@PostMapping
(
value
=
"/locksalary"
)
@ApiOperation
(
value
=
"是否锁定薪资"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
public
Result
<
Object
>
LockSalary
(
@CurrentUser
UserBean
userBean
,
@RequestBody
SalaryRulesDto
salaryrulesdto
)
{
XcglAdminXzz
.
builder
().
id
(
salaryrulesdto
.
getXzzid
()).
isXzsd
(
salaryrulesdto
.
getState
()).
build
().
updateById
();
return
ResultUtil
.
success
(
"操作成功!"
);
}
/**
* 查看薪资
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/xcgl/SalaryRulesDto.java
0 → 100644
View file @
493cda44
package
cn
.
timer
.
api
.
dto
.
xcgl
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
@Data
@AllArgsConstructor
@NoArgsConstructor
public
class
SalaryRulesDto
{
Integer
xzzid
;
Integer
state
;
//0 未
}
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/xcgl/XcglAdminXzzMapper.xml
View file @
493cda44
...
...
@@ -17,6 +17,9 @@
<result
column=
"pxfs"
property=
"pxfs"
/>
<result
column=
"monthtime"
property=
"monthtime"
/>
<result
column=
"xzyf"
property=
"xzyf"
/>
<result
column=
"is_xzgz"
property=
"isXzgz"
/>
<result
column=
"is_xzsd"
property=
"isXzsd"
/>
</resultMap>
<resultMap
id=
"PayrollExceptionDtoMap"
type=
"cn.timer.api.dto.xcgl.PayrollExceptionDto"
>
...
...
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