Commit c15665c3 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.17' into MVP1.7.17

parents 8d190bc1 7ff6d228
......@@ -473,7 +473,7 @@ when '4' then '待减员' when '5' then '待办理' when '6' then '减员中' wh
</if>
</where>
ORDER BY b.create_time desc,b.id asc
limit 2000
limit 5
</select>
<!--离职确认列表-->
<select id="getEmployeeRegistrationLeaveConfirmTablePage" resultMap="tableAndExportMap">
......
......@@ -8460,9 +8460,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
if (successNum == ids.size()) {
return R.ok();
} else if (successNum == CommonConstants.ZERO_INT) {
return R.failed();
} else {
int failNum = ids.size() - successNum;
return R.ok("成功"+successNum+"条;"+"失败"+failNum+"条");
return new R<>(CommonConstants.TWO_INT, "成功"+successNum+"条;"+"失败"+failNum+"条", null);
}
} else {
return R.failed("无数据可操作");
......
......@@ -360,7 +360,7 @@
</if>
</where>
order by a.POLICY_END asc,a.id asc
limit 2000
limit 5
</select>
<!-- 导出 -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment