报销工作台

1.默认打开待报销界面
2.待报销：费用申请单增加可用余额大于0；借款预付增加等待付款且金额大于0
3.已完成：费用申请增加可用余额等于0

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/plugin/form/ReimWorkBenchesFormPlugin.java

@@ -43,7 +43,7 @@ public class ReimWorkBenchesFormPlugin extends AbstractFormPlugin implements Tab
     public void beforeBindData(EventObject e) {
         super.beforeBindData(e);
         Tab tab = this.getControl(NCKD_TABAP);
-        tab.activeTab(NCKD_TAB_FLAG + ReimDetailTypeEnum.APPLY.getKey());
+        tab.activeTab(NCKD_TAB_FLAG + ReimDetailTypeEnum.REIMING.getKey());
     }
 
     @Override

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/plugin/form/ReimWorkBenchesHelper.java

@@ -1,12 +1,10 @@
 package nckd.jimin.jyyy.fi.plugin.form;
 
-import com.grapecity.documents.excel.Q;
 import kd.bos.algo.Algo;
 import kd.bos.algo.DataSet;
 import kd.bos.algo.DataType;
 import kd.bos.algo.RowMeta;
 import kd.bos.context.RequestContext;
-import kd.bos.entity.report.FilterInfo;
 import kd.bos.logging.Log;
 import kd.bos.logging.LogFactory;
 import kd.bos.orm.query.QCP;
@@ -130,7 +128,7 @@ public class ReimWorkBenchesHelper {
         DataSet dailyApplyDataSet = QueryServiceHelper.queryDataSet(this.getClass().getName(), "er_dailyapplybill",
                 "id billid,bizdate applydate,'er_dailyapplybill' billtype,'er_dailyapplybill' pageid,billno billno,description description,applyamount applyamount," +
                         "approveamount approveamount,balanceamount balanceamount,billstatus billstatus,costcompany.id company,applier.id applier",
-                getFilterArr(projectPersonFilter,quickFilter,applyStatusFilter), "");
+                getFilterArr(projectPersonFilter,quickFilter,applyStatusFilter,new QFilter("balanceamount", QCP.large_than, BigDecimal.ZERO)), "");
         dataSetList.add(dailyVehDataSet);
         dataSetList.add(tripReqDataSet);
         dataSetList.add(dailyApplyDataSet);
@@ -139,15 +137,19 @@ public class ReimWorkBenchesHelper {
         QFilter loanPayFilter = new QFilter("billstatus",QCP.in,new String[]{"E","G"})
                 .and(new QFilter("balanceamount", QCP.large_than, BigDecimal.ZERO));
 
+        QFilter waitPayLoanPayFilter = new QFilter("billstatus",QCP.equals,"F")
+                .and(new QFilter("notpayamount", QCP.large_than, BigDecimal.ZERO).and(new QFilter("balanceamount", QCP.large_than, BigDecimal.ZERO)));
+
+
         DataSet dailyloanDataSet = QueryServiceHelper.queryDataSet(this.getClass().getName(), "er_dailyloanbill",
                 "id billid,bizdate applydate,'er_dailyloanbill' billtype,'er_dailyloanbill' pageid,billno billno,description description,loanamount applyamount," +
                         "approveamount approveamount,balanceamount balanceamount,billstatus billstatus,costcompany.id company,applier.id applier",
-                getFilterArr(projectPersonFilter,quickFilter,loanPayFilter), "");
+                getFilterArr(projectPersonFilter,quickFilter,loanPayFilter.and(waitPayLoanPayFilter)), "");
 
         DataSet prepayBillDataSet = QueryServiceHelper.queryDataSet(this.getClass().getName(), "er_prepaybill",
                 "id billid,bizdate applydate,'er_prepaybill' billtype,case when nckd_pageid = 'nckd_er_srmperpaybill' then 'nckd_er_srmperpaybill' else 'nckd_er_dailyloanbill' end pageid,billno billno,description description,loanamount applyamount," +
                         "approveamount approveamount,balanceamount balanceamount,billstatus billstatus,costcompany.id company,applier.id applier",
-                getFilterArr(projectPersonFilter,quickFilter,loanPayFilter), "");
+                getFilterArr(projectPersonFilter,quickFilter,loanPayFilter.and(waitPayLoanPayFilter)), "");
 
         dataSetList.add(dailyloanDataSet);
         dataSetList.add(prepayBillDataSet);
@@ -225,7 +227,10 @@ public class ReimWorkBenchesHelper {
         }
 
         // 显示已废弃、已关闭、审核未通过、审核通过（可用余额=0）的申请类单据。
-        QFilter applyBillStatusFilter = new QFilter("billstatus", QCP.in, new String[]{"H", "I","E"});
+//        QFilter applyBillStatusFilter = new QFilter("billstatus", QCP.in, new String[]{"H", "I","E"});
+        QFilter applyBillStatusFilter = new QFilter("billstatus", QCP.in, new String[]{"H", "I"})
+                .or(new QFilter("billstatus", QCP.in, new String[]{"E"}).and(new QFilter("balanceamount", QCP.equals, BigDecimal.ZERO)));
+
 
         DataSet dailyVehDataSet = QueryServiceHelper.queryDataSet(this.getClass().getName(), "er_dailyvehiclebill",
                 "id billid,bizdate applydate,'er_dailyvehiclebill' billtype,'er_dailyvehiclebill' pageid,billno billno,description description,null applyamount," +