diff --git a/src/com/engine/salary/remote/attend/service/RemoteAttend4SalaryService.java b/src/com/engine/salary/remote/attend/service/RemoteAttend4SalaryService.java index fde7fea78..430e8b3c3 100644 --- a/src/com/engine/salary/remote/attend/service/RemoteAttend4SalaryService.java +++ b/src/com/engine/salary/remote/attend/service/RemoteAttend4SalaryService.java @@ -7,11 +7,22 @@ import java.util.Map; public interface RemoteAttend4SalaryService { + /** + * 考勤报表列 + * @return + */ List> getColumns(); - + /** + * 考勤报表数据 + * @param attend4Salary + * @return + */ List> getDatas(Attend4Salary attend4Salary); - - + /** + * 获取假期余额列 + * @return + */ + List> getBalanceOfLeaveColumns(); } diff --git a/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java b/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java index e8b65d616..4e0950b58 100644 --- a/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java +++ b/src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java @@ -3,6 +3,7 @@ package com.engine.salary.remote.attend.service.impl; import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.fastjson.JSONObject; import com.engine.core.impl.Service; +import com.engine.kq.cmd.balanceofleaverp.GetSearchListCmd; import com.engine.kq.cmd.report.GetKQReportCmd; import com.engine.salary.remote.attend.entity.Attend4Salary; import com.engine.salary.remote.attend.service.RemoteAttend4SalaryService; @@ -94,6 +95,8 @@ public class RemoteAttend4SalaryServiceImpl extends Service implements RemoteAtt } } }); + + getBalanceOfLeaveColumns(); return columns; } @@ -131,4 +134,29 @@ public class RemoteAttend4SalaryServiceImpl extends Service implements RemoteAtt } + + /** + * dateScope: 6 + * selectedYear: 2024 + * dataScope: 3 + * resourceId: 94,7938 + * status: 9 + * isNoAccount: true + * pageSize: 10 + * currentPage: 1 + * @return + */ + + @Override + public List> getBalanceOfLeaveColumns() { + Map paramsMap = new HashMap(); + paramsMap.put("dateScope", "6"); + paramsMap.put("selectedYear", 2023); + paramsMap.put("dataScope", "3"); + paramsMap.put("resourceId", 92); + paramsMap.put("status", "9"); + paramsMap.put("isNoAccount", true); + List datas = (List) commandExecutor.execute(new GetSearchListCmd(paramsMap, user)).get("columns"); + return null; + } } diff --git a/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java index c48b1c7e5..3979c3180 100644 --- a/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java +++ b/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java @@ -291,6 +291,11 @@ public class AttendQuoteFieldServiceImpl extends Service implements AttendQuoteF if (CollectionUtils.isNotEmpty(saves)) { biz.saveBatch(saves); } + + //假期余额 + + + return null; }