领悦报表调整

This commit is contained in:
harryxzy 2025-11-21 09:57:38 +08:00
parent a88c1d7af0
commit 0192bc89fa
1 changed files with 13 additions and 15 deletions

View File

@ -14,9 +14,7 @@ import weaver.hrm.User;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.*;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
@ -767,12 +765,12 @@ public class LySalaryController {
* @param param
* @return
*/
@POST
@GET
@Path("/generate/dbhzSbReport")
@Produces(MediaType.APPLICATION_JSON)
public String generateDbhzSbReport(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody LySalaryReportQueryParam param) {
public String generateDbhzSbReport(@Context HttpServletRequest request, @Context HttpServletResponse response, @QueryParam(value = "salaryMonth") String salaryMonth) {
User user = HrmUserVarify.getUser(request, response);
return new ResponseResult<String, Map<String, Object>>(user).run(getLySalaryWrapper(user)::generateDbhzSbReport, param.getSalaryMonth());
return new ResponseResult<String, Map<String, Object>>(user).run(getLySalaryWrapper(user)::generateDbhzSbReport, salaryMonth);
}
/**
@ -782,12 +780,12 @@ public class LySalaryController {
* @param param
* @return
*/
@POST
@GET
@Path("/generate/dbhzGjjReport")
@Produces(MediaType.APPLICATION_JSON)
public String generateDbhzGjjReport(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody LySalaryReportQueryParam param) {
public String generateDbhzGjjReport(@Context HttpServletRequest request, @Context HttpServletResponse response, @QueryParam(value = "salaryMonth") String salaryMonth) {
User user = HrmUserVarify.getUser(request, response);
return new ResponseResult<String, Map<String, Object>>(user).run(getLySalaryWrapper(user)::generateDbhzGjjReport, param.getSalaryMonth());
return new ResponseResult<String, Map<String, Object>>(user).run(getLySalaryWrapper(user)::generateDbhzGjjReport,salaryMonth);
}
/**
@ -797,12 +795,12 @@ public class LySalaryController {
* @param param
* @return
*/
@POST
@GET
@Path("/generate/cymxSbReport")
@Produces(MediaType.APPLICATION_JSON)
public String generateCymxSbReport(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody LySalaryReportQueryParam param) {
public String generateCymxSbReport(@Context HttpServletRequest request, @Context HttpServletResponse response, @QueryParam(value = "salaryMonth") String salaryMonth) {
User user = HrmUserVarify.getUser(request, response);
return new ResponseResult<String, Map<String, Object>>(user).run(getLySalaryWrapper(user)::generateCymxSbReport, param.getSalaryMonth());
return new ResponseResult<String, Map<String, Object>>(user).run(getLySalaryWrapper(user)::generateCymxSbReport, salaryMonth);
}
/**
@ -812,12 +810,12 @@ public class LySalaryController {
* @param param
* @return
*/
@POST
@GET
@Path("/generate/cymxGjjReport")
@Produces(MediaType.APPLICATION_JSON)
public String generateCymxGjjReport(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody LySalaryReportQueryParam param) {
public String generateCymxGjjReport(@Context HttpServletRequest request, @Context HttpServletResponse response, @QueryParam(value = "salaryMonth") String salaryMonth) {
User user = HrmUserVarify.getUser(request, response);
return new ResponseResult<String, Map<String, Object>>(user).run(getLySalaryWrapper(user)::generateCymxGjjReport, param.getSalaryMonth());
return new ResponseResult<String, Map<String, Object>>(user).run(getLySalaryWrapper(user)::generateCymxGjjReport, salaryMonth);
}
//---------------------------------------------------------领悦对比汇总表end-------------------------------------------