diff --git a/src/com/engine/salary/web/SIArchivesController.java b/src/com/engine/salary/web/SIArchivesController.java index 04a649a71..0c7d681e2 100644 --- a/src/com/engine/salary/web/SIArchivesController.java +++ b/src/com/engine/salary/web/SIArchivesController.java @@ -11,6 +11,8 @@ import com.engine.salary.service.SIArchivesService; import com.engine.salary.service.impl.SIArchivesServiceImpl; import com.engine.salary.util.ResponseResult; import io.swagger.v3.oas.annotations.parameters.RequestBody; +import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; import weaver.hrm.HrmUserVarify; import weaver.hrm.User; @@ -19,9 +21,12 @@ import javax.servlet.http.HttpServletResponse; import javax.ws.rs.*; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import java.math.BigDecimal; +import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * @Author weaver_cl @@ -134,17 +139,17 @@ public class SIArchivesController { } /** - * 查询档案列表 + * 查询档案详情列表 * @param request * @param response - * @param param * @return */ - @POST + @GET @Path("/getWelTableDetail") @Produces(MediaType.APPLICATION_JSON) - public String getWelTableDetail(@Context HttpServletRequest request, @Context HttpServletResponse response,@RequestBody InsuranceArchivesDetailListParam param) { + public String getWelTableDetail(@Context HttpServletRequest request, @Context HttpServletResponse response) { User user = HrmUserVarify.getUser(request, response); + InsuranceArchivesDetailListParam param = buildInsuranceArchivesDetailListParam(request); return new ResponseResult>>(user).run(getService(user)::getWelTableDetail, param); } @@ -266,4 +271,25 @@ public class SIArchivesController { param.setExtWelArchiveList(true); return new ResponseResult>(user).run(getService(user)::listPage, param); } + + @NotNull + private InsuranceArchivesDetailListParam buildInsuranceArchivesDetailListParam(HttpServletRequest request) { + InsuranceArchivesDetailListParam param = new InsuranceArchivesDetailListParam(); + + String runStatuses = request.getParameter("runStatuses"); + if (StringUtils.isNotBlank(runStatuses)) { + param.setRunStatuses(Arrays.stream(runStatuses.split(",")).map(String::valueOf).collect(Collectors.toList())); + } + + String employeeId = request.getParameter("employeeId"); + if (StringUtils.isNotBlank(employeeId)) { + param.setEmployeeId(Long.parseLong(employeeId)); + } + + String paymentOrganization = request.getParameter("paymentOrganization"); + if (StringUtils.isNotBlank(paymentOrganization)) { + param.setPaymentOrganization(Long.valueOf(paymentOrganization)); + } + return param; + } }