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
4f92d15c
Commit
4f92d15c
authored
Jun 17, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-合同自动化代码提交
parent
ddfe6c9c
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
49 additions
and
0 deletions
+49
-0
TEmployeeContractPreController.java
...u/archives/controller/TEmployeeContractPreController.java
+14
-0
TEmployeeContractPreService.java
...v1/yifu/archives/service/TEmployeeContractPreService.java
+3
-0
TEmployeeContractPreServiceImpl.java
...rchives/service/impl/TEmployeeContractPreServiceImpl.java
+9
-0
RegistConstants.java
...com/yifu/cloud/plus/v1/csp/constants/RegistConstants.java
+2
-0
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+21
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeContractPreController.java
View file @
4f92d15c
...
@@ -7,6 +7,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo;
...
@@ -7,6 +7,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractPre
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractPre
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContractInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContractInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeContractPreService
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeContractPreService
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmpProjectStatusVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeAutoRegistRevokeVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeAutoRegistRevokeVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeContractPreSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeContractPreSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeContractPreVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeContractPreVo
;
...
@@ -235,4 +236,17 @@ public class TEmployeeContractPreController {
...
@@ -235,4 +236,17 @@ public class TEmployeeContractPreController {
public
void
pushDisConfrimContracts
()
{
public
void
pushDisConfrimContracts
()
{
tEmployeeContractPreService
.
pushDisConfrimContracts
();
tEmployeeContractPreService
.
pushDisConfrimContracts
();
}
}
/**
* @param vo 人员信息
* @Description: 判断有没有流程中的合同待签订数据
* @Author: huyc
* @Date: 2025/6/17 18:18
* @return:
**/
@Inner
@PostMapping
(
"/inner/checkContractPreIsExit"
)
public
Boolean
checkContractPreIsExit
(
@RequestBody
EmpProjectStatusVo
vo
)
{
return
tEmployeeContractPreService
.
checkContractPreIsExit
(
vo
);
}
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeContractPreService.java
View file @
4f92d15c
...
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
...
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractPre
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractPre
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmpProjectStatusVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeAutoRegistRevokeVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeAutoRegistRevokeVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeContractPreSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeContractPreSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeContractPreVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeContractPreVo
;
...
@@ -76,4 +77,6 @@ public interface TEmployeeContractPreService extends IService<TEmployeeContractP
...
@@ -76,4 +77,6 @@ public interface TEmployeeContractPreService extends IService<TEmployeeContractP
void
pushDisConfrimContracts
();
void
pushDisConfrimContracts
();
Boolean
checkContractPreIsExit
(
EmpProjectStatusVo
vo
);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreServiceImpl.java
View file @
4f92d15c
...
@@ -409,6 +409,15 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
...
@@ -409,6 +409,15 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
}
}
}
}
@Override
public
Boolean
checkContractPreIsExit
(
EmpProjectStatusVo
vo
)
{
return
baseMapper
.
selectCount
(
Wrappers
.<
TEmployeeContractPre
>
query
().
lambda
()
.
eq
(
TEmployeeContractPre:
:
getEmpIdcard
,
vo
.
getEmpIdcard
())
.
eq
(
TEmployeeContractPre:
:
getDeptNo
,
vo
.
getDeptNo
())
.
ne
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
NINE_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
))
>
0
;
}
//发送企业微信待办
//发送企业微信待办
private
void
sendMessageToWx
(
TEmployeeContractPre
pre
)
{
private
void
sendMessageToWx
(
TEmployeeContractPre
pre
)
{
//获取前端客服
//获取前端客服
...
...
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/constants/RegistConstants.java
View file @
4f92d15c
...
@@ -19,6 +19,8 @@ public class RegistConstants {
...
@@ -19,6 +19,8 @@ public class RegistConstants {
public
static
final
String
EMP_PROJECT_EXIT_CHECK
=
"未找到该人员对应的在项信息!"
;
public
static
final
String
EMP_PROJECT_EXIT_CHECK
=
"未找到该人员对应的在项信息!"
;
public
static
final
String
EMP_CONTRACT_EXIT_CHECK
=
"已存在流程中的合同待签订数据!"
;
public
static
final
String
CONFIRM_SUBMIT
=
"确认接收"
;
public
static
final
String
CONFIRM_SUBMIT
=
"确认接收"
;
public
static
final
String
BEFORE_IN_PROJECT
=
"入职登记前已增员"
;
public
static
final
String
BEFORE_IN_PROJECT
=
"入职登记前已增员"
;
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
4f92d15c
...
@@ -1141,6 +1141,15 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -1141,6 +1141,15 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if
(
Common
.
isNotNull
(
exit
))
{
if
(
Common
.
isNotNull
(
exit
))
{
return
RegistConstants
.
REGIST_SAME_CHECK
;
return
RegistConstants
.
REGIST_SAME_CHECK
;
}
}
//针对入职的判断是否存在流程中的合同待签订数据
if
(
CommonConstants
.
ONE_STRING
.
equals
(
registration
.
getFeedbackType
()))
{
EmpProjectStatusVo
vo
=
new
EmpProjectStatusVo
();
vo
.
setEmpIdcard
(
registration
.
getEmpIdcard
());
vo
.
setDeptNo
(
registration
.
getDeptNo
());
if
(
checkContractPreIsExit
(
vo
))
{
return
RegistConstants
.
EMP_CONTRACT_EXIT_CHECK
;
}
}
//针对离职的判断人员项目档案状态是否正常
//针对离职的判断人员项目档案状态是否正常
if
(
CommonConstants
.
TWO_STRING
.
equals
(
registration
.
getFeedbackType
()))
{
if
(
CommonConstants
.
TWO_STRING
.
equals
(
registration
.
getFeedbackType
()))
{
EmpProjectStatusVo
vo
=
new
EmpProjectStatusVo
();
EmpProjectStatusVo
vo
=
new
EmpProjectStatusVo
();
...
@@ -1167,6 +1176,18 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -1167,6 +1176,18 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
}
}
}
//判断是否存在流程中的合同待签订数据
private
Boolean
checkContractPreIsExit
(
EmpProjectStatusVo
vo
)
{
//找到不在项人员的身份证信息
R
<
Boolean
>
sdr
=
HttpDaprUtil
.
invokeMethodPost
(
archivesProperties
.
getAppUrl
(),
archivesProperties
.
getAppId
()
,
"/temployeecontractpre/inner/checkContractPreIsExit"
,
vo
,
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
sdr
!=
null
&&
sdr
.
getData
()
!=
null
)
{
return
sdr
.
getData
();
}
else
{
return
false
;
}
}
//获取减项人员档案信息
//获取减项人员档案信息
private
EmpProjectStatusVo
getOutEmpProjectStatus
(
EmpProjectStatusVo
vo
)
{
private
EmpProjectStatusVo
getOutEmpProjectStatus
(
EmpProjectStatusVo
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