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
f721dda7
Commit
f721dda7
authored
Dec 02, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.17' into MVP1.7.17
parents
9325f732
5fb32565
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
48 additions
and
17 deletions
+48
-17
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+5
-1
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+3
-4
CommonConstants.java
...ud/plus/v1/yifu/common/core/constant/CommonConstants.java
+2
-0
EmployeeRegistrationLeaveServiceImpl.java
...sp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
+25
-9
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+6
-1
TInsuranceWarnServiceImpl.java
...ces/service/insurance/impl/TInsuranceWarnServiceImpl.java
+6
-1
TInsuranceDetailMapper.xml
...in/resources/mapper/insurances/TInsuranceDetailMapper.xml
+1
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
f721dda7
...
...
@@ -617,7 +617,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
tEmployeeContractInfo
.
setContractEnd
(
null
);
baseMapper
.
updateContractEnd
(
tEmployeeContractInfo
);
}
return
R
.
ok
(
null
,
CommonConstants
.
SAVE_SUCCESS
);
if
(
tEmployeeContractInfo
.
getAuditStatus
()
==
CommonConstants
.
TWO_INT
)
{
return
R
.
ok
(
null
,
CommonConstants
.
SAVE_AND_UPDATE
);
}
else
{
return
R
.
ok
(
null
,
CommonConstants
.
SAVE_SUCCESS
);
}
}
/**
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
f721dda7
...
...
@@ -4769,11 +4769,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if
(
Common
.
isNotNull
(
contractId
))
{
returnVo
.
setResultIdThree
(
contractId
);
returnVo
.
setResultIdThreeStatus
(
"可用"
);
}
else
{
// 如果没有可用的,查找终止的,放在离职待办的详情里
contractId
=
contractServicer
.
getContractByEmpIdCardAndDeptNoByEnd
(
paramVo
.
getEmpIdCard
(),
paramVo
.
getDeptNo
());
returnVo
.
setResultIdFour
(
contractId
);
}
// 如果没有可用的,查找终止的,放在离职待办的详情里
String
contractEndId
=
contractServicer
.
getContractByEmpIdCardAndDeptNoByEnd
(
paramVo
.
getEmpIdCard
(),
paramVo
.
getDeptNo
());
returnVo
.
setResultIdFourStatus
(
contractEndId
);
}
return
returnVo
;
}
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/CommonConstants.java
View file @
f721dda7
...
...
@@ -329,6 +329,8 @@ public interface CommonConstants {
String
RESULT_DATA_SUCESS
=
"操作成功"
;
String
SAVE_SUCCESS
=
"保存成功!"
;
// 保存并审核通过-合同专用,离职待办同步使用
String
SAVE_AND_UPDATE
=
"保存成功!!"
;
String
UPDATE_SUCCESS
=
"更新成功!"
;
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
View file @
f721dda7
...
...
@@ -142,7 +142,12 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
if
(
null
!=
domainR
&&
null
!=
domainR
.
getData
()
&&
null
!=
domainR
.
getData
().
getDeptNos
()
&&
!
domainR
.
getData
().
getDeptNos
().
isEmpty
())
{
searchVo
.
setDeptNoList
(
domainR
.
getData
().
getDeptNos
());
}
else
{
searchVo
.
setId
(
CommonConstants
.
ONE_STRING_NEGATE
);
domainR
=
archivesDaprUtil
.
getAllDeptByCustomerLoginName
(
user
.
getUsername
());
if
(
null
!=
domainR
&&
null
!=
domainR
.
getData
()
&&
null
!=
domainR
.
getData
().
getDeptNos
()
&&
!
domainR
.
getData
().
getDeptNos
().
isEmpty
())
{
searchVo
.
setDeptNoList
(
domainR
.
getData
().
getDeptNos
());
}
else
{
searchVo
.
setId
(
CommonConstants
.
ONE_STRING_NEGATE
);
}
}
}
}
...
...
@@ -602,19 +607,20 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
logInfo
.
append
(
"无需处理标记:"
);
if
(
doTypeWu
.
contains
(
CommonConstants
.
THREE_STRING
))
{
logInfo
.
append
(
"商险;"
);
if
(!
CommonConstants
.
ONE_STRING
.
equals
(
leave
.
getDoStatusInsurance
())
&&
!
CommonConstants
.
EIGHT_STRING
.
equals
(
leave
.
getDoStatusInsurance
()))
{
if
(
CommonConstants
.
TWO_STRING
.
equals
(
leave
.
getDoStatusInsurance
())
||
CommonConstants
.
THREE_STRING
.
equals
(
leave
.
getDoStatusInsurance
())
||
CommonConstants
.
NINE_STRING
.
equals
(
leave
.
getDoStatusInsurance
()))
{
leave
.
setInsuranceId
(
leave
.
getInsuranceIdOld
());
leave
.
setCloseRemarkInsurance
(
remark
);
leave
.
setDoStatusInsurance
(
CommonConstants
.
ONE_STRING
);
}
else
{
errorInfo
.
append
(
"商险状态已
完结,不可无需处理
!"
);
errorInfo
.
append
(
"商险状态已
处理,不可手动关闭
!"
);
}
}
if
(
doTypeWu
.
contains
(
CommonConstants
.
SIX_STRING
))
{
logInfo
.
append
(
"人员档案;"
);
if
(
!
CommonConstants
.
ONE
_STRING
.
equals
(
leave
.
getDoStatusEmp
())
&&
!
CommonConstants
.
EIGHT
_STRING
.
equals
(
leave
.
getDoStatusEmp
()))
{
if
(
CommonConstants
.
TWO
_STRING
.
equals
(
leave
.
getDoStatusEmp
())
||
CommonConstants
.
NINE
_STRING
.
equals
(
leave
.
getDoStatusEmp
()))
{
leave
.
setEmpId
(
leave
.
getEmpIdOld
());
leave
.
setCloseRemarkEmp
(
remark
);
leave
.
setDoStatusEmp
(
CommonConstants
.
ONE_STRING
);
...
...
@@ -631,7 +637,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
errorInfo
.
append
(
"人员当下非多项目,不可无需处理!"
);
}
}
else
{
errorInfo
.
append
(
"人员
档案状态已完结,不可无需处理
!"
);
errorInfo
.
append
(
"人员
状态已处理,不可手动关闭
!"
);
}
}
...
...
@@ -715,7 +721,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
returnVo
=
returnR
.
getData
();
if
(
Common
.
isNotNull
(
returnVo
.
getResultIdThree
()))
{
contractId
=
returnVo
.
getResultIdThree
();
contractIdEnd
=
returnVo
.
getResultIdFour
();
contractIdEnd
=
returnVo
.
getResultIdFour
Status
();
}
}
if
(!
CommonConstants
.
ONE_STRING
.
equals
(
leave
.
getDoStatusContract
())
...
...
@@ -728,7 +734,11 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
leave
.
setDoStatusContract
(
CommonConstants
.
ONE_STRING
);
leave
.
setCloseRemarkContract
(
closeRemark
);
}
else
{
errorInfo
.
append
(
"未找到终止的合同!"
);
// errorInfo.append("未找到终止的合同!")
// 社保派减,同步减合同,是没有终止的合同的,而是在合同本身改状态
leave
.
setContractId
(
leave
.
getContractIdOld
());
leave
.
setDoStatusContract
(
CommonConstants
.
ONE_STRING
);
leave
.
setCloseRemarkContract
(
closeRemark
);
}
}
}
else
{
...
...
@@ -1406,9 +1416,12 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
Map
<
String
,
String
>
errorMap
=
new
HashMap
<>();
// 存放成功的新ID
Map
<
String
,
String
>
successMap
=
new
HashMap
<>();
Map
<
String
,
String
>
successAndAuditMap
=
new
HashMap
<>();
for
(
ErrorMessage
message
:
contractParamList
)
{
if
(
CommonConstants
.
SAVE_SUCCESS
.
equals
(
message
.
getMessage
()))
{
successMap
.
put
(
message
.
getKey
(),
message
.
getName
());
}
else
if
(
CommonConstants
.
SAVE_AND_UPDATE
.
equals
(
message
.
getMessage
()))
{
successAndAuditMap
.
put
(
message
.
getKey
(),
message
.
getName
());
}
else
{
errorMap
.
put
(
message
.
getKey
(),
message
.
getMessage
());
}
...
...
@@ -1419,6 +1432,9 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
if
(
successMap
.
get
(
leave
.
getId
())
!=
null
)
{
leave
.
setContractId
(
successMap
.
get
(
leave
.
getId
()));
leave
.
setDoStatusContract
(
CommonConstants
.
FOUR_STRING
);
}
else
if
(
successAndAuditMap
.
get
(
leave
.
getId
())
!=
null
)
{
leave
.
setContractId
(
successAndAuditMap
.
get
(
leave
.
getId
()));
leave
.
setDoStatusContract
(
CommonConstants
.
EIGHT_STRING
);
}
else
if
(
errorMap
.
get
(
leave
.
getId
())
!=
null
)
{
// 失败
errorMessage
=
errorMap
.
get
(
leave
.
getId
());
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
f721dda7
...
...
@@ -1855,7 +1855,12 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if
(
null
!=
domainR
&&
null
!=
domainR
.
getData
()
&&
null
!=
domainR
.
getData
().
getDeptNos
()
&&
domainR
.
getData
().
getDeptNos
().
size
()
>
0
)
{
searchVo
.
setDeptNoList
(
domainR
.
getData
().
getDeptNos
());
}
else
{
searchVo
.
setId
(
CommonConstants
.
ONE_STRING_NEGATE
);
domainR
=
archivesDaprUtil
.
getAllDeptByCustomerLoginName
(
user
.
getUsername
());
if
(
null
!=
domainR
&&
null
!=
domainR
.
getData
()
&&
null
!=
domainR
.
getData
().
getDeptNos
()
&&
!
domainR
.
getData
().
getDeptNos
().
isEmpty
())
{
searchVo
.
setDeptNoList
(
domainR
.
getData
().
getDeptNos
());
}
else
{
searchVo
.
setId
(
CommonConstants
.
ONE_STRING_NEGATE
);
}
}
}
}
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceWarnServiceImpl.java
View file @
f721dda7
...
...
@@ -160,7 +160,12 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper,
if
(
null
!=
domainR
&&
null
!=
domainR
.
getData
()
&&
null
!=
domainR
.
getData
().
getDeptNos
()
&&
!
domainR
.
getData
().
getDeptNos
().
isEmpty
())
{
searchVo
.
setDeptNoList
(
domainR
.
getData
().
getDeptNos
());
}
else
{
searchVo
.
setId
(
CommonConstants
.
ONE_STRING_NEGATE
);
domainR
=
archivesDaprUtil
.
getAllDeptByCustomerLoginName
(
user
.
getUsername
());
if
(
null
!=
domainR
&&
null
!=
domainR
.
getData
()
&&
null
!=
domainR
.
getData
().
getDeptNos
()
&&
!
domainR
.
getData
().
getDeptNos
().
isEmpty
())
{
searchVo
.
setDeptNoList
(
domainR
.
getData
().
getDeptNos
());
}
else
{
searchVo
.
setId
(
CommonConstants
.
ONE_STRING_NEGATE
);
}
}
}
}
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
View file @
f721dda7
...
...
@@ -2225,7 +2225,7 @@
a.id
from
t_insurance_detail a
where a.DELETE_FLAG = 0 and
a.REDUCE_HANDLE_STATUS != 4
where a.DELETE_FLAG = 0 and
(a.REDUCE_HANDLE_STATUS is null or a.REDUCE_HANDLE_STATUS != 4)
and a.EMP_IDCARD_NO = #{empIdCard}
and a.DEPT_NO = #{deptNo}
...
...
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