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
bb65062d
Commit
bb65062d
authored
4 years ago
by
mobh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改问题
parent
745d2ea3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
5 deletions
+9
-5
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
+9
-5
No files found.
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
View file @
bb65062d
...
...
@@ -11,6 +11,8 @@ import javax.script.ScriptEngineManager;
import
javax.script.ScriptException
;
import
cn.timer.api.dto.xcgl.*
;
import
lombok.SneakyThrows
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.validation.annotation.Validated
;
...
...
@@ -1003,6 +1005,7 @@ public class SalaryManagementController {
/**
* 调薪
*/
@SneakyThrows
(
Exception
.
class
)
@PostMapping
(
value
=
"/payensaad"
)
@ApiOperation
(
value
=
"调薪"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
public
ResponseResult
EnterSalaryAdjustment
(
@CurrentUser
UserBean
userBean
,
@RequestBody
FixedsalaryDto
fixedsalarydto
)
{
...
...
@@ -1018,8 +1021,8 @@ public class SalaryManagementController {
return
new
ResponseResult
().
fail
(
"调薪成功失败, 已存在生效日期"
+
fixedsalarydto
.
getSxrq
()
+
"的待生效记录, 请到调薪记录页面查看!"
);
}
int
txzt
=
2
;
if
(
curDate
.
equals
(
fixedsalarydto
.
getSxrq
()
))
{
// 生效日期在当天, 立即生效, 原使用中的记录变成历史记录
if
(
DateUtil
.
getFormat
(
fixedsalarydto
.
getSxrq
())
<=
DateUtil
.
getFormat
(
curDate
))
{
// 生效日期在当天
或之前的
, 立即生效, 原使用中的记录变成历史记录
XcglAssoXzdadx
xzds
=
new
LambdaQueryChainWrapper
<
XcglAssoXzdadx
>(
xcglassoxzdadxmapper
)
.
eq
(
XcglAssoXzdadx:
:
getUserid
,
Integer
.
valueOf
(
fixedsalarydto
.
getUserid
()))
.
eq
(
XcglAssoXzdadx:
:
getTxzt
,
0
)
...
...
@@ -1072,6 +1075,7 @@ public class SalaryManagementController {
/**
* 调薪记录编辑保存
*/
@SneakyThrows
(
Exception
.
class
)
@PostMapping
(
value
=
"/saveTXjlEdit"
)
@ApiOperation
(
value
=
"调薪"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
public
ResponseResult
saveTXjlEdit
(
@CurrentUser
UserBean
userBean
,
@RequestBody
FixedsalaryDto
fixedsalarydto
)
{
...
...
@@ -1087,8 +1091,8 @@ public class SalaryManagementController {
return
new
ResponseResult
().
fail
(
"调薪成功失败, 已存在生效日期"
+
fixedsalarydto
.
getSxrq
()
+
"的待生效记录, 请到调薪记录页面查看!"
);
}
int
txzt
=
2
;
if
(
curDate
.
equals
(
fixedsalarydto
.
getSxrq
()
))
{
// 生效日期在当天, 立即生效, 原使用中的记录变成历史记录
if
(
DateUtil
.
getFormat
(
fixedsalarydto
.
getSxrq
())
<=
DateUtil
.
getFormat
(
curDate
))
{
// 生效日期在当天
或之前的
, 立即生效, 原使用中的记录变成历史记录
XcglAssoXzdadx
xzds
=
new
LambdaQueryChainWrapper
<
XcglAssoXzdadx
>(
xcglassoxzdadxmapper
)
.
eq
(
XcglAssoXzdadx:
:
getUserid
,
Integer
.
valueOf
(
fixedsalarydto
.
getUserid
()))
.
eq
(
XcglAssoXzdadx:
:
getTxzt
,
0
)
...
...
@@ -1578,7 +1582,7 @@ public class SalaryManagementController {
xzb
.
setUserid
(
znr
.
getUserid
());
//用户id
xzb
.
setXzyf
(
xzyf
);
//薪资月
xzb
.
setXzxid
(
cal
.
getId
());
//薪资项id
xzb
.
setXzxjg
(
Double
.
valueOf
(
cal
.
getRsz
()));
//薪资项结果
xzb
.
setXzxjg
(
StringUtils
.
isBlank
(
cal
.
getRsz
())
?
0
:
Double
.
valueOf
(
cal
.
getRsz
()));
//薪资项结果
xzb
.
setQyid
(
userBean
.
getOrgCode
());
xcglassoxzbmapper
.
xzbinsert
(
xzb
);
}
...
...
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