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

feat: pms-#3221 "[관리자] 청소년찾아가는 저작권 교육 > 강의조사 요청 목록 > 강의조사 진행목록(상세) 수정

Browse Source 
사항" 완료
This commit is contained in:
hylee 2023-06-30 17:44:49 +09:00
parent 3205c63c03
commit 325f16bafb
5 changed files with 78 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/web/OprtnLctrRsrchTngrContoller.java
View File

@ -342,8 +342,6 @@ public class OprtnLctrRsrchTngrContoller {
//로그인 처리==================================== //로그인 처리====================================
System.out.println(vELctrDetailVO.getStngYrMnt());
System.out.println(vELctrDetailVO.getRsrchInstrDiv());
//1.pageing step1 //1.pageing step1
PaginationInfo paginationInfo = new PaginationInfo(); PaginationInfo paginationInfo = new PaginationInfo();
@ -352,8 +350,28 @@ public class OprtnLctrRsrchTngrContoller {
//2. pageing step2 //2. pageing step2
vELctrDetailVO = vEPagingUtil.setPagingStep2_VELctrDetailVO(vELctrDetailVO, paginationInfo); vELctrDetailVO = vEPagingUtil.setPagingStep2_VELctrDetailVO(vELctrDetailVO, paginationInfo);
System.out.println("vELctrDetailVO.getOrderByQuery() :: "+ vELctrDetailVO.getOrderByQuery());
// 공통으로 사용하는 setPagingStep2_VELctrDetailVO 메소드에서
// vELctrDetailVO.getSearchSortCnd() 이 없으면 prcs_ord로 강제 입력하는데
// prcs_ord값은 detail 쿼리에 없는 값이라 다시 초기화 함
System.out.println(vELctrDetailVO.getSearchSortCnd());
System.out.println(vELctrDetailVO.getSearchSortOrd());
if("prcs_ord".equals(vELctrDetailVO.getSearchSortCnd())) {
vELctrDetailVO.setSearchSortCnd("");
vELctrDetailVO.setSearchSortOrd("");
}
if(StringUtils.isNotEmpty(vELctrDetailVO.getSearchSortCnd())) {
vELctrDetailVO.setOrderByQuery(vELctrDetailVO.getSearchSortCnd()+" "+vELctrDetailVO.getSearchSortOrd());
}
List<VELctrDetailVO> selectVELctrDetailVOList = vELctrRsrchMngService.selectPagingListLctr(vELctrDetailVO); List<VELctrDetailVO> selectVELctrDetailVOList = vELctrRsrchMngService.selectPagingListLctr(vELctrDetailVO);
System.out.println("============");
//3.pageing step3 //3.pageing step3
paginationInfo = vEPagingUtil.setPagingStep3_VELctrDetailVO(selectVELctrDetailVOList, paginationInfo); paginationInfo = vEPagingUtil.setPagingStep3_VELctrDetailVO(selectVELctrDetailVOList, paginationInfo);

1
src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Cubrid.xml
View File

@ -159,7 +159,6 @@
</isNotEmpty> </isNotEmpty>
</select> </select>
<!-- 강사 정보 R -->
<select id="VEAcmdtAplctDAO.selectDetailByUser_r2" parameterClass="VEInstrFeeAcmdtVO" resultClass="VEInstrFeeAcmdtVO"> <select id="VEAcmdtAplctDAO.selectDetailByUser_r2" parameterClass="VEInstrFeeAcmdtVO" resultClass="VEInstrFeeAcmdtVO">
select select
vaa.aprvl_cd as aprvlCd vaa.aprvl_cd as aprvlCd

3
src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchMng_SQL_Cubrid.xml
View File

@ -345,7 +345,10 @@
ORDER BY 1=1 ORDER BY 1=1
<!-- <isNotNull prepend=" ," property="searchSortCnd"> -->
<!-- </isNotNull> -->
<isEmpty property="orderByQuery"> <isEmpty property="orderByQuery">
, dddd.rsdne asc , dddd.rsdne asc
</isEmpty> </isEmpty>

55
src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngDetail.jsp
View File

@ -30,6 +30,40 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){
var $cnd = $('#searchSortCnd');
var $ord = $('#searchSortOrd');
$('.sort_btn').click(function(){
$cnd.val($(this).attr('id').replace('_sort', ''));
if($(this).text() == '▼'){
$ord.val('asc');
$(this).text('▲');
}else{
$ord.val('desc');
$(this).text('▼');
}
linkPage(1);
});
sort_init();
});
function sort_init(){
var $cnd = $('#searchSortCnd');
var $ord = $('#searchSortOrd');
if($ord.val() == 'asc'){
var idVal ='#'+$cnd.val()+'_sort';
console.log(idVal);
$(idVal).text('▲');
}
}
function fncGoList(){ function fncGoList(){
var listForm = document.listForm ; var listForm = document.listForm ;
listForm.stngYrMnt.value = '' ; listForm.stngYrMnt.value = '' ;
@ -96,8 +130,8 @@
<body> <body>
<form:form id="listForm" name="listForm" method="post" commandName="vEInstrDetailVO" onsubmit="return false;"> <form:form id="listForm" name="listForm" method="post" commandName="vEInstrDetailVO" onsubmit="return false;">
<input type="hidden" name="pageIndex" value="<c:out value='${vELctrDetailVO.pageIndex}' default='1' />"/> <input type="hidden" name="pageIndex" value="<c:out value='${vELctrDetailVO.pageIndex}' default='1' />"/>
<input type="hidden" name="searchSortCnd" value="<c:out value="${vELctrDetailVO.searchSortCnd}" />" /> <input type="hidden" name="searchSortCnd" id="searchSortCnd" value="<c:out value="${vELctrDetailVO.searchSortCnd}" />" />
<input type="hidden" name="searchSortOrd" value="<c:out value="${vELctrDetailVO.searchSortOrd}" />" /> <input type="hidden" name="searchSortOrd" id="searchSortOrd" value="<c:out value="${vELctrDetailVO.searchSortOrd}" />" />
<input type="hidden" name="userId" id="userId" value=""/> <!-- 사용자 아이디 --> <input type="hidden" name="userId" id="userId" value=""/> <!-- 사용자 아이디 -->
@ -190,21 +224,24 @@
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
<!-- <th>이름<button class="sort_btn" id="instrNm_sort">▼</button></th> -->
<th>이름</th> <th>이름</th>
<th>구분</th> <th>구분<button class="sort_btn" id="divCd_sort">▼</button></th>
<th>거주지역</th> <th>거주지역<button class="sort_btn" id="rsdne_sort">▼</button></th>
<th>강의가능지역</th> <th>강의가능지역<button class="sort_btn" id="lctrAreaNm_sort">▼</button></th>
<!-- <th>연락처<button class="sort_btn" id="phone_sort">▼</button></th> -->
<th>연락처</th> <th>연락처</th>
<th>주5일여부</th> <th>주5일여부<button class="sort_btn" id="wCnt_sort">▼</button></th>
<th>자격종료여부</th> <th>자격종료여부<button class="sort_btn" id="qlfctEndYn_sort">▼</button></th>
<th>강의조사서제출여부</th> <th>제출여부<button class="sort_btn" id="lctrStngOrd_sort">▼</button></th>
<!-- <th>강의조사서제출여부<button class="sort_btn">▼</button></th> -->
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<c:forEach var="list" items="${list}" varStatus="status"> <c:forEach var="list" items="${list}" varStatus="status">
<tr> <tr>
<td> <td>
<c:out value="${list.instrNm}"/> <c:out value="${list.instrNm}"/>
<br/>(${fn:split(list.userId,'_')[1]*1}) <br/>(${fn:split(list.userId,'_')[1]*1})
</td> </td>
<td> <td>

16
src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngList.jsp
View File

@ -37,11 +37,13 @@
function linkPage(pageNo){ function linkPage(pageNo){
var listForm = document.listForm ; var listForm = document.listForm ;
listForm.pageIndex.value = pageNo ; listForm.pageIndex.value = pageNo ;
if(listForm.searchStartDt.value > listForm.searchEndDt.value){ // console.log('listForm : ', listForm);
alert("시작일은 종료일보다 작아야합니다."); // if(listForm.searchStartDt.value > listForm.searchEndDt.value){
return; // alert("시작일은 종료일보다 작아야합니다.");
} // return;
listForm.action = "<c:url value='/ve/oprtn/instr/tngrVisitEdu/instrInfo/lctrRsrchMngList.do'/>"; // }
// listForm.action = "<c:url value='/ve/oprtn/instr/tngrVisitEdu/instrInfo/lctrRsrchMngList.do'/>";
listForm.action = "<c:url value='/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/lctrRsrchMngList.do'/>";
listForm.submit(); listForm.submit();
} }
@ -56,14 +58,14 @@
function fncGoReg(){ function fncGoReg(){
var listForm = document.listForm ; var listForm = document.listForm ;
listForm.instrDiv.value = "10" ; listForm.instrDiv.value = "10" ;
listForm.action = "<c:url value='/ve/oprtn/instr/tngrVisitEdu/instrInfo/instrAplctReg.do'/>"; listForm.action = "<c:url value='/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/instrAplctReg.do'/>";
listForm.submit(); listForm.submit();
} }
function fncGoRegExcel(){ function fncGoRegExcel(){
var listForm = document.listForm ; var listForm = document.listForm ;
listForm.instrDiv.value = "10" ; listForm.instrDiv.value = "10" ;
listForm.action = "<c:url value='/ve/oprtn/instr/tngrVisitEdu/instrInfo/instrAplctRegExcel.do'/>"; listForm.action = "<c:url value='/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/instrAplctRegExcel.do'/>";
listForm.submit(); listForm.submit();
} }