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
da41d317
Commit
da41d317
authored
Jun 25, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-合同自动化代码提交
parent
374981fc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
8 deletions
+13
-8
TEmployeeContractPreMapper.xml
.../src/main/resources/mapper/TEmployeeContractPreMapper.xml
+2
-2
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+11
-6
No files found.
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractPreMapper.xml
View file @
da41d317
...
@@ -343,14 +343,14 @@
...
@@ -343,14 +343,14 @@
a.CONTRACT_START as contractStart,
a.CONTRACT_START as contractStart,
if(a.CONTRACT_TERM ='1',a.CONTRACT_END,null) as contractEnd,
if(a.CONTRACT_TERM ='1',a.CONTRACT_END,null) as contractEnd,
a.post,
a.post,
a.working_hours
as workingHours,
if(a.working_hours = '' or a.working_hours is null,'4',a.working_hours)
as workingHours,
null contractNo,
null contractNo,
null fileCabinetNo,
null fileCabinetNo,
null leaveDate,
null leaveDate,
null reduceReason,
null reduceReason,
null remark,
null remark,
null changeContractAndEmployee,
null changeContractAndEmployee,
a.TRY_PERIOD
tryPeriod,
if(a.TRY_PERIOD = '' or a.TRY_PERIOD is null,'无',a.TRY_PERIOD) as
tryPeriod,
a.id preId,
a.id preId,
if(#{type} = '1',concat('手动签署-',a.customer_username),concat('自动化签署-',a.customer_username)) preName
if(#{type} = '1',concat('手动签署-',a.customer_username),concat('自动化签署-',a.customer_username)) preName
FROM t_employee_contract_pre a,(select @i:=0) as itable
FROM t_employee_contract_pre a,(select @i:=0) as itable
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
da41d317
...
@@ -789,10 +789,14 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -789,10 +789,14 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
vo
.
setRegistDate
(
employeeContractPreVo
.
getDispatchPeriodStart
());
vo
.
setRegistDate
(
employeeContractPreVo
.
getDispatchPeriodStart
());
employeeContractPreVo
.
setDispatchPeriodEnd
(
this
.
addYearsMonths
(
vo
));
employeeContractPreVo
.
setDispatchPeriodEnd
(
this
.
addYearsMonths
(
vo
));
}
}
if
(
Common
.
isNotNull
(
employeeContractPreVo
.
getInternshipPeriodStart
()))
{
employeeContractPreVo
.
setContractStart
(
employeeContractPreVo
.
getInternshipPeriodStart
());
}
//实习开始日期、实习结束日期
//实习开始日期、实习结束日期
if
(
Common
.
isEmpty
(
employeeContractPreVo
.
getInternshipPeriodStart
())
if
(
Common
.
isEmpty
(
employeeContractPreVo
.
getInternshipPeriodStart
())
&&
Common
.
isNotNull
(
employeeContractPreVo
.
getInternshipPeriodNum
()))
{
&&
Common
.
isNotNull
(
employeeContractPreVo
.
getInternshipPeriodNum
()))
{
employeeContractPreVo
.
setInternshipPeriodStart
(
employeeContractPreVo
.
getJoinLeaveDate
());
employeeContractPreVo
.
setInternshipPeriodStart
(
employeeContractPreVo
.
getJoinLeaveDate
());
employeeContractPreVo
.
setContractStart
(
employeeContractPreVo
.
getJoinLeaveDate
());
vo
.
setMonthAfter
(
Integer
.
parseInt
(
employeeContractPreVo
.
getInternshipPeriodNum
()));
vo
.
setMonthAfter
(
Integer
.
parseInt
(
employeeContractPreVo
.
getInternshipPeriodNum
()));
vo
.
setYearAfter
(
0
);
vo
.
setYearAfter
(
0
);
vo
.
setRegistDate
(
employeeContractPreVo
.
getInternshipPeriodStart
());
vo
.
setRegistDate
(
employeeContractPreVo
.
getInternshipPeriodStart
());
...
@@ -1102,13 +1106,14 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -1102,13 +1106,14 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
EmployeeRegistrationPreVo
preVo
=
vo
.
getPreVo
();
EmployeeRegistrationPreVo
preVo
=
vo
.
getPreVo
();
initRegistPreInfo
(
registrationNow
,
preVo
,
user
,
CommonConstants
.
FOUR_STRING
);
initRegistPreInfo
(
registrationNow
,
preVo
,
user
,
CommonConstants
.
FOUR_STRING
);
R
<
String
>
domainR
=
archivesDaprUtil
.
saveRegistPreInfo
(
preVo
);
R
<
String
>
domainR
=
archivesDaprUtil
.
saveRegistPreInfo
(
preVo
);
if
(
Common
.
isNotNull
(
domainR
)
&&
Common
.
isNotNull
(
domainR
.
getData
())
&&
if
(
Common
.
isNotNull
(
domainR
)
&&
Common
.
isNotNull
(
domainR
.
getData
())){
preVo
.
getServerItem
().
contains
(
"商险"
)
&&
!
preVo
.
getEmployeeInsurancePreVos
().
isEmpty
())
{
if
(
preVo
.
getServerItem
().
contains
(
"商险"
)
&&
!
preVo
.
getEmployeeInsurancePreVos
().
isEmpty
())
{
//生成商险待购买的数据
//生成商险待购买的数据
for
(
TEmployeeInsurancePreVo
insurancePreVo
:
preVo
.
getEmployeeInsurancePreVos
())
{
for
(
TEmployeeInsurancePreVo
insurancePreVo
:
preVo
.
getEmployeeInsurancePreVos
())
{
initInsruancePreInfo
(
registrationNow
,
insurancePreVo
,
user
,
domainR
.
getData
());
initInsruancePreInfo
(
registrationNow
,
insurancePreVo
,
user
,
domainR
.
getData
());
}
insuranceDaprUtil
.
saveInsurancePreInfo
(
preVo
);
}
}
insuranceDaprUtil
.
saveInsurancePreInfo
(
preVo
);
TEmployeeContractPreVo
employeeContractPreVo
=
preVo
.
getEmployeeContractPreVos
();
TEmployeeContractPreVo
employeeContractPreVo
=
preVo
.
getEmployeeContractPreVos
();
if
(
Common
.
isNotNull
(
employeeContractPreVo
)
&&
Common
.
isNotNull
(
employeeContractPreVo
.
getContractFlag
())
if
(
Common
.
isNotNull
(
employeeContractPreVo
)
&&
Common
.
isNotNull
(
employeeContractPreVo
.
getContractFlag
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
employeeContractPreVo
.
getContractFlag
()))
{
&&
CommonConstants
.
ONE_STRING
.
equals
(
employeeContractPreVo
.
getContractFlag
()))
{
...
...
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