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
5838e28f
Commit
5838e28f
authored
Dec 17, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.3-shuiyou 增减接口
parent
5f9ce6f9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
250 additions
and
248 deletions
+250
-248
TSocialFriendBackLog.java
...loud/plus/v1/yifu/social/entity/TSocialFriendBackLog.java
+1
-1
SocialFriendConfig.java
.../cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
+14
-2
TSocialSoldierLogService.java
...plus/v1/yifu/social/service/TSocialSoldierLogService.java
+3
-3
TSocialFriendPushServiceImpl.java
...ifu/social/service/impl/TSocialFriendPushServiceImpl.java
+216
-226
TSocialFriendServiceImpl.java
...v1/yifu/social/service/impl/TSocialFriendServiceImpl.java
+2
-2
TSocialSoldierLogServiceImpl.java
...ifu/social/service/impl/TSocialSoldierLogServiceImpl.java
+14
-14
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialFriendBackLog.java
View file @
5838e28f
...
...
@@ -65,7 +65,7 @@ public class TSocialFriendBackLog {
@ExcelAttribute
(
name
=
"类型"
)
@ExcelProperty
(
"类型"
)
@Schema
(
description
=
"类型"
)
@Schema
(
description
=
"类型
1社保增 2社保减 3医保增 4医保减 5推送的日志
"
)
private
Integer
type
;
/**
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
View file @
5838e28f
...
...
@@ -74,7 +74,7 @@ public class SocialFriendConfig {
* @return: java.lang.String
**/
public
String
pushFriendByInfo
(
RestTemplate
restTemplate
,
SociaFriendYgsAddVo
vo
,
int
type
,
String
thisTime
,
TSocialFriendBackLog
backLog
)
{
,
List
<
TSocialFriendBackLog
>
backLogList
)
{
String
addId
=
""
;
String
appAddUrl
=
urlPre
;
if
(
type
==
1
||
type
==
3
)
{
...
...
@@ -139,11 +139,21 @@ public class SocialFriendConfig {
setEmpInfo
(
json
,
vo
,
type
);
HttpEntity
<
String
>
formEntity
=
new
HttpEntity
<>(
json
.
toString
(),
headers
);
System
.
out
.
println
(
"推的接送="
+
json
);
// 推的json
TSocialFriendBackLog
backLog
=
new
TSocialFriendBackLog
();
backLog
.
setSocialId
(
vo
.
getSocialId
());
backLog
.
setType
(
5
);
backLog
.
setLogInfo
(
json
.
toString
());
backLog
.
setCreateTime
(
LocalDateTime
.
now
());
backLogList
.
add
(
backLog
);
String
dataResultList
=
restTemplate
.
postForObject
(
appAddUrl
,
formEntity
,
String
.
class
);
// {"head":{"code":"00000000","description":"成功","msg":"成功","time":"2024-12-06 17:10:26","status":"Y"
// ,"body":{"requestId":"85440b327d71466abcd9c5c81d5bb172"
if
(
Common
.
isNotNull
(
dataResultList
))
{
// 拉取的数据日志
backLog
=
new
TSocialFriendBackLog
();
backLog
.
setSocialId
(
vo
.
getSocialId
());
backLog
.
setType
(
type
);
backLog
.
setLogInfo
(
dataResultList
);
backLog
.
setCreateTime
(
LocalDateTime
.
now
());
JSONObject
dataObject
=
JSON
.
parseObject
(
dataResultList
);
...
...
@@ -155,8 +165,10 @@ public class SocialFriendConfig {
String
body
=
dataObject
.
getString
(
"body"
);
JSONObject
bodyObject
=
JSON
.
parseObject
(
body
);
addId
=
bodyObject
.
getString
(
"requestId"
);
backLog
.
setRequestId
(
addId
);
}
}
backLogList
.
add
(
backLog
);
}
return
addId
;
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TSocialSoldierLogService.java
View file @
5838e28f
...
...
@@ -60,9 +60,9 @@ public interface TSocialSoldierLogService extends IService<TSocialSoldierLog> {
TSocialSoldierLog
getYsdSoldierLog
(
SocialSoldierYsdAddVo
vo
,
String
type
,
String
remark
);
// 社保提交日志-税友
TSocialSoldierLog
get
YgsFriendLog
(
SociaFriendYgsAddVo
vo
,
String
type
,
String
remark
);
//
医保提交日志-税友
TSocialSoldierLog
get
YsdFriendLog
(
SociaFriendYgsAddVo
vo
,
String
type
,
String
remark
);
TSocialSoldierLog
get
FriendLog
(
SociaFriendYgsAddVo
vo
,
String
type
,
String
dispatchItem
,
String
remark
);
//
拉取提交结果日志 dispatchItem 社保、医保
TSocialSoldierLog
get
SocialFriendLog
(
TSocialInfo
social
,
String
type
,
String
dispatchItem
,
String
remark
);
// 审核社保提交日志
TSocialSoldierLog
getYgsSoldierAuditLog
(
SocialSoldierYgsAuditVo
vo
,
String
type
,
String
remark
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFriendPushServiceImpl.java
View file @
5838e28f
This diff is collapsed.
Click to expand it.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFriendServiceImpl.java
View file @
5838e28f
...
...
@@ -236,7 +236,7 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
updateSocial
.
setYgsHandleStatus
(
ygsHandleStatus
);
// 拉取审核结果,加日志
if
(
Common
.
isNotNull
(
ygsHandleStatus
))
{
socialLog
=
tSocialSoldierLogService
.
getSocial
Soldier
Log
(
socialInfo
,
"提交"
,
"社保"
socialLog
=
tSocialSoldierLogService
.
getSocial
Friend
Log
(
socialInfo
,
"提交"
,
"社保"
,
getStatusName
(
Integer
.
parseInt
(
ygsHandleStatus
)));
tSocialSoldierLogService
.
save
(
socialLog
);
}
...
...
@@ -309,7 +309,7 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
// 拉取审核结果,加日志
if
(
Common
.
isNotNull
(
ysdHandleStatus
))
{
socialLog
=
tSocialSoldierLogService
.
getSocial
Soldier
Log
(
socialInfo
,
"提交"
,
"医保"
socialLog
=
tSocialSoldierLogService
.
getSocial
Friend
Log
(
socialInfo
,
"提交"
,
"医保"
,
getStatusName
(
Integer
.
parseInt
(
ysdHandleStatus
)));
tSocialSoldierLogService
.
save
(
socialLog
);
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialSoldierLogServiceImpl.java
View file @
5838e28f
...
...
@@ -165,26 +165,26 @@ public class TSocialSoldierLogServiceImpl extends ServiceImpl<TSocialSoldierLogM
}
@Override
public
TSocialSoldierLog
get
YgsFriendLog
(
SociaFriendYgsAddVo
vo
,
String
type
,
String
remark
)
{
public
TSocialSoldierLog
get
FriendLog
(
SociaFriendYgsAddVo
vo
,
String
type
,
String
dispatchItem
,
String
remark
)
{
TSocialSoldierLog
log
=
new
TSocialSoldierLog
();
log
.
setSocialId
(
vo
.
getSocialId
());
log
.
setEmpName
(
vo
.
getEmpName
());
log
.
setEmpIdcard
(
vo
.
getEmpIdcard
());
log
.
setDispatchItem
(
"社保"
);
log
.
setDispatchItem
(
dispatchItem
);
log
.
setSocialHuName
(
vo
.
getSocialHouseholdName
());
// type 类型:提交;审核
log
.
setType
(
type
);
log
.
setRemark
(
remark
);
log
.
setRemark
(
"【税友】"
+
remark
);
return
log
;
}
@Override
public
TSocialSoldierLog
getY
sdFriendLog
(
SociaFriendYgsAdd
Vo
vo
,
String
type
,
String
remark
)
{
public
TSocialSoldierLog
getY
gsSoldierAuditLog
(
SocialSoldierYgsAudit
Vo
vo
,
String
type
,
String
remark
)
{
TSocialSoldierLog
log
=
new
TSocialSoldierLog
();
log
.
setSocialId
(
vo
.
getSocialId
());
log
.
setEmpName
(
vo
.
getEmpName
());
log
.
setEmpIdcard
(
vo
.
getEmpIdcard
());
log
.
setDispatchItem
(
"
医
保"
);
log
.
setDispatchItem
(
"
社
保"
);
log
.
setSocialHuName
(
vo
.
getSocialHouseholdName
());
// type 类型:提交;审核
log
.
setType
(
type
);
...
...
@@ -193,12 +193,12 @@ public class TSocialSoldierLogServiceImpl extends ServiceImpl<TSocialSoldierLogM
}
@Override
public
TSocialSoldierLog
getY
gsSoldierAuditLog
(
SocialSoldierYgs
AuditVo
vo
,
String
type
,
String
remark
)
{
public
TSocialSoldierLog
getY
sdSoldierAuditLog
(
SocialSoldierYsd
AuditVo
vo
,
String
type
,
String
remark
)
{
TSocialSoldierLog
log
=
new
TSocialSoldierLog
();
log
.
setSocialId
(
vo
.
getSocialId
());
log
.
setEmpName
(
vo
.
getEmpName
());
log
.
setEmpIdcard
(
vo
.
getEmpIdcard
());
log
.
setDispatchItem
(
"
社
保"
);
log
.
setDispatchItem
(
"
医
保"
);
log
.
setSocialHuName
(
vo
.
getSocialHouseholdName
());
// type 类型:提交;审核
log
.
setType
(
type
);
...
...
@@ -207,16 +207,16 @@ public class TSocialSoldierLogServiceImpl extends ServiceImpl<TSocialSoldierLogM
}
@Override
public
TSocialSoldierLog
get
YsdSoldierAuditLog
(
SocialSoldierYsdAuditVo
vo
,
String
type
,
String
remark
)
{
public
TSocialSoldierLog
get
SocialFriendLog
(
TSocialInfo
social
,
String
type
,
String
dispatchItem
,
String
remark
)
{
TSocialSoldierLog
log
=
new
TSocialSoldierLog
();
log
.
setSocialId
(
vo
.
getSocial
Id
());
log
.
setEmpName
(
vo
.
getEmpName
());
log
.
setEmpIdcard
(
vo
.
getEmpIdcard
());
log
.
setDispatchItem
(
"医保"
);
log
.
setSocialHuName
(
vo
.
getSocialHouseholdName
());
log
.
setSocialId
(
social
.
get
Id
());
log
.
setEmpName
(
social
.
getEmpName
());
log
.
setEmpIdcard
(
social
.
getEmpIdcard
());
log
.
setDispatchItem
(
dispatchItem
);
log
.
setSocialHuName
(
social
.
getSocialHouseholdName
());
// type 类型:提交;审核
log
.
setType
(
type
);
log
.
setRemark
(
remark
);
log
.
setRemark
(
"【税友】"
+
remark
);
return
log
;
}
...
...
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