|
|
@@ -121,8 +121,8 @@ public class TravelFinanConfirmCreateTask extends AbstractTask {
|
|
|
//DynamicObjectCollection slOrderDataCol = getSlOrderDataCol();
|
|
|
DynamicObjectCollection slOrderDataCol = QueryServiceHelper.query("er_allcheckingbill", "id,oabillnum,server,sourcebookedid.id applierId,totalamount,operationtype", new QFilter[]{
|
|
|
new QFilter("happenddate", QCP.less_equals, new Date()),
|
|
|
-// new QFilter(FinanceBillConfirmConstant.NCKD_SL_CONFRMID, QFilter.equals, 0)
|
|
|
-// .or(QFilter.isNull(FinanceBillConfirmConstant.NCKD_SL_CONFRMID)),
|
|
|
+ new QFilter(FinanceBillConfirmConstant.NCKD_SL_CONFRMID, QFilter.equals, 0)
|
|
|
+ .or(QFilter.isNull(FinanceBillConfirmConstant.NCKD_SL_CONFRMID)),
|
|
|
new QFilter("operationtype", QFilter.in, Arrays.asList("1","2","4","5","6")),
|
|
|
});
|
|
|
long confirmBillId = financeConfirmInfo.getLong("id");
|
|
|
@@ -201,8 +201,8 @@ public class TravelFinanConfirmCreateTask extends AbstractTask {
|
|
|
DynamicObjectCollection tripReqBillCol = QueryServiceHelper.query(TripReqBillConstant.ENTITYID, String.join(",",TripReqBillConstant.ID,TripReqBillConstant.BILLNO), new QFilter[]{
|
|
|
// 状态为审核通过、已付款、关闭
|
|
|
new QFilter(TripReqBillConstant.KEY_BILLSTATUS, QFilter.in, Arrays.asList("E", "G", "I")),
|
|
|
-// new QFilter(FinanceBillConfirmConstant.NCKD_BZ_CONFRMID, QFilter.equals, 0)
|
|
|
-// .or(QFilter.isNull(FinanceBillConfirmConstant.NCKD_BZ_CONFRMID)),
|
|
|
+ new QFilter(FinanceBillConfirmConstant.NCKD_BZ_CONFRMID, QFilter.equals, 0)
|
|
|
+ .or(QFilter.isNull(FinanceBillConfirmConstant.NCKD_BZ_CONFRMID)),
|
|
|
new QFilter(TripReqBillConstant.RENDDATE, QFilter.less_than, firstDay),
|
|
|
},"createtime desc" );
|
|
|
if(tripReqBillCol == null || tripReqBillCol.size() == 0){
|
|
|
@@ -210,7 +210,7 @@ public class TravelFinanConfirmCreateTask extends AbstractTask {
|
|
|
}
|
|
|
List<Object> tripReqBillIdList = tripReqBillCol.stream().map(r -> r.get(TripReqBillConstant.ID)).collect(Collectors.toList());
|
|
|
// 创建财务对账底稿
|
|
|
- //createTravelFinanDraft(financeConfirmInfo,tripReqBillIdList,bzAmount);
|
|
|
+ createTravelFinanDraft(financeConfirmInfo,tripReqBillIdList,bzAmount);
|
|
|
DynamicObjectCollection bzEntryCol = financeConfirmInfo.getDynamicObjectCollection(FinanceBillConfirmConstant.NCKD_BZ_ENTRY.ENTITYID);
|
|
|
// 查询关联的商旅补助底稿数据
|
|
|
List<Long> draftBillIdList = QueryServiceHelper.query(TravelFinanDraftConstant.ENTITYID, TravelFinanDraftConstant.ID,
|
