Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java

@@ -50,6 +50,8 @@ import java.util.List;
 @Data
 public class FinUncollectedReceivablesDetailedQuery implements Query {
 
+    @ApiModelProperty("应收款项状态 01正常，02作废")
+    private String kxState; // 应收款项状态 01正常，02作废
     @ApiModelProperty("合同编号")
     private String contractNo; // 合同编号
     @ApiModelProperty("客户名称")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedVo.java

@@ -54,6 +54,8 @@ import java.util.List;
 @Data
 public class FinUncollectedReceivablesDetailedVo implements Vo {
 
+    @ApiModelProperty("应收款项状态 01正常，02作废")
+    private String kxState; // 应收款项状态 01正常，02作废
     @ApiModelProperty("应收未收款项sid")
     private String sid; // 应收未收款项sid
     @ApiModelProperty("创建人sid")

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@@ -438,7 +438,9 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
                 }
             }
         }
-
+        if (StringUtils.isNotBlank(params.getKxState())) {
+            qw.like("kxState", params.getKxState());
+        }
         if (StringUtils.isNotBlank(params.getContractNo())) {
             qw.like("contractNo", params.getContractNo());
         }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java

@@ -403,7 +403,7 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
         taskQueryPagerQuery.setParams(taskQuery);
 //        return flowTaskFeign.businessTodoList(userSid, taskQueryPagerQuery);
 
-        ResultBean<Page<com.yxt.anrui.flowable.api.flowtask.FlowTaskDto>> resultBean = flowTaskFeign.businessTodoList(userSid, taskQueryPagerQuery);
+        ResultBean<Page<com.yxt.anrui.flowable.api.flowtask.FlowTaskDto>> resultBean = flowTaskFeign.businessTodoListForApp(userSid, taskQueryPagerQuery);
         if (!resultBean.getSuccess()) {
             return rb.setMsg("流程错误");
         }