diff --git a/src/com/engine/salary/web/SIReportController.java b/src/com/engine/salary/web/SIReportController.java index 3ef454540..23f105e22 100644 --- a/src/com/engine/salary/web/SIReportController.java +++ b/src/com/engine/salary/web/SIReportController.java @@ -1,16 +1,22 @@ package com.engine.salary.web; import com.engine.common.util.ServiceUtil; +import com.engine.salary.constant.SalrayCheckSecondAuthConstant; +import com.engine.salary.entity.salaryarchive.dto.SalaryItemAdjustRecordListDTO; +import com.engine.salary.entity.salaryarchive.param.SalaryItemAdjustRecordQueryParam; import com.engine.salary.entity.siaccount.param.QueryAccountDetailParam; import com.engine.salary.util.ResponseResult; +import com.engine.salary.util.page.PageInfo; import com.engine.salary.wrapper.SIReportWrapper; import com.engine.salary.wrapper.SalaryArchiveItemWrapper; +import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.parameters.RequestBody; import weaver.hrm.HrmUserVarify; import weaver.hrm.User; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; @@ -47,5 +53,20 @@ public class SIReportController { } + @GET + @Path("record/list") + @Produces(MediaType.APPLICATION_JSON) + public String recordList(@Context HttpServletRequest request, @Context HttpServletResponse response) { +// if (StringUtils.isEmpty(token)) { +// return WeaResult.success(null, SalrayCheckSecondAuthConstant.CHECK_SECOND_FAIL_NO_TOKEN); +// } +// Long employeeId = UserContext.getCurrentEmployeeId(); + User user = HrmUserVarify.getUser(request, response); + SalaryItemAdjustRecordQueryParam salaryItemAdjustRecordQueryParam = new SalaryItemAdjustRecordQueryParam(); + salaryItemAdjustRecordQueryParam.setEmployeeId((long)user.getUID()); + getSalaryArchiveItemWrapper(user).adjustRecordList(salaryItemAdjustRecordQueryParam); + return new ResponseResult>(user).run(getSalaryArchiveItemWrapper(user)::adjustRecordList, salaryItemAdjustRecordQueryParam); + } + } diff --git a/src/com/engine/salary/web/SalaryBillController.java b/src/com/engine/salary/web/SalaryBillController.java index 9a9f8555b..ae631caf9 100644 --- a/src/com/engine/salary/web/SalaryBillController.java +++ b/src/com/engine/salary/web/SalaryBillController.java @@ -422,7 +422,7 @@ public class SalaryBillController { // throw new SalaryRunTimeException(SalrayCheckSecondAuthConstant.CHECK_SECOND_FAIL_NO_TOKEN); // } // queryParam.setEmployeeId((long) user.getUID()); - return new ResponseResult>(user).run(getSalarySendWrapper(user)::mySalaryBillList, queryParam); + return new ResponseResult>(user, false).run(getSalarySendWrapper(user)::mySalaryBillList, queryParam); } /** @@ -439,7 +439,7 @@ public class SalaryBillController { // throw new SalaryRunTimeException(SalrayCheckSecondAuthConstant.CHECK_SECOND_FAIL_NO_TOKEN); // } User user = HrmUserVarify.getUser(request, response); - return new ResponseResult>(user).run(getSalarySendWrapper(user)::mySalaryBill, salaryInfoId); + return new ResponseResult>(user, false).run(getSalarySendWrapper(user)::mySalaryBill, salaryInfoId); } /******** 工资单发放 end ***********************************************************************************************/