wuzhen update zsjy0701

backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/service/impl/ZsjyEnrollmentProcessServiceImpl.java

@@ -27,6 +27,8 @@ import java.util.Date;
 import java.util.Set;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
+import java.util.Arrays;
+import java.util.Map;
 import java.text.SimpleDateFormat;
 
 /**
@@ -77,6 +79,8 @@ public class ZsjyEnrollmentProcessServiceImpl implements IZsjyEnrollmentProcessS
         // 计算分页偏移量
         long offset = (page.getCurrent() - 1) * page.getSize();
 
+        normalizeCurrentStatusListParam(bo);
+
         // 获取总记录数，这里我们需要先执行一次查询
         List<ZsjyEnrollmentProcessVo> allRecords = baseMapper.selectAllProcessWithInfoAudit(bo);
 
@@ -99,6 +103,23 @@ public class ZsjyEnrollmentProcessServiceImpl implements IZsjyEnrollmentProcessS
         return TableDataInfo.build(result);
     }
 
+    /**
+     * 将 params.currentStatusList（逗号分隔字符串）转换为 List，供 Mapper IN 查询使用
+     */
+    private void normalizeCurrentStatusListParam(ZsjyEnrollmentProcessBo bo) {
+        if (bo == null || bo.getParams() == null) {
+            return;
+        }
+        Map<String, Object> params = bo.getParams();
+        Object statusList = params.get("currentStatusList");
+        if (statusList instanceof String str && StringUtils.isNotBlank(str)) {
+            params.put("currentStatusList", Arrays.stream(str.split(","))
+                .map(String::trim)
+                .filter(StringUtils::isNotBlank)
+                .toList());
+        }
+    }
+
     /**
      * 查询符合条件的招生录取流程状态列表
      *

backend/ruoyi-modules/ruoyi-zsjy/src/main/resources/mapper/zsjy/ZsjyEnrollmentProcessMapper.xml

@@ -166,6 +166,18 @@
         <if test="currentStatus != null and currentStatus != ''">
             AND (ei.enrollment_status = #{currentStatus} OR p.current_status = #{currentStatus})
         </if>
+        <if test="params != null and params.currentStatusList != null and params.currentStatusList.size() > 0">
+            AND (
+                ei.enrollment_status IN
+                <foreach collection="params.currentStatusList" item="status" open="(" separator="," close=")">
+                    #{status}
+                </foreach>
+                OR p.current_status IN
+                <foreach collection="params.currentStatusList" item="status" open="(" separator="," close=")">
+                    #{status}
+                </foreach>
+            )
+        </if>
         <if test="params != null and params.majorId != null and params.majorId != ''">
             AND ei.major_code = #{params.majorId}
         </if>