DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

薪资接口的新要求

Browse Source
This commit is contained in:
Joshi
2025-06-26 13:56:07 +08:00
parent 5dda61bda6
commit c9f7131f04
13 changed files with 272 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaEmployeeTemplateBindingController.java
View File

@@ -117,10 +117,18 @@ public class OaEmployeeTemplateBindingController extends BaseController {
if (bo.getPayYear() == null || bo.getPayMonth() == null) {
return R.fail("请选择发薪年月");
}
if (bo.getDefaultInsuranceTemplateId() == null || bo.getDefaultSalaryTemplateId() == null) {
if (bo.getDefaultPersonalInsuranceTemplateId() == null || bo.getDefaultSalaryTemplateId() == null || bo.getDefaultCompanyInsuranceTemplateId() == null) {
return R.fail("请选择默认模板");
}
return toAjax(iOaEmployeeTemplateBindingService.calculateSalary(bo.getEmployeeIds(), bo.getPayYear(), bo.getPayMonth(), bo.getDefaultInsuranceTemplateId(), bo.getDefaultSalaryTemplateId()));
return toAjax(iOaEmployeeTemplateBindingService.calculateSalary(
bo.getEmployeeIds(),
bo.getPayYear(),
bo.getPayMonth(),
bo.getDefaultPersonalInsuranceTemplateId(), // 个人
bo.getDefaultCompanyInsuranceTemplateId(), // 企业
bo.getDefaultSalaryTemplateId()
));
}
// 7. 批量确认发放
@PostMapping("/finalize")