diff --git a/src/main/java/com/batch/config/MatchingExtraProcessorAuto.java b/src/main/java/com/batch/config/MatchingExtraProcessorAuto.java index 98bc6e6..3a0d4b2 100644 --- a/src/main/java/com/batch/config/MatchingExtraProcessorAuto.java +++ b/src/main/java/com/batch/config/MatchingExtraProcessorAuto.java @@ -42,13 +42,15 @@ public class MatchingExtraProcessorAuto { String sAccnutYm = (String) paramRec.get("accnut_ym"); String sCprCode = (String) paramRec.get("cpr_code"); String sPartCpr = (String) paramRec.get("partn_cpr"); + String sDelngCrncy = (String) paramRec.get("delng_crncy"); String sConds = (String) paramRec.get("conds"); - + //작업시작 Map mParam = new HashMap(); mParam.put("sysSe", sSysSe); mParam.put("accnutYm", sAccnutYm); mParam.put("conds", sConds); + mParam.put("delngCrncy", sDelngCrncy); //---------------------------------------------------------------------------- //자기법인 데이타 가져오기 @@ -131,7 +133,7 @@ public class MatchingExtraProcessorAuto { int mtchNumber = 0; String mtchSys = "AUTO"; String mtchType = "EX_" + iCmbnOwnCnt + "_" + iCmbnTranCnt; - String mtchTypeName = "자기(" + iCmbnOwnCnt + "건Sum), 상대(" + iCmbnTranCnt + "건Sum), 비교(금액)"; + String mtchTypeName = "자기(" + iCmbnOwnCnt + "건Sum), 상대(" + iCmbnTranCnt + "건Sum), ("+sDelngCrncy+"), 비교(금액)"; for (BigDecimal curKey : mMatchingDataOne.keySet()) { if (mMatchingDataTwo.containsKey(curKey)) { List> llMapOne = mMatchingDataOne.get(curKey); diff --git a/src/main/java/com/batch/config/MatchingItemProcessorAuto.java b/src/main/java/com/batch/config/MatchingItemProcessorAuto.java index 8c0547a..3c57a56 100644 --- a/src/main/java/com/batch/config/MatchingItemProcessorAuto.java +++ b/src/main/java/com/batch/config/MatchingItemProcessorAuto.java @@ -40,8 +40,10 @@ public class MatchingItemProcessorAuto implements ItemProcessor { int mtchNumber = 0; int iUpdated = 0; - log.debug("CustomItemProcessorA.params : " + params.toString()); - log.debug("CustomItemProcessorA.item : " + item.get("cpr_code") + "," + item.get("partn_cpr")); + log.info("CustomItemProcessorA.params : " + params.toString()); + log.info("CustomItemProcessorA.item : " + item.toString()); + + params.put("delngCrncy", item.get("delng_crncy")); //---------------------------------------------------------------------------- //자기법인 업데이트 diff --git a/src/main/java/com/batch/controller/JobController.java b/src/main/java/com/batch/controller/JobController.java index 64c5a78..319d671 100644 --- a/src/main/java/com/batch/controller/JobController.java +++ b/src/main/java/com/batch/controller/JobController.java @@ -120,12 +120,16 @@ public class JobController { // 수익/비용 for(Map curMap : retData) { curMap.put("conds", "T"); + log.info("Start extraJobSub Transaction !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); jobService.extraJobSub(sJobGroup, curMap); + log.info("End extraJobSub Transaction !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); } //채권/채무 for(Map curMap : retData) { curMap.put("conds", "B"); + log.info("Start extraJobSub Balance !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); jobService.extraJobSub(sJobGroup, curMap); + log.info("End extraJobSub Balance !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); } log.debug("End Extra Matching Job"); diff --git a/src/main/java/com/batch/service/JobService.java b/src/main/java/com/batch/service/JobService.java index 72e4125..28469ae 100644 --- a/src/main/java/com/batch/service/JobService.java +++ b/src/main/java/com/batch/service/JobService.java @@ -139,7 +139,7 @@ public class JobService { String sThreadName = Thread.currentThread().getName(); long startTime = System.currentTimeMillis(); - log.info("extra [" + sThreadName + "]Job Started : " + startTime); + log.info("extra [" + sThreadName + "]Job Started : " + startTime + "]params=" + paramRec.toString()); log.debug("extra [" + sThreadName + "]params=" + paramRec.toString()); MatchingExtraProcessorAuto matchingExtraProcessorAuto = new MatchingExtraProcessorAuto(matchingInnerDelingMapper); diff --git a/src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml b/src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml index 5724824..a2bb5a5 100644 --- a/src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml +++ b/src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml @@ -9,6 +9,7 @@ , accnut_ym , cpr_code , partn_cpr + , delng_crncy FROM ( SELECT @@ -16,6 +17,7 @@ , accnut_ym , cpr_code , partn_cpr + , delng_crncy , case when count(*) > 0 then 1 else 0 end as cnt FROM public.batch_tbcr_inner_delng @@ -29,12 +31,14 @@ , accnut_ym , cpr_code , partn_cpr + , delng_crncy union all SELECT sys_se , accnut_ym , partn_cpr as cpr_code , cpr_code as partn_cpr + , delng_crncy , case when count(*) > 0 then 1 else 0 end as cnt FROM public.batch_tbcr_inner_delng @@ -48,12 +52,14 @@ , accnut_ym , cpr_code , partn_cpr + , delng_crncy ) m GROUP BY sys_se , accnut_ym , cpr_code , partn_cpr + , delng_crncy HAVING sum(cnt) > 1 @@ -67,6 +73,7 @@ and accnut_ym = #{accnutYm} and cpr_code = #{cprCode} and partn_cpr = #{partnCpr} + and delng_crncy = #{delngCrncy} and ${item} @@ -86,6 +93,7 @@ and compare_ky is not null and cpr_code = #{cprCode} and partn_cpr = #{partnCpr} + and delng_crncy = #{delngCrncy} and ${item} @@ -109,6 +117,7 @@ and compare_ky is not null and cpr_code = #{cprCode} and partn_cpr = #{partnCpr} + and delng_crncy = #{delngCrncy} and ${item} @@ -411,6 +420,7 @@ , sn , '' as compare_ky , delng_de + , delng_crncy , delng_amt FROM public.batch_tbcr_inner_delng @@ -419,6 +429,7 @@ and accnut_ym = #{accnutYm} and cpr_code = #{cprCode} and partn_cpr = #{partnCpr} + and delng_crncy = #{delngCrncy} and mtch_ky is null and dta_ty in ('11','21','41') @@ -428,7 +439,7 @@ and delng_amt != 0 ORDER BY - delng_de + delng_de, sn @@ -439,6 +450,7 @@ , sn , '' as compare_ky , delng_de + , delng_crncy , delng_amt FROM public.batch_tbcr_inner_delng @@ -447,6 +459,7 @@ and accnut_ym = #{accnutYm} and cpr_code = #{cprCode} and partn_cpr = #{partnCpr} + and delng_crncy = #{delngCrncy} and mtch_ky is null and dta_ty in ('12','22','42') @@ -456,7 +469,7 @@ and delng_amt != 0 ORDER BY - delng_de + delng_de, sn @@ -503,63 +516,18 @@ -- libgit2 0.21.4