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
9e933b94
Commit
9e933b94
authored
Jun 19, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-合同自动化代码提交
parent
ab15db5d
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
0 deletions
+23
-0
TEmployeeContractPreVo.java
...loud/plus/v1/yifu/archives/vo/TEmployeeContractPreVo.java
+3
-0
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+3
-0
ArchivesDaprUtil.java
...cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
+13
-0
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+4
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TEmployeeContractPreVo.java
View file @
9e933b94
...
...
@@ -588,5 +588,8 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
@Schema
(
description
=
"是否撤销签署0是1否"
)
private
String
signFlag
;
@Schema
(
description
=
"撤销签署原因"
)
private
String
revokeReason
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
9e933b94
...
...
@@ -843,6 +843,9 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
employeeContractPreVo
.
setCreateName
(
user
.
getNickname
());
// 设置更新者ID
employeeContractPreVo
.
setUpdateBy
(
user
.
getId
());
//是否撤销签署
employeeContractPreVo
.
setSignFlag
(
CommonConstants
.
ONE_STRING
);
employeeContractPreVo
.
setRevokeReason
(
CommonConstants
.
EMPTY_STRING
);
// 预计提醒时间、预计合同发起时间
try
{
employeeContractPreVo
.
setExpectedCollectionTime
(
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
...
...
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
View file @
9e933b94
...
...
@@ -622,4 +622,17 @@ public class ArchivesDaprUtil {
public
R
<
Boolean
>
selectExitEmpCopntract
(
TEmployeeAutoRegistCheckVo
cardVo
)
{
return
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
(),
daprArchivesProperties
.
getAppId
(),
"/temployeecontractinfo/inner/selectExitEmpCopntract"
,
JSON
.
toJSONString
(
cardVo
),
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
}
/**
* @Author huyc
* @Description 新增合同待签订信息
* @Date 10:36 2025/6/19
* @Param
* @return
**/
public
R
<
Boolean
>
saveContractPreInfo
(
TEmployeeContractPreVo
preVo
)
{
return
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
(),
daprArchivesProperties
.
getAppId
(),
"/temployeecontractpre/inner/saveContractPreInfo"
,
JSON
.
toJSONString
(
preVo
),
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
}
}
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
9e933b94
...
...
@@ -706,6 +706,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
employeeContractPreVo
.
setCreateName
(
user
.
getNickname
());
// 设置更新者ID
employeeContractPreVo
.
setUpdateBy
(
user
.
getId
());
//是否撤销签署
employeeContractPreVo
.
setSignFlag
(
CommonConstants
.
ONE_STRING
);
employeeContractPreVo
.
setRevokeReason
(
CommonConstants
.
EMPTY_STRING
);
//预计确认提醒时间、预计合同发起时间日期赋值
R
<
TEmployeeInsuranceWorkDayVo
>
dataR
;
if
(
Common
.
isNotNull
(
employeeContractPreVo
.
getRegistType
())
...
...
@@ -794,6 +797,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
employeeContractPreVo
.
getExpectedCollectionTime
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
" 9:00"
,
DateUtil
.
DATETIME_PATTERN_MINUTE
));
employeeContractPreVo
.
setExpectedConfirmTime
(
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
employeeContractPreVo
.
getExpectedConfirmTime
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
" 8:30"
,
DateUtil
.
DATETIME_PATTERN_MINUTE
));
archivesDaprUtil
.
saveContractPreInfo
(
employeeContractPreVo
);
}
...
...
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