qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
钱涛 2022-05-10 17:27:10 +08:00
parent c440ccd0a6 b3ca582e3a
commit 9dc5a396f2
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/engine/salary/web/SIReportController.java
View File

@ -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<SalaryItemAdjustRecordQueryParam, PageInfo<SalaryItemAdjustRecordListDTO>>(user).run(getSalaryArchiveItemWrapper(user)::adjustRecordList, salaryItemAdjustRecordQueryParam);
}
}

4
src/com/engine/salary/web/SalaryBillController.java
View File

@ -422,7 +422,7 @@ public class SalaryBillController {
// throw new SalaryRunTimeException(SalrayCheckSecondAuthConstant.CHECK_SECOND_FAIL_NO_TOKEN);
// }
// queryParam.setEmployeeId((long) user.getUID());
return new ResponseResult<SalaryBillQueryParam, Map<String, Object>>(user).run(getSalarySendWrapper(user)::mySalaryBillList, queryParam);
return new ResponseResult<SalaryBillQueryParam, Map<String, Object>>(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<Long, Map<String, Object>>(user).run(getSalarySendWrapper(user)::mySalaryBill, salaryInfoId);
return new ResponseResult<Long, Map<String, Object>>(user, false).run(getSalarySendWrapper(user)::mySalaryBill, salaryInfoId);
}
/******** 工资单发放 end ***********************************************************************************************/