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
957b4481
Commit
957b4481
authored
May 18, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.23' into MVP1.7.23
parents
3e96be2b
3eab20ea
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
48 additions
and
15 deletions
+48
-15
TEmployeeContractPreServiceImpl.java
...rchives/service/impl/TEmployeeContractPreServiceImpl.java
+9
-1
TFascTemplateMapper.xml
...ves-biz/src/main/resources/mapper/TFascTemplateMapper.xml
+2
-2
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+37
-12
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreServiceImpl.java
View file @
957b4481
...
...
@@ -30,7 +30,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.SocialDaprUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TEmployeeInsurancePre
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TEmployeeInsuranceWorkDayVo
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.log4j.Log4j2
;
...
...
@@ -825,6 +824,15 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
}
else
{
return
false
;
}
// 新逻辑 v1.7.23 按身份证+项目查询合同:如果找到审核通过的可用的合同就不允许进入。
/*TEmployeeContractInfo contractInfo = contractInfoService.getOne(Wrappers.<TEmployeeContractInfo>query()
.lambda().eq(TEmployeeContractInfo::getEmpIdcard, vo.getEmpIdcard())
.eq(TEmployeeContractInfo::getDeptNo,vo.getDeptNo())
.eq(TEmployeeContractInfo::getAuditStatus,CommonConstants.TWO_STRING)
.eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT)
.eq(TEmployeeContractInfo::getInUse, CommonConstants.ZERO_STRING)
.last(CommonConstants.LAST_ONE_SQL));
return Common.isNotNull(contractInfo);*/
}
//发送企业微信待办
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TFascTemplateMapper.xml
View file @
957b4481
...
...
@@ -173,7 +173,7 @@
<include
refid=
"tFascTemplate_where"
/>
</where>
ORDER BY CASE WHEN a.sign_name = '安徽皖信人力资源管理有限公司' THEN 1 ELSE 0 END DESC
,a.fasc_
cre
ate_time DESC
,a.fasc_
upd
ate_time DESC
</select>
<!--tFascTemplate简单分页查询-->
...
...
@@ -227,7 +227,7 @@
</if>
</where>
ORDER BY CASE WHEN a.sign_name = '安徽皖信人力资源管理有限公司' THEN 1 ELSE 0 END DESC
,a.fasc_
cre
ate_time DESC
,a.fasc_
upd
ate_time DESC
<if
test=
"tFascTemplate != null"
>
<if
test=
"tFascTemplate.limitStart != null"
>
limit #{tFascTemplate.limitStart},#{tFascTemplate.limitEnd}
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
957b4481
...
...
@@ -77,6 +77,7 @@ import java.util.*;
import
java.util.regex.Matcher
;
import
java.util.regex.Pattern
;
import
java.util.stream.Collectors
;
import
java.util.stream.Stream
;
import
static
java
.
util
.
regex
.
Pattern
.
compile
;
...
...
@@ -1702,6 +1703,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if
(
preVo
.
getServerItem
().
contains
(
"合同"
)
&&
Common
.
isNotNull
(
preVo
.
getEmployeeContractPreVos
()))
{
preVo
.
setContractIsBuy
(
preVo
.
getEmployeeContractPreVos
().
getContractFlag
());
BeanUtils
.
copyProperties
(
preVo
.
getEmployeeContractPreVos
(),
employeeContractPreVo
);
//批量默认为否
preVo
.
setContractIsBuy
(
CommonConstants
.
ONE_STRING
);
//生成合同待购买数据
String
errorStr
=
null
;
try
{
...
...
@@ -2131,12 +2134,24 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if
(
Common
.
isEmpty
(
checkRes
)
||
checkRes
.
getCode
()
!=
CommonConstants
.
SUCCESS
){
return
checkRes
.
getMsg
();
}
EmployeeRegistration
exit
=
baseMapper
.
selectOne
(
Wrappers
.<
EmployeeRegistration
>
query
().
lambda
()
EmployeeRegistration
exit
=
null
;
//该人员入职/离职数据已登记,请勿重复操作
if
(
CommonConstants
.
TWO_STRING
.
equals
(
registration
.
getFeedbackType
())){
exit
=
baseMapper
.
selectOne
(
Wrappers
.<
EmployeeRegistration
>
query
().
lambda
()
.
eq
(
EmployeeRegistration:
:
getEmpIdcard
,
registration
.
getEmpIdcard
())
.
eq
(
EmployeeRegistration:
:
getDeptNo
,
registration
.
getDeptNo
())
.
eq
(
EmployeeRegistration:
:
getFeedbackType
,
registration
.
getFeedbackType
())
.
in
(
EmployeeRegistration:
:
getProcessStatus
,
CommonConstants
.
processStatus
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
}
else
{
// v1.7.23 新增:已处理 也要拒绝入职
exit
=
baseMapper
.
selectOne
(
Wrappers
.<
EmployeeRegistration
>
query
().
lambda
()
.
eq
(
EmployeeRegistration:
:
getEmpIdcard
,
registration
.
getEmpIdcard
())
.
eq
(
EmployeeRegistration:
:
getDeptNo
,
registration
.
getDeptNo
())
.
eq
(
EmployeeRegistration:
:
getFeedbackType
,
registration
.
getFeedbackType
())
.
in
(
EmployeeRegistration:
:
getProcessStatus
,
Stream
.
of
(
"0"
,
"1"
,
"2"
).
collect
(
Collectors
.
toList
()))
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
}
if
(
Common
.
isNotNull
(
exit
))
{
return
RegistConstants
.
REGIST_SAME_CHECK
;
}
...
...
@@ -3162,12 +3177,22 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
//该人员入职/离职数据已登记,请勿重复操作
if
(
CommonConstants
.
TWO_STRING
.
equals
(
insert
.
getFeedbackType
())){
exit
=
baseMapper
.
selectOne
(
Wrappers
.<
EmployeeRegistration
>
query
().
lambda
()
.
eq
(
EmployeeRegistration:
:
getEmpIdcard
,
insert
.
getEmpIdcard
())
.
eq
(
EmployeeRegistration:
:
getDeptNo
,
insert
.
getDeptNo
())
.
eq
(
EmployeeRegistration:
:
getFeedbackType
,
insert
.
getFeedbackType
())
.
in
(
EmployeeRegistration:
:
getProcessStatus
,
CommonConstants
.
processStatus
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
}
else
{
// v1.7.23 新增:已处理 也要拒绝入职
exit
=
baseMapper
.
selectOne
(
Wrappers
.<
EmployeeRegistration
>
query
().
lambda
()
.
eq
(
EmployeeRegistration:
:
getEmpIdcard
,
insert
.
getEmpIdcard
())
.
eq
(
EmployeeRegistration:
:
getDeptNo
,
insert
.
getDeptNo
())
.
eq
(
EmployeeRegistration:
:
getFeedbackType
,
insert
.
getFeedbackType
())
.
in
(
EmployeeRegistration:
:
getProcessStatus
,
Stream
.
of
(
"0"
,
"1"
,
"2"
).
collect
(
Collectors
.
toList
()))
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
}
if
(
Common
.
isNotNull
(
exit
))
{
errorList
.
add
(
RegistConstants
.
REGIST_SAME_CHECK
);
}
...
...
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