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
257d00fb
Commit
257d00fb
authored
Oct 27, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16
parents
e1d86c59
8e0e23ae
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
21 deletions
+21
-21
TGzController.java
...cloud/plus/v1/yifu/archives/controller/TGzController.java
+15
-8
MybatisPlusMetaObjectHandler.java
...u/common/mybatis/config/MybatisPlusMetaObjectHandler.java
+3
-3
TDispatchInfo.java
.../yifu/cloud/plus/v1/yifu/social/entity/TDispatchInfo.java
+0
-4
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+3
-6
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TGzController.java
View file @
257d00fb
...
@@ -19,14 +19,8 @@ package com.yifu.cloud.plus.v1.yifu.archives.controller;
...
@@ -19,14 +19,8 @@ package com.yifu.cloud.plus.v1.yifu.archives.controller;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.yifu.cloud.plus.v1.yifu.archives.config.GzConfig
;
import
com.yifu.cloud.plus.v1.yifu.archives.config.GzConfig
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TAttaInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpContactInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TGzEmpInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TGzOfferInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TAttaInfoService
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TEmpContactInfoService
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TGzEmpInfoService
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TGzOfferInfoService
;
import
com.yifu.cloud.plus.v1.yifu.archives.utils.GZSign
;
import
com.yifu.cloud.plus.v1.yifu.archives.utils.GZSign
;
import
com.yifu.cloud.plus.v1.yifu.archives.utils.ReturnGz
;
import
com.yifu.cloud.plus.v1.yifu.archives.utils.ReturnGz
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
...
@@ -72,6 +66,7 @@ public class TGzController {
...
@@ -72,6 +66,7 @@ public class TGzController {
private
final
TGzEmpInfoService
tGzEmpInfoService
;
private
final
TGzEmpInfoService
tGzEmpInfoService
;
private
final
TAttaInfoService
tAttaInfoService
;
private
final
TAttaInfoService
tAttaInfoService
;
private
final
TEmpContactInfoService
tEmpContactInfoService
;
private
final
TEmpContactInfoService
tEmpContactInfoService
;
private
final
LGuaziOfferRecordService
lGuaziOfferRecordService
;
private
RestTemplate
restTemplate
=
new
RestTemplate
();
private
RestTemplate
restTemplate
=
new
RestTemplate
();
...
@@ -113,10 +108,22 @@ public class TGzController {
...
@@ -113,10 +108,22 @@ public class TGzController {
if
(
R
.
isSuccess
(
r
))
{
if
(
R
.
isSuccess
(
r
))
{
return
ReturnGz
.
ok
();
return
ReturnGz
.
ok
();
}
else
{
}
else
{
saveFailLog
(
nowGzOfferInfo
.
getId
(),
user
);
return
ReturnGz
.
failed
(
r
.
getMsg
());
return
ReturnGz
.
failed
(
r
.
getMsg
());
}
}
}
}
private
void
saveFailLog
(
Integer
offerId
,
YifuUser
user
)
{
LGuaziOfferRecord
recordLog
=
new
LGuaziOfferRecord
();
recordLog
.
setOfferId
(
offerId
);
recordLog
.
setContent
(
"Offer取消失败"
);
// 记录来源
recordLog
.
setRecordFrom
(
"13"
);
recordLog
.
setCreateBy
(
user
.
getId
());
recordLog
.
setCreateName
(
user
.
getNickname
());
lGuaziOfferRecordService
.
save
(
recordLog
);
}
/**
/**
* @Description: 接收瓜子推送过来的Offer信息
* @Description: 接收瓜子推送过来的Offer信息
* @Author: hgw
* @Author: hgw
...
...
yifu-common/yifu-common-mybatis/src/main/java/com/yifu.cloud.plus.v1/yifu/common/mybatis/config/MybatisPlusMetaObjectHandler.java
View file @
257d00fb
...
@@ -31,9 +31,9 @@ public class MybatisPlusMetaObjectHandler implements MetaObjectHandler {
...
@@ -31,9 +31,9 @@ public class MybatisPlusMetaObjectHandler implements MetaObjectHandler {
fillValIfNullByName
(
"updateTime"
,
now
,
metaObject
,
true
);
fillValIfNullByName
(
"updateTime"
,
now
,
metaObject
,
true
);
YifuUser
yifuUser
=
getYifuUser
();
YifuUser
yifuUser
=
getYifuUser
();
if
(
Common
.
isNotNull
(
yifuUser
)){
if
(
Common
.
isNotNull
(
yifuUser
)){
fillValIfNullByName
(
"createBy"
,
yifuUser
.
getId
(),
metaObject
,
tru
e
);
fillValIfNullByName
(
"createBy"
,
yifuUser
.
getId
(),
metaObject
,
fals
e
);
fillValIfNullByName
(
"updateBy"
,
yifuUser
.
getId
(),
metaObject
,
tru
e
);
fillValIfNullByName
(
"updateBy"
,
yifuUser
.
getId
(),
metaObject
,
fals
e
);
fillValIfNullByName
(
"createName"
,
yifuUser
.
getNickname
(),
metaObject
,
tru
e
);
fillValIfNullByName
(
"createName"
,
yifuUser
.
getNickname
(),
metaObject
,
fals
e
);
}
}
}
}
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TDispatchInfo.java
View file @
257d00fb
...
@@ -900,8 +900,4 @@ public class TDispatchInfo extends BaseEntity {
...
@@ -900,8 +900,4 @@ public class TDispatchInfo extends BaseEntity {
@Schema
(
description
=
"社保待购买id"
)
@Schema
(
description
=
"社保待购买id"
)
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
String
preId
;
private
String
preId
;
@Schema
(
description
=
"社保待购买前端客服"
)
@TableField
(
exist
=
false
)
private
String
preName
;
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
257d00fb
...
@@ -814,8 +814,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -814,8 +814,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
auditInfo
.
setDispatchInfoId
(
dispatch
.
getId
());
auditInfo
.
setDispatchInfoId
(
dispatch
.
getId
());
auditInfo
.
setAuditRemark
(
"派单申请提交"
);
auditInfo
.
setAuditRemark
(
"派单申请提交"
);
auditInfo
.
setTitle
(
"派单申请"
);
auditInfo
.
setTitle
(
"派单申请"
);
auditInfo
.
setOrganName
(
dispatch
.
getOrganName
());
auditInfo
.
setOrganName
(
null
!=
dispatch
.
getPreId
()
?
""
:
dispatch
.
getOrganName
());
auditInfo
.
setAuditUser
(
null
!=
dispatch
.
getPreName
()
?
dispatch
.
getPreName
()
:
dispatch
.
getCreateName
());
auditInfo
.
setAuditUser
(
dispatch
.
getCreateName
());
auditInfo
.
setAuditTime
(
new
Date
());
auditInfo
.
setAuditTime
(
new
Date
());
auditInfo
.
setIsCommision
(
CommonConstants
.
ONE_STRING
);
auditInfo
.
setIsCommision
(
CommonConstants
.
ONE_STRING
);
auditInfoMapper
.
insert
(
auditInfo
);
auditInfoMapper
.
insert
(
auditInfo
);
...
@@ -1359,10 +1359,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -1359,10 +1359,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if
(
Common
.
isNotNull
(
excel
.
getPreId
()))
{
if
(
Common
.
isNotNull
(
excel
.
getPreId
()))
{
dispatch
.
setPreId
(
excel
.
getPreId
());
dispatch
.
setPreId
(
excel
.
getPreId
());
}
}
if
(
Common
.
isNotNull
(
excel
.
getPreName
()))
{
dispatch
.
setCreateBy
(
null
==
user
?
"1"
:
user
.
getId
());
dispatch
.
setPreName
(
excel
.
getPreName
());
}
dispatch
.
setCreateBy
(
null
==
user
?
"7"
:
user
.
getId
());
dispatch
.
setCreateName
(
Common
.
isNotNull
(
excel
.
getPreName
())
?
excel
.
getPreName
()
:
user
.
getNickname
());
dispatch
.
setCreateName
(
Common
.
isNotNull
(
excel
.
getPreName
())
?
excel
.
getPreName
()
:
user
.
getNickname
());
dispatch
.
setCreateTime
(
LocalDateTime
.
now
());
dispatch
.
setCreateTime
(
LocalDateTime
.
now
());
dispatch
.
setContractSubName
(
excel
.
getContractSubName
());
dispatch
.
setContractSubName
(
excel
.
getContractSubName
());
...
...
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