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
79047829
Commit
79047829
authored
Oct 23, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.0' into MVP1.7.0
parents
23c778f2
56bfa3ed
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
49 additions
and
52 deletions
+49
-52
EkpInsuranceUtil.java
...om/yifu/cloud/plus/v1/yifu/ekp/util/EkpInsuranceUtil.java
+4
-4
TSalaryEmployeeServiceImpl.java
.../yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
+1
-1
SalaryAccountUtil.java
...ifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
+2
-5
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+42
-42
No files found.
yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/util/EkpInsuranceUtil.java
View file @
79047829
...
@@ -59,10 +59,10 @@ public class EkpInsuranceUtil {
...
@@ -59,10 +59,10 @@ public class EkpInsuranceUtil {
//必须设置上传类型,如果入参是字符串,使用MediaType.TEXT_PLAIN;如果
//必须设置上传类型,如果入参是字符串,使用MediaType.TEXT_PLAIN;如果
HttpEntity
<
MultiValueMap
<
String
,
Object
>>
entity
=
new
HttpEntity
<
MultiValueMap
<
String
,
Object
>>(
wholeForm
,
headers
);
HttpEntity
<
MultiValueMap
<
String
,
Object
>>
entity
=
new
HttpEntity
<
MultiValueMap
<
String
,
Object
>>(
wholeForm
,
headers
);
//有返回值的情况 VO可以替换成具体的JavaBean
//有返回值的情况 VO可以替换成具体的JavaBean
log
.
error
(
"推送EKP开始,formValues:"
+
formValues
);
log
.
info
(
"推送EKP开始,formValues:"
+
formValues
);
ResponseEntity
<
String
>
obj
=
yourRestTemplate
.
exchange
(
ekpInsuranceProperties
.
getInsuranceUrl
(),
HttpMethod
.
POST
,
entity
,
String
.
class
);
ResponseEntity
<
String
>
obj
=
yourRestTemplate
.
exchange
(
ekpInsuranceProperties
.
getInsuranceUrl
(),
HttpMethod
.
POST
,
entity
,
String
.
class
);
String
body
=
obj
.
getBody
();
String
body
=
obj
.
getBody
();
log
.
error
(
"推送EKP结果,body:"
+
body
);
log
.
info
(
"推送EKP结果,body:"
+
body
);
if
(
StringUtils
.
isBlank
(
body
)){
if
(
StringUtils
.
isBlank
(
body
)){
log
.
error
(
"交易失败:"
+
obj
);
log
.
error
(
"交易失败:"
+
obj
);
return
null
;
return
null
;
...
@@ -84,7 +84,7 @@ public class EkpInsuranceUtil {
...
@@ -84,7 +84,7 @@ public class EkpInsuranceUtil {
* @return {@link String}
* @return {@link String}
*/
*/
public
String
sendUpdateToEkp
(
EkpUpdateParam
param
){
public
String
sendUpdateToEkp
(
EkpUpdateParam
param
){
log
.
error
(
"推送EKP开始--商险修改"
);
log
.
info
(
"推送EKP开始--商险修改"
);
RestTemplate
yourRestTemplate
=
new
RestTemplate
();
RestTemplate
yourRestTemplate
=
new
RestTemplate
();
try
{
try
{
String
formValues
=
new
ObjectMapper
().
writeValueAsString
(
param
);
String
formValues
=
new
ObjectMapper
().
writeValueAsString
(
param
);
...
@@ -107,7 +107,7 @@ public class EkpInsuranceUtil {
...
@@ -107,7 +107,7 @@ public class EkpInsuranceUtil {
//有返回值的情况 VO可以替换成具体的JavaBean
//有返回值的情况 VO可以替换成具体的JavaBean
ResponseEntity
<
String
>
obj
=
yourRestTemplate
.
exchange
(
ekpInsuranceProperties
.
getInsuranceUrl
(),
HttpMethod
.
POST
,
entity
,
String
.
class
);
ResponseEntity
<
String
>
obj
=
yourRestTemplate
.
exchange
(
ekpInsuranceProperties
.
getInsuranceUrl
(),
HttpMethod
.
POST
,
entity
,
String
.
class
);
String
body
=
obj
.
getBody
();
String
body
=
obj
.
getBody
();
log
.
error
(
"推送EKP结果,body:"
+
body
);
log
.
info
(
"推送EKP结果,body:"
+
body
);
if
(
StringUtils
.
isBlank
(
body
)){
if
(
StringUtils
.
isBlank
(
body
)){
log
.
error
(
EkpConstants
.
SEND_FAILED
);
log
.
error
(
EkpConstants
.
SEND_FAILED
);
return
null
;
return
null
;
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
View file @
79047829
...
@@ -570,7 +570,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
...
@@ -570,7 +570,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
}
}
// 银行卡
// 银行卡
// 代发户的,不校验卡号,下次使用的时候校验卡号
// 代发户的,不校验卡号,下次使用的时候校验卡号
//
todo
cyx-mvp1.7.0: 本次是代发户,是新员工,也要要校验银行卡(但是薪酬导入类型是劳务费才会走到这里)
// cyx-mvp1.7.0: 本次是代发户,是新员工,也要要校验银行卡(但是薪酬导入类型是劳务费才会走到这里)
if
(
Common
.
isNotNull
(
employee
.
getBankNo
()))
{
if
(
Common
.
isNotNull
(
employee
.
getBankNo
()))
{
//if (Common.isNotNull(employee.getBankNo()) && (Common.isEmpty(employee.getIssueStatus()) || employee.getIssueStatus().equals(CommonConstants.ZERO_INT))) {
//if (Common.isNotNull(employee.getBankNo()) && (Common.isEmpty(employee.getIssueStatus()) || employee.getIssueStatus().equals(CommonConstants.ZERO_INT))) {
// 调用校验服务
// 调用校验服务
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
View file @
79047829
...
@@ -278,9 +278,8 @@ public class SalaryAccountUtil implements Serializable {
...
@@ -278,9 +278,8 @@ public class SalaryAccountUtil implements Serializable {
newEmp
.
setEmpName
(
empName
);
newEmp
.
setEmpName
(
empName
);
}
}
// todo cyx-mvp1.7.0修复:去掉重复判断
// cyx-mvp1.7.0修复:去掉重复判断
if
((
SalaryConstants
.
IF_NEW_EMPLOYEE
.
equals
(
dbFiedName
)
||
SalaryConstants
.
IS_NEW_EMPLOYEE
.
equals
(
dbFiedName
))
if
(
SalaryConstants
.
IF_NEW_EMPLOYEE
.
equals
(
dbFiedName
)
&&
SalaryConstants
.
IS_NEW
.
equals
(
cellValueStr
))
{
&&
SalaryConstants
.
IS_NEW
.
equals
(
cellValueStr
))
{
isNewEmployee
=
true
;
isNewEmployee
=
true
;
entity
.
setIsNewEmployee
(
CommonConstants
.
ONE_STRING
);
entity
.
setIsNewEmployee
(
CommonConstants
.
ONE_STRING
);
}
}
...
@@ -632,13 +631,11 @@ public class SalaryAccountUtil implements Serializable {
...
@@ -632,13 +631,11 @@ public class SalaryAccountUtil implements Serializable {
}
}
if
(
canSave
)
{
if
(
canSave
)
{
log
.
error
(
"走到了》》》》canSave"
);
log
.
error
(
"走到了》》》》canSave"
);
log
.
error
(
"走到了》》》》saveNewEmpList>>>{}"
,
saveNewEmpList
.
toString
());
// 新增
// 新增
if
(!
saveNewEmpList
.
isEmpty
())
{
if
(!
saveNewEmpList
.
isEmpty
())
{
log
.
error
(
"走到了》》》》saveNewEmpList"
);
log
.
error
(
"走到了》》》》saveNewEmpList"
);
tSalaryEmployeeService
.
saveNewEmployeeList
(
saveNewEmpList
,
errorList
);
tSalaryEmployeeService
.
saveNewEmployeeList
(
saveNewEmpList
,
errorList
);
}
}
log
.
error
(
"走到了》》》》updateEmpBankList>>>{}"
,
updateEmpBankList
.
toString
());
// 更新人员信息
// 更新人员信息
if
(!
updateEmpBankList
.
isEmpty
())
{
if
(!
updateEmpBankList
.
isEmpty
())
{
log
.
error
(
"走到了》》》》updateEmpBankList"
);
log
.
error
(
"走到了》》》》updateEmpBankList"
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
79047829
This diff is collapsed.
Click to expand it.
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