From 36e5b153cce2c00efd3595b331b03df53304890d Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Tue, 26 Sep 2023 11:40:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-=E7=A6=8F?=
 =?UTF-8?q?=E5=88=A9=E6=A1=A3=E6=A1=88=EF=BC=8C=E6=A1=A3=E6=A1=88=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=EF=BC=88=E7=A4=BE?=
 =?UTF-8?q?=E4=BF=9D=E3=80=81=E5=85=AC=E7=A7=AF=E9=87=91=E3=80=81=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E7=A6=8F=E5=88=A9=EF=BC=89=EF=BC=8C=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=B0=83=E6=95=B4=E4=B8=BAget?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/web/SIArchivesController.java      | 34 ++++++++++++++++---
 1 file changed, 30 insertions(+), 4 deletions(-)

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<InsuranceArchivesDetailListParam, List<Map<String, Object>>>(user).run(getService(user)::getWelTableDetail, param);
     }
 
@@ -266,4 +271,25 @@ public class SIArchivesController  {
         param.setExtWelArchiveList(true);
         return new ResponseResult<InsuranceArchivesListParam,Map<String,Object>>(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;
+    }
 }