Merge branch 'hylee' into advc

This commit is contained in:
hylee 2023-12-26 18:22:50 +09:00
commit c42c841b6d
2 changed files with 6 additions and 6 deletions

View File

@ -945,7 +945,7 @@
<!-- 강사 디테일 정보 L page --> <!-- 강사 디테일 정보 L page -->
<select id="VEInstrMixDAO.selectWhereInDetailReport" parameterClass="VEInstrDetailVO" resultClass="VEInstrDetailVO"> <select id="VEInstrMixDAO.selectWhereInDetailReport" parameterClass="VEInstrDetailVO" resultClass="VEInstrDetailVO">
/* VEInstrMixDAO.selectPagingDetailList4Report */ /* VEInstrMixDAO.selectWhereInDetailReport */
SELECT SELECT
COUNT(1) OVER() AS totCnt , COUNT(1) OVER() AS totCnt ,
<include refid="VEInstrMixDAO.select_detail_column_name"/>, <include refid="VEInstrMixDAO.select_detail_column_name"/>,
@ -1066,7 +1066,7 @@
AND a00.instrDiv =a.instr_div AND a00.instrDiv =a.instr_div
AND a00.userId =a.user_id AND a00.userId =a.user_id
AND a00.instrDetailOrd=a.instr_detail_ord AND a00.instrDetailOrd=a.instr_detail_ord
AND AND userId IN
<iterate property="userIdList" open="(" close=")" conjunction=","> <iterate property="userIdList" open="(" close=")" conjunction=",">
#userIdList[]# #userIdList[]#
</iterate> </iterate>

View File

@ -240,19 +240,19 @@
</thead> </thead>
<tbody> <tbody>
<c:forEach var="list" items="${resultList}" varStatus="status"> <c:forEach var="list" items="${resultList}" varStatus="status">
<tr onclick="fncGoDetail('<c:out value="${list.userId}"/>', '<c:out value="${list.instrDiv}"/>' , '<c:out value="${list.instrDetailOrd}"/>', '<c:out value="${list.rqstCnt}"/>');" style="cursor:pointer;"> <tr>
<td> <td>
<input name="chk" value="${list.userId}" title="Check" type="checkbox"/> <input name="chk" value="${list.userId}" title="Check" type="checkbox"/>
</td> </td>
<td> <td onclick="fncGoDetail('<c:out value="${list.userId}"/>', '<c:out value="${list.instrDiv}"/>' , '<c:out value="${list.instrDetailOrd}"/>', '<c:out value="${list.rqstCnt}"/>');" style="cursor:pointer;">
<c:out value="${list.instrNm}"/> <c:out value="${list.instrNm}"/>
</td> </td>
<td> <td onclick="fncGoDetail('<c:out value="${list.userId}"/>', '<c:out value="${list.instrDiv}"/>' , '<c:out value="${list.instrDetailOrd}"/>', '<c:out value="${list.rqstCnt}"/>');" style="cursor:pointer;">
<ve:code codeId="VE0018" code="${list.apptDiv}"/> <ve:code codeId="VE0018" code="${list.apptDiv}"/>
</td> </td>
<td> <td onclick="fncGoDetail('<c:out value="${list.userId}"/>', '<c:out value="${list.instrDiv}"/>' , '<c:out value="${list.instrDetailOrd}"/>', '<c:out value="${list.rqstCnt}"/>');" style="cursor:pointer;">
<c:out value="${list.rsdne}"/> <c:out value="${list.rsdne}"/>
</td> </td>
<td> <td>