grp_ai / matching_ai

Commit 81d4839a9ff311f48cc8b2d6a29e579880dd5927

Authored by 함상기
1 parent 8dc487b1

20240228

Showing 3 changed files with 191 additions and 174 deletions   Show diff stats
Inline Side-by-side
src/main/java/com/batch/config/MatchingExtraProcessorAuto.java
  Show/Hide comments   View file @81d4839
... ... @@ -69,17 +69,26 @@ public class MatchingExtraProcessorAuto {
69 69 iEndOwn = iStartOwn + 1000;
70 70 if (iEndOwn > lMatchingDataOne.size()) iEndOwn = lMatchingDataOne.size();
71 71 }
72   - if (iCmbnOwnCnt > 2) {
73   - iEndOwn = iStartOwn + 100;
  72 + if (iCmbnOwnCnt == 3) {
  73 + iEndOwn = iStartOwn + 50;
74 74 if (iEndOwn > lMatchingDataOne.size()) iEndOwn = lMatchingDataOne.size();
75 75 }
  76 + if (iCmbnOwnCnt > 3) {
  77 + iEndOwn = iStartOwn + 25;
  78 + if (iEndOwn > lMatchingDataOne.size()) iEndOwn = lMatchingDataOne.size();
  79 + }
  80 +
76 81 int iEndTran = lMatchingDataTwo.size();
77 82 if (iCmbnTranCnt == 2) {
78 83 iEndTran = iStartTran + 1000;
79 84 if (iEndTran > lMatchingDataTwo.size()) iEndTran = lMatchingDataTwo.size();
80 85 }
81   - if (iCmbnTranCnt > 2) {
82   - iEndTran = iStartTran + 100;
  86 + if (iCmbnTranCnt == 3) {
  87 + iEndTran = iStartTran + 50;
  88 + if (iEndTran > lMatchingDataTwo.size()) iEndTran = lMatchingDataTwo.size();
  89 + }
  90 + if (iCmbnTranCnt > 3) {
  91 + iEndTran = iStartTran + 25;
83 92 if (iEndTran > lMatchingDataTwo.size()) iEndTran = lMatchingDataTwo.size();
84 93 }
85 94  
... ...
src/main/java/com/batch/service/JobService.java
  Show/Hide comments   View file @81d4839
... ... @@ -124,12 +124,20 @@ public class JobService {
124 124 }
125 125  
126 126 //3건씩 매칭일 경우 최대 5000건 까지
127   - for (int i=0; i<2000;i=i+100) {
  127 + for (int i=0; i<5000;i=i+50) {
128 128 matchingExtraProcessorAuto.process(paramRec, 1, 3, 0, i);
129 129 }
130   - for (int i=0; i<2000;i=i+100) {
  130 + for (int i=0; i<5000;i=i+50) {
131 131 matchingExtraProcessorAuto.process(paramRec, 3, 1, i, 0);
132 132 }
  133 +
  134 + //3건씩 매칭일 경우 최대 2000건 까지
  135 + for (int i=0; i<2000;i=i+25) {
  136 + matchingExtraProcessorAuto.process(paramRec, 1, 4, 0, i);
  137 + }
  138 + for (int i=0; i<2000;i=i+25) {
  139 + matchingExtraProcessorAuto.process(paramRec, 4, 1, i, 0);
  140 + }
133 141  
134 142 long endTime = System.currentTimeMillis();
135 143 log.info("Job Ended: " + endTime);
... ...
src/main/resources/matchingSetup.json
  Show/Hide comments   View file @81d4839
... ... @@ -7,7 +7,7 @@
7 7  
8 8 "condOne": {
9 9 "cond": [
10   - "dta_ty in ('11','21')",
  10 + "dta_ty in ('11','21','41')",
11 11 "mtch_ty is null",
12 12 "cmpnsp_ky is not null",
13 13 "cmpnsp_ky != ''"
... ... @@ -18,7 +18,7 @@
18 18 },
19 19 "condTwo": {
20 20 "cond": [
21   - "dta_ty in ('12','22')",
  21 + "dta_ty in ('12','22','42')",
22 22 "mtch_ty is null",
23 23 "cmpnsp_ky is not null",
24 24 "cmpnsp_ky != ''"
... ... @@ -50,7 +50,7 @@
50 50  
51 51 "condOne": {
52 52 "cond": [
53   - "dta_ty in ('31','33','35','37','41')",
  53 + "dta_ty in ('31','33','35','37')",
54 54 "mtch_ty is null",
55 55 "cmpnsp_ky is not null",
56 56 "cmpnsp_ky != ''"
... ... @@ -61,7 +61,7 @@
61 61 },
62 62 "condTwo": {
63 63 "cond": [
64   - "dta_ty in ('32','34','36','38','42')",
  64 + "dta_ty in ('32','34','36','38')",
65 65 "mtch_ty is null",
66 66 "cmpnsp_ky is not null",
67 67 "cmpnsp_ky != ''"
... ... @@ -97,7 +97,7 @@
97 97  
98 98 "condOne": {
99 99 "cond": [
100   - "dta_ty in ('11','21')",
  100 + "dta_ty in ('11','21','41')",
101 101 "mtch_ty is null",
102 102 "ext_key1 is not null",
103 103 "ext_key1 != ''"
... ... @@ -108,7 +108,7 @@
108 108 },
109 109 "condTwo": {
110 110 "cond": [
111   - "dta_ty in ('12','22')",
  111 + "dta_ty in ('12','22','42')",
112 112 "mtch_ty is null",
113 113 "ext_key1 is not null",
114 114 "ext_key1 != ''"
... ... @@ -139,7 +139,7 @@
139 139  
140 140 "condOne": {
141 141 "cond": [
142   - "dta_ty in ('31','33','35','37','41')",
  142 + "dta_ty in ('31','33','35','37')",
143 143 "mtch_ty is null",
144 144 "ext_key1 is not null",
145 145 "ext_key1 != ''"
... ... @@ -150,7 +150,7 @@
150 150 },
151 151 "condTwo": {
152 152 "cond": [
153   - "dta_ty in ('32','34','36','38','42')",
  153 + "dta_ty in ('32','34','36','38')",
154 154 "mtch_ty is null",
155 155 "ext_key1 is not null",
156 156 "ext_key1 != ''"
... ... @@ -187,7 +187,7 @@
187 187  
188 188 "condOne": {
189 189 "cond": [
190   - "dta_ty in ('11','21')",
  190 + "dta_ty in ('11','21','41')",
191 191 "mtch_ty is null",
192 192 "chit_no is not null",
193 193 "chit_no != ''"
... ... @@ -198,7 +198,7 @@
198 198 },
199 199 "condTwo": {
200 200 "cond": [
201   - "dta_ty in ('12','22')",
  201 + "dta_ty in ('12','22','42')",
202 202 "mtch_ty is null",
203 203 "chit_no is not null",
204 204 "chit_no != ''"
... ... @@ -229,7 +229,7 @@
229 229  
230 230 "condOne": {
231 231 "cond": [
232   - "dta_ty in ('31','33','35','37','41')",
  232 + "dta_ty in ('31','33','35','37')",
233 233 "mtch_ty is null",
234 234 "chit_no is not null",
235 235 "chit_no != ''"
... ... @@ -240,7 +240,7 @@
240 240 },
241 241 "condTwo": {
242 242 "cond": [
243   - "dta_ty in ('32','34','36','38','42')",
  243 + "dta_ty in ('32','34','36','38')",
244 244 "mtch_ty is null",
245 245 "chit_no is not null"
246 246 ],
... ... @@ -276,7 +276,7 @@
276 276  
277 277 "condOne": {
278 278 "cond": [
279   - "dta_ty in ('11','21')",
  279 + "dta_ty in ('11','21','41')",
280 280 "mtch_ty is null"
281 281 ],
282 282 "makeCompareKey": [
... ... @@ -285,7 +285,7 @@
285 285 },
286 286 "condTwo": {
287 287 "cond": [
288   - "dta_ty in ('12','22')",
  288 + "dta_ty in ('12','22','42')",
289 289 "mtch_ty is null"
290 290 ],
291 291 "makeCompareKey": [
... ... @@ -314,7 +314,7 @@
314 314  
315 315 "condOne": {
316 316 "cond": [
317   - "dta_ty in ('31','33','35','37','41')",
  317 + "dta_ty in ('31','33','35','37')",
318 318 "mtch_ty is null"
319 319 ],
320 320 "makeCompareKey": [
... ... @@ -323,7 +323,7 @@
323 323 },
324 324 "condTwo": {
325 325 "cond": [
326   - "dta_ty in ('32','34','36','38','42')",
  326 + "dta_ty in ('32','34','36','38')",
327 327 "mtch_ty is null"
328 328 ],
329 329 "makeCompareKey": [
... ... @@ -357,7 +357,7 @@
357 357  
358 358 "condOne": {
359 359 "cond": [
360   - "dta_ty in ('11','21')",
  360 + "dta_ty in ('11','21','41')",
361 361 "mtch_ty is null"
362 362 ],
363 363 "makeCompareKey": [
... ... @@ -366,7 +366,7 @@
366 366 },
367 367 "condTwo": {
368 368 "cond": [
369   - "dta_ty in ('12','22')",
  369 + "dta_ty in ('12','22','42')",
370 370 "mtch_ty is null"
371 371 ],
372 372 "makeCompareKey": [
... ... @@ -395,7 +395,7 @@
395 395  
396 396 "condOne": {
397 397 "cond": [
398   - "dta_ty in ('31','33','35','37','41')",
  398 + "dta_ty in ('31','33','35','37')",
399 399 "mtch_ty is null"
400 400 ],
401 401 "makeCompareKey": [
... ... @@ -404,7 +404,7 @@
404 404 },
405 405 "condTwo": {
406 406 "cond": [
407   - "dta_ty in ('32','34','36','38','42')",
  407 + "dta_ty in ('32','34','36','38')",
408 408 "mtch_ty is null"
409 409 ],
410 410 "makeCompareKey": [
... ... @@ -441,7 +441,7 @@
441 441  
442 442 "condOne": {
443 443 "cond": [
444   - "dta_ty in ('11','21')",
  444 + "dta_ty in ('11','21','41')",
445 445 "mtch_ty is null"
446 446 ],
447 447 "makeCompareKey": [
... ... @@ -451,7 +451,7 @@
451 451 },
452 452 "condTwo": {
453 453 "cond": [
454   - "dta_ty in ('12','22')",
  454 + "dta_ty in ('12','22','42')",
455 455 "mtch_ty is null"
456 456 ],
457 457 "makeCompareKey": [
... ... @@ -481,7 +481,7 @@
481 481  
482 482 "condOne": {
483 483 "cond": [
484   - "dta_ty in ('31','33','35','37','41')",
  484 + "dta_ty in ('31','33','35','37')",
485 485 "mtch_ty is null"
486 486 ],
487 487 "makeCompareKey": [
... ... @@ -491,7 +491,7 @@
491 491 },
492 492 "condTwo": {
493 493 "cond": [
494   - "dta_ty in ('32','34','36','38','42')",
  494 + "dta_ty in ('32','34','36','38')",
495 495 "mtch_ty is null"
496 496 ],
497 497 "makeCompareKey": [
... ... @@ -526,7 +526,7 @@
526 526  
527 527 "condOne": {
528 528 "cond": [
529   - "dta_ty in ('11','21')",
  529 + "dta_ty in ('11','21','41')",
530 530 "mtch_ty is null"
531 531 ],
532 532 "makeCompareKey": [
... ... @@ -537,7 +537,7 @@
537 537 },
538 538 "condTwo": {
539 539 "cond": [
540   - "dta_ty in ('12','22')",
  540 + "dta_ty in ('12','22','42')",
541 541 "mtch_ty is null"
542 542 ],
543 543 "makeCompareKey": [
... ... @@ -568,7 +568,7 @@
568 568  
569 569 "condOne": {
570 570 "cond": [
571   - "dta_ty in ('31','33','35','37','41')",
  571 + "dta_ty in ('31','33','35','37')",
572 572 "mtch_ty is null"
573 573 ],
574 574 "makeCompareKey": [
... ... @@ -579,7 +579,7 @@
579 579 },
580 580 "condTwo": {
581 581 "cond": [
582   - "dta_ty in ('32','34','36','38','42')",
  582 + "dta_ty in ('32','34','36','38')",
583 583 "mtch_ty is null"
584 584 ],
585 585 "makeCompareKey": [
... ... @@ -618,7 +618,7 @@
618 618  
619 619 "condOne": {
620 620 "cond": [
621   - "dta_ty in ('11','21')",
  621 + "dta_ty in ('11','21','41')",
622 622 "mtch_ty is null"
623 623 ],
624 624 "makeCompareKey": [
... ... @@ -629,7 +629,7 @@
629 629 },
630 630 "condTwo": {
631 631 "cond": [
632   - "dta_ty in ('12','22')",
  632 + "dta_ty in ('12','22','42')",
633 633 "mtch_ty is null"
634 634 ],
635 635 "makeCompareKey": [
... ... @@ -660,7 +660,7 @@
660 660  
661 661 "condOne": {
662 662 "cond": [
663   - "dta_ty in ('11','21')",
  663 + "dta_ty in ('11','21','41')",
664 664 "mtch_ty is null"
665 665 ],
666 666 "makeCompareKey": [
... ... @@ -670,7 +670,7 @@
670 670 },
671 671 "condTwo": {
672 672 "cond": [
673   - "dta_ty in ('12','22')",
  673 + "dta_ty in ('12','22','42')",
674 674 "mtch_ty is null"
675 675 ],
676 676 "makeCompareKey": [
... ... @@ -701,7 +701,7 @@
701 701  
702 702 "condOne": {
703 703 "cond": [
704   - "dta_ty in ('11','21')",
  704 + "dta_ty in ('11','21','41')",
705 705 "mtch_ty is null",
706 706 "chit_no is not null",
707 707 "chit_no != ''"
... ... @@ -713,7 +713,7 @@
713 713 },
714 714 "condTwo": {
715 715 "cond": [
716   - "dta_ty in ('12','22')",
  716 + "dta_ty in ('12','22','42')",
717 717 "mtch_ty is null"
718 718 ],
719 719 "makeCompareKey": [
... ... @@ -744,7 +744,7 @@
744 744  
745 745 "condOne": {
746 746 "cond": [
747   - "dta_ty in ('11','21')",
  747 + "dta_ty in ('11','21','41')",
748 748 "mtch_ty is null",
749 749 "ext_key1 is not null",
750 750 "ext_key1 != ''"
... ... @@ -756,7 +756,7 @@
756 756 },
757 757 "condTwo": {
758 758 "cond": [
759   - "dta_ty in ('12','22')",
  759 + "dta_ty in ('12','22','42')",
760 760 "mtch_ty is null"
761 761 ],
762 762 "makeCompareKey": [
... ... @@ -787,7 +787,7 @@
787 787  
788 788 "condOne": {
789 789 "cond": [
790   - "dta_ty in ('12','22')",
  790 + "dta_ty in ('12','22','42')",
791 791 "mtch_ty is null"
792 792 ],
793 793 "makeCompareKey": [
... ... @@ -798,7 +798,7 @@
798 798 },
799 799 "condTwo": {
800 800 "cond": [
801   - "dta_ty in ('11','21')",
  801 + "dta_ty in ('11','21','41')",
802 802 "mtch_ty is null"
803 803 ],
804 804 "makeCompareKey": [
... ... @@ -829,7 +829,7 @@
829 829  
830 830 "condOne": {
831 831 "cond": [
832   - "dta_ty in ('12','22')",
  832 + "dta_ty in ('12','22','42')",
833 833 "mtch_ty is null"
834 834 ],
835 835 "makeCompareKey": [
... ... @@ -839,7 +839,7 @@
839 839 },
840 840 "condTwo": {
841 841 "cond": [
842   - "dta_ty in ('11','21')",
  842 + "dta_ty in ('11','21','41')",
843 843 "mtch_ty is null"
844 844 ],
845 845 "makeCompareKey": [
... ... @@ -870,7 +870,7 @@
870 870  
871 871 "condOne": {
872 872 "cond": [
873   - "dta_ty in ('12','22')",
  873 + "dta_ty in ('12','22','42')",
874 874 "mtch_ty is null",
875 875 "chit_no is not null",
876 876 "chit_no != ''"
... ... @@ -882,7 +882,7 @@
882 882 },
883 883 "condTwo": {
884 884 "cond": [
885   - "dta_ty in ('11','21')",
  885 + "dta_ty in ('11','21','41')",
886 886 "mtch_ty is null"
887 887 ],
888 888 "makeCompareKey": [
... ... @@ -913,7 +913,7 @@
913 913  
914 914 "condOne": {
915 915 "cond": [
916   - "dta_ty in ('12','22')",
  916 + "dta_ty in ('12','22','42')",
917 917 "mtch_ty is null",
918 918 "ext_key1 is not null",
919 919 "ext_key1 != ''"
... ... @@ -925,7 +925,7 @@
925 925 },
926 926 "condTwo": {
927 927 "cond": [
928   - "dta_ty in ('11','21')",
  928 + "dta_ty in ('11','21','41')",
929 929 "mtch_ty is null"
930 930 ],
931 931 "makeCompareKey": [
... ... @@ -959,7 +959,7 @@
959 959  
960 960 "condOne": {
961 961 "cond": [
962   - "dta_ty in ('31','33','35','37','41')",
  962 + "dta_ty in ('31','33','35','37')",
963 963 "mtch_ty is null"
964 964 ],
965 965 "makeCompareKey": [
... ... @@ -970,7 +970,7 @@
970 970 },
971 971 "condTwo": {
972 972 "cond": [
973   - "dta_ty in ('32','34','36','38','42')",
  973 + "dta_ty in ('32','34','36','38')",
974 974 "mtch_ty is null"
975 975 ],
976 976 "makeCompareKey": [
... ... @@ -1001,7 +1001,7 @@
1001 1001  
1002 1002 "condOne": {
1003 1003 "cond": [
1004   - "dta_ty in ('31','33','35','37','41')",
  1004 + "dta_ty in ('31','33','35','37')",
1005 1005 "mtch_ty is null"
1006 1006 ],
1007 1007 "makeCompareKey": [
... ... @@ -1011,7 +1011,7 @@
1011 1011 },
1012 1012 "condTwo": {
1013 1013 "cond": [
1014   - "dta_ty in ('32','34','36','38','42')",
  1014 + "dta_ty in ('32','34','36','38')",
1015 1015 "mtch_ty is null"
1016 1016 ],
1017 1017 "makeCompareKey": [
... ... @@ -1042,7 +1042,7 @@
1042 1042  
1043 1043 "condOne": {
1044 1044 "cond": [
1045   - "dta_ty in ('31','33','35','37','41')",
  1045 + "dta_ty in ('31','33','35','37')",
1046 1046 "mtch_ty is null",
1047 1047 "chit_no is not null",
1048 1048 "chit_no != ''"
... ... @@ -1054,7 +1054,7 @@
1054 1054 },
1055 1055 "condTwo": {
1056 1056 "cond": [
1057   - "dta_ty in ('32','34','36','38','42')",
  1057 + "dta_ty in ('32','34','36','38')",
1058 1058 "mtch_ty is null"
1059 1059 ],
1060 1060 "makeCompareKey": [
... ... @@ -1085,7 +1085,7 @@
1085 1085  
1086 1086 "condOne": {
1087 1087 "cond": [
1088   - "dta_ty in ('31','33','35','37','41')",
  1088 + "dta_ty in ('31','33','35','37')",
1089 1089 "mtch_ty is null"
1090 1090 ],
1091 1091 "makeCompareKey": [
... ... @@ -1095,7 +1095,7 @@
1095 1095 },
1096 1096 "condTwo": {
1097 1097 "cond": [
1098   - "dta_ty in ('32','34','36','38','42')",
  1098 + "dta_ty in ('32','34','36','38')",
1099 1099 "mtch_ty is null"
1100 1100 ],
1101 1101 "makeCompareKey": [
... ... @@ -1126,7 +1126,7 @@
1126 1126  
1127 1127 "condOne": {
1128 1128 "cond": [
1129   - "dta_ty in ('32','34','36','38','42')",
  1129 + "dta_ty in ('32','34','36','38')",
1130 1130 "mtch_ty is null"
1131 1131 ],
1132 1132 "makeCompareKey": [
... ... @@ -1137,7 +1137,7 @@
1137 1137 },
1138 1138 "condTwo": {
1139 1139 "cond": [
1140   - "dta_ty in ('31','33','35','37','41')",
  1140 + "dta_ty in ('31','33','35','37')",
1141 1141 "mtch_ty is null"
1142 1142 ],
1143 1143 "makeCompareKey": [
... ... @@ -1168,7 +1168,7 @@
1168 1168  
1169 1169 "condOne": {
1170 1170 "cond": [
1171   - "dta_ty in ('32','34','36','38','42')",
  1171 + "dta_ty in ('32','34','36','38')",
1172 1172 "mtch_ty is null"
1173 1173 ],
1174 1174 "makeCompareKey": [
... ... @@ -1178,7 +1178,7 @@
1178 1178 },
1179 1179 "condTwo": {
1180 1180 "cond": [
1181   - "dta_ty in ('31','33','35','37','41')",
  1181 + "dta_ty in ('31','33','35','37')",
1182 1182 "mtch_ty is null"
1183 1183 ],
1184 1184 "makeCompareKey": [
... ... @@ -1209,7 +1209,7 @@
1209 1209  
1210 1210 "condOne": {
1211 1211 "cond": [
1212   - "dta_ty in ('32','34','36','38','42')",
  1212 + "dta_ty in ('32','34','36','38')",
1213 1213 "mtch_ty is null",
1214 1214 "chit_no is not null",
1215 1215 "chit_no != ''"
... ... @@ -1221,7 +1221,7 @@
1221 1221 },
1222 1222 "condTwo": {
1223 1223 "cond": [
1224   - "dta_ty in ('31','33','35','37','41')",
  1224 + "dta_ty in ('31','33','35','37')",
1225 1225 "mtch_ty is null"
1226 1226 ],
1227 1227 "makeCompareKey": [
... ... @@ -1252,7 +1252,7 @@
1252 1252  
1253 1253 "condOne": {
1254 1254 "cond": [
1255   - "dta_ty in ('32','34','36','38','42')",
  1255 + "dta_ty in ('32','34','36','38')",
1256 1256 "mtch_ty is null"
1257 1257 ],
1258 1258 "makeCompareKey": [
... ... @@ -1262,7 +1262,7 @@
1262 1262 },
1263 1263 "condTwo": {
1264 1264 "cond": [
1265   - "dta_ty in ('31','33','35','37','41')",
  1265 + "dta_ty in ('31','33','35','37')",
1266 1266 "mtch_ty is null"
1267 1267 ],
1268 1268 "makeCompareKey": [
... ... @@ -1297,7 +1297,7 @@
1297 1297  
1298 1298 "condOne": {
1299 1299 "cond": [
1300   - "dta_ty in ('11','21')",
  1300 + "dta_ty in ('11','21','41')",
1301 1301 "mtch_ty is null"
1302 1302 ],
1303 1303 "makeCompareKey": [
... ... @@ -1307,7 +1307,7 @@
1307 1307 },
1308 1308 "condTwo": {
1309 1309 "cond": [
1310   - "dta_ty in ('12','22')",
  1310 + "dta_ty in ('12','22','42')",
1311 1311 "mtch_ty is null"
1312 1312 ],
1313 1313 "makeCompareKey": [
... ... @@ -1338,7 +1338,7 @@
1338 1338  
1339 1339 "condOne": {
1340 1340 "cond": [
1341   - "dta_ty in ('11','21')",
  1341 + "dta_ty in ('11','21','41')",
1342 1342 "mtch_ty is null"
1343 1343 ],
1344 1344 "makeCompareKey": [
... ... @@ -1348,7 +1348,7 @@
1348 1348 },
1349 1349 "condTwo": {
1350 1350 "cond": [
1351   - "dta_ty in ('12','22')",
  1351 + "dta_ty in ('12','22','42')",
1352 1352 "mtch_ty is null"
1353 1353 ],
1354 1354 "makeCompareKey": [
... ... @@ -1379,7 +1379,7 @@
1379 1379  
1380 1380 "condOne": {
1381 1381 "cond": [
1382   - "dta_ty in ('12','22')",
  1382 + "dta_ty in ('12','22','42')",
1383 1383 "mtch_ty is null"
1384 1384 ],
1385 1385 "makeCompareKey": [
... ... @@ -1389,7 +1389,7 @@
1389 1389 },
1390 1390 "condTwo": {
1391 1391 "cond": [
1392   - "dta_ty in ('11','21')",
  1392 + "dta_ty in ('11','21','41')",
1393 1393 "mtch_ty is null"
1394 1394 ],
1395 1395 "makeCompareKey": [
... ... @@ -1420,7 +1420,7 @@
1420 1420  
1421 1421 "condOne": {
1422 1422 "cond": [
1423   - "dta_ty in ('12','22')",
  1423 + "dta_ty in ('12','22','42')",
1424 1424 "mtch_ty is null"
1425 1425 ],
1426 1426 "makeCompareKey": [
... ... @@ -1430,7 +1430,7 @@
1430 1430 },
1431 1431 "condTwo": {
1432 1432 "cond": [
1433   - "dta_ty in ('11','21')",
  1433 + "dta_ty in ('11','21','41')",
1434 1434 "mtch_ty is null"
1435 1435 ],
1436 1436 "makeCompareKey": [
... ... @@ -1461,7 +1461,7 @@
1461 1461  
1462 1462 "condOne": {
1463 1463 "cond": [
1464   - "dta_ty in ('11','21')",
  1464 + "dta_ty in ('11','21','41')",
1465 1465 "mtch_ty is null"
1466 1466 ],
1467 1467 "makeCompareKey": [
... ... @@ -1471,7 +1471,7 @@
1471 1471 },
1472 1472 "condTwo": {
1473 1473 "cond": [
1474   - "dta_ty in ('12','22')",
  1474 + "dta_ty in ('12','22','42')",
1475 1475 "mtch_ty is null"
1476 1476 ],
1477 1477 "makeCompareKey": [
... ... @@ -1502,7 +1502,7 @@
1502 1502  
1503 1503 "condOne": {
1504 1504 "cond": [
1505   - "dta_ty in ('12','22')",
  1505 + "dta_ty in ('12','22','42')",
1506 1506 "mtch_ty is null"
1507 1507 ],
1508 1508 "makeCompareKey": [
... ... @@ -1512,7 +1512,7 @@
1512 1512 },
1513 1513 "condTwo": {
1514 1514 "cond": [
1515   - "dta_ty in ('11','21')",
  1515 + "dta_ty in ('11','21','41')",
1516 1516 "mtch_ty is null"
1517 1517 ],
1518 1518 "makeCompareKey": [
... ... @@ -1546,7 +1546,7 @@
1546 1546  
1547 1547 "condOne": {
1548 1548 "cond": [
1549   - "dta_ty in ('31','33','35','37','41')",
  1549 + "dta_ty in ('31','33','35','37')",
1550 1550 "mtch_ty is null"
1551 1551 ],
1552 1552 "makeCompareKey": [
... ... @@ -1556,7 +1556,7 @@
1556 1556 },
1557 1557 "condTwo": {
1558 1558 "cond": [
1559   - "dta_ty in ('32','34','36','38','42')",
  1559 + "dta_ty in ('32','34','36','38')",
1560 1560 "mtch_ty is null"
1561 1561 ],
1562 1562 "makeCompareKey": [
... ... @@ -1587,7 +1587,7 @@
1587 1587  
1588 1588 "condOne": {
1589 1589 "cond": [
1590   - "dta_ty in ('31','33','35','37','41')",
  1590 + "dta_ty in ('31','33','35','37')",
1591 1591 "mtch_ty is null"
1592 1592 ],
1593 1593 "makeCompareKey": [
... ... @@ -1597,7 +1597,7 @@
1597 1597 },
1598 1598 "condTwo": {
1599 1599 "cond": [
1600   - "dta_ty in ('32','34','36','38','42')",
  1600 + "dta_ty in ('32','34','36','38')",
1601 1601 "mtch_ty is null"
1602 1602 ],
1603 1603 "makeCompareKey": [
... ... @@ -1628,7 +1628,7 @@
1628 1628  
1629 1629 "condOne": {
1630 1630 "cond": [
1631   - "dta_ty in ('32','34','36','38','42')",
  1631 + "dta_ty in ('32','34','36','38')",
1632 1632 "mtch_ty is null"
1633 1633 ],
1634 1634 "makeCompareKey": [
... ... @@ -1638,7 +1638,7 @@
1638 1638 },
1639 1639 "condTwo": {
1640 1640 "cond": [
1641   - "dta_ty in ('31','33','35','37','41')",
  1641 + "dta_ty in ('31','33','35','37')",
1642 1642 "mtch_ty is null"
1643 1643 ],
1644 1644 "makeCompareKey": [
... ... @@ -1669,7 +1669,7 @@
1669 1669  
1670 1670 "condOne": {
1671 1671 "cond": [
1672   - "dta_ty in ('32','34','36','38','42')",
  1672 + "dta_ty in ('32','34','36','38')",
1673 1673 "mtch_ty is null"
1674 1674 ],
1675 1675 "makeCompareKey": [
... ... @@ -1679,7 +1679,7 @@
1679 1679 },
1680 1680 "condTwo": {
1681 1681 "cond": [
1682   - "dta_ty in ('31','33','35','37','41')",
  1682 + "dta_ty in ('31','33','35','37')",
1683 1683 "mtch_ty is null"
1684 1684 ],
1685 1685 "makeCompareKey": [
... ... @@ -1710,7 +1710,7 @@
1710 1710  
1711 1711 "condOne": {
1712 1712 "cond": [
1713   - "dta_ty in ('31','33','35','37','41')",
  1713 + "dta_ty in ('31','33','35','37')",
1714 1714 "mtch_ty is null"
1715 1715 ],
1716 1716 "makeCompareKey": [
... ... @@ -1720,7 +1720,7 @@
1720 1720 },
1721 1721 "condTwo": {
1722 1722 "cond": [
1723   - "dta_ty in ('32','34','36','38','42')",
  1723 + "dta_ty in ('32','34','36','38')",
1724 1724 "mtch_ty is null"
1725 1725 ],
1726 1726 "makeCompareKey": [
... ... @@ -1751,7 +1751,7 @@
1751 1751  
1752 1752 "condOne": {
1753 1753 "cond": [
1754   - "dta_ty in ('32','34','36','38','42')",
  1754 + "dta_ty in ('32','34','36','38')",
1755 1755 "mtch_ty is null"
1756 1756 ],
1757 1757 "makeCompareKey": [
... ... @@ -1761,7 +1761,7 @@
1761 1761 },
1762 1762 "condTwo": {
1763 1763 "cond": [
1764   - "dta_ty in ('31','33','35','37','41')",
  1764 + "dta_ty in ('31','33','35','37')",
1765 1765 "mtch_ty is null"
1766 1766 ],
1767 1767 "makeCompareKey": [
... ... @@ -1796,7 +1796,7 @@
1796 1796  
1797 1797 "condOne": {
1798 1798 "cond": [
1799   - "dta_ty in ('11','21')",
  1799 + "dta_ty in ('11','21','41')",
1800 1800 "mtch_ty is null"
1801 1801 ],
1802 1802 "makeCompareKey": [
... ... @@ -1807,7 +1807,7 @@
1807 1807 },
1808 1808 "condTwo": {
1809 1809 "cond": [
1810   - "dta_ty in ('12','22')",
  1810 + "dta_ty in ('12','22','42')",
1811 1811 "mtch_ty is null"
1812 1812 ],
1813 1813 "makeCompareKey": [
... ... @@ -1838,7 +1838,7 @@
1838 1838  
1839 1839 "condOne": {
1840 1840 "cond": [
1841   - "dta_ty in ('12','22')",
  1841 + "dta_ty in ('12','22','42')",
1842 1842 "mtch_ty is null"
1843 1843 ],
1844 1844 "makeCompareKey": [
... ... @@ -1849,7 +1849,7 @@
1849 1849 },
1850 1850 "condTwo": {
1851 1851 "cond": [
1852   - "dta_ty in ('11','21')",
  1852 + "dta_ty in ('11','21','41')",
1853 1853 "mtch_ty is null"
1854 1854 ],
1855 1855 "makeCompareKey": [
... ... @@ -1880,7 +1880,7 @@
1880 1880  
1881 1881 "condOne": {
1882 1882 "cond": [
1883   - "dta_ty in ('11','21')",
  1883 + "dta_ty in ('11','21','41')",
1884 1884 "mtch_ty is null"
1885 1885 ],
1886 1886 "makeCompareKey": [
... ... @@ -1891,7 +1891,7 @@
1891 1891 },
1892 1892 "condTwo": {
1893 1893 "cond": [
1894   - "dta_ty in ('12','22')",
  1894 + "dta_ty in ('12','22','42')",
1895 1895 "mtch_ty is null"
1896 1896 ],
1897 1897 "makeCompareKey": [
... ... @@ -1922,7 +1922,7 @@
1922 1922  
1923 1923 "condOne": {
1924 1924 "cond": [
1925   - "dta_ty in ('12','22')",
  1925 + "dta_ty in ('12','22','42')",
1926 1926 "mtch_ty is null"
1927 1927 ],
1928 1928 "makeCompareKey": [
... ... @@ -1933,7 +1933,7 @@
1933 1933 },
1934 1934 "condTwo": {
1935 1935 "cond": [
1936   - "dta_ty in ('11','21')",
  1936 + "dta_ty in ('11','21','41')",
1937 1937 "mtch_ty is null"
1938 1938 ],
1939 1939 "makeCompareKey": [
... ... @@ -1965,7 +1965,7 @@
1965 1965  
1966 1966 "condOne": {
1967 1967 "cond": [
1968   - "dta_ty in ('31','33','35','37','41')",
  1968 + "dta_ty in ('31','33','35','37')",
1969 1969 "mtch_ty is null"
1970 1970 ],
1971 1971 "makeCompareKey": [
... ... @@ -1976,7 +1976,7 @@
1976 1976 },
1977 1977 "condTwo": {
1978 1978 "cond": [
1979   - "dta_ty in ('32','34','36','38','42')",
  1979 + "dta_ty in ('32','34','36','38')",
1980 1980 "mtch_ty is null"
1981 1981 ],
1982 1982 "makeCompareKey": [
... ... @@ -2007,7 +2007,7 @@
2007 2007  
2008 2008 "condOne": {
2009 2009 "cond": [
2010   - "dta_ty in ('32','34','36','38','42')",
  2010 + "dta_ty in ('32','34','36','38')",
2011 2011 "mtch_ty is null"
2012 2012 ],
2013 2013 "makeCompareKey": [
... ... @@ -2018,7 +2018,7 @@
2018 2018 },
2019 2019 "condTwo": {
2020 2020 "cond": [
2021   - "dta_ty in ('31','33','35','37','41')",
  2021 + "dta_ty in ('31','33','35','37')",
2022 2022 "mtch_ty is null"
2023 2023 ],
2024 2024 "makeCompareKey": [
... ... @@ -2049,7 +2049,7 @@
2049 2049  
2050 2050 "condOne": {
2051 2051 "cond": [
2052   - "dta_ty in ('31','33','35','37','41')",
  2052 + "dta_ty in ('31','33','35','37')",
2053 2053 "mtch_ty is null"
2054 2054 ],
2055 2055 "makeCompareKey": [
... ... @@ -2060,7 +2060,7 @@
2060 2060 },
2061 2061 "condTwo": {
2062 2062 "cond": [
2063   - "dta_ty in ('32','34','36','38','42')",
  2063 + "dta_ty in ('32','34','36','38')",
2064 2064 "mtch_ty is null"
2065 2065 ],
2066 2066 "makeCompareKey": [
... ... @@ -2091,7 +2091,7 @@
2091 2091  
2092 2092 "condOne": {
2093 2093 "cond": [
2094   - "dta_ty in ('32','34','36','38','42')",
  2094 + "dta_ty in ('32','34','36','38')",
2095 2095 "mtch_ty is null"
2096 2096 ],
2097 2097 "makeCompareKey": [
... ... @@ -2102,7 +2102,7 @@
2102 2102 },
2103 2103 "condTwo": {
2104 2104 "cond": [
2105   - "dta_ty in ('31','33','35','37','41')",
  2105 + "dta_ty in ('31','33','35','37')",
2106 2106 "mtch_ty is null"
2107 2107 ],
2108 2108 "makeCompareKey": [
... ... @@ -2146,7 +2146,7 @@
2146 2146  
2147 2147 "condOne": {
2148 2148 "cond": [
2149   - "dta_ty in ('11','21')",
  2149 + "dta_ty in ('11','21','41')",
2150 2150 "mtch_ty is null"
2151 2151 ],
2152 2152 "makeCompareKey": [
... ... @@ -2157,7 +2157,7 @@
2157 2157 },
2158 2158 "condTwo": {
2159 2159 "cond": [
2160   - "dta_ty in ('12','22')",
  2160 + "dta_ty in ('12','22','42')",
2161 2161 "mtch_ty is null"
2162 2162 ],
2163 2163 "makeCompareKey": [
... ... @@ -2188,7 +2188,7 @@
2188 2188  
2189 2189 "condOne": {
2190 2190 "cond": [
2191   - "dta_ty in ('12','22')",
  2191 + "dta_ty in ('12','22','42')",
2192 2192 "mtch_ty is null"
2193 2193 ],
2194 2194 "makeCompareKey": [
... ... @@ -2199,7 +2199,7 @@
2199 2199 },
2200 2200 "condTwo": {
2201 2201 "cond": [
2202   - "dta_ty in ('11','21')",
  2202 + "dta_ty in ('11','21','41')",
2203 2203 "mtch_ty is null"
2204 2204 ],
2205 2205 "makeCompareKey": [
... ... @@ -2230,7 +2230,7 @@
2230 2230  
2231 2231 "condOne": {
2232 2232 "cond": [
2233   - "dta_ty in ('11','21')",
  2233 + "dta_ty in ('11','21','41')",
2234 2234 "mtch_ty is null"
2235 2235 ],
2236 2236 "makeCompareKey": [
... ... @@ -2241,7 +2241,7 @@
2241 2241 },
2242 2242 "condTwo": {
2243 2243 "cond": [
2244   - "dta_ty in ('12','22')",
  2244 + "dta_ty in ('12','22','42')",
2245 2245 "mtch_ty is null"
2246 2246 ],
2247 2247 "makeCompareKey": [
... ... @@ -2272,7 +2272,7 @@
2272 2272  
2273 2273 "condOne": {
2274 2274 "cond": [
2275   - "dta_ty in ('12','22')",
  2275 + "dta_ty in ('12','22','42')",
2276 2276 "mtch_ty is null"
2277 2277 ],
2278 2278 "makeCompareKey": [
... ... @@ -2283,7 +2283,7 @@
2283 2283 },
2284 2284 "condTwo": {
2285 2285 "cond": [
2286   - "dta_ty in ('11','21')",
  2286 + "dta_ty in ('11','21','41')",
2287 2287 "mtch_ty is null"
2288 2288 ],
2289 2289 "makeCompareKey": [
... ... @@ -2314,7 +2314,7 @@
2314 2314  
2315 2315 "condOne": {
2316 2316 "cond": [
2317   - "dta_ty in ('31','33','35','37','41')",
  2317 + "dta_ty in ('31','33','35','37')",
2318 2318 "mtch_ty is null"
2319 2319 ],
2320 2320 "makeCompareKey": [
... ... @@ -2325,7 +2325,7 @@
2325 2325 },
2326 2326 "condTwo": {
2327 2327 "cond": [
2328   - "dta_ty in ('32','34','36','38','42')",
  2328 + "dta_ty in ('32','34','36','38')",
2329 2329 "mtch_ty is null"
2330 2330 ],
2331 2331 "makeCompareKey": [
... ... @@ -2356,7 +2356,7 @@
2356 2356  
2357 2357 "condOne": {
2358 2358 "cond": [
2359   - "dta_ty in ('32','34','36','38','42')",
  2359 + "dta_ty in ('32','34','36','38')",
2360 2360 "mtch_ty is null"
2361 2361 ],
2362 2362 "makeCompareKey": [
... ... @@ -2367,7 +2367,7 @@
2367 2367 },
2368 2368 "condTwo": {
2369 2369 "cond": [
2370   - "dta_ty in ('31','33','35','37','41')",
  2370 + "dta_ty in ('31','33','35','37')",
2371 2371 "mtch_ty is null"
2372 2372 ],
2373 2373 "makeCompareKey": [
... ... @@ -2398,7 +2398,7 @@
2398 2398  
2399 2399 "condOne": {
2400 2400 "cond": [
2401   - "dta_ty in ('31','33','35','37','41')",
  2401 + "dta_ty in ('31','33','35','37')",
2402 2402 "mtch_ty is null"
2403 2403 ],
2404 2404 "makeCompareKey": [
... ... @@ -2409,7 +2409,7 @@
2409 2409 },
2410 2410 "condTwo": {
2411 2411 "cond": [
2412   - "dta_ty in ('32','34','36','38','42')",
  2412 + "dta_ty in ('32','34','36','38')",
2413 2413 "mtch_ty is null"
2414 2414 ],
2415 2415 "makeCompareKey": [
... ... @@ -2440,7 +2440,7 @@
2440 2440  
2441 2441 "condOne": {
2442 2442 "cond": [
2443   - "dta_ty in ('32','34','36','38','42')",
  2443 + "dta_ty in ('32','34','36','38')",
2444 2444 "mtch_ty is null"
2445 2445 ],
2446 2446 "makeCompareKey": [
... ... @@ -2451,7 +2451,7 @@
2451 2451 },
2452 2452 "condTwo": {
2453 2453 "cond": [
2454   - "dta_ty in ('31','33','35','37','41')",
  2454 + "dta_ty in ('31','33','35','37')",
2455 2455 "mtch_ty is null"
2456 2456 ],
2457 2457 "makeCompareKey": [
... ... @@ -2486,7 +2486,7 @@
2486 2486  
2487 2487 "condOne": {
2488 2488 "cond": [
2489   - "dta_ty in ('11','21')",
  2489 + "dta_ty in ('11','21','41')",
2490 2490 "mtch_ty is null",
2491 2491 "elcty_de is not null",
2492 2492 "elcty_de != ''"
... ... @@ -2497,7 +2497,7 @@
2497 2497 },
2498 2498 "condTwo": {
2499 2499 "cond": [
2500   - "dta_ty in ('12','22')",
  2500 + "dta_ty in ('12','22','42')",
2501 2501 "mtch_ty is null",
2502 2502 "elcty_de is not null",
2503 2503 "elcty_de != ''"
... ... @@ -2528,7 +2528,7 @@
2528 2528  
2529 2529 "condOne": {
2530 2530 "cond": [
2531   - "dta_ty in ('11','21')",
  2531 + "dta_ty in ('11','21','41')",
2532 2532 "mtch_ty is null",
2533 2533 "elcty_de is not null",
2534 2534 "elcty_de != ''"
... ... @@ -2539,7 +2539,7 @@
2539 2539 },
2540 2540 "condTwo": {
2541 2541 "cond": [
2542   - "dta_ty in ('12','22')",
  2542 + "dta_ty in ('12','22','42')",
2543 2543 "mtch_ty is null"
2544 2544 ],
2545 2545 "makeCompareKey": [
... ... @@ -2570,7 +2570,7 @@
2570 2570  
2571 2571 "condOne": {
2572 2572 "cond": [
2573   - "dta_ty in ('12','22')",
  2573 + "dta_ty in ('12','22','42')",
2574 2574 "mtch_ty is null",
2575 2575 "elcty_de is not null",
2576 2576 "elcty_de != ''"
... ... @@ -2581,7 +2581,7 @@
2581 2581 },
2582 2582 "condTwo": {
2583 2583 "cond": [
2584   - "dta_ty in ('11','21')",
  2584 + "dta_ty in ('11','21','41')",
2585 2585 "mtch_ty is null"
2586 2586 ],
2587 2587 "makeCompareKey": [
... ... @@ -2617,7 +2617,7 @@
2617 2617  
2618 2618 "condOne": {
2619 2619 "cond": [
2620   - "dta_ty in ('11','21')",
  2620 + "dta_ty in ('11','21','41')",
2621 2621 "mtch_ty is null"
2622 2622 ],
2623 2623 "makeCompareKey": [
... ... @@ -2626,7 +2626,7 @@
2626 2626 },
2627 2627 "condTwo": {
2628 2628 "cond": [
2629   - "dta_ty in ('12','22')",
  2629 + "dta_ty in ('12','22','42')",
2630 2630 "mtch_ty is null"
2631 2631 ],
2632 2632 "makeCompareKey": [
... ... @@ -2655,7 +2655,7 @@
2655 2655  
2656 2656 "condOne": {
2657 2657 "cond": [
2658   - "dta_ty in ('11','21')",
  2658 + "dta_ty in ('11','21','41')",
2659 2659 "mtch_ty is null"
2660 2660 ],
2661 2661 "makeCompareKey": [
... ... @@ -2664,7 +2664,7 @@
2664 2664 },
2665 2665 "condTwo": {
2666 2666 "cond": [
2667   - "dta_ty in ('12','22')",
  2667 + "dta_ty in ('12','22','42')",
2668 2668 "mtch_ty is null"
2669 2669 ],
2670 2670 "makeCompareKey": [
... ... @@ -2695,7 +2695,7 @@
2695 2695  
2696 2696 "condOne": {
2697 2697 "cond": [
2698   - "dta_ty in ('12','22')",
  2698 + "dta_ty in ('12','22','42')",
2699 2699 "mtch_ty is null"
2700 2700 ],
2701 2701 "makeCompareKey": [
... ... @@ -2704,7 +2704,7 @@
2704 2704 },
2705 2705 "condTwo": {
2706 2706 "cond": [
2707   - "dta_ty in ('11','21')",
  2707 + "dta_ty in ('11','21','41')",
2708 2708 "mtch_ty is null"
2709 2709 ],
2710 2710 "makeCompareKey": [
... ... @@ -2739,7 +2739,7 @@
2739 2739  
2740 2740 "condOne": {
2741 2741 "cond": [
2742   - "dta_ty in ('11','21')",
  2742 + "dta_ty in ('11','21','41')",
2743 2743 "mtch_ty is null"
2744 2744 ],
2745 2745 "makeCompareKey": [
... ... @@ -2748,7 +2748,7 @@
2748 2748 },
2749 2749 "condTwo": {
2750 2750 "cond": [
2751   - "dta_ty in ('12','22')",
  2751 + "dta_ty in ('12','22','42')",
2752 2752 "mtch_ty is null"
2753 2753 ],
2754 2754 "makeCompareKey": [
... ... @@ -2777,7 +2777,7 @@
2777 2777  
2778 2778 "condOne": {
2779 2779 "cond": [
2780   - "dta_ty in ('11','21')",
  2780 + "dta_ty in ('11','21','41')",
2781 2781 "mtch_ty is null"
2782 2782 ],
2783 2783 "makeCompareKey": [
... ... @@ -2786,7 +2786,7 @@
2786 2786 },
2787 2787 "condTwo": {
2788 2788 "cond": [
2789   - "dta_ty in ('12','22')",
  2789 + "dta_ty in ('12','22','42')",
2790 2790 "mtch_ty is null"
2791 2791 ],
2792 2792 "makeCompareKey": [
... ... @@ -2817,7 +2817,7 @@
2817 2817  
2818 2818 "condOne": {
2819 2819 "cond": [
2820   - "dta_ty in ('12','22')",
  2820 + "dta_ty in ('12','22','42')",
2821 2821 "mtch_ty is null"
2822 2822 ],
2823 2823 "makeCompareKey": [
... ... @@ -2826,7 +2826,7 @@
2826 2826 },
2827 2827 "condTwo": {
2828 2828 "cond": [
2829   - "dta_ty in ('11','21')",
  2829 + "dta_ty in ('11','21','41')",
2830 2830 "mtch_ty is null"
2831 2831 ],
2832 2832 "makeCompareKey": [
... ... @@ -2857,7 +2857,7 @@
2857 2857  
2858 2858 "condOne": {
2859 2859 "cond": [
2860   - "dta_ty in ('11','21')",
  2860 + "dta_ty in ('11','21','41')",
2861 2861 "mtch_ty is null"
2862 2862 ],
2863 2863 "makeCompareKey": [
... ... @@ -2866,7 +2866,7 @@
2866 2866 },
2867 2867 "condTwo": {
2868 2868 "cond": [
2869   - "dta_ty in ('12','22')",
  2869 + "dta_ty in ('12','22','42')",
2870 2870 "mtch_ty is null"
2871 2871 ],
2872 2872 "makeCompareKey": [
... ... @@ -2895,7 +2895,7 @@
2895 2895  
2896 2896 "condOne": {
2897 2897 "cond": [
2898   - "dta_ty in ('12','22')",
  2898 + "dta_ty in ('12','22','42')",
2899 2899 "mtch_ty is null"
2900 2900 ],
2901 2901 "makeCompareKey": [
... ... @@ -2904,7 +2904,7 @@
2904 2904 },
2905 2905 "condTwo": {
2906 2906 "cond": [
2907   - "dta_ty in ('11','21')",
  2907 + "dta_ty in ('11','21','41')",
2908 2908 "mtch_ty is null"
2909 2909 ],
2910 2910 "makeCompareKey": [
... ... @@ -2937,7 +2937,7 @@
2937 2937  
2938 2938 "condOne": {
2939 2939 "cond": [
2940   - "dta_ty in ('11','21')",
  2940 + "dta_ty in ('11','21','41')",
2941 2941 "mtch_ty is null",
2942 2942 "ext_key2 is not null",
2943 2943 "ext_key2 != ''"
... ... @@ -2948,7 +2948,7 @@
2948 2948 },
2949 2949 "condTwo": {
2950 2950 "cond": [
2951   - "dta_ty in ('12','22')",
  2951 + "dta_ty in ('12','22','42')",
2952 2952 "mtch_ty is null",
2953 2953 "ext_key2 is not null",
2954 2954 "ext_key2 != ''"
... ... @@ -2979,7 +2979,7 @@
2979 2979  
2980 2980 "condOne": {
2981 2981 "cond": [
2982   - "dta_ty in ('11','21')",
  2982 + "dta_ty in ('11','21','41')",
2983 2983 "mtch_ty is null",
2984 2984 "ext_key2 is not null",
2985 2985 "ext_key2 != ''"
... ... @@ -2990,7 +2990,7 @@
2990 2990 },
2991 2991 "condTwo": {
2992 2992 "cond": [
2993   - "dta_ty in ('12','22')",
  2993 + "dta_ty in ('12','22','42')",
2994 2994 "mtch_ty is null"
2995 2995 ],
2996 2996 "makeCompareKey": [
... ... @@ -3021,7 +3021,7 @@
3021 3021  
3022 3022 "condOne": {
3023 3023 "cond": [
3024   - "dta_ty in ('12','22')",
  3024 + "dta_ty in ('12','22','42')",
3025 3025 "mtch_ty is null",
3026 3026 "ext_key2 is not null",
3027 3027 "ext_key2 != ''"
... ... @@ -3032,7 +3032,7 @@
3032 3032 },
3033 3033 "condTwo": {
3034 3034 "cond": [
3035   - "dta_ty in ('11','21')",
  3035 + "dta_ty in ('11','21','41')",
3036 3036 "mtch_ty is null"
3037 3037 ],
3038 3038 "makeCompareKey": [
... ... @@ -3066,7 +3066,7 @@
3066 3066  
3067 3067 "condOne": {
3068 3068 "cond": [
3069   - "dta_ty in ('11','21')",
  3069 + "dta_ty in ('11','21','41')",
3070 3070 "mtch_ty is null",
3071 3071 "ext_key3 is not null",
3072 3072 "ext_key3 != ''"
... ... @@ -3077,7 +3077,7 @@
3077 3077 },
3078 3078 "condTwo": {
3079 3079 "cond": [
3080   - "dta_ty in ('12','22')",
  3080 + "dta_ty in ('12','22','42')",
3081 3081 "mtch_ty is null",
3082 3082 "ext_key3 is not null",
3083 3083 "ext_key3 != ''"
... ... @@ -3108,7 +3108,7 @@
3108 3108  
3109 3109 "condOne": {
3110 3110 "cond": [
3111   - "dta_ty in ('11','21')",
  3111 + "dta_ty in ('11','21','41')",
3112 3112 "mtch_ty is null",
3113 3113 "ext_key3 is not null",
3114 3114 "ext_key3 != ''"
... ... @@ -3119,7 +3119,7 @@
3119 3119 },
3120 3120 "condTwo": {
3121 3121 "cond": [
3122   - "dta_ty in ('12','22')",
  3122 + "dta_ty in ('12','22','42')",
3123 3123 "mtch_ty is null"
3124 3124 ],
3125 3125 "makeCompareKey": [
... ... @@ -3150,7 +3150,7 @@
3150 3150  
3151 3151 "condOne": {
3152 3152 "cond": [
3153   - "dta_ty in ('12','22')",
  3153 + "dta_ty in ('12','22','42')",
3154 3154 "mtch_ty is null",
3155 3155 "ext_key3 is not null",
3156 3156 "ext_key3 != ''"
... ... @@ -3161,7 +3161,7 @@
3161 3161 },
3162 3162 "condTwo": {
3163 3163 "cond": [
3164   - "dta_ty in ('11','21')",
  3164 + "dta_ty in ('11','21','41')",
3165 3165 "mtch_ty is null"
3166 3166 ],
3167 3167 "makeCompareKey": [
... ... @@ -3195,7 +3195,7 @@
3195 3195  
3196 3196 "condOne": {
3197 3197 "cond": [
3198   - "dta_ty in ('11','21')",
  3198 + "dta_ty in ('11','21','41')",
3199 3199 "mtch_ty is null",
3200 3200 "ext_key4 is not null",
3201 3201 "ext_key4 != ''"
... ... @@ -3206,7 +3206,7 @@
3206 3206 },
3207 3207 "condTwo": {
3208 3208 "cond": [
3209   - "dta_ty in ('12','22')",
  3209 + "dta_ty in ('12','22','42')",
3210 3210 "mtch_ty is null",
3211 3211 "ext_key4 is not null",
3212 3212 "ext_key4 != ''"
... ... @@ -3237,7 +3237,7 @@
3237 3237  
3238 3238 "condOne": {
3239 3239 "cond": [
3240   - "dta_ty in ('11','21')",
  3240 + "dta_ty in ('11','21','41')",
3241 3241 "mtch_ty is null",
3242 3242 "ext_key4 is not null",
3243 3243 "ext_key4 != ''"
... ... @@ -3248,7 +3248,7 @@
3248 3248 },
3249 3249 "condTwo": {
3250 3250 "cond": [
3251   - "dta_ty in ('12','22')",
  3251 + "dta_ty in ('12','22','42')",
3252 3252 "mtch_ty is null"
3253 3253 ],
3254 3254 "makeCompareKey": [
... ... @@ -3279,7 +3279,7 @@
3279 3279  
3280 3280 "condOne": {
3281 3281 "cond": [
3282   - "dta_ty in ('12','22')",
  3282 + "dta_ty in ('12','22','42')",
3283 3283 "mtch_ty is null",
3284 3284 "ext_key4 is not null",
3285 3285 "ext_key4 != ''"
... ... @@ -3290,7 +3290,7 @@
3290 3290 },
3291 3291 "condTwo": {
3292 3292 "cond": [
3293   - "dta_ty in ('11','21')",
  3293 + "dta_ty in ('11','21','41')",
3294 3294 "mtch_ty is null"
3295 3295 ],
3296 3296 "makeCompareKey": [
... ... @@ -3326,7 +3326,7 @@
3326 3326  
3327 3327 "condOne": {
3328 3328 "cond": [
3329   - "dta_ty in ('11','21')",
  3329 + "dta_ty in ('11','21','41')",
3330 3330 "mtch_ty is null"
3331 3331 ],
3332 3332 "makeCompareKey": [
... ... @@ -3337,7 +3337,7 @@
3337 3337 },
3338 3338 "condTwo": {
3339 3339 "cond": [
3340   - "dta_ty in ('12','22')",
  3340 + "dta_ty in ('12','22','42')",
3341 3341 "mtch_ty is null"
3342 3342 ],
3343 3343 "makeCompareKey": [
... ... @@ -3368,7 +3368,7 @@
3368 3368  
3369 3369 "condOne": {
3370 3370 "cond": [
3371   - "dta_ty in ('11','21')",
  3371 + "dta_ty in ('11','21','41')",
3372 3372 "mtch_ty is null"
3373 3373 ],
3374 3374 "makeCompareKey": [
... ... @@ -3379,7 +3379,7 @@
3379 3379 },
3380 3380 "condTwo": {
3381 3381 "cond": [
3382   - "dta_ty in ('12','22')",
  3382 + "dta_ty in ('12','22','42')",
3383 3383 "mtch_ty is null"
3384 3384 ],
3385 3385 "makeCompareKey": [
... ... @@ -3410,7 +3410,7 @@
3410 3410  
3411 3411 "condOne": {
3412 3412 "cond": [
3413   - "dta_ty in ('11','21')",
  3413 + "dta_ty in ('11','21','41')",
3414 3414 "mtch_ty is null"
3415 3415 ],
3416 3416 "makeCompareKey": [
... ... @@ -3420,7 +3420,7 @@
3420 3420 },
3421 3421 "condTwo": {
3422 3422 "cond": [
3423   - "dta_ty in ('12','22')",
  3423 + "dta_ty in ('12','22','42')",
3424 3424 "mtch_ty is null"
3425 3425 ],
3426 3426 "makeCompareKey": [
... ... @@ -3450,7 +3450,7 @@
3450 3450  
3451 3451 "condOne": {
3452 3452 "cond": [
3453   - "dta_ty in ('31','33','35','37','41')",
  3453 + "dta_ty in ('31','33','35','37')",
3454 3454 "mtch_ty is null"
3455 3455 ],
3456 3456 "makeCompareKey": [
... ... @@ -3461,7 +3461,7 @@
3461 3461 },
3462 3462 "condTwo": {
3463 3463 "cond": [
3464   - "dta_ty in ('32','34','36','38','42')",
  3464 + "dta_ty in ('32','34','36','38')",
3465 3465 "mtch_ty is null"
3466 3466 ],
3467 3467 "makeCompareKey": [
... ... @@ -3492,7 +3492,7 @@
3492 3492  
3493 3493 "condOne": {
3494 3494 "cond": [
3495   - "dta_ty in ('31','33','35','37','41')",
  3495 + "dta_ty in ('31','33','35','37')",
3496 3496 "mtch_ty is null"
3497 3497 ],
3498 3498 "makeCompareKey": [
... ... @@ -3503,7 +3503,7 @@
3503 3503 },
3504 3504 "condTwo": {
3505 3505 "cond": [
3506   - "dta_ty in ('32','34','36','38','42')",
  3506 + "dta_ty in ('32','34','36','38')",
3507 3507 "mtch_ty is null"
3508 3508 ],
3509 3509 "makeCompareKey": [
... ... @@ -3534,7 +3534,7 @@
3534 3534  
3535 3535 "condOne": {
3536 3536 "cond": [
3537   - "dta_ty in ('31','33','35','37','41')",
  3537 + "dta_ty in ('31','33','35','37')",
3538 3538 "mtch_ty is null"
3539 3539 ],
3540 3540 "makeCompareKey": [
... ... @@ -3544,7 +3544,7 @@
3544 3544 },
3545 3545 "condTwo": {
3546 3546 "cond": [
3547   - "dta_ty in ('32','34','36','38','42')",
  3547 + "dta_ty in ('32','34','36','38')",
3548 3548 "mtch_ty is null"
3549 3549 ],
3550 3550 "makeCompareKey": [
... ...