Merge branch 'refs/heads/dev-qinyulong'

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/PostHandleQuery.java

@@ -44,8 +44,8 @@ public class PostHandleQuery {
     /**
      * 状态
      */
-    @Schema(description = "状态")
-    private Integer phStatus;
+    @Schema(description = "多个状态（1,2,3,4）")
+    private String phStatus;
     /**
      * 入职时间
      */

blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/PostHandleController.java

@@ -82,7 +82,7 @@ public class PostHandleController extends BladeController {
             @Parameter(name = "station", description = "所属岗位", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
             @Parameter(name = "inJobDate", description = "入职时间", in = ParameterIn.QUERY, schema = @Schema(type = "string", format = "date")),
             @Parameter(name = "skill", description = "技能等级", in = ParameterIn.QUERY, schema = @Schema(type = "integer")),
-            @Parameter(name = "phStatus", description = "状态", in = ParameterIn.QUERY, schema = @Schema(type = "integer")),
+            @Parameter(name = "phStatus", description = "状态", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
             @Parameter(name = "conExpDate", description = "合同到期日期", in = ParameterIn.QUERY, schema = @Schema(type = "string", format = "date")),
     })
     public R<IPage<PostHandleVO>> page(@Parameter(hidden = true) PostHandleQuery postHandleQuery, Query query) {

blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/PostHandleMapper.xml

@@ -122,8 +122,12 @@
         <if test="postHandle.skill != null">
             AND mph.SKILL = #{postHandle.skill}
         </if>
-        <if test="postHandle.phStatus != null">
-            AND mph.PH_STATUS = #{postHandle.phStatus}
+        <if test="postHandle.phStatus != null and postHandle.phStatus != ''">
+            AND mph.PH_STATUS IN
+            <foreach collection="postHandle.phStatus.split(',')" item="status"
+                     open="(" separator="," close=")" index="index">
+                #{status}
+            </foreach>
         </if>
         <if test="postHandle.inJobDate != null">
             AND mph.IN_JOB_DATE = #{postHandle.inJobDate}