薪酬系统-薪资核算、薪资档案、福利档案，高级搜索中的状态条件改为数组类型的入参

src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java

@@ -50,7 +50,8 @@ public class SalaryAcctEmployeeQueryParam extends BaseQueryParam {
      */
 
     private SalaryEmployeeStatusEnum status;
-    private Collection<Integer> statusList;
+    //状态(多选)
+    private List<String> statuses;
 
     //离职日期")
     private LocalDateRange dismissDate;

src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultQueryParam.java

@@ -10,6 +10,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.Collection;
+import java.util.List;
 
 /**
  * 薪资核算结果查询参数
@@ -46,7 +47,8 @@ public class SalaryAcctResultQueryParam extends BaseQueryParam {
 
     //状态
     private SalaryEmployeeStatusEnum status;
-    private Collection<Integer> statusList;
+    //状态(多选)
+    private List<String> statuses;
 
     //离职日期
     private LocalDateRange dismissDate;

src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java

@@ -48,6 +48,8 @@ public class SalaryArchiveQueryParam extends BaseQueryParam {
 
     //状态
     private String userstatus;
+    //状态(多选)
+    private List<String> statuses;
 
     //入职日期
     private List<String> hiredate;

src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml

@@ -528,6 +528,12 @@
                     #{positionId}
                 </foreach>
             </if>
+            <if test="param.statuses != null and param.statuses.size()>0">
+                AND em.status IN
+                <foreach collection="param.statuses" open="(" item="userStatus" separator="," close=")">
+                    #{userStatus}
+                </foreach>
+            </if>
             -- 在职
             <if test="param.status != null  and param.status.toString == 'NORMAL'">
                 AND em.status in (0,1,2,3)
@@ -611,6 +617,12 @@
                     #{positionId}
                 </foreach>
             </if>
+            <if test="param.statuses != null and param.statuses.size()>0">
+                AND em.status IN
+                <foreach collection="param.statuses" open="(" item="userStatus" separator="," close=")">
+                    #{userStatus}
+                </foreach>
+            </if>
             -- 在职
             <if test="param.status != null  and param.status.toString == 'NORMAL'">
                 AND em.status in (0,1,2,3)
@@ -694,6 +706,12 @@
                     #{positionId}
                 </foreach>
             </if>
+            <if test="param.statuses != null and param.statuses.size()>0">
+                AND em.status IN
+                <foreach collection="param.statuses" open="(" item="userStatus" separator="," close=")">
+                    #{userStatus}
+                </foreach>
+            </if>
             -- 在职
             <if test="param.status != null  and param.status.toString == 'NORMAL'">
                 AND em.status in (0,1,2,3)

src/com/engine/salary/web/SalaryAcctController.java

@@ -709,6 +709,10 @@ public class SalaryAcctController {
         if (StringUtils.isNotBlank(status)) {
             param.setStatus(SalaryEmployeeStatusEnum.parseByValue(Integer.parseInt(status)));
         }
+        String statuses = request.getParameter("statuses");
+        if (StringUtils.isNotBlank(statuses)) {
+            param.setStatuses(Arrays.stream(statuses.split(",")).map(String::valueOf).collect(Collectors.toList()));
+        }
         //fixme 日期
         request.getParameter("dismissDate");
         String consolidatedTaxation = request.getParameter("consolidatedTaxation");