diff --git a/jinbooks-ui/src/api/system/hr/employee-salary.ts b/jinbooks-ui/src/api/system/hr/employee-salary.ts index f120729..0f5b12e 100644 --- a/jinbooks-ui/src/api/system/hr/employee-salary.ts +++ b/jinbooks-ui/src/api/system/hr/employee-salary.ts @@ -64,3 +64,11 @@ export function generateVoucherSubmit(data: any) { data: data }) } + +export function deleteVoucherSubmit(data: any) { + return request({ + url: '/employee/salary/delete-voucher', + method: 'post', + data: data + }) +} diff --git a/jinbooks-ui/src/views/hr/salary-detail.vue b/jinbooks-ui/src/views/hr/salary-detail.vue index 9802dbb..0bfab6b 100644 --- a/jinbooks-ui/src/views/hr/salary-detail.vue +++ b/jinbooks-ui/src/views/hr/salary-detail.vue @@ -211,7 +211,7 @@ {{ formatAmount(scope.row.businessExpenditureCosts) }} - - - - - - - - - - - - - - - - - - - - - diff --git a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/EmployeeSalaryService.java b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/EmployeeSalaryService.java index 6243698..daba057 100644 --- a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/EmployeeSalaryService.java +++ b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/EmployeeSalaryService.java @@ -48,4 +48,6 @@ public interface EmployeeSalaryService extends IService { Message exportTaxItems(SalaryDetailPageDto dto, HttpServletResponse response); Message generateVoucher(GenerateVoucherDto dto); + + Message deleteVoucher(GenerateVoucherDto dto); } diff --git a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalaryServiceImpl.java b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalaryServiceImpl.java index 9765112..a1249c0 100644 --- a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalaryServiceImpl.java +++ b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalaryServiceImpl.java @@ -440,4 +440,24 @@ public class EmployeeSalaryServiceImpl extends ServiceImpl deleteVoucher(GenerateVoucherDto dto) { + Integer voucherType = dto.getVoucherType(); + EmployeeSalary salary = super.getById(dto.getId()); + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(EmployeeSalary::getId, dto.getId()); + List ids = new ArrayList<>(); + if(voucherType.equals(2)) { + updateWrapper.set(EmployeeSalary::getAccrualVoucherId, null); + ids.add(salary.getAccrualVoucherId()); + }else if(voucherType.equals(3)) { + updateWrapper.set(EmployeeSalary::getSalaryVoucherId, null); + ids.add(salary.getSalaryVoucherId()); + } + voucherService.delete(ids, salary.getBookId()); + super.update(updateWrapper); + + return Message.ok("删除成功!"); + } } diff --git a/jinbooks/jinbooks-web/src/main/java/com/jinbooks/web/hr/controller/EmployeeSalaryController.java b/jinbooks/jinbooks-web/src/main/java/com/jinbooks/web/hr/controller/EmployeeSalaryController.java index ee25257..4fdff66 100644 --- a/jinbooks/jinbooks-web/src/main/java/com/jinbooks/web/hr/controller/EmployeeSalaryController.java +++ b/jinbooks/jinbooks-web/src/main/java/com/jinbooks/web/hr/controller/EmployeeSalaryController.java @@ -116,4 +116,10 @@ public class EmployeeSalaryController { dto.setBookId(currentUser.getBookId()); return employeeSalaryService.generateVoucher(dto); } + + @PostMapping("/delete-voucher") + public Message deleteVoucher(@Validated @RequestBody GenerateVoucherDto dto, @CurrentUser UserInfo currentUser) { + dto.setBookId(currentUser.getBookId()); + return employeeSalaryService.deleteVoucher(dto); + } }