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
24698b3b
Commit
24698b3b
authored
Nov 27, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.17' into MVP1.7.17
parents
a249971a
2710a135
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
11 deletions
+14
-11
EmployeeRegistrationLeaveServiceImpl.java
...sp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
+5
-4
EmployeeRegistrationLeaveMapper.xml
...main/resources/mapper/EmployeeRegistrationLeaveMapper.xml
+6
-6
TInsuranceWarnServiceImpl.java
...ces/service/insurance/impl/TInsuranceWarnServiceImpl.java
+3
-1
No files found.
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
View file @
24698b3b
...
...
@@ -118,6 +118,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
@Override
public
IPage
<
EmployeeRegistrationLeaveTableVo
>
getEmployeeRegistrationLeaveConfirmTablePage
(
Page
<
EmployeeRegistrationLeaveTableVo
>
page
,
EmployeeRegistrationLeaveSearchVo
employeeRegistrationLeave
)
{
initSearchVo
(
employeeRegistrationLeave
);
return
baseMapper
.
getEmployeeRegistrationLeaveConfirmTablePage
(
page
,
employeeRegistrationLeave
);
}
...
...
@@ -1528,7 +1529,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
private
boolean
judgeToUpdateContract
(
String
isExit
,
String
doType
,
LocalDateTime
nowTime
,
EmployeeRegistrationLeave
leave
)
{
return
(
Common
.
isEmpty
(
doType
)
||
doType
.
contains
(
CommonConstants
.
FOUR_STRING
))
&&
Common
.
isNotNull
(
leave
.
getContractIdOld
())
&&
(
CommonConstants
.
ZERO_STRING
.
equals
(
isExit
)
||
(
CommonConstants
.
ONE_STRING
.
equals
(
isExit
)
&&
leave
.
getContractExpectedTime
().
isBefore
(
nowTime
)))
||
(
CommonConstants
.
ONE_STRING
.
equals
(
isExit
)
&&
Common
.
isNotNull
(
leave
.
getContractExpectedTime
())
&&
leave
.
getContractExpectedTime
().
isBefore
(
nowTime
)))
&&
Common
.
isNotNull
(
leave
.
getDoStatusContract
())
&&
(
leave
.
getDoStatusContract
().
equals
(
CommonConstants
.
TWO_STRING
)
||
leave
.
getDoStatusContract
().
equals
(
CommonConstants
.
THREE_STRING
)
...
...
@@ -1539,7 +1540,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
private
boolean
judgeToUpdateSocial
(
String
isExit
,
String
doType
,
LocalDateTime
nowTime
,
EmployeeRegistrationLeave
leave
)
{
return
(
Common
.
isEmpty
(
doType
)
||
doType
.
contains
(
CommonConstants
.
ONE_STRING
))
&&
Common
.
isNotNull
(
leave
.
getSocialDispatchIdOld
())
&&
(
CommonConstants
.
ZERO_STRING
.
equals
(
isExit
)
||
(
CommonConstants
.
ONE_STRING
.
equals
(
isExit
)
&&
leave
.
getSocialExpectedTime
().
isBefore
(
nowTime
)))
||
(
CommonConstants
.
ONE_STRING
.
equals
(
isExit
)
&&
Common
.
isNotNull
(
leave
.
getSocialExpectedTime
())
&&
leave
.
getSocialExpectedTime
().
isBefore
(
nowTime
)))
&&
Common
.
isNotNull
(
leave
.
getDoStatusSocial
())
&&
(
leave
.
getDoStatusSocial
().
equals
(
CommonConstants
.
TWO_STRING
)
||
leave
.
getDoStatusSocial
().
equals
(
CommonConstants
.
THREE_STRING
)
...
...
@@ -1552,7 +1553,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
private
boolean
judgeToUpdateFund
(
String
isExit
,
String
doType
,
LocalDateTime
nowTime
,
EmployeeRegistrationLeave
leave
)
{
return
(
Common
.
isEmpty
(
doType
)
||
doType
.
contains
(
CommonConstants
.
TWO_STRING
))
&&
Common
.
isNotNull
(
leave
.
getFundDispatchIdOld
())
&&
(
CommonConstants
.
ZERO_STRING
.
equals
(
isExit
)
||
(
CommonConstants
.
ONE_STRING
.
equals
(
isExit
)
&&
leave
.
getFundExpectedTime
().
isBefore
(
nowTime
)))
||
(
CommonConstants
.
ONE_STRING
.
equals
(
isExit
)
&&
Common
.
isNotNull
(
leave
.
getFundExpectedTime
())
&&
leave
.
getFundExpectedTime
().
isBefore
(
nowTime
)))
&&
Common
.
isNotNull
(
leave
.
getDoStatusFund
())
&&
(
leave
.
getDoStatusFund
().
equals
(
CommonConstants
.
TWO_STRING
)
||
leave
.
getDoStatusFund
().
equals
(
CommonConstants
.
THREE_STRING
)
...
...
@@ -1565,7 +1566,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
private
boolean
judgeToUpdateInsurance
(
String
isExit
,
String
doType
,
LocalDateTime
nowTime
,
EmployeeRegistrationLeave
leave
)
{
return
(
Common
.
isEmpty
(
doType
)
||
doType
.
contains
(
CommonConstants
.
THREE_STRING
))
&&
Common
.
isNotNull
(
leave
.
getInsuranceIdOld
())
&&
(
CommonConstants
.
ZERO_STRING
.
equals
(
isExit
)
||
(
CommonConstants
.
ONE_STRING
.
equals
(
isExit
)
&&
leave
.
getInsuranceExpectedTime
().
isBefore
(
nowTime
)))
||
(
CommonConstants
.
ONE_STRING
.
equals
(
isExit
)
&&
Common
.
isNotNull
(
leave
.
getInsuranceExpectedTime
())
&&
leave
.
getInsuranceExpectedTime
().
isBefore
(
nowTime
)))
&&
Common
.
isNotNull
(
leave
.
getDoStatusInsurance
())
&&
(
leave
.
getDoStatusInsurance
().
equals
(
CommonConstants
.
TWO_STRING
)
||
leave
.
getDoStatusInsurance
().
equals
(
CommonConstants
.
THREE_STRING
)
...
...
yifu-csp/yifu-csp-biz/src/main/resources/mapper/EmployeeRegistrationLeaveMapper.xml
View file @
24698b3b
...
...
@@ -604,19 +604,19 @@ when '4' then '待减员' when '5' then '待办理' when '6' then '减员中' wh
<if
test=
"idList != null and idList.size() > 0"
>
<if
test=
"doType != null and doType.trim() != ''"
>
<if
test=
'doType == "1" '
>
and a.social_id in
and a.do_status_social not in ('0','1')
and a.social_id in
</if>
<if
test=
'doType == "2" '
>
and a.fund_id in
and a.
do_status_fund not in ('0','1') and a.
fund_id in
</if>
<if
test=
'doType == "4" '
>
and a.contract_id in
and a.
do_status_contract not in ('0','1') and a.
contract_id in
</if>
<if
test=
'doType == "5" '
>
and a.emp_project_id in
and a.
do_status_project not in ('0','1') and a.
emp_project_id in
</if>
<if
test=
'doType == "6" '
>
and a.emp_id in
and a.
do_status_emp not in ('0','1') and a.
emp_id in
</if>
<foreach
collection=
"idList"
item=
"param"
index=
"index"
open=
"("
close=
")"
separator=
","
>
#{param}
...
...
@@ -633,7 +633,7 @@ when '4' then '待减员' when '5' then '待办理' when '6' then '减员中' wh
<include
refid=
"Base_Column_List"
/>
FROM employee_registration_leave a
JOIN employee_registration_leave_insurance i on a.id=i.leave_id
where i.insurance_id in
where
a.do_status_insurance not in ('0','1') and a.insurance_id is not null and
i.insurance_id in
<foreach
collection=
"idList"
item=
"param"
index=
"index"
open=
"("
close=
")"
separator=
","
>
#{param}
</foreach>
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceWarnServiceImpl.java
View file @
24698b3b
...
...
@@ -336,7 +336,9 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper,
if
(
days
!=
null
&&
Common
.
isNotNull
(
days
))
{
// 新增逻辑
detail
.
setExpectedCollectionTime
(
days
.
atTime
(
15
,
20
));
detail
.
setPolicyStart
(
days
.
plusDays
(
CommonConstants
.
ONE_INT
));
if
(
Common
.
isNotNull
(
vo
.
getPolicyStart
()))
{
detail
.
setPolicyStart
(
vo
.
getPolicyStart
().
plusDays
(
CommonConstants
.
ONE_INT
));
}
detail
.
setPolicyEffect
(
detail
.
getPolicyStart
());
Integer
month
=
CommonConstants
.
ONE_INT
;
if
(
detailVO
!=
null
&&
Common
.
isNotNull
(
detailVO
.
getNum
()))
{
...
...
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