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

Merge branch 'hylee' into advc

Browse Source 
Conflicts:
	src/main/webapp/WEB-INF/jsp/main/EgovMainList.jsp
This commit is contained in:
hylee 2023-12-18 17:29:54 +09:00
commit d8507c2a2c
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctMngController.java
View File

@ -45,6 +45,7 @@ import kcc.com.cmm.spring.data.util.ExcelUtil;
import kcc.com.cmm.util.IpUtil; import kcc.com.cmm.util.IpUtil;
import kcc.com.cmm.util.StringUtil; import kcc.com.cmm.util.StringUtil;
import kcc.com.utl.user.service.CheckLoginUtil; import kcc.com.utl.user.service.CheckLoginUtil;
import kcc.let.uss.notify.service.NotifyManageService;
import kcc.let.utl.fcc.service.EgovCryptoUtil; import kcc.let.utl.fcc.service.EgovCryptoUtil;
import kcc.ve.cmm.VeConstants; import kcc.ve.cmm.VeConstants;
import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEEduExcelVO; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEEduExcelVO;
@ -128,6 +129,9 @@ public class OprtnAplctMngController {
@Resource(name = "vEPrcsAplctPrdService") @Resource(name = "vEPrcsAplctPrdService")
private VEPrcsAplctPrdService vEPrcsAplctPrdService; private VEPrcsAplctPrdService vEPrcsAplctPrdService;
@Resource(name = "NotifyManageService")
private NotifyManageService notifyManageService;
/** /**
* 저작권체험교실 목록 화면 * 저작권체험교실 목록 화면
*/ */
@ -230,12 +234,15 @@ public class OprtnAplctMngController {
*/ */
@RequestMapping("oprtnAplctMngDetail.do") @RequestMapping("oprtnAplctMngDetail.do")
public String oprtnAplctMngDetail( @ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO , ModelMap model , HttpSession session, HttpServletRequest request ) throws Exception { public String oprtnAplctMngDetail( @ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO , ModelMap model , HttpSession session, HttpServletRequest request ) throws Exception {
notifyManageService.updateNotifyChkWhereCmmNotifyOrd(vEEduAplctVO.getCmmNotifyOrd());
LoginVO user = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; LoginVO user = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
//기본데이터 불러오기 //기본데이터 불러오기
vEEduAplctVO = vEEduAplctService.selectOprtnDetail(vEEduAplctVO); vEEduAplctVO = vEEduAplctService.selectOprtnDetail(vEEduAplctVO);
//데이터 복호화 - VO 단위로 만들어서 사용 //데이터 복호화 - VO 단위로 만들어서 사용
vEEduAplctVO = egovCryptoUtil.decryptVEEduAplctVOInfo(vEEduAplctVO); vEEduAplctVO = egovCryptoUtil.decryptVEEduAplctVOInfo(vEEduAplctVO);

6
src/main/webapp/WEB-INF/jsp/main/EgovMainList.jsp
View File

@ -109,7 +109,6 @@ function fn_goDetail(cmmNotifyOrd){
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
<!-- <th scope="col">확인여부</th> -->
<th scope="col">분야</th> <th scope="col">분야</th>
<th scope="col">메세지</th> <th scope="col">메세지</th>
<th scope="col">등록일</th> <th scope="col">등록일</th>
@ -130,6 +129,11 @@ function fn_goDetail(cmmNotifyOrd){
</td> --%> </td> --%>
<td> <td>
<span class="new_icon">NEW</span><ve:code codeId="VE0011" code="${list.lctrDivCd}"/> <span class="new_icon">NEW</span><ve:code codeId="VE0011" code="${list.lctrDivCd}"/>
<td>
<c:if test="${list.notifyChk ne 'Y'}">
<span class="new_icon">NEW</span>
</c:if>
<ve:code codeId="VE0011" code="${list.lctrDivCd}"/>
</td> </td>
<td> <td>
<c:out value="${list.notifyCn}"/> <c:out value="${list.notifyCn}"/>