From 81d4839a9ff311f48cc8b2d6a29e579880dd5927 Mon Sep 17 00:00:00 2001 From: ham sangki Date: Wed, 28 Feb 2024 15:15:21 +0900 Subject: [PATCH] 20240228 --- src/main/java/com/batch/config/MatchingExtraProcessorAuto.java | 17 +++++++++++++---- src/main/java/com/batch/service/JobService.java | 12 ++++++++++-- src/main/resources/matchingSetup.json | 336 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------ 3 files changed, 191 insertions(+), 174 deletions(-) diff --git a/src/main/java/com/batch/config/MatchingExtraProcessorAuto.java b/src/main/java/com/batch/config/MatchingExtraProcessorAuto.java index bd8f045..44548dd 100644 --- a/src/main/java/com/batch/config/MatchingExtraProcessorAuto.java +++ b/src/main/java/com/batch/config/MatchingExtraProcessorAuto.java @@ -69,17 +69,26 @@ public class MatchingExtraProcessorAuto { iEndOwn = iStartOwn + 1000; if (iEndOwn > lMatchingDataOne.size()) iEndOwn = lMatchingDataOne.size(); } - if (iCmbnOwnCnt > 2) { - iEndOwn = iStartOwn + 100; + if (iCmbnOwnCnt == 3) { + iEndOwn = iStartOwn + 50; if (iEndOwn > lMatchingDataOne.size()) iEndOwn = lMatchingDataOne.size(); } + if (iCmbnOwnCnt > 3) { + iEndOwn = iStartOwn + 25; + if (iEndOwn > lMatchingDataOne.size()) iEndOwn = lMatchingDataOne.size(); + } + int iEndTran = lMatchingDataTwo.size(); if (iCmbnTranCnt == 2) { iEndTran = iStartTran + 1000; if (iEndTran > lMatchingDataTwo.size()) iEndTran = lMatchingDataTwo.size(); } - if (iCmbnTranCnt > 2) { - iEndTran = iStartTran + 100; + if (iCmbnTranCnt == 3) { + iEndTran = iStartTran + 50; + if (iEndTran > lMatchingDataTwo.size()) iEndTran = lMatchingDataTwo.size(); + } + if (iCmbnTranCnt > 3) { + iEndTran = iStartTran + 25; if (iEndTran > lMatchingDataTwo.size()) iEndTran = lMatchingDataTwo.size(); } diff --git a/src/main/java/com/batch/service/JobService.java b/src/main/java/com/batch/service/JobService.java index 31a8003..a1dbdd9 100644 --- a/src/main/java/com/batch/service/JobService.java +++ b/src/main/java/com/batch/service/JobService.java @@ -124,12 +124,20 @@ public class JobService { } //3건씩 매칭일 경우 최대 5000건 까지 - for (int i=0; i<2000;i=i+100) { + for (int i=0; i<5000;i=i+50) { matchingExtraProcessorAuto.process(paramRec, 1, 3, 0, i); } - for (int i=0; i<2000;i=i+100) { + for (int i=0; i<5000;i=i+50) { matchingExtraProcessorAuto.process(paramRec, 3, 1, i, 0); } + + //3건씩 매칭일 경우 최대 2000건 까지 + for (int i=0; i<2000;i=i+25) { + matchingExtraProcessorAuto.process(paramRec, 1, 4, 0, i); + } + for (int i=0; i<2000;i=i+25) { + matchingExtraProcessorAuto.process(paramRec, 4, 1, i, 0); + } long endTime = System.currentTimeMillis(); log.info("Job Ended: " + endTime); diff --git a/src/main/resources/matchingSetup.json b/src/main/resources/matchingSetup.json index 40c292c..09db2a5 100644 --- a/src/main/resources/matchingSetup.json +++ b/src/main/resources/matchingSetup.json @@ -7,7 +7,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null", "cmpnsp_ky is not null", "cmpnsp_ky != ''" @@ -18,7 +18,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null", "cmpnsp_ky is not null", "cmpnsp_ky != ''" @@ -50,7 +50,7 @@ "condOne": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null", "cmpnsp_ky is not null", "cmpnsp_ky != ''" @@ -61,7 +61,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null", "cmpnsp_ky is not null", "cmpnsp_ky != ''" @@ -97,7 +97,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null", "ext_key1 is not null", "ext_key1 != ''" @@ -108,7 +108,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null", "ext_key1 is not null", "ext_key1 != ''" @@ -139,7 +139,7 @@ "condOne": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null", "ext_key1 is not null", "ext_key1 != ''" @@ -150,7 +150,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null", "ext_key1 is not null", "ext_key1 != ''" @@ -187,7 +187,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null", "chit_no is not null", "chit_no != ''" @@ -198,7 +198,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null", "chit_no is not null", "chit_no != ''" @@ -229,7 +229,7 @@ "condOne": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null", "chit_no is not null", "chit_no != ''" @@ -240,7 +240,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null", "chit_no is not null" ], @@ -276,7 +276,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -285,7 +285,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -314,7 +314,7 @@ "condOne": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null" ], "makeCompareKey": [ @@ -323,7 +323,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null" ], "makeCompareKey": [ @@ -357,7 +357,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -366,7 +366,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -395,7 +395,7 @@ "condOne": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null" ], "makeCompareKey": [ @@ -404,7 +404,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null" ], "makeCompareKey": [ @@ -441,7 +441,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -451,7 +451,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -481,7 +481,7 @@ "condOne": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null" ], "makeCompareKey": [ @@ -491,7 +491,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null" ], "makeCompareKey": [ @@ -526,7 +526,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -537,7 +537,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -568,7 +568,7 @@ "condOne": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null" ], "makeCompareKey": [ @@ -579,7 +579,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null" ], "makeCompareKey": [ @@ -618,7 +618,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -629,7 +629,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -660,7 +660,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -670,7 +670,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -701,7 +701,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null", "chit_no is not null", "chit_no != ''" @@ -713,7 +713,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -744,7 +744,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null", "ext_key1 is not null", "ext_key1 != ''" @@ -756,7 +756,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -787,7 +787,7 @@ "condOne": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -798,7 +798,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -829,7 +829,7 @@ "condOne": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -839,7 +839,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -870,7 +870,7 @@ "condOne": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null", "chit_no is not null", "chit_no != ''" @@ -882,7 +882,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -913,7 +913,7 @@ "condOne": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null", "ext_key1 is not null", "ext_key1 != ''" @@ -925,7 +925,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -959,7 +959,7 @@ "condOne": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null" ], "makeCompareKey": [ @@ -970,7 +970,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1001,7 +1001,7 @@ "condOne": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1011,7 +1011,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1042,7 +1042,7 @@ "condOne": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null", "chit_no is not null", "chit_no != ''" @@ -1054,7 +1054,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1085,7 +1085,7 @@ "condOne": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1095,7 +1095,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1126,7 +1126,7 @@ "condOne": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1137,7 +1137,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1168,7 +1168,7 @@ "condOne": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1178,7 +1178,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1209,7 +1209,7 @@ "condOne": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null", "chit_no is not null", "chit_no != ''" @@ -1221,7 +1221,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1252,7 +1252,7 @@ "condOne": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1262,7 +1262,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1297,7 +1297,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1307,7 +1307,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1338,7 +1338,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1348,7 +1348,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1379,7 +1379,7 @@ "condOne": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1389,7 +1389,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1420,7 +1420,7 @@ "condOne": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1430,7 +1430,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1461,7 +1461,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1471,7 +1471,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1502,7 +1502,7 @@ "condOne": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1512,7 +1512,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1546,7 +1546,7 @@ "condOne": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1556,7 +1556,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1587,7 +1587,7 @@ "condOne": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1597,7 +1597,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1628,7 +1628,7 @@ "condOne": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1638,7 +1638,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1669,7 +1669,7 @@ "condOne": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1679,7 +1679,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1710,7 +1710,7 @@ "condOne": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1720,7 +1720,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1751,7 +1751,7 @@ "condOne": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1761,7 +1761,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1796,7 +1796,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1807,7 +1807,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1838,7 +1838,7 @@ "condOne": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1849,7 +1849,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1880,7 +1880,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1891,7 +1891,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1922,7 +1922,7 @@ "condOne": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1933,7 +1933,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1965,7 +1965,7 @@ "condOne": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null" ], "makeCompareKey": [ @@ -1976,7 +1976,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2007,7 +2007,7 @@ "condOne": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2018,7 +2018,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2049,7 +2049,7 @@ "condOne": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2060,7 +2060,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2091,7 +2091,7 @@ "condOne": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2102,7 +2102,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2146,7 +2146,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2157,7 +2157,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2188,7 +2188,7 @@ "condOne": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2199,7 +2199,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2230,7 +2230,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2241,7 +2241,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2272,7 +2272,7 @@ "condOne": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2283,7 +2283,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2314,7 +2314,7 @@ "condOne": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2325,7 +2325,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2356,7 +2356,7 @@ "condOne": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2367,7 +2367,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2398,7 +2398,7 @@ "condOne": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2409,7 +2409,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2440,7 +2440,7 @@ "condOne": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2451,7 +2451,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2486,7 +2486,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null", "elcty_de is not null", "elcty_de != ''" @@ -2497,7 +2497,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null", "elcty_de is not null", "elcty_de != ''" @@ -2528,7 +2528,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null", "elcty_de is not null", "elcty_de != ''" @@ -2539,7 +2539,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2570,7 +2570,7 @@ "condOne": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null", "elcty_de is not null", "elcty_de != ''" @@ -2581,7 +2581,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2617,7 +2617,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2626,7 +2626,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2655,7 +2655,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2664,7 +2664,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2695,7 +2695,7 @@ "condOne": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2704,7 +2704,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2739,7 +2739,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2748,7 +2748,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2777,7 +2777,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2786,7 +2786,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2817,7 +2817,7 @@ "condOne": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2826,7 +2826,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2857,7 +2857,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2866,7 +2866,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2895,7 +2895,7 @@ "condOne": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2904,7 +2904,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -2937,7 +2937,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null", "ext_key2 is not null", "ext_key2 != ''" @@ -2948,7 +2948,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null", "ext_key2 is not null", "ext_key2 != ''" @@ -2979,7 +2979,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null", "ext_key2 is not null", "ext_key2 != ''" @@ -2990,7 +2990,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -3021,7 +3021,7 @@ "condOne": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null", "ext_key2 is not null", "ext_key2 != ''" @@ -3032,7 +3032,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -3066,7 +3066,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null", "ext_key3 is not null", "ext_key3 != ''" @@ -3077,7 +3077,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null", "ext_key3 is not null", "ext_key3 != ''" @@ -3108,7 +3108,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null", "ext_key3 is not null", "ext_key3 != ''" @@ -3119,7 +3119,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -3150,7 +3150,7 @@ "condOne": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null", "ext_key3 is not null", "ext_key3 != ''" @@ -3161,7 +3161,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -3195,7 +3195,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null", "ext_key4 is not null", "ext_key4 != ''" @@ -3206,7 +3206,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null", "ext_key4 is not null", "ext_key4 != ''" @@ -3237,7 +3237,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null", "ext_key4 is not null", "ext_key4 != ''" @@ -3248,7 +3248,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -3279,7 +3279,7 @@ "condOne": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null", "ext_key4 is not null", "ext_key4 != ''" @@ -3290,7 +3290,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -3326,7 +3326,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -3337,7 +3337,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -3368,7 +3368,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -3379,7 +3379,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -3410,7 +3410,7 @@ "condOne": { "cond": [ - "dta_ty in ('11','21')", + "dta_ty in ('11','21','41')", "mtch_ty is null" ], "makeCompareKey": [ @@ -3420,7 +3420,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('12','22')", + "dta_ty in ('12','22','42')", "mtch_ty is null" ], "makeCompareKey": [ @@ -3450,7 +3450,7 @@ "condOne": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null" ], "makeCompareKey": [ @@ -3461,7 +3461,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null" ], "makeCompareKey": [ @@ -3492,7 +3492,7 @@ "condOne": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null" ], "makeCompareKey": [ @@ -3503,7 +3503,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null" ], "makeCompareKey": [ @@ -3534,7 +3534,7 @@ "condOne": { "cond": [ - "dta_ty in ('31','33','35','37','41')", + "dta_ty in ('31','33','35','37')", "mtch_ty is null" ], "makeCompareKey": [ @@ -3544,7 +3544,7 @@ }, "condTwo": { "cond": [ - "dta_ty in ('32','34','36','38','42')", + "dta_ty in ('32','34','36','38')", "mtch_ty is null" ], "makeCompareKey": [ -- libgit2 0.21.4