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
08c886d2
Commit
08c886d2
authored
Oct 24, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16
parents
ecaa832a
ae9fb36e
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
6 deletions
+13
-6
FascController.java
...loud/plus/v1/yifu/archives/controller/FascController.java
+3
-2
TDispatchInfo.java
.../yifu/cloud/plus/v1/yifu/social/entity/TDispatchInfo.java
+3
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+7
-4
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/FascController.java
View file @
08c886d2
...
@@ -287,8 +287,9 @@ public class FascController {
...
@@ -287,8 +287,9 @@ public class FascController {
contractAutoLog
.
setContractId
(
uuid
.
toString
());
contractAutoLog
.
setContractId
(
uuid
.
toString
());
contractAutoLog
.
setEmpName
(
pre
.
getEmployeeName
());
contractAutoLog
.
setEmpName
(
pre
.
getEmployeeName
());
contractAutoLog
.
setEmpIdcard
(
pre
.
getEmpIdcard
());
contractAutoLog
.
setEmpIdcard
(
pre
.
getEmpIdcard
());
contractAutoLog
.
setPhone
(
pre
.
getEmpPhone
());
contractAutoLog
.
setMainId
(
pre
.
getId
());
contractAutoLog
.
setMainId
(
pre
.
getId
());
contractAutoLog
.
setErrorInfo
(
terminationNote
);
contractAutoLog
.
setErrorInfo
(
null
==
terminationNote
?
"法大大签署失败"
:
terminationNote
);
contractAutoLogService
.
save
(
contractAutoLog
);
contractAutoLogService
.
save
(
contractAutoLog
);
//签署失败发送企微消息
//签署失败发送企微消息
sendFddFalureInfoToWx
(
pre
,
contractAutoLog
.
getId
());
sendFddFalureInfoToWx
(
pre
,
contractAutoLog
.
getId
());
...
@@ -392,7 +393,7 @@ public class FascController {
...
@@ -392,7 +393,7 @@ public class FascController {
String
authUrl
=
String
.
format
(
SecurityConstants
.
WX_GET_MESSAGE_AUTH_URL
,
wxConfig
.
getCorpid
()
String
authUrl
=
String
.
format
(
SecurityConstants
.
WX_GET_MESSAGE_AUTH_URL
,
wxConfig
.
getCorpid
()
,
wxConfig
.
getDomainName
()
+
"/auth/oauth/wxLogin"
,
"72"
+
id
);
,
wxConfig
.
getDomainName
()
+
"/auth/oauth/wxLogin"
,
"72"
+
id
);
StringBuilder
description
=
new
StringBuilder
();
StringBuilder
description
=
new
StringBuilder
();
String
title
=
"作业自动化——电子合同签署
超期自动撤回
提醒"
;
String
title
=
"作业自动化——电子合同签署
失败
提醒"
;
description
.
append
(
pre
.
getEmployeeName
()
+
"-"
+
pre
.
getEmpIdcard
()+
"-"
+
pre
.
getEmpPhone
()
+
description
.
append
(
pre
.
getEmployeeName
()
+
"-"
+
pre
.
getEmpIdcard
()+
"-"
+
pre
.
getEmpPhone
()
+
",电子合同签署失败"
).
append
(
"<br>"
);
",电子合同签署失败"
).
append
(
"<br>"
);
description
.
append
(
"请及时处理,以免产生用工风险!"
).
append
(
"<br>"
);
description
.
append
(
"请及时处理,以免产生用工风险!"
).
append
(
"<br>"
);
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TDispatchInfo.java
View file @
08c886d2
...
@@ -901,4 +901,7 @@ public class TDispatchInfo extends BaseEntity {
...
@@ -901,4 +901,7 @@ public class TDispatchInfo extends BaseEntity {
@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 @
08c886d2
...
@@ -815,7 +815,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -815,7 +815,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
auditInfo
.
setAuditRemark
(
"派单申请提交"
);
auditInfo
.
setAuditRemark
(
"派单申请提交"
);
auditInfo
.
setTitle
(
"派单申请"
);
auditInfo
.
setTitle
(
"派单申请"
);
auditInfo
.
setOrganName
(
dispatch
.
getOrganName
());
auditInfo
.
setOrganName
(
dispatch
.
getOrganName
());
auditInfo
.
setAuditUser
(
dispatch
.
getCreateName
());
auditInfo
.
setAuditUser
(
null
!=
dispatch
.
getPreName
()
?
dispatch
.
getPreName
()
:
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,8 +1359,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -1359,8 +1359,11 @@ 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
());
}
}
dispatch
.
setCreateBy
(
null
==
user
?
"1"
:
user
.
getId
());
if
(
Common
.
isNotNull
(
excel
.
getPreName
()))
{
dispatch
.
setCreateName
(
null
==
excel
.
getPreName
()
?
user
.
getNickname
()
:
excel
.
getPreName
());
dispatch
.
setPreName
(
excel
.
getPreName
());
}
dispatch
.
setCreateBy
(
null
==
user
?
"7"
:
user
.
getId
());
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
());
dispatch
.
setContractName
(
excel
.
getContractName
());
dispatch
.
setContractName
(
excel
.
getContractName
());
...
@@ -1371,7 +1374,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -1371,7 +1374,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
dispatch
.
setTryPeriod
(
excel
.
getTryPeriod
());
dispatch
.
setTryPeriod
(
excel
.
getTryPeriod
());
dispatch
.
setEmpMobile
(
excel
.
getEmpMobile
());
dispatch
.
setEmpMobile
(
excel
.
getEmpMobile
());
dispatch
.
setType
(
CommonConstants
.
ZERO_STRING
);
dispatch
.
setType
(
CommonConstants
.
ZERO_STRING
);
dispatch
.
setCurrentOperator
(
null
==
excel
.
getPreName
()
?
user
.
getNickname
()
:
excel
.
getPreN
ame
());
dispatch
.
setCurrentOperator
(
Common
.
isNotNull
(
excel
.
getPreName
())
?
excel
.
getPreName
()
:
user
.
getNickn
ame
());
dispatch
.
setTrustRemark
(
excel
.
getTrustRemark
());
dispatch
.
setTrustRemark
(
excel
.
getTrustRemark
());
dispatch
.
setBelongUnitName
(
excel
.
getCustomerName
());
dispatch
.
setBelongUnitName
(
excel
.
getCustomerName
());
dispatch
.
setBelongUnit
(
excel
.
getCustomerId
());
dispatch
.
setBelongUnit
(
excel
.
getCustomerId
());
...
...
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