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
ac1c130f
Commit
ac1c130f
authored
Jun 30, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-合同自动化代码提交
parent
c6052080
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+1
-2
THolidayInfoController.java
...lus/v1/yifu/social/controller/THolidayInfoController.java
+2
-2
No files found.
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
ac1c130f
...
@@ -1103,8 +1103,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -1103,8 +1103,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
insuranceDaprUtil
.
saveInsurancePreInfo
(
preVo
);
insuranceDaprUtil
.
saveInsurancePreInfo
(
preVo
);
}
}
TEmployeeContractPreVo
employeeContractPreVo
=
preVo
.
getEmployeeContractPreVos
();
TEmployeeContractPreVo
employeeContractPreVo
=
preVo
.
getEmployeeContractPreVos
();
if
(
Common
.
isNotNull
(
employeeContractPreVo
)
&&
Common
.
isNotNull
(
employeeContractPreVo
.
getContractFlag
())
if
(
preVo
.
getServerItem
().
contains
(
"合同"
)
&&
Common
.
isNotNull
(
employeeContractPreVo
))
{
&&
CommonConstants
.
ONE_STRING
.
equals
(
employeeContractPreVo
.
getContractFlag
()))
{
//生成合同待购买数据
//生成合同待购买数据
initContractPreInfo
(
registrationNow
,
employeeContractPreVo
,
user
,
domainR
.
getData
());
initContractPreInfo
(
registrationNow
,
employeeContractPreVo
,
user
,
domainR
.
getData
());
}
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/THolidayInfoController.java
View file @
ac1c130f
...
@@ -220,8 +220,8 @@ public class THolidayInfoController {
...
@@ -220,8 +220,8 @@ public class THolidayInfoController {
**/
**/
@Inner
@Inner
@PostMapping
(
"/inner/selectBeforeOrAfterWorkDayCommon"
)
@PostMapping
(
"/inner/selectBeforeOrAfterWorkDayCommon"
)
public
R
selectBeforeOrAfterWorkDayInnerCommon
(
@RequestBody
TEmployeeInsuranceWorkDayVo
vo
)
{
public
TEmployeeInsuranceWorkDayVo
selectBeforeOrAfterWorkDayInnerCommon
(
@RequestBody
TEmployeeInsuranceWorkDayVo
vo
)
{
return
R
.
ok
(
tHolidayInfoService
.
selectBeforeOrAfterWorkDayCommon
(
vo
)
);
return
tHolidayInfoService
.
selectBeforeOrAfterWorkDayCommon
(
vo
);
}
}
/**
/**
...
...
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