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
870fbf19
Commit
870fbf19
authored
Jun 26, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.12' into MVP1.7.12
parents
3c7c2f2c
36c6f3e2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
9 deletions
+22
-9
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+8
-0
TEmployeeContractPreMapper.xml
.../src/main/resources/mapper/TEmployeeContractPreMapper.xml
+3
-3
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+11
-6
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
870fbf19
...
@@ -26,6 +26,7 @@ import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
...
@@ -26,6 +26,7 @@ import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
import
com.alibaba.excel.util.ListUtils
;
import
com.alibaba.excel.util.ListUtils
;
import
com.alibaba.excel.write.metadata.WriteSheet
;
import
com.alibaba.excel.write.metadata.WriteSheet
;
import
com.baomidou.lock.annotation.Lock4j
;
import
com.baomidou.lock.annotation.Lock4j
;
import
com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
...
@@ -1034,6 +1035,13 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -1034,6 +1035,13 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
if
(
Common
.
isNotNull
(
contractPre
))
{
if
(
Common
.
isNotNull
(
contractPre
))
{
contractPre
.
setProcessStatus
(
CommonConstants
.
NINE_STRING
);
contractPre
.
setProcessStatus
(
CommonConstants
.
NINE_STRING
);
contractPreMapper
.
updateById
(
contractPre
);
contractPreMapper
.
updateById
(
contractPre
);
//把关联的其他附件置空
LambdaUpdateWrapper
<
TAttaInfo
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
// 设置更新条件和新值
updateWrapper
.
eq
(
TAttaInfo:
:
getDomainId
,
contractPre
.
getId
())
.
set
(
TAttaInfo:
:
getDomainId
,
CommonConstants
.
EMPTY_STRING
);
// 执行更新操作,清空附件的ID
tAttaInfoService
.
update
(
updateWrapper
);
//附件同步
//附件同步
if
(
Common
.
isNotNull
(
tEmployeeContractInfo
.
getAttaList
())
&&
!
tEmployeeContractInfo
.
getAttaList
().
isEmpty
())
{
if
(
Common
.
isNotNull
(
tEmployeeContractInfo
.
getAttaList
())
&&
!
tEmployeeContractInfo
.
getAttaList
().
isEmpty
())
{
for
(
String
id
:
tEmployeeContractInfo
.
getAttaList
())
{
for
(
String
id
:
tEmployeeContractInfo
.
getAttaList
())
{
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractPreMapper.xml
View file @
870fbf19
...
@@ -339,18 +339,18 @@
...
@@ -339,18 +339,18 @@
null contractSubName,
null contractSubName,
null reason,
null reason,
a.signatory contractParty,
a.signatory contractParty,
a.CONTRACT_TERM
contractType,
if(a.CONTRACT_TERM = '' or a.CONTRACT_TERM is null,'2',a.CONTRACT_TERM)
contractType,
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 @
870fbf19
...
@@ -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