diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java index 9757721c5b..79755004be 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java @@ -153,7 +153,7 @@ public class BaseDistributorFeignFallback implements BaseDistributorFeign { } @Override - public ResultBean> selectAllDisList() { + public ResultBean> selectAllDisList(String orgSid, String staffSid) { return null; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorListVo.java index bbc27ca1e1..b257eb276c 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorListVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorListVo.java @@ -22,6 +22,4 @@ public class BaseDistributorListVo implements Vo { private String invoBankNum;//开票银行账号 private String openTickRemarks; - - private String idCard;//客户身份证号 } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java index f3c183e2e9..958cb28285 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java @@ -889,7 +889,7 @@ public class BaseDistributorService extends MybatisBaseService wrapper.eq("fba.billStateKey", "001").or().eq("fba.billStateKey", "002")); qw.eq("fba.useOrgSid", query.getUseOrgSid()); qw.eq("fba.createBySid", query.getCreateBySid()); + if ("1".equals(query.getType())) { + qw.eq("fba.nodeState", "待提交"); + } else if ("2".equals(query.getType())) { + qw.ne("fba.nodeState", "待提交"); + } if (StringUtils.isNotBlank(query.getSaleTypeKey())) { qw.eq("fba.saleTypeKey", query.getSaleTypeKey()); } @@ -214,6 +219,7 @@ public class FinBillApplicationService extends MybatisBaseService= date_format('" + returnedMoneyStartDate + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(returnedMoneyEndDate), "date_format (fba.returnedMoneyDate,'%Y-%m-%d') <= date_format('" + returnedMoneyEndDate + "','%Y-%m-%d')" ); + qw.orderByDesc("fba.createTime"); return qw; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageQuery.java index 82a4e24f5d..e44ce5154d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageQuery.java @@ -16,4 +16,6 @@ public class BillApplicationPageQuery implements Query { private String name; @ApiModelProperty("组织全路径") private String orgPath; + @ApiModelProperty("1待办2已办") + private String type; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java index 14d05bffa7..9dd12e97cb 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java @@ -54,6 +54,7 @@ public class InvoicedService { finBillApplicationQuery.setCreateBySid(params.getUserSid()); finBillApplicationQuery.setCustomerName(params.getName()); finBillApplicationQuery.setOrgPath(params.getOrgPath()); + finBillApplicationQuery.setType(params.getType()); PagerQuery pcq = new PagerQuery<>(); pcq.setParams(finBillApplicationQuery); ResultBean> resultBean = finBillApplicationFeign.listPage(pcq);