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
c48f71f6
Commit
c48f71f6
authored
Jun 30, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-合同自动化代码提交
parent
81b294c0
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
4 deletions
+21
-4
TEmployeeContractPreServiceImpl.java
...rchives/service/impl/TEmployeeContractPreServiceImpl.java
+17
-3
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+4
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreServiceImpl.java
View file @
c48f71f6
...
...
@@ -418,12 +418,26 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
@Override
public
Boolean
checkContractPreIsExit
(
EmpProjectStatusVo
vo
)
{
return
baseMapper
.
selectCount
(
Wrappers
.<
TEmployeeContractPre
>
query
().
lambda
()
TEmployeeContractPre
contractPre
=
baseMapper
.
selectOne
(
Wrappers
.<
TEmployeeContractPre
>
query
().
lambda
()
.
eq
(
TEmployeeContractPre:
:
getEmpIdcard
,
vo
.
getEmpIdcard
())
.
eq
(
TEmployeeContractPre:
:
getDeptNo
,
vo
.
getDeptNo
())
.
ne
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
NINE_STRING
)
.
ne
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
TEN_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
))
>
0
;
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
contractPre
))
{
//如果是已完结判断合同申请数据在不在用
if
(
CommonConstants
.
NINE_STRING
.
equals
(
contractPre
.
getProcessStatus
()))
{
TEmployeeContractInfo
contractInfo
=
contractInfoService
.
getOne
(
Wrappers
.<
TEmployeeContractInfo
>
query
()
.
lambda
().
eq
(
TEmployeeContractInfo:
:
getId
,
contractPre
.
getContractId
())
.
eq
(
TEmployeeContractInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TEmployeeContractInfo:
:
getInUse
,
CommonConstants
.
ZERO_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
return
Common
.
isNotNull
(
contractInfo
);
}
else
{
return
true
;
}
}
else
{
return
false
;
}
}
//发送企业微信待办
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
c48f71f6
...
...
@@ -1104,7 +1104,10 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
insuranceDaprUtil
.
saveInsurancePreInfo
(
preVo
);
}
TEmployeeContractPreVo
employeeContractPreVo
=
preVo
.
getEmployeeContractPreVos
();
if
(
preVo
.
getServerItem
().
contains
(
"合同"
)
&&
Common
.
isNotNull
(
employeeContractPreVo
))
{
if
(
preVo
.
getServerItem
().
contains
(
"合同"
)
&&
null
!=
preVo
.
getEmployeeContractPreVos
()
&&
((
Common
.
isNotNull
(
preVo
.
getEmployeeContractPreVos
().
getContractFlag
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
preVo
.
getEmployeeContractPreVos
().
getContractFlag
()))
||
Common
.
isEmpty
(
preVo
.
getEmployeeContractPreVos
().
getContractFlag
())))
{
//生成合同待购买数据
initContractPreInfo
(
registrationNow
,
employeeContractPreVo
,
user
,
domainR
.
getData
());
}
...
...
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