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
b7188b5a
Commit
b7188b5a
authored
Sep 19, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.10社保士兵改token
parent
db2ecbf2
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
36 additions
and
3 deletions
+36
-3
TSalaryEmployeeServiceImpl.java
.../yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
+27
-0
SalaryAccountUtil.java
...ifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
+1
-1
TSocialSoldierPushServiceImpl.java
...fu/social/service/impl/TSocialSoldierPushServiceImpl.java
+5
-0
application-dev.yml
...al/yifu-social-biz/src/main/resources/application-dev.yml
+2
-1
application-prd.yml
...al/yifu-social-biz/src/main/resources/application-prd.yml
+1
-1
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
View file @
b7188b5a
...
...
@@ -70,6 +70,8 @@ import java.util.ArrayList;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.regex.Matcher
;
import
java.util.regex.Pattern
;
/**
* 薪酬人员表
...
...
@@ -488,6 +490,21 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
}
}
}
for
(
TSalaryEmployee
employee
:
updateEmployeeBankList
)
{
if
(
Common
.
isNotNull
(
employee
.
getBankProvince
())
&&
!
regNumber
(
employee
.
getBankProvince
()))
{
areaProvince
=
ExcelUtil
.
getRedisAreaValue
(
CacheConstants
.
AREA_VALUE
+
employee
.
getBankProvince
().
trim
());
if
(
Common
.
isNotNull
(
areaProvince
))
{
if
(
Common
.
isNotNull
(
employee
.
getBankCity
())
&&
!
regNumber
(
employee
.
getBankCity
()))
{
areaCity
=
ExcelUtil
.
getRedisAreaValue
(
CacheConstants
.
AREA_VALUE
+
employee
.
getBankCity
().
trim
()
+
CommonConstants
.
DOWN_LINE_STRING
+
employee
.
getBankProvince
().
trim
());
if
(
Common
.
isNotNull
(
areaCity
))
{
employee
.
setBankCity
(
areaCity
);
}
}
employee
.
setBankProvince
(
areaProvince
);
}
}
}
if
(
isFalse
)
{
return
null
;
}
...
...
@@ -499,6 +516,16 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
return
null
;
}
private
static
boolean
regNumber
(
String
content
)
{
boolean
flag
=
false
;
Pattern
p
=
Pattern
.
compile
(
"^[0-9]*$"
);
Matcher
m
=
p
.
matcher
(
content
);
if
(
m
.
matches
())
{
flag
=
true
;
}
return
flag
;
}
/**
* @param employee
* @Description: 校验卡号与手机号
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
View file @
b7188b5a
...
...
@@ -774,7 +774,7 @@ public class SalaryAccountUtil implements Serializable {
}
else
{
emp
.
setBankProvince
(
entity
.
getBankProvince
());
}
if
(
Common
.
isEmpty
(
e
mp
.
getBankCity
()))
{
if
(
Common
.
isEmpty
(
e
ntity
.
getBankCity
()))
{
if
(
Common
.
isEmpty
(
emp
.
getBankCity
()))
{
error
=
"第"
+
i
+
SalaryConstants
.
LINE_EMP
+
emp
.
getEmpIdcard
()
+
"-发放方式为银行发放,但是-开户行市-为空,请在工资模板正确填写!"
;
errorList
.
add
(
new
ErrorMessage
(
i
,
error
));
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialSoldierPushServiceImpl.java
View file @
b7188b5a
...
...
@@ -263,6 +263,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
this
.
getOneAppGetModuleDetail
(
socialIdList
,
file
,
socialType
);
}
}
catch
(
Exception
e
)
{
log
.
error
(
"提交社保士兵异常2:"
,
e
);
if
(!
logList
.
isEmpty
())
{
for
(
TSocialSoldierLog
logTemp
:
logList
)
{
logTemp
.
setRemark
(
"提交社保士兵异常!"
);
...
...
@@ -330,6 +331,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
this
.
getOneAppGetModuleDetail
(
socialIdList
,
file
,
socialType
);
}
}
catch
(
Exception
e
)
{
log
.
error
(
"提交社保士兵异常1:"
,
e
);
if
(!
logList
.
isEmpty
())
{
for
(
TSocialSoldierLog
logTemp
:
logList
)
{
logTemp
.
setRemark
(
"提交社保士兵异常!"
);
...
...
@@ -486,6 +488,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
try
{
this
.
getOneAppGetModuleDetailByAudit
(
socialIdList
,
file
,
sheetName
);
}
catch
(
Exception
e
)
{
log
.
error
(
errorRemark
+
"2:"
,
e
);
if
(!
logList
.
isEmpty
())
{
// 异常时,更新日志
for
(
TSocialSoldierLog
logTemp
:
logList
)
{
...
...
@@ -524,6 +527,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
try
{
this
.
getOneAppGetModuleDetailByAudit
(
socialIdList
,
file
,
sheetName
);
}
catch
(
Exception
e
)
{
log
.
error
(
errorRemark
+
"1:"
,
e
);
if
(!
logList
.
isEmpty
())
{
// 异常时,更新日志
for
(
TSocialSoldierLog
logTemp
:
logList
)
{
...
...
@@ -563,6 +567,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
try
{
this
.
getOneAppGetModuleDetailByAudit
(
socialIdList
,
file
,
sheetName
);
}
catch
(
Exception
e
)
{
log
.
error
(
errorRemark
+
"3:"
,
e
);
if
(!
logList
.
isEmpty
())
{
// 异常时,更新日志
for
(
TSocialSoldierLog
logTemp
:
logList
)
{
...
...
yifu-social/yifu-social-biz/src/main/resources/application-dev.yml
View file @
b7188b5a
...
...
@@ -56,5 +56,6 @@ soldier:
authorizations
:
Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJmODA2ZjRlYzYzZjY0NjVlOGFlZjRmZmVlOTYwMzcxNiIsInN1YiI6IjIiLCJ1c2VyX3Bob25lIjoiIiwidXNlcl90eXBlIjoiMTAiLCJ1c2VyX25hbWUiOiLmtYvor5UiLCJpc19hcHAiOiIxIiwiVXNlcklkIjoiMiIsIm5iZiI6MTcxMjg5Mjk1OCwiZXhwIjoxNzIzMjYwOTU4LCJpYXQiOjE3MTI4OTI5NTh9.oTmhLfv1tLq8aPOfO3LeqM1IDYT76YGXkqpz3dwBX4M
urlPre
:
http://172.16.24.66:55555
#线上社保士兵,一般不允许用,用之前要清理测试环境当月的社保自动化数据,否则有可能产生费用
#authorizations: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI2MzcwYWIyZDRhZTI0NjQ2YTg0MTE0Mzk1Y2M2MTkzMiIsInN1YiI6IjQiLCJ1c2VyX3Bob25lIjoiIiwidXNlcl90eXBlIjoiMTAiLCJ1c2VyX25hbWUiOiLlkIjogqXnpL7kv53lo6vlhbVBUEkiLCJpc19hcHAiOiIxIiwiVXNlcklkIjoiNCIsIm5iZiI6MTcxNjE3OTIxOSwiZXhwIjoxNzI2NTQ3MjE5LCJpYXQiOjE3MTYxNzkyMTl9.Ei-52hRlfMLXLzpzmbP2xCVFZKE5sHHexzfX5PtmZ_M
#原先的老的 : authorizations: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI2MzcwYWIyZDRhZTI0NjQ2YTg0MTE0Mzk1Y2M2MTkzMiIsInN1YiI6IjQiLCJ1c2VyX3Bob25lIjoiIiwidXNlcl90eXBlIjoiMTAiLCJ1c2VyX25hbWUiOiLlkIjogqXnpL7kv53lo6vlhbVBUEkiLCJpc19hcHAiOiIxIiwiVXNlcklkIjoiNCIsIm5iZiI6MTcxNjE3OTIxOSwiZXhwIjoxNzI2NTQ3MjE5LCJpYXQiOjE3MTYxNzkyMTl9.Ei-52hRlfMLXLzpzmbP2xCVFZKE5sHHexzfX5PtmZ_M
#authorizations: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI3ZmRjOGJmYWM0Yjg0NTkzYmMzNjllYzAwN2ExODgzZCIsInN1YiI6IjQiLCJ1c2VyX3Bob25lIjoiIiwidXNlcl90eXBlIjoiMTAiLCJ1c2VyX25hbWUiOiLlkIjogqXnpL7kv53lo6vlhbVBUEkiLCJpc19hcHAiOiIxIiwiVXNlcklkIjoiNCIsIm5iZiI6MTcyNjcxMjQzOSwiZXhwIjo1NTExMDMyNDM5LCJpYXQiOjE3MjY3MTI0Mzl9.o91Ay4hRJofg76WCColUaixuyOyWvsuMDTWZMKSThc0
#urlPre: http://60.168.131.18:55555
\ No newline at end of file
yifu-social/yifu-social-biz/src/main/resources/application-prd.yml
View file @
b7188b5a
...
...
@@ -53,5 +53,5 @@ spring:
password
:
'
@yf_2022'
#社保士兵相关属性配置
soldier
:
authorizations
:
Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI
2MzcwYWIyZDRhZTI0NjQ2YTg0MTE0Mzk1Y2M2MTkzMiIsInN1YiI6IjQiLCJ1c2VyX3Bob25lIjoiIiwidXNlcl90eXBlIjoiMTAiLCJ1c2VyX25hbWUiOiLlkIjogqXnpL7kv53lo6vlhbVBUEkiLCJpc19hcHAiOiIxIiwiVXNlcklkIjoiNCIsIm5iZiI6MTcxNjE3OTIxOSwiZXhwIjoxNzI2NTQ3MjE5LCJpYXQiOjE3MTYxNzkyMTl9.Ei-52hRlfMLXLzpzmbP2xCVFZKE5sHHexzfX5PtmZ_M
authorizations
:
Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI
3ZmRjOGJmYWM0Yjg0NTkzYmMzNjllYzAwN2ExODgzZCIsInN1YiI6IjQiLCJ1c2VyX3Bob25lIjoiIiwidXNlcl90eXBlIjoiMTAiLCJ1c2VyX25hbWUiOiLlkIjogqXnpL7kv53lo6vlhbVBUEkiLCJpc19hcHAiOiIxIiwiVXNlcklkIjoiNCIsIm5iZiI6MTcyNjcxMjQzOSwiZXhwIjo1NTExMDMyNDM5LCJpYXQiOjE3MjY3MTI0Mzl9.o91Ay4hRJofg76WCColUaixuyOyWvsuMDTWZMKSThc0
urlPre
:
http://60.168.131.18:55555
\ No newline at end of file
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