fix:月结账单调度计划批量拉取月结账单

nckd-fi/src/main/java/nckd/fi/er/task/MonthlySettlementBillTask.java

@@ -131,7 +131,9 @@ public class MonthlySettlementBillTask extends AbstractTask {
             Object rebookingTime = resultMap.get("rebookingtime");
             //航班号/车次号-机票航班号/车票车次
             Object number = resultMap.get("flight")==null ? resultMap.get("ticketInfoID") : resultMap.get("flight");
-           //测试用例
+            //国内/国外
+            Object international = resultMap.get("international");
+            //测试用例
 //            Object invoicefromcity = resultMap.get("cityName");
 //            Object invoiceno = resultMap.get("subAccCheckBatchNo");
 //            Object departtime = resultMap.get("startTime");
@@ -156,8 +158,25 @@ public class MonthlySettlementBillTask extends AbstractTask {
                     filters
             );
             dynamicBillObj.set("settlemain", conflictBills);
+            String s = null;
+            switch (operationtype.toString()){
+                case "01001":
+                case "01002":
+                case "01003":
+                    if ("1".equals(international.toString())){
+                        s = "2";
+                    }else {
+                        s = "4";
+                    }
+                    break;
+                case "1":
+                case "2":
+                case "3":
+                    s = "6";
+                    break;
+            }
             //服务类型
-            dynamicBillObj.set("operationtype", operationtype);
+            dynamicBillObj.set("operationtype", s);
             //单据状态
             dynamicBillObj.set("billstatusname", "4");
             //币种
@@ -221,7 +240,8 @@ public class MonthlySettlementBillTask extends AbstractTask {
             DynamicObjectCollection entryEntity = dynamicBillObj.getDynamicObjectCollection("invoiceentry");
             if (CollectionUtils.isEmpty(resultInvoiceLists)){
                 log.info("结算单号："+checkingbillno+"未查询到发票数据");
-                break;
+                ids.add(dynamicBillObj);
+                continue;
             }
             for (Map<String, Object> resultInvoiceList : resultInvoiceLists){
                 //单据体新增一行