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
daf7e594
Commit
daf7e594
authored
Oct 29, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.16-优化代码
parent
7d4f87dd
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
281 additions
and
2 deletions
+281
-2
FascController.java
...loud/plus/v1/yifu/archives/controller/FascController.java
+13
-2
DoFascTask.java
...om/yifu/cloud/plus/v1/yifu/archives/utils/DoFascTask.java
+268
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/FascController.java
View file @
daf7e594
...
...
@@ -11,6 +11,8 @@ import com.yifu.cloud.plus.v1.yifu.archives.config.FascConfig;
import
com.yifu.cloud.plus.v1.yifu.archives.config.WxConfig
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.utils.DoFascTask
;
import
com.yifu.cloud.plus.v1.yifu.archives.utils.DoJointTask
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
...
...
@@ -23,6 +25,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import
lombok.RequiredArgsConstructor
;
import
org.apache.commons.lang.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.context.annotation.Lazy
;
import
org.springframework.security.core.GrantedAuthority
;
import
org.springframework.security.core.authority.AuthorityUtils
;
import
org.springframework.web.bind.annotation.*
;
...
...
@@ -53,6 +56,10 @@ public class FascController {
@Autowired
private
UpmsDaprUtils
upmsDaprUtils
;
@Autowired
@Lazy
private
DoFascTask
doFascTask
;
private
final
TFascPushLogService
tFascPushLogService
;
private
final
TEmployeeContractPreService
tEmployeeContractPreService
;
private
final
TEmployeeContractInfoService
tEmployeeContractInfoService
;
...
...
@@ -196,6 +203,10 @@ public class FascController {
String
terminationNote
=
jsonObject
.
getString
(
"terminationNote"
);
// 操作人
String
userName
=
jsonObject
.
getString
(
"userName"
);
// 异步执行:
doFascTask
.
doFascOkCore
(
pushLog
,
fddEvent
,
fddBizContent
,
signTaskId
,
terminationNote
);
/*YifuUser user = getNewYifuUser();
pushLog.setTypeKey("fddEvent:"+ fddEvent);
pushLog.setReturnData("初始无事件:fddEvent:" + fddEvent + "fddBizContent:" + fddBizContent);
...
...
@@ -203,7 +214,7 @@ public class FascController {
// 根据requestId获取信息:
TEmployeeContractPre pre = tEmployeeContractPreService.getOne(Wrappers.<TEmployeeContractPre>query().lambda()
.eq(TEmployeeContractPre::getRequestId, signTaskId).last(CommonConstants.LAST_ONE_SQL));
YifuUser
user
=
getNewYifuUser
();
if (pre != null && Common.isNotNull(pre.getProcessStatus()) && !pre.getProcessStatus().equals(CommonConstants.dingleDigitStrArray[9])) {
TEmployeeContractInfo contractInfo = null;
if (Common.isNotNull(pre.getContractId())) {
...
...
@@ -306,7 +317,7 @@ public class FascController {
}
}
}
tFascPushLogService
.
updateById
(
pushLog
);
tFascPushLogService.updateById(pushLog);
*/
return
R
.
ok
(
null
,
FASC_SUCCESS
);
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/utils/DoFascTask.java
0 → 100644
View file @
daf7e594
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