Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
fc7adf38
Commit
fc7adf38
authored
Aug 28, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.9-(优化房小bug:薪资人员没有手机号,日志报错)
parent
9c03257f
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
38 additions
and
22 deletions
+38
-22
TSalaryEmpModLogServiceImpl.java
...yifu/salary/service/impl/TSalaryEmpModLogServiceImpl.java
+38
-22
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmpModLogServiceImpl.java
View file @
fc7adf38
...
...
@@ -145,23 +145,34 @@ public class TSalaryEmpModLogServiceImpl extends ServiceImpl<TSalaryEmpModLogMap
str
.
append
(
" "
);
}
//开户行
if
(
Common
.
isNotNull
(
newEntity
.
getBankName
())
&&
!
oldEntity
.
getBankName
().
equals
(
newEntity
.
getBankName
())){
if
(
Common
.
isNotNull
(
newEntity
.
getBankName
())){
if
(
Common
.
isEmpty
(
oldEntity
.
getBankName
()))
{
str
.
append
(
"开户行: 空 ->"
);
str
.
append
(
newEntity
.
getBankName
());
str
.
append
(
" "
);
}
else
if
(!
oldEntity
.
getBankName
().
equals
(
newEntity
.
getBankName
())){
str
.
append
(
"开户行:"
);
str
.
append
(
oldEntity
.
getBankName
());
str
.
append
(
"->"
);
str
.
append
(
newEntity
.
getBankName
());
str
.
append
(
" "
);
}
}
//银行卡号
if
(
Common
.
isNotNull
(
newEntity
.
getBankNo
())
&&
!
oldEntity
.
getBankNo
().
equals
(
newEntity
.
getBankNo
())){
if
(
Common
.
isNotNull
(
newEntity
.
getBankNo
()))
{
if
(
Common
.
isEmpty
(
oldEntity
.
getBankNo
()))
{
str
.
append
(
"银行卡号: 空 ->"
);
str
.
append
(
newEntity
.
getBankNo
());
str
.
append
(
" "
);
}
else
if
(!
oldEntity
.
getBankNo
().
equals
(
newEntity
.
getBankNo
())){
str
.
append
(
"银行卡号:"
);
str
.
append
(
oldEntity
.
getBankNo
());
str
.
append
(
"->"
);
str
.
append
(
newEntity
.
getBankNo
());
str
.
append
(
" "
);
}
}
//开户行支行
if
((
Common
.
isEmpty
(
oldEntity
.
getBankSubName
())
&&
Common
.
isNotNull
(
newEntity
.
getBankSubName
()))
...
...
@@ -175,7 +186,7 @@ public class TSalaryEmpModLogServiceImpl extends ServiceImpl<TSalaryEmpModLogMap
}
//在职状态
if
(
Common
.
isNotNull
(
newEntity
.
getFileStatus
())
&&
!
oldEntity
.
getFileStatus
().
equals
(
newEntity
.
getFileStatus
(
))){
&&
(
Common
.
isEmpty
(
oldEntity
.
getFileStatus
())
||
!
oldEntity
.
getFileStatus
().
equals
(
newEntity
.
getFileStatus
()
))){
str
.
append
(
"在职状态:"
);
str
.
append
(
CommonConstants
.
ZERO_STRING
.
equals
(
oldEntity
.
getFileStatus
())?
"在职"
:
"离职"
);
str
.
append
(
"->"
);
...
...
@@ -183,8 +194,12 @@ public class TSalaryEmpModLogServiceImpl extends ServiceImpl<TSalaryEmpModLogMap
str
.
append
(
" "
);
}
//手机号码
if
(
Common
.
isNotNull
(
newEntity
.
getEmpPhone
())
&&
!
oldEntity
.
getEmpPhone
().
equals
(
newEntity
.
getEmpPhone
())){
if
(
Common
.
isNotNull
(
newEntity
.
getEmpPhone
()))
{
if
(
Common
.
isEmpty
(
oldEntity
.
getEmpPhone
()))
{
str
.
append
(
"手机号码: 空 ->"
);
str
.
append
(
newEntity
.
getEmpPhone
());
str
.
append
(
" "
);
}
else
if
(!
oldEntity
.
getEmpPhone
().
equals
(
newEntity
.
getEmpPhone
())){
str
.
append
(
"手机号码:"
);
str
.
append
(
oldEntity
.
getEmpPhone
());
str
.
append
(
"->"
);
...
...
@@ -192,6 +207,7 @@ public class TSalaryEmpModLogServiceImpl extends ServiceImpl<TSalaryEmpModLogMap
str
.
append
(
" "
);
}
}
}
private
LambdaQueryWrapper
buildQueryWrapper
(
TSalaryEmpModLogSearchVo
entity
){
LambdaQueryWrapper
<
TSalaryEmpModLog
>
wrapper
=
Wrappers
.
lambdaQuery
();
...
...
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