Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
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
90d5928e
Commit
90d5928e
authored
Jun 02, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.23' into MVP1.7.23
parents
23965156
c99516ba
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
164 additions
and
58 deletions
+164
-58
TAutoMainRelExportVo.java
.../cloud/plus/v1/yifu/archives/vo/TAutoMainRelExportVo.java
+6
-6
TAutoMainRelServiceImpl.java
...1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
+107
-27
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+45
-25
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+6
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TAutoMainRelExportVo.java
View file @
90d5928e
...
...
@@ -64,6 +64,12 @@ public class TAutoMainRelExportVo implements Serializable {
@Schema
(
description
=
"项目编码"
)
private
String
deptNo
;
// ==================== 自动化配置项显示字段 ====================
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"自动化配置项"
)
@Schema
(
description
=
"自动化配置项列表(记录配置了哪些服务项目)"
)
private
String
autoConfigItemsDisplay
;
/**
* 服务状态:0正常 1停止服务 2冻结 (是否使用:0是 非0否)
*/
...
...
@@ -114,12 +120,6 @@ public class TAutoMainRelExportVo implements Serializable {
@Schema
(
description
=
"限制项显示(拼接后的服务项目名称)"
)
private
String
restrictItemsDisplay
;
// ==================== 自动化配置项显示字段 ====================
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"自动化配置项"
)
@Schema
(
description
=
"自动化配置项列表(记录配置了哪些服务项目)"
)
private
String
autoConfigItemsDisplay
;
/**
* 创建时间
*/
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
View file @
90d5928e
This diff is collapsed.
Click to expand it.
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
90d5928e
...
...
@@ -2152,30 +2152,43 @@ 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
latestExit
=
baseMapper
.
selectOne
(
Wrappers
.<
EmployeeRegistration
>
query
().
lambda
()
.
eq
(
EmployeeRegistration:
:
getEmpIdcard
,
registration
.
getEmpIdcard
())
.
eq
(
EmployeeRegistration:
:
getDeptNo
,
registration
.
getDeptNo
())
.
eq
(
EmployeeRegistration:
:
getFeedbackType
,
registration
.
getFeedbackType
())
.
orderByDesc
(
EmployeeRegistration:
:
getCreateTime
)
.
in
(
EmployeeRegistration:
:
getProcessStatus
,
CommonConstants
.
processStatus
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
exit
))
{
return
RegistConstants
.
REGIST_SAME_CHECK
;
// 如果存在历史记录,根据不同状态处理
if
(
Common
.
isNotNull
(
latestExit
))
{
String
processStatus
=
latestExit
.
getProcessStatus
();
// 状态为待处理(0)或已接收(1) → 拦截重复登记
if
(
CommonConstants
.
processStatus
.
contains
(
processStatus
))
{
return
RegistConstants
.
REGIST_SAME_CHECK
;
}
// 状态为已处理(2) → 需要校验项目档案
if
(
CommonConstants
.
TWO_STRING
.
equals
(
processStatus
)
&&
CommonConstants
.
ONE_STRING
.
equals
(
registration
.
getFeedbackType
()))
{
EmpProjectStatusVo
vo
=
new
EmpProjectStatusVo
();
vo
.
setEmpIdcard
(
registration
.
getEmpIdcard
());
vo
.
setDeptNo
(
registration
.
getDeptNo
());
EmpProjectStatusVo
exitProject
=
getEmpProjectStatus
(
vo
);
if
(!
Common
.
isEmpty
(
exitProject
))
{
return
RegistConstants
.
EMP_PROJECT_IS_EXIT_CHECK
;
}
}
// 其他状态(如拒绝入职3、已离职等)→ 允许重新登记,不校验项目档案
}
//针对入职的判断
//针对入职的其他判断
if
(
CommonConstants
.
ONE_STRING
.
equals
(
registration
.
getFeedbackType
()))
{
int
nowDay
=
Integer
.
parseInt
(
DateUtil
.
getThisDay
());
if
(
Common
.
isNot16Age
(
registration
.
getEmpIdcard
(),
nowDay
))
{
return
CommonConstants
.
UNDER_16_ERROR
;
}
//针对入职的判断是否存在在项项目档案
EmpProjectStatusVo
vo
=
new
EmpProjectStatusVo
();
vo
.
setEmpIdcard
(
registration
.
getEmpIdcard
());
vo
.
setDeptNo
(
registration
.
getDeptNo
());
EmpProjectStatusVo
exitProject
=
getEmpProjectStatus
(
vo
);
if
(!
Common
.
isEmpty
(
exitProject
))
{
return
RegistConstants
.
EMP_PROJECT_IS_EXIT_CHECK
;
}
}
//针对离职的判断人员项目档案状态是否正常
if
(
CommonConstants
.
TWO_STRING
.
equals
(
registration
.
getFeedbackType
()))
{
...
...
@@ -3199,22 +3212,29 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
.
eq
(
EmployeeRegistration:
:
getEmpIdcard
,
insert
.
getEmpIdcard
())
.
eq
(
EmployeeRegistration:
:
getDeptNo
,
insert
.
getDeptNo
())
.
eq
(
EmployeeRegistration:
:
getFeedbackType
,
insert
.
getFeedbackType
())
.
in
(
EmployeeRegistration:
:
getProcessStatus
,
CommonConstants
.
processStatus
)
.
orderByDesc
(
EmployeeRegistration:
:
getCreateTime
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
// 如果存在历史记录,根据不同状态处理
if
(
Common
.
isNotNull
(
exit
))
{
errorList
.
add
(
RegistConstants
.
REGIST_SAME_CHECK
);
}
//针对入职的判断是否存在在项项目档案
if
(
CommonConstants
.
ONE_STRING
.
equals
(
insert
.
getFeedbackType
()))
{
EmpProjectStatusVo
vo
=
new
EmpProjectStatusVo
();
vo
.
setEmpIdcard
(
insert
.
getEmpIdcard
());
vo
.
setDeptNo
(
insert
.
getDeptNo
());
EmpProjectStatusVo
exitProject
=
getEmpProjectStatus
(
vo
);
if
(!
Common
.
isEmpty
(
exitProject
))
{
errorList
.
add
(
RegistConstants
.
EMP_PROJECT_IS_EXIT_CHECK
);
String
processStatus
=
exit
.
getProcessStatus
();
// 状态为待处理(0)或已接收(1) → 拦截重复登记
if
(
CommonConstants
.
processStatus
.
contains
(
processStatus
))
{
errorList
.
add
(
RegistConstants
.
REGIST_SAME_CHECK
);
}
// 状态为已处理(2) → 需要校验项目档案
else
if
(
CommonConstants
.
TWO_STRING
.
equals
(
processStatus
)
&&
CommonConstants
.
ONE_STRING
.
equals
(
exit
.
getFeedbackType
()))
{
EmpProjectStatusVo
vo
=
new
EmpProjectStatusVo
();
vo
.
setEmpIdcard
(
insert
.
getEmpIdcard
());
vo
.
setDeptNo
(
insert
.
getDeptNo
());
EmpProjectStatusVo
exitProject
=
getEmpProjectStatus
(
vo
);
if
(!
Common
.
isEmpty
(
exitProject
))
{
errorList
.
add
(
RegistConstants
.
EMP_PROJECT_IS_EXIT_CHECK
);
}
}
// 其他状态(如拒绝入职3、已离职等)→ 允许重新登记,不校验项目档案
}
//针对离职的判断人员项目档案状态是否正常(前置条件:项目存在)
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
90d5928e
...
...
@@ -10438,6 +10438,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
.
set
(
TEmployeeInsurancePre:
:
getErrorTime
,
null
);
employeeInsurancePreMapper
.
update
(
null
,
updateDiyInfoWrapper
);
LambdaUpdateWrapper
<
TInsurancePreRenewDetail
>
updateReNewInfoWrapper
=
new
LambdaUpdateWrapper
<>();
updateReNewInfoWrapper
.
eq
(
TInsurancePreRenewDetail:
:
getInsurancesId
,
ids
)
.
set
(
TInsurancePreRenewDetail:
:
getProcessStatus
,
CommonConstants
.
THREE_STRING
)
.
set
(
TInsurancePreRenewDetail:
:
getErrorTime
,
null
)
.
set
(
TInsurancePreRenewDetail:
:
getErrorInfo
,
null
);
tInsurancePreRenewDetailMapper
.
update
(
null
,
updateReNewInfoWrapper
);
}
}
}
...
...
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