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
c15665c3
Commit
c15665c3
authored
Dec 01, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.17' into MVP1.7.17
parents
8d190bc1
7ff6d228
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
EmployeeRegistrationLeaveMapper.xml
...main/resources/mapper/EmployeeRegistrationLeaveMapper.xml
+1
-1
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+3
-1
TInsuranceWarnMapper.xml
...main/resources/mapper/insurances/TInsuranceWarnMapper.xml
+1
-1
No files found.
yifu-csp/yifu-csp-biz/src/main/resources/mapper/EmployeeRegistrationLeaveMapper.xml
View file @
c15665c3
...
@@ -473,7 +473,7 @@ when '4' then '待减员' when '5' then '待办理' when '6' then '减员中' wh
...
@@ -473,7 +473,7 @@ when '4' then '待减员' when '5' then '待办理' when '6' then '减员中' wh
</if>
</if>
</where>
</where>
ORDER BY b.create_time desc,b.id asc
ORDER BY b.create_time desc,b.id asc
limit
2000
limit
5
</select>
</select>
<!--离职确认列表-->
<!--离职确认列表-->
<select
id=
"getEmployeeRegistrationLeaveConfirmTablePage"
resultMap=
"tableAndExportMap"
>
<select
id=
"getEmployeeRegistrationLeaveConfirmTablePage"
resultMap=
"tableAndExportMap"
>
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
c15665c3
...
@@ -8460,9 +8460,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -8460,9 +8460,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
}
if
(
successNum
==
ids
.
size
())
{
if
(
successNum
==
ids
.
size
())
{
return
R
.
ok
();
return
R
.
ok
();
}
else
if
(
successNum
==
CommonConstants
.
ZERO_INT
)
{
return
R
.
failed
();
}
else
{
}
else
{
int
failNum
=
ids
.
size
()
-
successNum
;
int
failNum
=
ids
.
size
()
-
successNum
;
return
R
.
ok
(
"成功"
+
successNum
+
"条;"
+
"失败"
+
failNum
+
"条"
);
return
new
R
<>(
CommonConstants
.
TWO_INT
,
"成功"
+
successNum
+
"条;"
+
"失败"
+
failNum
+
"条"
,
null
);
}
}
}
else
{
}
else
{
return
R
.
failed
(
"无数据可操作"
);
return
R
.
failed
(
"无数据可操作"
);
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceWarnMapper.xml
View file @
c15665c3
...
@@ -360,7 +360,7 @@
...
@@ -360,7 +360,7 @@
</if>
</if>
</where>
</where>
order by a.POLICY_END asc,a.id asc
order by a.POLICY_END asc,a.id asc
limit
2000
limit
5
</select>
</select>
<!-- 导出 -->
<!-- 导出 -->
...
...
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