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
d44c6b00
Commit
d44c6b00
authored
Feb 14, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.5' into MVP1.5
parents
317ecb61
dc20a07e
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
79 additions
and
21 deletions
+79
-21
TCheckBankNoServiceImpl.java
...d/plus/v1/check/service/impl/TCheckBankNoServiceImpl.java
+10
-2
HrEquator.java
...loud/plus/v1/yifu/common/core/util/equator/HrEquator.java
+35
-1
TSalaryEmployeeServiceImpl.java
.../yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
+12
-8
SalaryAccountUtil.java
...ifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
+6
-8
SysBaseSetInfoServiceImpl.java
...1/yifu/social/service/impl/SysBaseSetInfoServiceImpl.java
+12
-1
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+4
-1
No files found.
yifu-check/yifu-check-biz/src/main/java/com/yifu/cloud/plus/v1/check/service/impl/TCheckBankNoServiceImpl.java
View file @
d44c6b00
...
...
@@ -120,8 +120,16 @@ public class TCheckBankNoServiceImpl extends ServiceImpl<TCheckBankNoMapper, TCh
Map
<
String
,
Boolean
>
bankMap
=
new
HashMap
<>();
for
(
TCheckBankNo
check
:
list
)
{
cur
=
noMap
.
get
(
check
.
getBankNo
());
if
(
cur
!=
null
&&
cur
.
getName
().
equals
(
check
.
getName
()))
{
bankMap
.
put
(
cur
.
getBankNo
(),
CommonConstants
.
ZERO_ONE
.
equals
(
cur
.
getResult
()));
if
(
cur
!=
null
)
{
if
(
CommonConstants
.
ZERO_ONE
.
equals
(
cur
.
getResult
()))
{
bankMap
.
put
(
cur
.
getBankNo
(),
cur
.
getName
().
equals
(
check
.
getName
()));
}
else
{
if
(
cur
.
getName
().
equals
(
check
.
getName
()))
{
bankMap
.
put
(
cur
.
getBankNo
(),
false
);
}
else
{
noCurlist
.
add
(
check
);
}
}
}
else
{
noCurlist
.
add
(
check
);
}
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/equator/HrEquator.java
View file @
d44c6b00
...
...
@@ -51,15 +51,49 @@ public class HrEquator extends GetterBaseEquator {
List
<
FieldInfo
>
diff
=
equator
.
getDiffFields
(
oldInfo
,
newInfo
);
Map
<
String
,
Integer
>
curMap
=
new
HashMap
<>();
String
fieldName
;
String
fieldName2
;
boolean
newChange
=
false
;
if
(!
Common
.
isEmpty
(
diff
))
{
List
<
FieldInfo
>
diff2
;
for
(
FieldInfo
field:
diff
){
fieldName
=
field
.
getFieldName
();
curMap
.
put
(
fieldName
,
1
);
if
(!
"updateTime"
.
equals
(
fieldName
)
&&
!
"updateBy"
.
equals
(
fieldName
))
{
if
(!
"updateTime"
.
equals
(
fieldName
)
&&
!
"updateBy"
.
equals
(
fieldName
)
&&
!
"java.util.List"
.
equals
(
field
.
getFirstFieldType
().
getName
())
)
{
newChange
=
true
;
sb
.
append
(
field
.
getFieldName
()).
append
(
","
);
}
try
{
if
(
"java.util.List"
.
equals
(
field
.
getFirstFieldType
().
getName
()))
{
List
<
Object
>
firstList
=
(
List
<
Object
>)
field
.
getFirstVal
();
List
<
Object
>
secondList
=
(
List
<
Object
>)
field
.
getSecondVal
();
curMap
.
put
(
fieldName
,
1
);
if
(
firstList
!=
null
&&
secondList
!=
null
)
{
if
(
firstList
.
size
()
==
secondList
.
size
())
{
listA:
for
(
int
i
=
0
;
i
<
firstList
.
size
();
i
++)
{
diff2
=
equator
.
getDiffFields
(
firstList
.
get
(
i
),
secondList
.
get
(
i
));
for
(
FieldInfo
field2
:
diff2
)
{
fieldName2
=
field2
.
getFieldName
();
if
(!
"createTime"
.
equals
(
fieldName2
)
&&
!
"createBy"
.
equals
(
fieldName2
)
&&
!
"createName"
.
equals
(
fieldName2
)
&&
!
"updateTime"
.
equals
(
fieldName2
)
&&
!
"updateBy"
.
equals
(
fieldName2
))
{
newChange
=
true
;
sb
.
append
(
field
.
getFieldName
()).
append
(
","
);
break
listA
;
}
}
}
}
else
{
newChange
=
true
;
sb
.
append
(
field
.
getFieldName
()).
append
(
","
);
}
}
else
if
(
firstList
!=
null
||
secondList
!=
null
)
{
newChange
=
true
;
sb
.
append
(
field
.
getFieldName
()).
append
(
","
);
}
}
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
}
}
// 从有值变为空,也要记录变更日志
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
View file @
d44c6b00
...
...
@@ -328,26 +328,30 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
}
}
boolean
isFalse
=
false
;
for
(
TSalaryEmployee
employee
:
saveNewEmpList
)
{
if
(
bankMap
.
get
(
employee
.
getBankNo
())
!=
null
)
{
if
(
Boolean
.
FALSE
.
equals
(
bankMap
.
get
(
employee
.
getBankNo
())))
{
errorList
.
add
(
new
ErrorMessage
((
employee
.
getLineNums
()
+
2
),
"第"
+
(
employee
.
getLineNums
()
+
2
)
+
"行:该员工新建
时校验卡号错误
"
));
return
null
;
errorList
.
add
(
new
ErrorMessage
((
employee
.
getLineNums
()
+
2
),
"第"
+
(
employee
.
getLineNums
()
+
2
)
+
"行:该员工新建
失败:【姓名与卡号验证:认证不一致】
"
));
isFalse
=
true
;
}
}
else
{
errorList
.
add
(
new
ErrorMessage
((
employee
.
getLineNums
()
+
2
),
"第"
+
(
employee
.
getLineNums
()
+
2
)
+
"行:该员工新建
时校验卡号错误:【
"
+
SalaryConstants
.
CHECK_NO_RESPONSE
+
"】"
));
return
null
;
errorList
.
add
(
new
ErrorMessage
((
employee
.
getLineNums
()
+
2
),
"第"
+
(
employee
.
getLineNums
()
+
2
)
+
"行:该员工新建
失败:【姓名与卡号验证:
"
+
SalaryConstants
.
CHECK_NO_RESPONSE
+
"】"
));
isFalse
=
true
;
}
if
(
phoneMap
.
get
(
employee
.
getEmpPhone
())
!=
null
)
{
if
(
Boolean
.
FALSE
.
equals
(
phoneMap
.
get
(
employee
.
getEmpPhone
())))
{
errorList
.
add
(
new
ErrorMessage
((
employee
.
getLineNums
()
+
2
),
"第"
+
(
employee
.
getLineNums
()
+
2
)
+
"行:该员工新建
时校验手机号错误
"
));
return
null
;
errorList
.
add
(
new
ErrorMessage
((
employee
.
getLineNums
()
+
2
),
"第"
+
(
employee
.
getLineNums
()
+
2
)
+
"行:该员工新建
失败:【手机号验证:手机号错误】
"
));
isFalse
=
true
;
}
}
else
{
errorList
.
add
(
new
ErrorMessage
((
employee
.
getLineNums
()
+
2
),
"第"
+
(
employee
.
getLineNums
()
+
2
)
+
"行:该员工新建
时校验手机号错误:【
"
+
SalaryConstants
.
CHECK_NO_RESPONSE
+
"】"
));
return
null
;
errorList
.
add
(
new
ErrorMessage
((
employee
.
getLineNums
()
+
2
),
"第"
+
(
employee
.
getLineNums
()
+
2
)
+
"行:该员工新建
失败:【手机号验证:
"
+
SalaryConstants
.
CHECK_NO_RESPONSE
+
"】"
));
isFalse
=
true
;
}
}
if
(
isFalse
)
{
return
null
;
}
this
.
saveBatch
(
saveNewEmpList
);
}
return
null
;
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
View file @
d44c6b00
...
...
@@ -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
);
...
...
@@ -478,10 +474,10 @@ public class SalaryAccountUtil implements Serializable {
saveNewEmpList
.
add
(
newEmps
);
checkTaxMonthList
.
add
(
newEmps
.
getEmpIdcard
());
}
else
{
if
(
"4"
.
equals
(
salaryType
))
{
error
=
"第"
+
(
newEmps
.
getLineNums
()
+
2
)
+
"行:薪酬人员查询菜单无此员工,请添加<是否新员工(默认否)
>列,并录入身份证号、开户行总行、开户行省、开户行市、银行卡号、手机号码!"
;
errorList
.
add
(
new
ErrorMessage
(
newEmps
.
getLineNums
()
+
2
,
error
));
}
else
if
(
notLabour
)
{
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
));
}
...
...
@@ -915,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
));
...
...
@@ -924,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 @
d44c6b00
...
...
@@ -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
();
}
...
...
@@ -249,6 +253,13 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
sysPayProportionService
.
save
(
payProportion
);
}
}
for
(
SysPayProportion
payProportion
:
payProportionList
)
{
payProportion
.
setCreateBy
(
null
);
payProportion
.
setCreateName
(
null
);
payProportion
.
setCreateTime
(
null
);
payProportion
.
setUpdateBy
(
null
);
payProportion
.
setUpdateTime
(
null
);
}
if
(!
oldFundMap
.
isEmpty
())
{
for
(
SysPayProportion
fund
:
oldFundMap
.
values
())
{
sysPayProportionService
.
removeById
(
fund
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
d44c6b00
...
...
@@ -2519,7 +2519,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
payExists
.
setSocialSecurityNo
(
infoVo
.
getSocialSecurityNo
());
payExists
.
setSocialCreateMonth
(
infoVo
.
getSocialCreateMonth
());
payExists
.
setSumAll
(
payExists
.
getSocialSum
());
payExists
.
setCreateTime
(
LocalDateTime
.
now
());
payExists
.
setSocialId
(
UUID
.
randomUUID
().
toString
());
if
(
PaymentConstants
.
PENSION_RISK
.
equals
(
infoVo
.
getRiskType
()))
{
...
...
@@ -2531,6 +2530,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
payExists
.
setSocialSecurityPersonalSum
(
BigDecimalUtils
.
safeAdd
(
payExists
.
getPersonalPensionMoney
()
,
payExists
.
getSocialSecurityPersonalSum
()));
payExists
.
setSocialSum
(
BigDecimalUtils
.
safeAdd
(
payExists
.
getUnitSocialSum
(),
payExists
.
getSocialSecurityPersonalSum
()));
payExists
.
setSumAll
(
payExists
.
getSocialSum
());
batchYlInsertList
.
put
(
UUID
.
randomUUID
().
toString
(),
payExists
);
}
if
(
PaymentConstants
.
UNEMPLOYEEMENT_RISK
.
equals
(
infoVo
.
getRiskType
()))
{
...
...
@@ -2542,6 +2542,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
payExists
.
setSocialSecurityPersonalSum
(
BigDecimalUtils
.
safeAdd
(
payExists
.
getPersonalUnemploymentMoney
()
,
payExists
.
getSocialSecurityPersonalSum
()));
payExists
.
setSocialSum
(
BigDecimalUtils
.
safeAdd
(
payExists
.
getUnitSocialSum
(),
payExists
.
getSocialSecurityPersonalSum
()));
payExists
.
setSumAll
(
payExists
.
getSocialSum
());
batchSyInsertList
.
put
(
UUID
.
randomUUID
().
toString
(),
payExists
);
}
if
(
PaymentConstants
.
INJURY_RISK
.
equals
(
infoVo
.
getRiskType
()))
{
...
...
@@ -2550,6 +2551,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
payExists
.
setUnitSocialSum
(
BigDecimalUtils
.
safeAdd
(
payExists
.
getUnitInjuryMoney
()
,
payExists
.
getUnitSocialSum
()));
payExists
.
setSocialSum
(
BigDecimalUtils
.
safeAdd
(
payExists
.
getUnitSocialSum
(),
payExists
.
getSocialSecurityPersonalSum
()));
payExists
.
setSumAll
(
payExists
.
getSocialSum
());
batchGsInsertList
.
put
(
UUID
.
randomUUID
().
toString
(),
payExists
);
}
if
(
CommonConstants
.
ONE_STRING
.
equals
(
type
))
{
...
...
@@ -2566,6 +2568,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
,
payExists
.
getPersonalBigmailmentMoney
()
,
payExists
.
getSocialSecurityPersonalSum
()));
payExists
.
setSocialSum
(
BigDecimalUtils
.
safeAdd
(
payExists
.
getUnitSocialSum
(),
payExists
.
getSocialSecurityPersonalSum
()));
payExists
.
setSumAll
(
payExists
.
getSocialSum
());
batchYyInsertList
.
put
(
UUID
.
randomUUID
().
toString
(),
payExists
);
}
errorMessageList
.
put
(
UUID
.
randomUUID
().
toString
(),
new
ErrorDetailVO
(
infoVo
.
getRowIndex
(),
CommonConstants
.
ONE_INT
,
...
...
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