Merge branch 'main' into main-admin-feat

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<String> unitySndngMastrIds = fmcExcels.stream().map(FmcInfExcel::getUnitySndngMastrId).collect(Collectors.toList());
+        List<String> unitySndngMastrIdList = fmcExcels.stream().map(FmcInfExcel::getUnitySndngMastrId).collect(Collectors.toList());
+        List<String> unitySndngMastrIds = unitySndngMastrIdList.stream().distinct().collect(Collectors.toList());
         for (String unitySndngMastrId : unitySndngMastrIds){
             String tmplatId = "";
             int excelCnt = 0;
@@ -468,7 +469,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()});
             }