From 9809222e212929036d4e16b2bf64789e47d69fca Mon Sep 17 00:00:00 2001 From: kjh Date: Wed, 22 Nov 2023 18:33:30 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20unitySndngMastrId=20=EC=A4=91?= =?UTF-8?q?=EB=B3=B5=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/kr/xit/biz/sisul/service/BizSisulService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mens-api/src/main/java/kr/xit/biz/sisul/service/BizSisulService.java b/mens-api/src/main/java/kr/xit/biz/sisul/service/BizSisulService.java index 9cb599d..be973c3 100644 --- a/mens-api/src/main/java/kr/xit/biz/sisul/service/BizSisulService.java +++ b/mens-api/src/main/java/kr/xit/biz/sisul/service/BizSisulService.java @@ -95,7 +95,8 @@ public class BizSisulService extends AbstractService implements IBizSisulService checkValidated(fmcExcels); //23.11.22 jhseo: 하나의 엑셀에 unitySndngMastrId 여러개일 경우 동일한 unitySndngMastrId Row만 처리 - List unitySndngMastrIds = fmcExcels.stream().map(FmcInfExcel::getUnitySndngMastrId).collect(Collectors.toList()); + List unitySndngMastrIdList = fmcExcels.stream().map(FmcInfExcel::getUnitySndngMastrId).collect(Collectors.toList()); + List unitySndngMastrIds = unitySndngMastrIdList.stream().distinct().collect(Collectors.toList()); for (String unitySndngMastrId : unitySndngMastrIds){ String tmplatId = ""; int excelCnt = 0; From 29be211f290b166242f1c876c9d7a0434d3b4863 Mon Sep 17 00:00:00 2001 From: kjh Date: Thu, 30 Nov 2023 12:04:01 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=EB=B0=9C=EC=86=A1=EC=9A=94=EC=B2=AD?= =?UTF-8?q?=EC=9D=BC=EC=8B=9C=20=EC=9D=BC=EC=9E=90=20=EC=95=9E=EC=9E=90?= =?UTF-8?q?=EB=A6=AC=203=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/kr/xit/biz/sisul/service/BizSisulService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mens-api/src/main/java/kr/xit/biz/sisul/service/BizSisulService.java b/mens-api/src/main/java/kr/xit/biz/sisul/service/BizSisulService.java index 9cb599d..3517e9a 100644 --- a/mens-api/src/main/java/kr/xit/biz/sisul/service/BizSisulService.java +++ b/mens-api/src/main/java/kr/xit/biz/sisul/service/BizSisulService.java @@ -468,7 +468,7 @@ public class BizSisulService extends AbstractService implements IBizSisulService String.valueOf(idx.get()), "unitySndngDetailId(파일유일키)", "필수(최대 20자)", d.getUnitySndngDetailId()}); } - if(Checks.isEmpty(d.getSndngDt()) || d.getSndngDt().length() != 14 || !Pattern.matches("20([2-9][0-9][0-1][1-9][0-2][0-9][0-2][0-9][0-5][0-9][0-5][0-9])", d.getSndngDt())){ + if(Checks.isEmpty(d.getSndngDt()) || d.getSndngDt().length() != 14 || !Pattern.matches("20([2-9][0-9][0-1][1-9][0-3][0-9][0-2][0-9][0-5][0-9][0-5][0-9])", d.getSndngDt())){ throw BizRuntimeException.create("fail.api.excel.upload.data", new String[]{ String.valueOf(idx.get()), "sndngDt(우편물요청일시)", "필수(14자)", d.getSndngDt()}); }