Merge branch 'JIWOO' into advc

This commit is contained in:
jiwoo 2024-02-23 14:53:04 +09:00
commit 9c9ea73efe
2 changed files with 34 additions and 5 deletions

View File

@ -7362,7 +7362,8 @@ VALUES
AND e.frst_register_id = #notiUserId# AND e.frst_register_id = #notiUserId#
) )
AS notiCnt, AS notiCnt,
C.CHRG_MJR AS chrgMjr C.CHRG_MJR AS chrgMjr,
A.clphone AS clphone
FROM ve_edu_aplct A FROM ve_edu_aplct A
LEFT OUTER JOIN VE_EDU_OPRTN C LEFT OUTER JOIN VE_EDU_OPRTN C
ON A.EDU_APLCT_ORD = C.EDU_APLCT_ORD ON A.EDU_APLCT_ORD = C.EDU_APLCT_ORD

View File

@ -17,6 +17,7 @@
<html lang="ko"> <html lang="ko">
<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 src="${pageContext.request.contextPath}/js/ve/sendSmsEmailUtil.js"></script>
<style> <style>
input:read-only { input:read-only {
background-color: #ededed; background-color: #ededed;
@ -130,7 +131,9 @@ input:read-only {
success:function(returnData){ success:function(returnData){
if(returnData.rsCnt > 0){ if(returnData.rsCnt > 0){
alert("상태가 변경 되었습니다."); alert("상태가 변경 되었습니다.");
location.reload(); if(aprvlCdSelected != '11'){
location.reload();
}
} }
}, },
error:function(request , status, error){ error:function(request , status, error){
@ -138,6 +141,20 @@ input:read-only {
} }
}); });
} }
if(aprvlCdSelected == '11'){
$('input:checkbox[name="chk"]:checked').each(function() {
sendSms(
$(this).data('clphone'),
"교육운영 관리 시스템입니다. 등록하신 체험교실 운영신청 수정요청드립니다.",
$(this).val(),
$(this).data('userid'),
"G",
"N"
);
});
}
location.reload();
} }
function fileChk() { function fileChk() {
@ -379,7 +396,9 @@ input:read-only {
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
<td> <td>
<input name="chk" id="<c:out value="${list.eduAplctOrd}"/>" type="checkbox" value="<c:out value="${list.eduAplctOrd}"/>"/> <label for="<c:out value="${list.eduAplctOrd}"/>"></label> <input name="chk" id="<c:out value="${list.eduAplctOrd}"/>"
data-clphone="<c:out value='${list.clphone}' />" data-userid="<c:out value='${list.userId}' />"
type="checkbox" value="<c:out value="${list.eduAplctOrd}"/>"/> <label for="<c:out value="${list.eduAplctOrd}"/>"></label>
</td> </td>
<td><c:out <td><c:out
value="${ ( paginationInfo.totalRecordCount - ((paginationInfo.currentPageNo -1)*paginationInfo.recordCountPerPage) ) - status.index }" /> value="${ ( paginationInfo.totalRecordCount - ((paginationInfo.currentPageNo -1)*paginationInfo.recordCountPerPage) ) - status.index }" />
@ -419,10 +438,10 @@ input:read-only {
<!-- //list --> <!-- //list -->
<div class="btn_wrap btn_layout01"> <div class="btn_wrap btn_layout01">
<div class="btn_left"> <div class="btn_left">
<select name="aprvlCdSelect" id="aprvlCdSelect"class="sel_type1"> <!-- <select name="aprvlCdSelect" id="aprvlCdSelect"class="sel_type1">
<option value="">선택</option> <option value="">선택</option>
<option value="10">운영신청</option> <option value="10">운영신청</option>
<!-- <option value="70">수정요청</option> --> <option value="70">수정요청</option>
<option value="12">운영미확정</option> <option value="12">운영미확정</option>
<option value="13">수정완료</option> <option value="13">수정완료</option>
<option value="20">운영확정</option> <option value="20">운영확정</option>
@ -431,6 +450,15 @@ input:read-only {
<option value="60">결과보고 완료</option> <option value="60">결과보고 완료</option>
<option value="70">검토중</option> <option value="70">검토중</option>
<option value="80">운영종료</option> <option value="80">운영종료</option>
</select> -->
<select name="aprvlCdSelect" id="aprvlCdSelect"class="sel_type1">
<option value="">선택</option>
<option value="11">수정요청</option>
<option value="20">운영교사 선정</option>
<option value="12">운영교사 미선정</option>
<option value="40">서류제출 요청</option>
<option value="50">결과보고 요청</option>
<option value="80">운영종료</option>
</select> </select>
<button class="btn_type04" onclick="fncStatusChangeAll(); return false;" >일괄변경</button> <button class="btn_type04" onclick="fncStatusChangeAll(); return false;" >일괄변경</button>
</div> </div>