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
e239c827
Commit
e239c827
authored
Feb 14, 2023
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.5-薪资导入优化(社保基数)
parent
e3235ee0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
8 deletions
+15
-8
SalaryAccountUtil.java
...ifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
+10
-7
SysBaseSetInfoServiceImpl.java
...1/yifu/social/service/impl/SysBaseSetInfoServiceImpl.java
+5
-1
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
View file @
e239c827
...
...
@@ -405,10 +405,6 @@ public class SalaryAccountUtil implements Serializable {
,
entity
,
emp
,
saiList
,
salaryGiveTimeFlag
,
isNewEmployee
,
empName
,
salaryStyle
,
nowMonth
,
updateEmpList
,
checkBankInfoEmpList
,
i
))
continue
;
}
else
if
(
"3"
.
equals
(
salaryType
)
||
"4"
.
equals
(
salaryType
))
{
error
=
"第"
+
(
i
+
2
)
+
"行:薪酬人员查询菜单无此员工,请添加<是否新员工>列,并录入身份证号、开户行总行、开户行省、开户行市、银行卡号、手机号码!"
;
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
continue
;
}
if
(
saiList
!=
null
&&
!
saiList
.
isEmpty
())
{
entity
.
setSaiList
(
saiList
);
...
...
@@ -477,9 +473,14 @@ public class SalaryAccountUtil implements Serializable {
}
saveNewEmpList
.
add
(
newEmps
);
checkTaxMonthList
.
add
(
newEmps
.
getEmpIdcard
());
}
else
if
(!
"3"
.
equals
(
salaryType
)
&&
!
"4"
.
equals
(
salaryType
))
{
error
=
"第"
+
(
newEmps
.
getLineNums
()
+
2
)
+
"行:薪酬人员查询菜单无此员工,请添加<是否新员工(默认否)>列,并录入身份证号、开户行总行、开户行省、开户行市、银行卡号、计税月份、手机号码!"
;
errorList
.
add
(
new
ErrorMessage
(
newEmps
.
getLineNums
()
+
2
,
error
));
}
else
{
if
(
"3"
.
equals
(
salaryType
)
||
"4"
.
equals
(
salaryType
))
{
error
=
"第"
+
(
i
+
2
)
+
"行:薪酬人员查询菜单无此员工,请添加<是否新员工>列,并录入身份证号、开户行总行、开户行省、开户行市、银行卡号、手机号码!"
;
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
}
else
{
error
=
"第"
+
(
newEmps
.
getLineNums
()
+
2
)
+
"行:薪酬人员查询菜单无此员工,请添加<是否新员工(默认否)>列,并录入身份证号、开户行总行、开户行省、开户行市、银行卡号、计税月份、手机号码!"
;
errorList
.
add
(
new
ErrorMessage
(
newEmps
.
getLineNums
()
+
2
,
error
));
}
}
}
else
{
// 使用emp信息
...
...
@@ -910,6 +911,7 @@ public class SalaryAccountUtil implements Serializable {
areaStr
=
ExcelUtil
.
getRedisAreaValue
(
CacheConstants
.
AREA_VALUE
+
entity
.
getBankProvince
().
trim
());
if
(
Common
.
isNotNull
(
areaStr
))
{
newEmp
.
setBankProvince
(
areaStr
);
entity
.
setBankProvince
(
String
.
valueOf
(
newEmp
.
getBankProvince
()));
}
else
{
error
=
"第"
+
(
i
+
2
)
+
"行:"
+
newEmpStr
+
"-开户行省错误:"
+
entity
.
getBankProvince
();
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
...
...
@@ -919,6 +921,7 @@ public class SalaryAccountUtil implements Serializable {
+
CommonConstants
.
DOWN_LINE_STRING
+
entity
.
getBankProvince
().
trim
());
if
(
Common
.
isNotNull
(
areaStr
))
{
newEmp
.
setBankCity
(
areaStr
);
entity
.
setBankCity
(
String
.
valueOf
(
newEmp
.
getBankCity
()));
}
else
{
error
=
"第"
+
(
i
+
2
)
+
"行:"
+
newEmpStr
+
"-开户行市错误:"
+
entity
.
getBankCity
();
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/SysBaseSetInfoServiceImpl.java
View file @
e239c827
...
...
@@ -209,8 +209,12 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
}
this
.
saveOrUpdateBaseAndFundPro
(
sysBaseSetInfo
,
old
);
int
type
=
CommonConstants
.
ONE_INT
;
if
(
CommonConstants
.
ONE_STRING
.
equals
(
sysBaseSetInfo
.
getBaseType
()))
{
type
=
CommonConstants
.
TWO_INT
;
}
// 记录变更日志
tSocialLogService
.
saveModificationRecord
(
CommonConstants
.
ONE_INT
,
old
.
getId
(),
old
,
sysBaseSetInfo
);
tSocialLogService
.
saveModificationRecord
(
type
,
old
.
getId
(),
old
,
sysBaseSetInfo
);
return
R
.
ok
();
}
...
...
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