From d482c03f728f4c277f69020b45f8605d16797aec Mon Sep 17 00:00:00 2001 From: kmg Date: Wed, 14 Feb 2024 16:20:57 +0900 Subject: [PATCH 1/7] =?UTF-8?q?2024/02/14=20=ED=85=8C=EC=9D=B4=EB=B8=94=20?= =?UTF-8?q?class=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/sym/mnu/mcm/EgovMenuCreatManage.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/jsp/sym/mnu/mcm/EgovMenuCreatManage.jsp b/src/main/webapp/WEB-INF/jsp/sym/mnu/mcm/EgovMenuCreatManage.jsp index 05dd1a62..0b48fc40 100644 --- a/src/main/webapp/WEB-INF/jsp/sym/mnu/mcm/EgovMenuCreatManage.jsp +++ b/src/main/webapp/WEB-INF/jsp/sym/mnu/mcm/EgovMenuCreatManage.jsp @@ -99,7 +99,7 @@ function selectMenuCreat(vAuthorCode) { //메뉴생성 화면 호출 -
+
From 0f50b46df80548f153a0e3fdf15eb1824f1936c6 Mon Sep 17 00:00:00 2001 From: kmg Date: Wed, 14 Feb 2024 16:54:19 +0900 Subject: [PATCH 2/7] =?UTF-8?q?2024/02/14=20=ED=85=8C=EC=9D=B4=EB=B8=94=20?= =?UTF-8?q?class=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/sec/ram/EgovAuthorManage.jsp | 2 +- src/main/webapp/WEB-INF/jsp/sec/rgm/EgovAuthorGroupManage.jsp | 2 +- src/main/webapp/WEB-INF/jsp/sec/rmt/EgovRoleManage.jsp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/sec/ram/EgovAuthorManage.jsp b/src/main/webapp/WEB-INF/jsp/sec/ram/EgovAuthorManage.jsp index ba384f46..5d9856ab 100644 --- a/src/main/webapp/WEB-INF/jsp/sec/ram/EgovAuthorManage.jsp +++ b/src/main/webapp/WEB-INF/jsp/sec/ram/EgovAuthorManage.jsp @@ -196,7 +196,7 @@ function press() { -
+
diff --git a/src/main/webapp/WEB-INF/jsp/sec/rgm/EgovAuthorGroupManage.jsp b/src/main/webapp/WEB-INF/jsp/sec/rgm/EgovAuthorGroupManage.jsp index 9e681a9a..8d564212 100644 --- a/src/main/webapp/WEB-INF/jsp/sec/rgm/EgovAuthorGroupManage.jsp +++ b/src/main/webapp/WEB-INF/jsp/sec/rgm/EgovAuthorGroupManage.jsp @@ -230,7 +230,7 @@ function press() { -
+
diff --git a/src/main/webapp/WEB-INF/jsp/sec/rmt/EgovRoleManage.jsp b/src/main/webapp/WEB-INF/jsp/sec/rmt/EgovRoleManage.jsp index 6f314a28..5958d39c 100644 --- a/src/main/webapp/WEB-INF/jsp/sec/rmt/EgovRoleManage.jsp +++ b/src/main/webapp/WEB-INF/jsp/sec/rmt/EgovRoleManage.jsp @@ -172,7 +172,7 @@ function roleListExcelDownload(){ -
+
From b9e184cec02a4319d295c8fccc4ae36ee2b8870b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ITN=5F=EB=94=94=EC=9E=90=EC=9D=B8=ED=8C=80?= Date: Wed, 14 Feb 2024 17:01:37 +0900 Subject: [PATCH 3/7] =?UTF-8?q?2024/02/14=20=EA=B4=80=EB=A6=AC=EC=9E=90?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=8A=A4=ED=83=80=EC=9D=BC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/cmm/uss/umt/EgovUserInsert.jsp | 19 ++++++++++--------- .../visitEdu/adm/publish/css/content.css | 9 ++++++++- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserInsert.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserInsert.jsp index 622fa3fe..3733a179 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserInsert.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserInsert.jsp @@ -441,7 +441,7 @@ function wrapWindowByMask(){ From 9585b86f6aa5c78fb9dd389e4ab58a37deec29cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ITN=5F=EB=94=94=EC=9E=90=EC=9D=B8=ED=8C=80?= Date: Wed, 14 Feb 2024 17:36:59 +0900 Subject: [PATCH 6/7] =?UTF-8?q?2024/02/14=20=EA=B4=80=EB=A6=AC=EC=9E=90?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=8A=A4=ED=83=80=EC=9D=BC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeRegist.jsp | 9 ++++----- src/main/webapp/visitEdu/adm/publish/css/content_sub.css | 3 ++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeRegist.jsp b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeRegist.jsp index 0695c2e6..0ef84690 100644 --- a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeRegist.jsp @@ -443,7 +443,6 @@ function fn_egov_regist_preview() { 공지여부 + + + + + + + +
담당업무 -
+
@@ -508,25 +508,26 @@ function wrapWindowByMask(){
-->
-
+

아이디 중복 확인

-

- 사용할 아이디 -
-
-
- 중복확인을 실행하십시오 +
+
+ 사용할 아이디 +
+
+ +

- +
diff --git a/src/main/webapp/visitEdu/adm/publish/css/content.css b/src/main/webapp/visitEdu/adm/publish/css/content.css index f9f38c18..8acfd294 100644 --- a/src/main/webapp/visitEdu/adm/publish/css/content.css +++ b/src/main/webapp/visitEdu/adm/publish/css/content.css @@ -472,4 +472,11 @@ input[type="text"].input_time {width: 50px;} .pr_name input{width: 500px;} /*게시판 > 등록화면 > 제목 input 가로 수정*/ -.tite_in input{width: 100%;} \ No newline at end of file +.tite_in input{width: 100%;} + +/*관리자 관리 > 등록 > 중복아이디 검색 팝업 수정*/ +.check_pop .cont_popup .id_wrap{display: flex; justify-content: center;} +.check_pop .cont_popup .id_wrap .id_check3 .btnType03{background-color: #697e9b; margin: 0 0 0 5px; font-size: 17px; padding: 0 15px; height: 40px;} +.check_pop .cont_popup .id_wrap .id_check3 .btnType03:hover{background-color: #546a89;} +.check_pop .cont_popup .id_check2 span{margin-right: 5px;} +.check_pop .cont_popup .btn_wrap{text-align: center;} \ No newline at end of file From c85a40d68f714692500ac4e5bd611a8b99022916 Mon Sep 17 00:00:00 2001 From: kmg Date: Wed, 14 Feb 2024 17:11:17 +0900 Subject: [PATCH 4/7] =?UTF-8?q?2024/02/14=20=ED=85=8C=EC=9D=B4=EB=B8=94=20?= =?UTF-8?q?=ED=83=80=EC=9D=B4=ED=8B=80=20class=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/oprtn/tngrVisitEdu/advStngMngList.jsp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/advStngMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/advStngMngList.jsp index a8e1b0c7..d4e5bf93 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/advStngMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/advStngMngList.jsp @@ -142,8 +142,8 @@ --> -
-

교육최소시간설정

+
+

교육최소시간설정

@@ -212,8 +212,8 @@ -
-

교육신청등록문구

+
+

교육신청등록문구

@@ -255,8 +255,8 @@
-
-

강사대시보드 문구

+
+

강사대시보드 문구

From 506c8da82487d4ad2aa4a0f9475c5d9c0f76fe44 Mon Sep 17 00:00:00 2001 From: kmg Date: Wed, 14 Feb 2024 17:25:33 +0900 Subject: [PATCH 5/7] =?UTF-8?q?2024/02/14=20=EA=B3=BC=EC=A0=95=EB=AA=85=20?= =?UTF-8?q?input=20width=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EB=B0=8F=20=EC=82=AC=EC=A7=84=20=EC=98=81=EC=97=AD?= =?UTF-8?q?=20=EC=A4=91=EB=B3=B5=20class=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngReg.jsp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngReg.jsp index d1c3ffe9..65246f33 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngReg.jsp @@ -183,8 +183,6 @@ defaultText="선택" /> -
-
@@ -197,15 +195,13 @@
-
-
<%-- --%>
과정명 - +
- @@ -462,12 +461,12 @@ function fn_egov_regist_preview() { - 시 - @@ -479,12 +478,12 @@ function fn_egov_regist_preview() { - 시 - diff --git a/src/main/webapp/visitEdu/adm/publish/css/content_sub.css b/src/main/webapp/visitEdu/adm/publish/css/content_sub.css index 643ef8d8..6241b4dd 100644 --- a/src/main/webapp/visitEdu/adm/publish/css/content_sub.css +++ b/src/main/webapp/visitEdu/adm/publish/css/content_sub.css @@ -103,4 +103,5 @@ /*관리자 NEW 아이콘 추가*/ .new_icon{display: block; width:30px; background-color: #e95504; font-size: 12px; color: #fff; border-radius: 5px; padding: 0 5px 2px 5px; margin: 0 auto;} - +/*게시판관리 > 게시판관리 > 공지사항 등록 > 공지기간 select 수정*/ +.da_fo{width: 90px !important;} From af61e366acb9aae0a6c4dbe259fa7d0b84fe70b4 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Wed, 14 Feb 2024 17:43:25 +0900 Subject: [PATCH 7/7] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=9E=90=20=EA=B8=B0=EC=86=8C=EC=9C=A0=EC=98=88=20?= =?UTF-8?q?=EC=A0=91=EC=88=98=20=EC=8B=9C=20=EB=8C=80=EC=83=81=EC=9E=90=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=EC=97=90=20=ED=9C=B4=EB=8C=80=ED=8F=B0=20?= =?UTF-8?q?=EC=9D=B8=EC=A6=9D=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SspnIdtmtServiceImpl.java | 69 ++++++++ .../ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml | 6 + src/main/webapp/WEB-INF/decorators.xml | 1 + .../aplct/sspnIdtmt/popup/eduAplctPopList.jsp | 148 +++++++++++++----- 4 files changed, 185 insertions(+), 39 deletions(-) diff --git a/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java b/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java index f7fafa86..d278539c 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java +++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java @@ -1,16 +1,26 @@ package kcc.ve.aplct.sspnIdtmt.service.impl; import java.util.List; +import java.util.Map; import javax.annotation.Resource; +import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.web.servlet.ModelAndView; +import egovframework.rte.fdl.idgnr.EgovIdGnrService; +import kcc.com.cmm.LoginVO; +import kcc.com.utl.user.service.CheckLoginUtil; +import kcc.let.utl.fcc.service.EgovCryptoUtil; import kcc.ve.aplct.sspnIdtmt.service.SspnIdtmtService; +import kcc.ve.cmm.VeSendSMS; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctSndHstryService; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.impl.VEEduAplctDAO; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrMixService; import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngVO; import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.impl.CndtnTrgtMngDAO; @@ -26,6 +36,25 @@ public class SspnIdtmtServiceImpl implements SspnIdtmtService { @Resource(name="cndtnTrgtInfoMngDAO") private CndtnTrgtMngDAO cndtnTrgtInfoMngDAO; + //snd_hstry id gen + @Resource(name = "sndGnrService") + private EgovIdGnrService sndGnrService; + + //로그인 체크 util + @Resource(name = "checkLoginUtil") + private CheckLoginUtil checkLoginUtil; + + //암복호화 유틸 + @Resource(name = "egovCryptoUtil") + EgovCryptoUtil egovCryptoUtil; + + //강사 정보 MIX + @Resource(name="vEInstrMixService") + private VEInstrMixService vEInstrMixService; + + // 교육신청발송이력 + @Resource(name = "vEEduAplctSndHstryService") + private VEEduAplctSndHstryService vEEduAplctSndHstryService; @Override public void insertVeEduAplct(VEEduAplctVO paramVO) { @@ -107,6 +136,7 @@ public class SspnIdtmtServiceImpl implements SspnIdtmtService { String msg=""; String id=""; String next=""; //? + String smsYn = ""; //휴대폰 인증 번호 발송 여부 try { result=""; // @@ -176,6 +206,7 @@ public class SspnIdtmtServiceImpl implements SspnIdtmtService { msg = ""; id = cndtnTrgtMngVOList.get(0).getSspnIdtmtTrgtOrd(); next = "Y"; + smsYn = "Y"; //next = Integer.toString(cndtnTrgtMngVOList.size()); //대상자 수 }else if (cndtnTrgtMngVOList.size()>1) { //대상 리스트 던질것 @@ -184,6 +215,7 @@ public class SspnIdtmtServiceImpl implements SspnIdtmtService { msg = ""; id = ""; //여기에 대상 선택을 위한 데이터를 넣어준다. next = "N"; + smsYn = "Y"; modelAndView.addObject("cndtnTrgtMngVOList", cndtnTrgtMngVOList); //cndtnTrgtMngVOList.get(0).getreg @@ -191,6 +223,43 @@ public class SspnIdtmtServiceImpl implements SspnIdtmtService { } + //핸드폰으로 인증번호 발송 + if ("Y".equals(smsYn)) { + //인증번호 생성 + String code = RandomStringUtils.randomNumeric(6); + VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); + VeSendSMS sendSMS = new VeSendSMS(); + cndtnTrgtInfoMngVO = egovCryptoUtil.decryptCndtnTrgtMngVOInfo(cndtnTrgtInfoMngVO); //핸드폰번호 복호화 + vEEduAplctVO.setEduAplctOrd("기소유예 대상자 인증"); + vEEduAplctVO.setSndCn("안녕하세요. 저작권배움터 기소유예 담당자입니다.\n인증번호는 " + code + " 입니다."); + vEEduAplctVO.setClphone(cndtnTrgtInfoMngVO.getClphone()); + vEEduAplctVO.setSndFlag("B"); + Map resultMap = sendSMS.VeSendSMS(vEEduAplctVO.getClphone(), vEEduAplctVO.getSndCn(), vEEduAplctVO.getSndFlag()); + //문자 발송 성공 시 + if("1".equals(resultMap.get("result_code"))){ + //발송 로그 + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); + String snd_ord = sndGnrService.getNextStringId(); + vEEduAplctVO.setSndHstryOrd(snd_ord); + vEEduAplctVO.setSndId(loginVO.getUniqId()); + vEEduAplctVO.setTrgt(vEEduAplctVO.getClphone()); + vEEduAplctVO.setSndCd("10"); + vEEduAplctVO.setTrgtId(loginVO.getUniqId()); + vEEduAplctSndHstryService.insert(vEEduAplctVO); + + + //인증번호 row 생성 (기존 강사인증 테이블 사용) + VEInstrDetailVO vEInstrDetailVO = new VEInstrDetailVO(); + vEInstrDetailVO.setEmail(vEEduAplctVO.getClphone()); + vEInstrDetailVO.setCrtfdNumber(code); + vEInstrDetailVO.setUserId(loginVO.getUniqId()); + vEInstrMixService.deleteInstrEmailCrtfd(vEInstrDetailVO); + vEInstrMixService.insertInstrEmailCrtfd(vEInstrDetailVO); + + } + } + + /* if(StringUtils.isNotEmpty(id)) { msg = "이미 신청한 대상자 입니다."; diff --git a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml index 664629c7..27cc77ba 100644 --- a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml @@ -496,6 +496,9 @@ ) AND a.prcs_aplct_prd_ord_cmplt IS NULL /* 병합되지 않았다. */ + + AND a.clphone = #clphone# + @@ -533,6 +536,9 @@ ) AND a.prcs_aplct_prd_ord_cmplt IS NULL /* 병합되지 않았다. */ + + AND a.clphone = #clphone# + diff --git a/src/main/webapp/WEB-INF/decorators.xml b/src/main/webapp/WEB-INF/decorators.xml index b6e25065..0a9dc9e1 100644 --- a/src/main/webapp/WEB-INF/decorators.xml +++ b/src/main/webapp/WEB-INF/decorators.xml @@ -169,6 +169,7 @@ */cop/bbs/EgovBBSIdListSearch.do /web/ve/aplct/fndtnEnhanceTrn/eduAplctPop.do + /web/ve/aplct/sspnIdtmt/eduAplctPop.do diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp index e1cdaec2..f667eeda 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp @@ -25,7 +25,8 @@ --%>
휴대폰 번호 + +
성별 @@ -378,7 +448,7 @@ $(document).ready(function(){
- +