From d2a7c6bda44a1329e9002abdc9512ef0667b4e55 Mon Sep 17 00:00:00 2001 From: mjkhan21 Date: Wed, 4 Sep 2024 16:16:06 +0900 Subject: [PATCH] =?UTF-8?q?=EC=88=98=EC=8B=A0=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EC=8B=9C=20=EB=82=A0=EC=A7=9C=20=EC=A1=B0?= =?UTF-8?q?=EA=B1=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...LGE_0001_20230922151037@4060000DPV_000.txt | 0 ...LGE_0002_20230923020019_001@4060000DPV.csv | 0 .../basic/a/service/LntrisAService.java | 4 +-- .../a/service/bean/LntrisAServiceBean.java | 4 +-- .../lntris/basic/a/web/LntrisAController.java | 5 ++-- .../basic/d/service/LntrisDService.java | 20 +++++++-------- .../d/service/bean/LntrisDServiceBean.java | 20 +++++++-------- .../lntris/basic/d/web/LntrisDController.java | 25 +++++++++++-------- src/main/resources/intf-conf/file-job.conf | 4 ++- src/main/resources/intf-conf/lntris.conf | 6 +++-- .../sql/mapper/lntris/lntris-A-mapper.xml | 9 +++---- .../sql/mapper/lntris/lntris-D-mapper.xml | 18 +++++-------- .../sql/mapper/lntris/lntris-D07-mapper.xml | 15 ++++------- .../basic/a/service/LntrisAServiceTest.java | 2 +- .../basic/a/service/LntrisDServiceTest.java | 10 ++++---- .../resources/spring/context-datasource.xml | 4 +-- 16 files changed, 71 insertions(+), 75 deletions(-) rename files/{interface/success/receive => ESB_AGENT/RCV}/1741000NIS/EBF_1741000NIS_Z000001LGE_0001_20230922151037@4060000DPV_000.txt (100%) rename files/interface/{success => fail}/receive/1741000NIS/EBF_1741000NIS_Z000001LGE_0002_20230923020019_001@4060000DPV.csv (100%) diff --git a/files/interface/success/receive/1741000NIS/EBF_1741000NIS_Z000001LGE_0001_20230922151037@4060000DPV_000.txt b/files/ESB_AGENT/RCV/1741000NIS/EBF_1741000NIS_Z000001LGE_0001_20230922151037@4060000DPV_000.txt similarity index 100% rename from files/interface/success/receive/1741000NIS/EBF_1741000NIS_Z000001LGE_0001_20230922151037@4060000DPV_000.txt rename to files/ESB_AGENT/RCV/1741000NIS/EBF_1741000NIS_Z000001LGE_0001_20230922151037@4060000DPV_000.txt diff --git a/files/interface/success/receive/1741000NIS/EBF_1741000NIS_Z000001LGE_0002_20230923020019_001@4060000DPV.csv b/files/interface/fail/receive/1741000NIS/EBF_1741000NIS_Z000001LGE_0002_20230923020019_001@4060000DPV.csv similarity index 100% rename from files/interface/success/receive/1741000NIS/EBF_1741000NIS_Z000001LGE_0002_20230923020019_001@4060000DPV.csv rename to files/interface/fail/receive/1741000NIS/EBF_1741000NIS_Z000001LGE_0002_20230923020019_001@4060000DPV.csv diff --git a/src/main/java/cokr/xit/interfaces/lntris/basic/a/service/LntrisAService.java b/src/main/java/cokr/xit/interfaces/lntris/basic/a/service/LntrisAService.java index 373e942..4949f2d 100644 --- a/src/main/java/cokr/xit/interfaces/lntris/basic/a/service/LntrisAService.java +++ b/src/main/java/cokr/xit/interfaces/lntris/basic/a/service/LntrisAService.java @@ -50,10 +50,10 @@ public interface LntrisAService { * @param orgs 기관/단체코드 * @param sysCodes 시스템 코드 */ - List readA02s(String[] orgs, String... sysCodes); + List readA02s(String[] orgs, String[] sysCodes, String... dates); default List readA02s() { - return readA02s(null); + return readA02s(null, null); } /**전일자 변동 과태료 대장의 업무 적용상태를 수정한다. diff --git a/src/main/java/cokr/xit/interfaces/lntris/basic/a/service/bean/LntrisAServiceBean.java b/src/main/java/cokr/xit/interfaces/lntris/basic/a/service/bean/LntrisAServiceBean.java index bea4553..76e18f9 100644 --- a/src/main/java/cokr/xit/interfaces/lntris/basic/a/service/bean/LntrisAServiceBean.java +++ b/src/main/java/cokr/xit/interfaces/lntris/basic/a/service/bean/LntrisAServiceBean.java @@ -56,8 +56,8 @@ public class LntrisAServiceBean extends ScheduledServiceBean implements LntrisAS } @Override - public List readA02s(String[] orgs, String... sysCodes) { - return execute(a02Bean, () -> a02Bean.read(orgs, sysCodes)); + public List readA02s(String[] orgs, String[] sysCodes, String... dates) { + return execute(a02Bean, () -> a02Bean.read(orgs, sysCodes, dates)); } @Override diff --git a/src/main/java/cokr/xit/interfaces/lntris/basic/a/web/LntrisAController.java b/src/main/java/cokr/xit/interfaces/lntris/basic/a/web/LntrisAController.java index e9fb591..e934172 100644 --- a/src/main/java/cokr/xit/interfaces/lntris/basic/a/web/LntrisAController.java +++ b/src/main/java/cokr/xit/interfaces/lntris/basic/a/web/LntrisAController.java @@ -95,9 +95,10 @@ public class LntrisAController extends AbstractController { @Operation(summary = "과태료 대장 전일자 변동자료 일괄조회", tags = "a02") public void readA02s( @Parameter(description = "단체/기관 코드") @RequestParam(value = "orgs", required=false) String[] orgs, - @Parameter(description = "시스템 코드") @RequestParam(value = "sysCodes", required=false) String[] sysCodes + @Parameter(description = "시스템 코드") @RequestParam(value = "sysCodes", required=false) String[] sysCodes, + @Parameter(description = "날짜") @RequestParam(value = "dates", required=false) String... dates ) { - lntrisAService.readA02s(orgs, sysCodes); + lntrisAService.readA02s(orgs, sysCodes, dates); } /** diff --git a/src/main/java/cokr/xit/interfaces/lntris/basic/d/service/LntrisDService.java b/src/main/java/cokr/xit/interfaces/lntris/basic/d/service/LntrisDService.java index 9b623de..77d2e51 100644 --- a/src/main/java/cokr/xit/interfaces/lntris/basic/d/service/LntrisDService.java +++ b/src/main/java/cokr/xit/interfaces/lntris/basic/d/service/LntrisDService.java @@ -151,10 +151,10 @@ public interface LntrisDService { * @param orgs 기관/단체코드 * @param sysCodes 시스템 코드 */ - List readD07as(String[] orgs, String... sysCodes); + List readD07as(String[] orgs, String[] sysCodes, String... dates); default List readD07as() { - return readD07as(null); + return readD07as(null, null); } /**업무 적용대상 전일자 변동 부과체납 정보를 조회한다. @@ -179,10 +179,10 @@ public interface LntrisDService { * @param orgs 기관/단체코드 * @param sysCodes 시스템 코드 */ - List readD07bs(String[] orgs, String... sysCodes); + List readD07bs(String[] orgs, String[] sysCodes, String... dates); default List readD07bs() { - return readD07bs(null); + return readD07bs(null, null); } /**업무 적용대상 전일자 변동 수납정보를 조회한다. @@ -207,10 +207,10 @@ public interface LntrisDService { * @param orgs 기관/단체코드 * @param sysCodes 시스템 코드 */ - List readD07cs(String[] orgs, String... sysCodes); + List readD07cs(String[] orgs, String[] sysCodes, String... dates); default List readD07cs() { - return readD07cs(null); + return readD07cs(null, null); } /**업무 적용대상 전일자 변동 감액정보를 조회한다. @@ -235,10 +235,10 @@ public interface LntrisDService { * @param orgs 기관/단체코드 * @param sysCodes 시스템 코드 */ - List readD07ds(String[] orgs, String... sysCodes); + List readD07ds(String[] orgs, String[] sysCodes, String... dates); default List readD07ds() { - return readD07ds(null); + return readD07ds(null, null); } /**업무 적용대상 전일자 변동 과오납 정보를 조회한다. @@ -263,10 +263,10 @@ public interface LntrisDService { * @param orgs 기관/단체코드 * @param sysCodes 시스템 코드 */ - List readD07es(String[] orgs, String... sysCodes); + List readD07es(String[] orgs, String[] sysCodes, String... dates); default List readD07es() { - return readD07es(null); + return readD07es(null, null); } /**업무 적용대상 전일자 변동 결손정보를 조회한다. diff --git a/src/main/java/cokr/xit/interfaces/lntris/basic/d/service/bean/LntrisDServiceBean.java b/src/main/java/cokr/xit/interfaces/lntris/basic/d/service/bean/LntrisDServiceBean.java index f19f754..b2e56bf 100644 --- a/src/main/java/cokr/xit/interfaces/lntris/basic/d/service/bean/LntrisDServiceBean.java +++ b/src/main/java/cokr/xit/interfaces/lntris/basic/d/service/bean/LntrisDServiceBean.java @@ -154,8 +154,8 @@ public class LntrisDServiceBean extends ScheduledServiceBean implements LntrisDS } @Override - public List readD07as(String[] orgs, String... sysCodes) { - return execute(d07aBean, () -> d07aBean.read(orgs, sysCodes)); + public List readD07as(String[] orgs, String[] sysCodes, String... dates) { + return execute(d07aBean, () -> d07aBean.read(orgs, sysCodes, dates)); } @Override @@ -169,8 +169,8 @@ public class LntrisDServiceBean extends ScheduledServiceBean implements LntrisDS } @Override - public List readD07bs(String[] orgs, String... sysCodes) { - return execute(d07bBean, () -> d07bBean.read(orgs, sysCodes)); + public List readD07bs(String[] orgs, String[] sysCodes, String... dates) { + return execute(d07bBean, () -> d07bBean.read(orgs, sysCodes, dates)); } @Override @@ -184,8 +184,8 @@ public class LntrisDServiceBean extends ScheduledServiceBean implements LntrisDS } @Override - public List readD07cs(String[] orgs, String... sysCodes) { - return execute(d07cBean, () -> d07cBean.read(orgs, sysCodes)); + public List readD07cs(String[] orgs, String[] sysCodes, String... dates) { + return execute(d07cBean, () -> d07cBean.read(orgs, sysCodes, dates)); } @Override @@ -199,8 +199,8 @@ public class LntrisDServiceBean extends ScheduledServiceBean implements LntrisDS } @Override - public List readD07ds(String[] orgs, String... sysCodes) { - return execute(d07dBean, () -> d07dBean.read(orgs, sysCodes)); + public List readD07ds(String[] orgs, String[] sysCodes, String... dates) { + return execute(d07dBean, () -> d07dBean.read(orgs, sysCodes, dates)); } @Override @@ -214,8 +214,8 @@ public class LntrisDServiceBean extends ScheduledServiceBean implements LntrisDS } @Override - public List readD07es(String[] orgs, String... sysCodes) { - return execute(d07eBean, () -> d07eBean.read(orgs, sysCodes)); + public List readD07es(String[] orgs, String[] sysCodes, String... dates) { + return execute(d07eBean, () -> d07eBean.read(orgs, sysCodes, dates)); } @Override diff --git a/src/main/java/cokr/xit/interfaces/lntris/basic/d/web/LntrisDController.java b/src/main/java/cokr/xit/interfaces/lntris/basic/d/web/LntrisDController.java index b0ad0e2..fffbd6b 100644 --- a/src/main/java/cokr/xit/interfaces/lntris/basic/d/web/LntrisDController.java +++ b/src/main/java/cokr/xit/interfaces/lntris/basic/d/web/LntrisDController.java @@ -319,9 +319,10 @@ public class LntrisDController extends AbstractController { @Operation(summary = "전일자 변동 부과체납 정보 등록", tags = "d07a") public void readD07a( @Parameter(description = "단체/기관 코드") @RequestParam(value = "orgs", required=false) String[] orgs, - @Parameter(description = "시스템 코드") @RequestParam(value = "sysCodes", required=false) String[] sysCodes + @Parameter(description = "시스템 코드") @RequestParam(value = "sysCodes", required=false) String[] sysCodes, + @Parameter(description = "날짜") @RequestParam(value = "dates", required=false) String... dates ) { - lntrisDService.readD07as(orgs, sysCodes); + lntrisDService.readD07as(orgs, sysCodes, dates); } /**업무 적용대상인 전일자 변동 부과체납 정보 목록을 조회한다. @@ -368,9 +369,10 @@ public class LntrisDController extends AbstractController { @Operation(summary = "전일자 변동 수납정보 등록", tags = "d07b") public void readD07b( @Parameter(description = "단체/기관 코드") @RequestParam(value = "orgs", required=false) String[] orgs, - @Parameter(description = "시스템 코드") @RequestParam(value = "sysCodes", required=false) String[] sysCodes + @Parameter(description = "시스템 코드") @RequestParam(value = "sysCodes", required=false) String[] sysCodes, + @Parameter(description = "날짜") @RequestParam(value = "dates", required=false) String... dates ) { - lntrisDService.readD07bs(orgs, sysCodes); + lntrisDService.readD07bs(orgs, sysCodes, dates); } /**업무 적용대상인 전일자 변동 수납정보 목록을 조회한다. @@ -417,9 +419,10 @@ public class LntrisDController extends AbstractController { @Operation(summary = "전일자 변동 감액정보 등록", tags = "d07c") public void readD07c( @Parameter(description = "단체/기관 코드") @RequestParam(value = "orgs", required=false) String[] orgs, - @Parameter(description = "시스템 코드") @RequestParam(value = "sysCodes", required=false) String[] sysCodes + @Parameter(description = "시스템 코드") @RequestParam(value = "sysCodes", required=false) String[] sysCodes, + @Parameter(description = "날짜") @RequestParam(value = "dates", required=false) String... dates ) { - lntrisDService.readD07cs(orgs, sysCodes); + lntrisDService.readD07cs(orgs, sysCodes, dates); } /**업무 적용대상인 전일자 변동 감액정보 목록을 조회한다. @@ -466,9 +469,10 @@ public class LntrisDController extends AbstractController { @Operation(summary = "전일자 변동 과오납 정보 등록", tags = "d07d") public void readD07d( @Parameter(description = "단체/기관 코드") @RequestParam(value = "orgs", required=false) String[] orgs, - @Parameter(description = "시스템 코드") @RequestParam(value = "sysCodes", required=false) String[] sysCodes + @Parameter(description = "시스템 코드") @RequestParam(value = "sysCodes", required=false) String[] sysCodes, + @Parameter(description = "날짜") @RequestParam(value = "dates", required=false) String... dates ) { - lntrisDService.readD07ds(orgs, sysCodes); + lntrisDService.readD07ds(orgs, sysCodes, dates); } /**업무 적용대상인 전일자 변동 과오납 정보 목록을 조회한다. @@ -515,9 +519,10 @@ public class LntrisDController extends AbstractController { @Operation(summary = "전일자 변동 결손정보 등록", tags = "d07e") public void readD07e( @Parameter(description = "단체/기관 코드") @RequestParam(value = "orgs", required=false) String[] orgs, - @Parameter(description = "시스템 코드") @RequestParam(value = "sysCodes", required=false) String[] sysCodes + @Parameter(description = "시스템 코드") @RequestParam(value = "sysCodes", required=false) String[] sysCodes, + @Parameter(description = "날짜") @RequestParam(value = "dates", required=false) String... dates ) { - lntrisDService.readD07es(orgs, sysCodes); + lntrisDService.readD07es(orgs, sysCodes, dates); } /**업무 적용대상인 전일자 변동 결손정보 목록을 조회한다. diff --git a/src/main/resources/intf-conf/file-job.conf b/src/main/resources/intf-conf/file-job.conf index 988d500..57d3a07 100644 --- a/src/main/resources/intf-conf/file-job.conf +++ b/src/main/resources/intf-conf/file-job.conf @@ -15,7 +15,9 @@ "defaults": { "charset": "euc-kr", "fetchSize": 100, - "workSize": 100 + "workSize": 100, + "receiptDates": -4, /* 처리전문 수신일수(0: 당일 전문, -n: 당일부터 n일전까지 전문, 지정하지 않으면 폴더의 모든 전문) */ + "receiptCount": 1 /* 수신파일 처리건수(n > 0: n건, n < 1: 모든 파일) */ }, "jobs": [ diff --git a/src/main/resources/intf-conf/lntris.conf b/src/main/resources/intf-conf/lntris.conf index 07de191..7a41e29 100644 --- a/src/main/resources/intf-conf/lntris.conf +++ b/src/main/resources/intf-conf/lntris.conf @@ -4,8 +4,10 @@ "locals": [ {"organization": "4060000",/* 지역 자치단체 코드(7자리) */ - /* 지역 시스템 코드(3자리) */ - "systems": ["DPV"] + "systems": ["DPV"] /* 지역 시스템 코드(3자리) */ + }, + {"organization": "4060000",/* 지역 자치단체 코드(7자리) */ + "systems": ["PVS"] /* 지역 시스템 코드(3자리) */ } ], diff --git a/src/main/resources/sql/mapper/lntris/lntris-A-mapper.xml b/src/main/resources/sql/mapper/lntris/lntris-A-mapper.xml index 7345448..693c6b7 100644 --- a/src/main/resources/sql/mapper/lntris/lntris-A-mapper.xml +++ b/src/main/resources/sql/mapper/lntris/lntris-A-mapper.xml @@ -206,8 +206,7 @@ /* 과태료 대장 단속 정보 등록(lntrisAMapper.insertA01) */ SELECT CONCAT(TODAY, LPAD(NVL(SUBSTR(MAX(A01_ID), 9) + 1, 1), 22, '0')) NEW_ID - FROM TB_NIS_INDIV_A01 A, () B - WHERE A01_ID LIKE CONCAT(TODAY, '%') + FROM () B LEFT OUTER JOIN TB_NIS_INDIV_A01 A ON A01_ID LIKE CONCAT(TODAY, '%') INSERT INTO TB_NIS_INDIV_A01 ( A01_ID , TASK_SE_CD @@ -655,8 +654,7 @@ INSERT INTO TB_NIS_INDIV_A01 ( /* 과태료 대장 전일자 변동자료 등록(lntrisAMapper.insertA02) */ SELECT CONCAT(TODAY, LPAD(NVL(SUBSTR(MAX(A02_ID), 9) + 1, 1), 22, '0')) NEW_ID - FROM TB_NIS_INDIV_A02 A, () B - WHERE A02_ID LIKE CONCAT(TODAY, '%') + FROM () B LEFT OUTER JOIN TB_NIS_INDIV_A02 A ON A02_ID LIKE CONCAT(TODAY, '%') INSERT INTO TB_NIS_INDIV_A02 ( A02_ID , LINK_YMD @@ -1146,8 +1144,7 @@ UPDATE TB_NIS_INDIV_A02 /* 과태료 대장 상세 조회 결과 등록(lntrisAMapper.insertA03) */ SELECT CONCAT(TODAY, LPAD(NVL(SUBSTR(MAX(A03_ID), 9) + 1, 1), 22, '0')) NEW_ID - FROM TB_NIS_INDIV_A03 A, () B - WHERE A03_ID LIKE CONCAT(TODAY, '%') + FROM () B LEFT OUTER JOIN TB_NIS_INDIV_A03 A ON A03_ID LIKE CONCAT(TODAY, '%') INSERT INTO TB_NIS_INDIV_A03 ( A03_ID , TASK_SE_CD diff --git a/src/main/resources/sql/mapper/lntris/lntris-D-mapper.xml b/src/main/resources/sql/mapper/lntris/lntris-D-mapper.xml index e40b65c..4f9186e 100644 --- a/src/main/resources/sql/mapper/lntris/lntris-D-mapper.xml +++ b/src/main/resources/sql/mapper/lntris/lntris-D-mapper.xml @@ -200,8 +200,7 @@ /* 부과정보 등록(lntrisDMapper.insertD01) */ SELECT CONCAT(TODAY, LPAD(NVL(SUBSTR(MAX(D01_ID), 9) + 1, 1), 22, '0')) NEW_ID - FROM TB_NIS_INDIV_D01 A, () B - WHERE D01_ID LIKE CONCAT(TODAY, '%') + FROM () B LEFT OUTER JOIN TB_NIS_INDIV_D01 A ON D01_ID LIKE CONCAT(TODAY, '%') INSERT INTO TB_NIS_INDIV_D01 ( D01_ID , TASK_SE_CD @@ -611,8 +610,7 @@ INSERT INTO TB_NIS_INDIV_D01 ( /* 부과_수납정보 등록(lntrisDMapper.insertD02) */ SELECT CONCAT(TODAY, LPAD(NVL(SUBSTR(MAX(D02_ID), 9) + 1, 1), 22, '0')) NEW_ID - FROM TB_NIS_INDIV_D02 A, () B - WHERE D02_ID LIKE CONCAT(TODAY, '%') + FROM () B LEFT OUTER JOIN TB_NIS_INDIV_D02 A ON D02_ID LIKE CONCAT(TODAY, '%') INSERT INTO TB_NIS_INDIV_D02 ( D02_ID , TASK_SE_CD @@ -979,8 +977,7 @@ INSERT INTO TB_NIS_INDIV_D02 ( /* 부과결과정보 등록(lntrisDMapper.insertD03) */ SELECT CONCAT(TODAY, LPAD(NVL(SUBSTR(MAX(D03_ID), 9) + 1, 1), 22, '0')) NEW_ID - FROM TB_NIS_INDIV_D03 A, () B - WHERE D03_ID LIKE CONCAT(TODAY, '%') + FROM () B LEFT OUTER JOIN TB_NIS_INDIV_D03 A ON D03_ID LIKE CONCAT(TODAY, '%') INSERT INTO TB_NIS_INDIV_D03 ( D03_ID , SGB_CD @@ -1189,8 +1186,7 @@ UPDATE TB_NIS_INDIV_D03 /* 부과취소정보 등록(lntrisDMapper.insertD04) */ SELECT CONCAT(TODAY, LPAD(NVL(SUBSTR(MAX(D04_ID), 9) + 1, 1), 22, '0')) NEW_ID - FROM TB_NIS_INDIV_D04 A, () B - WHERE D04_ID LIKE CONCAT(TODAY, '%') + FROM () B LEFT OUTER JOIN TB_NIS_INDIV_D04 A ON D04_ID LIKE CONCAT(TODAY, '%') INSERT INTO TB_NIS_INDIV_D04 ( D04_ID , SGB_CD @@ -1355,8 +1351,7 @@ UPDATE TB_NIS_INDIV_D04 /* 수납정보 등록(lntrisDMapper.insertD05) */ SELECT CONCAT(TODAY, LPAD(NVL(SUBSTR(MAX(D05_ID), 9) + 1, 1), 22, '0')) NEW_ID - FROM TB_NIS_INDIV_D05 A, () B - WHERE D05_ID LIKE CONCAT(TODAY, '%') + FROM () B LEFT OUTER JOIN TB_NIS_INDIV_D05 A ON D05_ID LIKE CONCAT(TODAY, '%') INSERT INTO TB_NIS_INDIV_D05 ( D05_ID , SGB_CD @@ -1559,8 +1554,7 @@ UPDATE TB_NIS_INDIV_D05 /* 감액정보 등록(lntrisDMapper.insertD06) */ SELECT CONCAT(TODAY, LPAD(NVL(SUBSTR(MAX(D06_ID), 9) + 1, 1), 22, '0')) NEW_ID - FROM TB_NIS_INDIV_D06 A, () B - WHERE D06_ID LIKE CONCAT(TODAY, '%') + FROM () B LEFT OUTER JOIN TB_NIS_INDIV_D06 A ON D06_ID LIKE CONCAT(TODAY, '%') INSERT INTO TB_NIS_INDIV_D06 ( D06_ID , SGB_CD diff --git a/src/main/resources/sql/mapper/lntris/lntris-D07-mapper.xml b/src/main/resources/sql/mapper/lntris/lntris-D07-mapper.xml index b5ddce2..4bbf75e 100644 --- a/src/main/resources/sql/mapper/lntris/lntris-D07-mapper.xml +++ b/src/main/resources/sql/mapper/lntris/lntris-D07-mapper.xml @@ -263,8 +263,7 @@ /* 부과체납정보 등록(lntrisD07Mapper.insertD07a) */ SELECT CONCAT(TODAY, LPAD(NVL(SUBSTR(MAX(D07A_ID), 9) + 1, 1), 22, '0')) NEW_ID - FROM TB_NIS_INDIV_D07A A, () B - WHERE D07A_ID LIKE CONCAT(TODAY, '%') + FROM () B LEFT OUTER JOIN TB_NIS_INDIV_D07A A ON D07A_ID LIKE CONCAT(TODAY, '%') INSERT INTO TB_NIS_INDIV_D07A ( D07A_ID , CRTR_YMD @@ -628,8 +627,7 @@ UPDATE TB_NIS_INDIV_D07A /* 수납정보 등록(lntrisD07Mapper.insertD07b) */ SELECT CONCAT(TODAY, LPAD(NVL(SUBSTR(MAX(D07B_ID), 9) + 1, 1), 22, '0')) NEW_ID - FROM TB_NIS_INDIV_D07B A, () B - WHERE D07B_ID LIKE CONCAT(TODAY, '%') + FROM () B LEFT OUTER JOIN TB_NIS_INDIV_D07B A ON D07B_ID LIKE CONCAT(TODAY, '%') INSERT INTO TB_NIS_INDIV_D07B ( D07B_ID , CRTR_YMD @@ -833,8 +831,7 @@ UPDATE TB_NIS_INDIV_D07B /* 감액정보 등록(lntrisD07Mapper.insertD07c) */ SELECT CONCAT(TODAY, LPAD(NVL(SUBSTR(MAX(D07C_ID), 9) + 1, 1), 22, '0')) NEW_ID - FROM TB_NIS_INDIV_D07C A, () B - WHERE D07C_ID LIKE CONCAT(TODAY, '%') + FROM () B LEFT OUTER JOIN TB_NIS_INDIV_D07C A ON D07C_ID LIKE CONCAT(TODAY, '%') INSERT INTO TB_NIS_INDIV_D07C ( D07C_ID , CRTR_YMD @@ -1032,8 +1029,7 @@ UPDATE TB_NIS_INDIV_D07C /* 과오납정보 등록(lntrisD07Mapper.insertD07d) */ SELECT CONCAT(TODAY, LPAD(NVL(SUBSTR(MAX(D07D_ID), 9) + 1, 1), 22, '0')) NEW_ID - FROM TB_NIS_INDIV_D07D A, () B - WHERE D07D_ID LIKE CONCAT(TODAY, '%') + FROM () B LEFT OUTER JOIN TB_NIS_INDIV_D07D A ON D07D_ID LIKE CONCAT(TODAY, '%') INSERT INTO TB_NIS_INDIV_D07D ( D07D_ID , CRTR_YMD @@ -1247,8 +1243,7 @@ UPDATE TB_NIS_INDIV_D07D /* 결손정보 등록(lntrisD07Mapper.insertD07e) */ SELECT CONCAT(TODAY, LPAD(NVL(SUBSTR(MAX(D07E_ID), 9) + 1, 1), 22, '0')) NEW_ID - FROM TB_NIS_INDIV_D07E A, () B - WHERE D07E_ID LIKE CONCAT(TODAY, '%') + FROM () B LEFT OUTER JOIN TB_NIS_INDIV_D07E A ON D07E_ID LIKE CONCAT(TODAY, '%') INSERT INTO TB_NIS_INDIV_D07E ( D07E_ID , CRTR_YMD diff --git a/src/test/java/cokr/xit/interfaces/lntris/basic/a/service/LntrisAServiceTest.java b/src/test/java/cokr/xit/interfaces/lntris/basic/a/service/LntrisAServiceTest.java index 5082899..c5a6043 100644 --- a/src/test/java/cokr/xit/interfaces/lntris/basic/a/service/LntrisAServiceTest.java +++ b/src/test/java/cokr/xit/interfaces/lntris/basic/a/service/LntrisAServiceTest.java @@ -50,7 +50,7 @@ public class LntrisAServiceTest extends TestSupport { @Test void a02Read() { - lntrisAService.readA02s(null); + lntrisAService.readA02s(null, null, "20230922"); } @Test diff --git a/src/test/java/cokr/xit/interfaces/lntris/basic/a/service/LntrisDServiceTest.java b/src/test/java/cokr/xit/interfaces/lntris/basic/a/service/LntrisDServiceTest.java index 07724a7..8a24c3a 100644 --- a/src/test/java/cokr/xit/interfaces/lntris/basic/a/service/LntrisDServiceTest.java +++ b/src/test/java/cokr/xit/interfaces/lntris/basic/a/service/LntrisDServiceTest.java @@ -42,7 +42,7 @@ public class LntrisDServiceTest extends TestSupport { @Test void d07a() { - List d07as = dService.readD07as(null); + List d07as = dService.readD07as(null, null); if (d07as.isEmpty()) return; String d07aIds = d07as.stream() @@ -54,7 +54,7 @@ public class LntrisDServiceTest extends TestSupport { @Test void d07b() { - List d07bs = dService.readD07bs(null); + List d07bs = dService.readD07bs(null, null); if (d07bs.isEmpty()) return; String d07bIds = d07bs.stream() @@ -65,7 +65,7 @@ public class LntrisDServiceTest extends TestSupport { @Test void d07c() { - List d07cs = dService.readD07cs(null); + List d07cs = dService.readD07cs(null, null); if (d07cs.isEmpty()) return; String d07cIds = d07cs.stream() @@ -76,7 +76,7 @@ public class LntrisDServiceTest extends TestSupport { @Test void d07d() { - List d07ds = dService.readD07ds(null); + List d07ds = dService.readD07ds(null, null); if (d07ds.isEmpty()) return; String d07dIds = d07ds.stream() @@ -88,7 +88,7 @@ public class LntrisDServiceTest extends TestSupport { @Test void d07e() { - List d07es = dService.readD07es(null); + List d07es = dService.readD07es(null, null); if (d07es.isEmpty()) return; String d07eIds = d07es.stream() diff --git a/src/test/resources/spring/context-datasource.xml b/src/test/resources/spring/context-datasource.xml index 78ec5f3..3099372 100644 --- a/src/test/resources/spring/context-datasource.xml +++ b/src/test/resources/spring/context-datasource.xml @@ -15,9 +15,9 @@ --> - + - +