问题优化

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<List<BaseDistributorListVo>> selectAllDisList() {
+    public ResultBean<List<BaseDistributorListVo>> selectAllDisList(String orgSid, String staffSid) {
         return null;
     }
 

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;//客户身份证号
 }

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<BaseDistributorMa
             BaseDistributorListVo baseDistributorListVo = new BaseDistributorListVo();
             baseDistributorListVo.setName(crmCustomerTempListVo.getName());
             baseDistributorListVo.setSid(crmCustomerTempListVo.getSid());
-            baseDistributorListVo.setIdCard(crmCustomerTempListVo.getIdCard());
+            baseDistributorListVo.setOpenTickRemarks(crmCustomerTempListVo.getIdCard());
             baseDistributorListVos.add(baseDistributorListVo);
         }
         return rb.success().setData(baseDistributorListVos);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -183,6 +183,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         qw.and(wrapper -> 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<FinBillApplica
         qw.apply(StringUtils.isNotEmpty(returnedMoneyStartDate), "date_format (fba.returnedMoneyDate,'%Y-%m-%d') >= 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;
     }
 

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;
 }

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<FinBillApplicationQuery> pcq = new PagerQuery<>();
         pcq.setParams(finBillApplicationQuery);
         ResultBean<PagerVo<FinBillApplicationVo>> resultBean = finBillApplicationFeign.listPage(pcq);