|
@@ -53,7 +53,7 @@ public class TravelFinanConfirmCreateTask extends AbstractTask {
|
|
|
logger.info("TravelFinanConfirmCreateTask begin");
|
|
|
periodEndDate = new Date();
|
|
|
// 创建当月的财务底稿确认单
|
|
|
- if(map.containsKey("startDate")){
|
|
|
+ if(map.containsKey("startDate") && map.get("startDate") != null && StringUtils.isNotEmpty(map.get("startDate").toString())){
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
|
|
|
try {
|
|
|
periodEndDate = sdf.parse((String)map.get("startDate"));
|
|
@@ -129,7 +129,7 @@ public class TravelFinanConfirmCreateTask extends AbstractTask {
|
|
|
"id,org.id,oabillnum,sourcebookedid.id applierId,sourcebookedid.gender applierGender,totalamount,cityname,checkindate,checkoutdate," +
|
|
|
"hotelname,roomstylename,ordernum", new QFilter[]{
|
|
|
QFilter.isNotNull("sourcebookedid"),
|
|
|
- new QFilter("ordernum", QCP.in, billNumList),
|
|
|
+ new QFilter("checkingbillnum", QCP.in, billNumList),
|
|
|
new QFilter("ordertype", QCP.in, Arrays.asList("O","G")),
|
|
|
new QFilter("orderstatus", QCP.not_in, Arrays.asList("14","10")),
|
|
|
});
|
|
@@ -289,7 +289,7 @@ public class TravelFinanConfirmCreateTask extends AbstractTask {
|
|
|
DynamicObjectCollection trainTgEntryCol = QueryServiceHelper.query("er_traincheckingbill",
|
|
|
"id,oabillnum,sourcebookedid.id applierId,totalamount,orderstatus,ordertype,ordernum,happenddate,departtime,arrivecity,departcity" +
|
|
|
",refundamount", new QFilter[]{
|
|
|
- new QFilter("ordernum", QCP.in, billNumList),
|
|
|
+ new QFilter("checkingbillnum", QCP.in, billNumList),
|
|
|
new QFilter("orderstatus", QFilter.in, Arrays.asList("2","3")),
|
|
|
new QFilter("ordertype", QFilter.in, Arrays.asList("G","T"))
|
|
|
});
|
|
@@ -335,7 +335,7 @@ public class TravelFinanConfirmCreateTask extends AbstractTask {
|
|
|
DynamicObjectCollection trainTgEntryCol = QueryServiceHelper.query("er_planecheckingbill",
|
|
|
"id,oabillnum,sourcebookedid.id applierId,totalamount,orderstatus,ordertype,ordernum,happenddate,takeofftime,fromcityname,tocityname," +
|
|
|
"refundamount,endorsementamount", new QFilter[]{
|
|
|
- new QFilter("ordernum", QCP.in, billNumList),
|
|
|
+ new QFilter("checkingbillnum", QCP.in, billNumList),
|
|
|
new QFilter("orderstatus", QFilter.in, Arrays.asList("50202","50302")),
|
|
|
new QFilter("ordertype", QFilter.in, Arrays.asList("G","T"))
|
|
|
});
|
|
@@ -381,7 +381,7 @@ public class TravelFinanConfirmCreateTask extends AbstractTask {
|
|
|
DynamicObjectCollection hotelTgEntryCol = QueryServiceHelper.query("er_hotelcheckingbill",
|
|
|
"id,oabillnum,server,sourcebookedid.id applierId,totalamount,orderstatus,ordertype,ordernum,happenddate," +
|
|
|
"unbookfee,checkindate", new QFilter[]{
|
|
|
- new QFilter("ordernum", QCP.in, billNumList),
|
|
|
+ new QFilter("checkingbillnum", QCP.in, billNumList),
|
|
|
new QFilter("orderstatus", QFilter.equals, "10"),
|
|
|
new QFilter("ordertype", QFilter.in, Arrays.asList("G","T"))
|
|
|
});
|
|
@@ -893,7 +893,8 @@ public class TravelFinanConfirmCreateTask extends AbstractTask {
|
|
|
new QFilter(TripReqBillConstant.KEY_BILLSTATUS, QFilter.in, Arrays.asList("E", "G", "I")),
|
|
|
new QFilter(FinanceBillConfirmConstant.NCKD_BZ_CONFRMID, QFilter.equals, 0L)
|
|
|
.or(QFilter.isNull(FinanceBillConfirmConstant.NCKD_BZ_CONFRMID)),
|
|
|
- QFilter.isNotNull(FinanceBillConfirmConstant.NCKD_SUP_CHECKID),
|
|
|
+ new QFilter(FinanceBillConfirmConstant.NCKD_SUP_CHECKID, QFilter.equals, 0L)
|
|
|
+ .or(QFilter.isNull(FinanceBillConfirmConstant.NCKD_SUP_CHECKID)),
|
|
|
new QFilter(TripReqBillConstant.RENDDATE, QFilter.less_than, periodEndDate),
|
|
|
},"createtime desc" );
|
|
|
if(tripReqBillCol == null || tripReqBillCol.size() == 0){
|