diff --git a/src/com/engine/salary/service/SalarySendService.java b/src/com/engine/salary/service/SalarySendService.java index ef0e0d6bf..1a590970f 100644 --- a/src/com/engine/salary/service/SalarySendService.java +++ b/src/com/engine/salary/service/SalarySendService.java @@ -149,4 +149,12 @@ public interface SalarySendService { * @date 2022/11/25 10:45 */ void handleHistory(); + + /** + * 合计行 + * + * @param queryParam + * @return + */ + Map sumRow(SalarySendInfoQueryParam queryParam); } diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java index 80cae1f54..e8a4bdaba 100644 --- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java @@ -21,6 +21,7 @@ import com.engine.salary.entity.salaryBill.po.SalarySendInfoPO; import com.engine.salary.entity.salaryBill.po.SalarySendPO; import com.engine.salary.entity.salaryBill.po.SalaryTemplatePO; import com.engine.salary.entity.salaryacct.bo.SalaryAcctResultBO; +import com.engine.salary.entity.salaryacct.param.SalaryAcctResultQueryParam; import com.engine.salary.entity.salaryacct.po.SalaryAcctEmployeePO; import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO; import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO; @@ -1309,4 +1310,16 @@ public class SalarySendServiceImpl extends Service implements SalarySendService // BatchCallbackMessage message = BatchExportContext.getBatchCallbackMessage(); // System.out.println("接受到导出的结果" + JSONObject.toJSONString(message)); // } + + + @Override + public Map sumRow(SalarySendInfoQueryParam queryParam) { + Long salarySendId = queryParam.getSalarySendId(); + // 获取薪资核算ID + SalarySendPO salarySendPO = getById(salarySendId); + if(Objects.isNull(salarySendPO)){ + throw new SalaryRunTimeException("工资发放记录不存在或已被删除"); + } + return getSalaryAcctResultService(user).sumRow(SalaryAcctResultQueryParam.builder().salaryAcctRecordId(salarySendPO.getSalaryAccountingId()).build()); + } } diff --git a/src/com/engine/salary/web/SalaryBillController.java b/src/com/engine/salary/web/SalaryBillController.java index 71adaa017..deed2d29f 100644 --- a/src/com/engine/salary/web/SalaryBillController.java +++ b/src/com/engine/salary/web/SalaryBillController.java @@ -312,6 +312,20 @@ public class SalaryBillController { return new ResponseResult>(user).run(getSalarySendWrapper(user)::infoList, queryParam); } + /** + * 工资单发放信息合计行 + * + * @param queryParam + * @return + */ + @POST + @Path("/send/sum") + @Produces(MediaType.APPLICATION_JSON) + public String sumSendResult(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalarySendInfoQueryParam queryParam) { + User user = HrmUserVarify.getUser(request, response); + return new ResponseResult>(user).run(getSalarySendWrapper(user)::sumSendResult, queryParam); + } + /** * 导出-工资单发放信息列表 * diff --git a/src/com/engine/salary/wrapper/SalarySendWrapper.java b/src/com/engine/salary/wrapper/SalarySendWrapper.java index 631e1e539..5f428694b 100644 --- a/src/com/engine/salary/wrapper/SalarySendWrapper.java +++ b/src/com/engine/salary/wrapper/SalarySendWrapper.java @@ -626,4 +626,19 @@ public class SalarySendWrapper extends Service { public Map mySalaryBill(Long salaryInfoId) { return getSalarySendService(user).mySalaryBill(salaryInfoId, (long) user.getUID()); } + + /** + * 工资单发放信息合计行 + * + * @param queryParam + * @return + */ + public Map sumSendResult(SalarySendInfoQueryParam queryParam) { + Map datas = new HashMap<>(); + //合计 + Map sumRow = getSalarySendService(user).sumRow(queryParam); + datas.put("sumRow", sumRow); + return datas; + + } }