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
4ea83949
Commit
4ea83949
authored
Jul 19, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.7-薪资导入相关
parent
66a687ce
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
TPreEmployeeInfo.java
.../cloud/plus/v1/yifu/archives/entity/TPreEmployeeInfo.java
+0
-2
TSalaryEmpModLogServiceImpl.java
...yifu/salary/service/impl/TSalaryEmpModLogServiceImpl.java
+5
-3
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TPreEmployeeInfo.java
View file @
4ea83949
...
...
@@ -415,7 +415,6 @@ public class TPreEmployeeInfo extends BaseEntity {
/**
* 开户行省
*/
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
@ExcelAttribute
(
name
=
"开户行省"
,
isArea
=
true
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"开户行省"
)
...
...
@@ -423,7 +422,6 @@ public class TPreEmployeeInfo extends BaseEntity {
/**
* 开户行市
*/
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
@ExcelAttribute
(
name
=
"开户行市"
,
isArea
=
true
,
parentField
=
"bankProvince"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"开户行市"
)
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmpModLogServiceImpl.java
View file @
4ea83949
...
...
@@ -90,7 +90,8 @@ public class TSalaryEmpModLogServiceImpl extends ServiceImpl<TSalaryEmpModLogMap
}
extracted
(
newEntity
,
oldEntity
,
str
);
//计税月份
if
(
Common
.
isNotNull
(
newEntity
.
getTaxMonth
())
&&
!
oldEntity
.
getTaxMonth
().
equals
(
newEntity
.
getTaxMonth
())){
if
(
Common
.
isNotNull
(
newEntity
.
getTaxMonth
())
&&
Common
.
isNotNull
(
oldEntity
.
getTaxMonth
())
&&
!
oldEntity
.
getTaxMonth
().
equals
(
newEntity
.
getTaxMonth
())){
str
.
append
(
"计税月份:"
);
str
.
append
(
oldEntity
.
getTaxMonth
());
str
.
append
(
"->"
);
...
...
@@ -99,7 +100,7 @@ public class TSalaryEmpModLogServiceImpl extends ServiceImpl<TSalaryEmpModLogMap
}
//开户行省
if
(
Common
.
isNotNull
(
newEntity
.
getBankProvince
())
&&
!
oldEntity
.
getBankProvince
().
equals
(
newEntity
.
getBankProvince
())){
&&
Common
.
isNotNull
(
oldEntity
.
getBankProvince
())
&&
!
oldEntity
.
getBankProvince
().
equals
(
newEntity
.
getBankProvince
())){
str
.
append
(
"开户行省:"
);
str
.
append
(
Common
.
isEmpty
(
oldEntity
.
getBankProvince
())?
""
:
util
.
getAreaLabelPublic
(
oldEntity
.
getBankProvince
()));
str
.
append
(
"->"
);
...
...
@@ -107,7 +108,8 @@ public class TSalaryEmpModLogServiceImpl extends ServiceImpl<TSalaryEmpModLogMap
str
.
append
(
" "
);
}
//开户行市
if
(
Common
.
isNotNull
(
newEntity
.
getBankCity
())
&&
!
oldEntity
.
getBankCity
().
equals
(
newEntity
.
getBankCity
())){
if
(
Common
.
isNotNull
(
newEntity
.
getBankCity
())
&&
Common
.
isNotNull
(
oldEntity
.
getBankCity
())
&&
!
oldEntity
.
getBankCity
().
equals
(
newEntity
.
getBankCity
())){
str
.
append
(
"开户行市:"
);
str
.
append
(
Common
.
isEmpty
(
oldEntity
.
getBankCity
())?
""
:
util
.
getAreaLabelPublic
(
oldEntity
.
getBankCity
()));
str
.
append
(
"->"
);
...
...
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