Merge remote-tracking branch 'origin/test' into test

yd-csf-service/src/main/java/com/yd/csf/service/dto/FnaQueryRequest.java

@@ -16,6 +16,11 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class FnaQueryRequest extends PageDto implements Serializable {
+    /**
+     * 流程业务ID
+     */
+    @Schema(description = "流程业务ID")
+    private String fnaBizId;
 
     /**
      * 创建时间开始
@@ -69,6 +74,5 @@ public class FnaQueryRequest extends PageDto implements Serializable {
     @Schema(description = "保单号")
     private String policyNo;
 
-
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FnaServiceImpl.java

@@ -132,6 +132,9 @@ public class FnaServiceImpl extends ServiceImpl<FnaMapper, Fna> implements FnaSe
         LocalDateTime endTime = fnaQueryRequest.getEndTime();
         String fnaNo = fnaQueryRequest.getFnaNo();
         String status = fnaQueryRequest.getStatus();
+        String fnaBizId = fnaQueryRequest.getFnaBizId();
+        // 流程业务ID
+        queryWrapper.eq(StringUtils.isNotBlank(fnaBizId), "fna_biz_id", fnaBizId);
         // 流程编号
         queryWrapper.like(StringUtils.isNotBlank(fnaNo), "fna_no", fnaNo);
         // 状态 'DRAFT'-草稿, 'UNCOMPLETED'-未完成, 'COMPLETED'-已完成，默认查询未完成和已完成