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

Merge branch 'JIWOO' into advc

Browse Source
This commit is contained in:
jiwoo 2024-02-20 11:47:12 +09:00
commit 85b7e8de3e
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -447,7 +447,7 @@ public class OprtnAplctMngController {
// 세팅값 // 세팅값
String title = "저작권 체험교실 운영 신청 접수 목록"; String title = "저작권 체험교실 운영 신청 접수 목록";
int[] width = {1500, 2000, 2000, 4000, 4000, 4000, 4000, 4000, 2000, 10000 int[] width = {1500, 2000, 2000, 4000, 4000, 4000, 4000, 4000, 2000, 10000
, 3000, 3000, 4000, 4000, 4000, 4000, 4000, 4000, 4000, 6000 , 3000, 3000, 4000, 4000, 4000, 4000, 4000, 4000, 8000
, 4000, 3000, 4000 , 4000, 3000, 4000
}; // 너비 }; // 너비
@ -469,8 +469,7 @@ String[] header = {
,"운영연도" ,"운영연도"
,"신청경로" ,"신청경로"
,"대상학년" ,"대상학년/반"
,"대상반"
,"학생수" ,"학생수"
,"보고서제출일" ,"보고서제출일"
@ -500,7 +499,6 @@ String[] order = {
,"ExprnClsrnAplct" ,"ExprnClsrnAplct"
,"TrgtGrade" ,"TrgtGrade"
,"TrgtClsrm"
,"TrgtPrsnl" ,"TrgtPrsnl"
,"RprtSbmtDt" ,"RprtSbmtDt"
@ -543,8 +541,8 @@ String[] order = {
List<String> atchFileIdList = new ArrayList<String>(); List<String> atchFileIdList = new ArrayList<String>();
vEEduAplctVOList.forEach( vo -> { vEEduAplctVOList.forEach( vo -> {
if(vo.getOathAtchFileId() != null) { if(vo.getScholSealAtchFileId() != null) {
atchFileIdList.add(vo.getOathAtchFileId()); atchFileIdList.add(vo.getScholSealAtchFileId());
} }
}); });
@ -577,14 +575,14 @@ String[] order = {
//첨부파일있는 항목만 재배치 //첨부파일있는 항목만 재배치
List<String> atchFileIdList = new ArrayList<String>(); List<String> atchFileIdList = new ArrayList<String>();
vEEduAplctVOList.forEach( vo -> { vEEduAplctVOList.forEach( vo -> {
if(vo.getOathAtchFileId() != null) { if(vo.getScholSealAtchFileId() != null) {
atchFileIdList.add(vo.getOathAtchFileId()); atchFileIdList.add(vo.getScholSealAtchFileId());
} }
}); });
List<VEEduAplctVO> fileYEduList = new ArrayList<VEEduAplctVO>(); List<VEEduAplctVO> fileYEduList = new ArrayList<VEEduAplctVO>();
vEEduAplctVOList.forEach( vo -> { vEEduAplctVOList.forEach( vo -> {
if(vo.getOathAtchFileId() != null) { if(vo.getScholSealAtchFileId() != null) {
fileYEduList.add(vo); fileYEduList.add(vo);
} }
}); });

6
src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
View File

@ -5953,7 +5953,8 @@
, TO_CHAR(E.RPRT_SBMT,'YYYY-MM-DD') AS rprtSbmtDt , TO_CHAR(E.RPRT_SBMT,'YYYY-MM-DD') AS rprtSbmtDt
<!-- , DATE_FORMAT(STR_TO_DATE(E.OPRTN_STRT_DT,'%Y%m%d') ,'%Y-%m-%d') || '~' || DATE_FORMAT(STR_TO_DATE(E.OPRTN_END_DT,'%Y%m%d') ,'%Y-%m-%d') --> <!-- , DATE_FORMAT(STR_TO_DATE(E.OPRTN_STRT_DT,'%Y%m%d') ,'%Y-%m-%d') || '~' || DATE_FORMAT(STR_TO_DATE(E.OPRTN_END_DT,'%Y%m%d') ,'%Y-%m-%d') -->
, TO_CHAR(TO_DATE(E.OPRTN_STRT_DT,'YYYYMMdd') ,'YYYY-MM-dd') || '~' || TO_CHAR(TO_DATE(E.OPRTN_END_DT,'YYYYMMdd') ,'YYYY-MM-dd') <!-- , TO_CHAR(TO_DATE(E.OPRTN_STRT_DT,'YYYYMMdd') ,'YYYY-MM-dd') || '~' || TO_CHAR(TO_DATE(E.OPRTN_END_DT,'YYYYMMdd') ,'YYYY-MM-dd') -->
, TO_CHAR(TO_DATE(E.OPRTN_STRT_DT,'YYYY.MM.dd') ,'YYYY-MM-dd') || '~' || TO_CHAR(TO_DATE(E.OPRTN_END_DT,'YYYY.MM.dd') ,'YYYY-MM-dd')
AS oprtnStrtDt AS oprtnStrtDt
, A.MDFY_RQST_YN AS mdfyRqstYn , A.MDFY_RQST_YN AS mdfyRqstYn
, DECODE(E.chrg_sex_cd, 'M', '남성', 'F', '여성') AS chrgSexCd , DECODE(E.chrg_sex_cd, 'M', '남성', 'F', '여성') AS chrgSexCd
@ -8751,7 +8752,8 @@ VALUES
A.edu_aplct_ord AS eduAplctOrd, A.edu_aplct_ord AS eduAplctOrd,
A.schol_instt_nm AS scholInsttNm, A.schol_instt_nm AS scholInsttNm,
A.chrg_nm AS chrgNm, A.chrg_nm AS chrgNm,
A.oath_atch_file_id AS oathAtchFileId A.oath_atch_file_id AS oathAtchFileId,
A.SCHOL_SEAL_ATCH_FILE_ID AS scholSealAtchFileId
FROM VE_EDU_APLCT A FROM VE_EDU_APLCT A
WHERE A.edu_aplct_ord IN WHERE A.edu_aplct_ord IN
<iterate property="eduAplctOrdList" open="(" close=")" conjunction=","> <iterate property="eduAplctOrdList" open="(" close=")" conjunction=",">

2
src/main/webapp/WEB-INF/jsp/oprtn/cmm/rejectPopup.jsp
View File

@ -50,7 +50,7 @@
try{ try{
sendSms( sendSms(
"<c:out value='${veEduAplctVO.phone}'/>", "<c:out value='${veEduAplctVO.phone}'/>",
"교육운영 관리 시스템입니다. 등록하신 체험교실 운영신청 수정요청드립니다.", "교육운영 관리 시스템입니다. 등록하신 체험교실 운영신청 수정요청드립니다.\n(수정요청사유: "+$("#aprvlCn").val()+")",
"<c:out value="${veEduAplctVO.eduAplctOrd}" />", "<c:out value="${veEduAplctVO.eduAplctOrd}" />",
"<c:out value='${veEduAplctVO.targetId}'/>", "<c:out value='${veEduAplctVO.targetId}'/>",
"G", "G",

6
src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp
View File

@ -183,13 +183,13 @@
</tr> </tr>
<tr> <tr>
<th scope="row"> <th scope="row">
<p>처리상태 </p> <p>처리상태</p>
</th> </th>
<td colspan="3"> <td colspan="3">
<ve:code codeId="VEA013" code="${info.aprvlCd}"/> <ve:code codeId="VEA013" code="${info.aprvlCd}"/>
</td> </td>
</tr> </tr>
<c:if test="${info.aprvlCd eq '70'}"> <c:if test="${info.aprvlCd eq '11'}">
<tr> <tr>
<th scope="row"> <th scope="row">
<p>수정요청사유</p> <p>수정요청사유</p>
@ -521,7 +521,7 @@
<div class="btn_wrap btn_layout01"> <div class="btn_wrap btn_layout01">
<div class="btn_left"> <div class="btn_left">
<!-- 운영신청 상태, 수정완료상태에서만 수정요청 가능 --> <!-- 운영신청 상태, 수정완료상태에서만 수정요청 가능 -->
<c:if test="${info.aprvlCd eq '10' or info.aprvlCd eq '13'}"> <c:if test="${info.aprvlCd eq '10' or info.aprvlCd eq '11' or info.aprvlCd eq '13'}">
<button type="button" class="btn_type01" onclick="fncRejectPopup(); return false;">수정요청</button> <button type="button" class="btn_type01" onclick="fncRejectPopup(); return false;">수정요청</button>
</c:if> </c:if>
</div> </div>