|
|
@@ -128,7 +128,10 @@ 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,new QFilter("balanceamount", QCP.large_than, BigDecimal.ZERO)), "");
|
|
|
+ getFilterArr(projectPersonFilter,quickFilter,applyStatusFilter
|
|
|
+ ,new QFilter("balanceamount", QCP.large_than, BigDecimal.ZERO)
|
|
|
+ //增加手工隐藏标记的过滤
|
|
|
+ ,new QFilter("nckd_handhide", QCP.equals, "0")), "");
|
|
|
dataSetList.add(dailyVehDataSet);
|
|
|
dataSetList.add(tripReqDataSet);
|
|
|
dataSetList.add(dailyApplyDataSet);
|
|
|
@@ -250,7 +253,9 @@ 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,billstatus billstatus,costcompany.id company,applier.id applier",
|
|
|
- getFilterArr(projectPersonFilter,quickFilter,applyBillStatusFilter), "");
|
|
|
+ getFilterArr(projectPersonFilter,quickFilter,applyBillStatusFilter
|
|
|
+ //增加手工隐藏标记的过滤
|
|
|
+ , new QFilter("nckd_handhide", QCP.equals, "0")), "");
|
|
|
dataSetList.add(dailyVehDataSet);
|
|
|
dataSetList.add(tripReqDataSet);
|
|
|
dataSetList.add(dailyApplyDataSet);
|