tolag3/koipa_edu_2025-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2025-11-03 10:19 설문조사 및 이수증 노출 조건 수정

Browse Source
This commit is contained in:
myname 2025-11-03 10:19:16 +09:00
parent 46d67b3fc2
commit e6404b8f4f
10 changed files with 72 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/kcc/let/sym/log/clg/service/EgovLoginLogService.java
View File

@ -71,6 +71,8 @@ public interface EgovLoginLogService {
public EgovMap selectMethodEgov(LoginLog loginLog) throws Exception;
public void updateLogMethod(LoginLog tempLoginLog) throws Exception;
public void updateLogMethodAuto(LoginLog tempLoginLog) throws Exception;
public void insertLogMethod(LoginLog loginLog) throws Exception;

5
src/main/java/kcc/let/sym/log/clg/service/impl/EgovLoginLogServiceImpl.java
View File

@ -206,6 +206,11 @@ public class EgovLoginLogServiceImpl extends EgovAbstractServiceImpl implements
loginLogDAO.updateLogMethod(loginLog);
}
@Override
public void updateLogMethodAuto(LoginLog loginLog) throws Exception {
loginLogDAO.updateLogMethodAuto(loginLog);
}
@Override
public void insertLogMethod(LoginLog loginLog) throws Exception {
loginLogDAO.insertLogMethod(loginLog);

5
src/main/java/kcc/let/sym/log/clg/service/impl/LoginLogDAO.java
View File

@ -128,6 +128,11 @@ public class LoginLogDAO extends EgovAbstractDAO {
public void updateLogMethod(LoginLog loginLog) throws Exception{
update("LoginLogDAO.updateLogMethod", loginLog);
}
//위의 동일한 명칭을 한번에 수정하기 위해서 만듬
public void updateLogMethodAuto(LoginLog loginLog) throws Exception{
update("LoginLogDAO.updateLogMethodAuto", loginLog);
}
public void insertLogMethod(LoginLog loginLog) throws Exception{
insert("LoginLogDAO.insertLogMethod", loginLog);

23
src/main/java/kcc/let/sym/log/clg/web/EgovLoginLogController.java
View File

@ -462,7 +462,28 @@ public class EgovLoginLogController {
loginLog.setAdmotId(loginLog.getAdmotId().trim());
LoginVO user = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
loginLogService.updateLogMethod(loginLog);
loginLogService.updateLogMethod(loginLog);
//사업 런칭 초기나 등등 같은 데이터를 한번에 수정하기 위해서 추가함...오류 발생시 주석처리 할것.
System.out.println(loginLog.getMethodNm());
System.out.println(loginLog.getMethodNm());
System.out.println(loginLog.getMethodNm());
try {
String[] s_arr = loginLog.getMethodNm().split("\\?");
System.out.println(s_arr.length);
System.out.println(s_arr.length);
System.out.println(loginLog.getMethodNm().split("\\?").length);
System.out.println(loginLog.getMethodNm().split("\\?")[0]);
}catch(Exception ex) {
ex.printStackTrace();
}
loginLog.setMethodNm(loginLog.getMethodNm().substring(0, loginLog.getMethodNm().split("\\?")[0].length()));
loginLogService.updateLogMethodAuto(loginLog);
model.addAttribute("message", egovMessageSource.getMessage("success.common.update"));
redirectAttributes.addFlashAttribute("message", egovMessageSource.getMessage("success.common.insert"));
RedirectUrlMaker redirectUrlMaker = new RedirectUrlMaker("/sym/log/clg/SelectLogMethodList.do");

18
src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Postgresql.xml
View File

@ -253,7 +253,9 @@
, LETTNADMINLOG b
, COMVNUSERMASTER c
WHERE 1=1
/*
AND a.use_yn='Y'
*/
AND a.method_cd='A'
AND a.METHOD_NM =b.PROGRM_FILE_NM
AND b.CONECT_ID =c.ESNTL_ID
@ -574,6 +576,22 @@
WHERE ADMOT_ID = #admotId#
</update>
<!-- 관리자 로그설정 메소드 수정 -->
<update id="LoginLogDAO.updateLogMethodAuto" parameterClass="loginLog">
/* 임시.*NOT_SQL_LOG.* LoginLogDAO.LoginLogDAO.updateLogMethodAuto */
UPDATE LETTNADMINMETHOD
SET
PARAM = #param#
, MENU_NM = #menuNm#
, APPRO_NM = #approNm#
, PRIVACY = #privacy#
, USE_YN = #useYn#
<isNotEmpty property="sortNum">
, sort_num = CAST(#sortNum# as int)
</isNotEmpty>
WHERE METHOD_NM like CONCAT(CAST(#methodNm# as text), '%')
</update>
<insert id="LoginLogDAO.insertLogMethod" parameterClass="loginLog">
/* 임시.*NOT_SQL_LOG.* LoginLogDAO.insertLogMethod */
INSERT INTO LETTNADMINMETHOD

3
src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp
View File

@ -925,7 +925,8 @@
<c:choose>
<c:when test="${list.qestRsltExists and list.aprvlCd eq '60' and list.aplctStateCd eq '20'}">
<c:when test="${list.qestRsltExists and list.aprvlCd eq '60' and list.aplctStateCd eq '20' and list.qestnrId10Cnt gt 0}">
<!-- 교육 기간 종료 & 교육신청은 확정(60) & 교육상태는 이슈(20) & 수료증 출력 가능 -->
<button type="button" class="btn_type04"
onclick="fncPrintCert('${list.eduAplctOrd}','${list.eduChasiOrd}','10','insert','${list.qustnrTmplatId}','${list.qestnrId10}','')"/>출력</button>

2
src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp
View File

@ -1004,7 +1004,7 @@
<c:choose>
<c:when test="${list.qestRsltExists and list.aprvlCd eq '60' and list.aplctStateCd eq '20'}">
<c:when test="${list.qestRsltExists and list.aprvlCd eq '60' and list.aplctStateCd eq '20' and list.qestnrId10Cnt gt 0}">
<!-- 교육 기간 종료 & 교육신청은 확정(60) & 교육상태는 이슈(20) & 수료증 출력 가능 -->
<button type="button" class="btn_type04"
onclick="fncPrintCert('${list.eduAplctOrd}','${list.eduChasiOrd}','10','insert','${list.qustnrTmplatId}','${list.qestnrId10}','')"/>출력</button>

4
src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp
View File

@ -922,11 +922,9 @@
-
</c:otherwise>
</c:choose>
<c:choose>
<c:when test="${list.qestRsltExists and list.aprvlCd eq '60' and list.aplctStateCd eq '20'}">
<c:when test="${list.qestRsltExists and list.aprvlCd eq '60' and list.aplctStateCd eq '20' and list.qestnrId10Cnt gt 0}">
<!-- 교육 기간 종료 & 교육신청은 확정(60) & 교육상태는 이슈(20) & 수료증 출력 가능 -->
<button type="button" class="btn_type04"
onclick="fncPrintCert('${list.eduAplctOrd}','${list.eduChasiOrd}','10','insert','${list.qustnrTmplatId}','${list.qestnrId10}','')"/>출력</button>

6
src/main/webapp/WEB-INF/jsp/sym/log/clg/ViewLogMethod.jsp
View File

@ -202,6 +202,7 @@ function fn_delete() {
<input name="searchCondition" type="hidden" value="<c:out value="${searchFr.searchCondition}" />" />
<input name="searchKeyword" type="hidden" value="<c:out value="${searchFr.searchKeyword}" />"/>
<input name="pageUnit" type="hidden" value="<c:out value="${searchFr.pageUnit}" />"/>
<div class="cont_wrap">
@ -270,7 +271,9 @@ function fn_delete() {
</tr>
<tr>
<th><span class="reqArea">사용자구분</span></th>
<td colspan="3" style="text-align:left;">${loginLog.dateType}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="cfText c_ed4555">U(사용자) / A(관리자)</span>
<td colspan="3" style="text-align:left;">
<input type="text" size="10" name="dateType" value="${empty loginLog.admotId ? 'N' : loginLog.dateType }" title="privacy" maxlength="10" />
${loginLog.dateType}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="cfText c_ed4555">U(사용자) / A(관리자)</span>
</td>
</tr>
@ -354,6 +357,7 @@ function fn_delete() {
<input name="pageIndex" type="hidden" value="1" />
<input name="searchCondition" type="hidden" value="<c:out value="${searchFr.searchCondition}" />" />
<input name="searchKeyword" type="hidden" value="<c:out value="${searchFr.searchKeyword}" />"/>
<input name="pageUnit" type="hidden" value="<c:out value="${searchFr.pageUnit}" />"/>
<input name="searchConditionSite" type="hidden" />
</form>

26
src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp
View File

@ -271,36 +271,31 @@
<td>
<c:choose>
<c:when test="${list.aprvlCd eq 60 and list.qestRsltExists and list.aplctStateCd eq 20}">
<c:when test="${list.aprvlCd eq 60 and list.qestRsltExists}">
<!-- 설문노출대상(승인처리를 받았음(20) && 교육기간이 지났음 list.qestRsltExists=true && 미이수가 아닌것(10) ) -->
<!-- 설문노출대상(확정처리를 받았음(60) && 교육기간이 지났음 list.qestRsltExists=true && 미이수가 아닌것(10) ) -->
<c:choose>
<c:when test="${list.aplctStateCd eq 20 and list.qestnrId10Cnt gt 0}">
<c:when test="${list.qestnrId10Cnt gt 0}">
<!-- 작성된 설문이 있다 -->
<button type="button" class="btnType02" data-info="${list.eduAplctOrd}" data-tooltip="sub36_pop02"
onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduChasiOrd}','10','select'
,'${list.qustnrTmplatId}','${list.qestnrId10}',''
)" title="팝업 열림">설문완료</button>
</c:when>
<c:when test="${empty list.qestnrId10 and list.aprvlCd eq 20}">
<!-- 대상 설문이 없다 -->
대상설문없음
</c:when>
<c:when test="${(empty list.qestnrId10Cnt or list.qestnrId10Cnt eq 0) and list.qustnrTm eq '0'}">
<c:when test="${empty list.qestnrId10Cnt or list.qestnrId10Cnt eq 0}">
<!-- 작성된 설문이 없다 -->
<button type="button" class="btn small mint line sur_bt" data-info="${list.eduAplctOrd}" data-tooltip="sub36_pop02"
<button type="button" class="btnType01 btn line small mint" data-tooltip="sub37_pop20"
onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduChasiOrd}','10','insert'
,'${list.qustnrTmplatId}','${list.qestnrId10}',''
)" title="팝업 열림">설문등록</button>
</c:when>
<c:when test="${list.qustnrTm eq '1'}">
<!-- 작성된 설문이 없다 -->
<button type="button" class="btn small mint line sur_bt" data-info="${list.eduAplctOrd}" data-tooltip="sub36_pop02"
onclick="fncQustnrList('${list.eduAplctOrd}','${list.eduChasiOrd}','10','insert'
,'${list.qustnrTmplatId}','${list.qestnrId10}',''
)" title="팝업 열림">설문등록</button>
</c:when>
</c:when>
<c:otherwise>
-
</c:otherwise>
@ -316,7 +311,8 @@
</td>
<td>
<c:choose>
<c:when test="${list.qestRsltExists }">
<c:when test="${list.qestRsltExists and list.aprvlCd eq '60' and list.aplctStateCd eq '20' and list.qestnrId10Cnt gt 0}">
<!-- 교육 기간 종료 & 교육신청은 확정(60) & 교육상태는 이슈(20) & 설문이 완료된 경우만 수료증 출력 가능 -->
<button type="button" class="btn small mint line sur_bt" data-info="${list.eduAplctOrd}" data-tooltip="sub36_pop02"
onclick="fncPrintCert('${list.eduAplctOrd}','${list.eduChasiOrd}','10','insert'
,'${list.qustnrTmplatId}','${list.qestnrId10}',''