diff --git a/src/com/engine/salary/web/SalaryAcctController.java b/src/com/engine/salary/web/SalaryAcctController.java index c4eed7f35..ee962b340 100644 --- a/src/com/engine/salary/web/SalaryAcctController.java +++ b/src/com/engine/salary/web/SalaryAcctController.java @@ -15,6 +15,7 @@ import com.engine.salary.wrapper.*; import io.swagger.v3.oas.annotations.parameters.RequestBody; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.jetbrains.annotations.NotNull; import weaver.hrm.HrmUserVarify; @@ -962,6 +963,22 @@ public class SalaryAcctController { User user = HrmUserVarify.getUser(request, response); wldDynamicSalaryReportQueryParam param = new wldDynamicSalaryReportQueryParam(); param.setExport(true); + String lbListStr = request.getParameterValues("lbList")[0]; + if (StringUtils.isNotBlank(lbListStr)) { + param.setLbList(Arrays.stream(lbListStr.split(",")).filter(NumberUtils::isCreatable).map(Integer::valueOf).collect(Collectors.toList())); + } + String bgddListStr = request.getParameterValues("bgddList")[0]; + if (StringUtils.isNotBlank(bgddListStr)) { + param.setBgddList(Arrays.stream(bgddListStr.split(",")).filter(NumberUtils::isCreatable).map(Integer::valueOf).collect(Collectors.toList())); + } + String gwmcListStr = request.getParameterValues("gwmcList")[0]; + if (StringUtils.isNotBlank(gwmcListStr)) { + param.setGwmcList(Arrays.stream(gwmcListStr.split(",")).filter(NumberUtils::isCreatable).map(Integer::valueOf).collect(Collectors.toList())); + } + String gwzjListStr = request.getParameterValues("gwzjList")[0]; + if (StringUtils.isNotBlank(gwzjListStr)) { + param.setGwzjList(Arrays.stream(gwzjListStr.split(",")).collect(Collectors.toList())); + } XSSFWorkbook workbook = getSalaryAcctResultWrapper(user).exportWdlDynamicSalaryReport(param); String time = LocalDate.now().toString(); String fileName = "万德隆薪资动态表" + time;