Merge branch 'JIWOO'
This commit is contained in:
commit
a6c98adec2
@ -180,6 +180,8 @@ public class UserManageVO extends UserDefaultVO{
|
|||||||
|
|
||||||
private String certNum; // otp 인증번호
|
private String certNum; // otp 인증번호
|
||||||
|
|
||||||
|
private String mberId;
|
||||||
|
|
||||||
public String getAuthorCode() {
|
public String getAuthorCode() {
|
||||||
return authorCode;
|
return authorCode;
|
||||||
}
|
}
|
||||||
@ -721,6 +723,12 @@ public class UserManageVO extends UserDefaultVO{
|
|||||||
public void setCertNum(String certNum) {
|
public void setCertNum(String certNum) {
|
||||||
this.certNum = certNum;
|
this.certNum = certNum;
|
||||||
}
|
}
|
||||||
|
public String getMberId() {
|
||||||
|
return mberId;
|
||||||
|
}
|
||||||
|
public void setMberId(String mberId) {
|
||||||
|
this.mberId = mberId;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -5,7 +5,6 @@
|
|||||||
|
|
||||||
<typeAlias alias="egovMap" type="egovframework.rte.psl.dataaccess.util.EgovMap"/>
|
<typeAlias alias="egovMap" type="egovframework.rte.psl.dataaccess.util.EgovMap"/>
|
||||||
<typeAlias alias="FileVO" type="kcc.com.cmm.service.FileVO"/>
|
<typeAlias alias="FileVO" type="kcc.com.cmm.service.FileVO"/>
|
||||||
<typeAlias alias="vEEduAplctVO" type="kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO"/>
|
|
||||||
|
|
||||||
<resultMap id="fileList" class="kcc.com.cmm.service.FileVO">
|
<resultMap id="fileList" class="kcc.com.cmm.service.FileVO">
|
||||||
<result property="atchFileId" column="ATCH_FILE_ID" columnIndex="1"/>
|
<result property="atchFileId" column="ATCH_FILE_ID" columnIndex="1"/>
|
||||||
@ -18,8 +17,6 @@
|
|||||||
<result property="streFileNm" column="STRE_FILE_NM" columnIndex="8"/>
|
<result property="streFileNm" column="STRE_FILE_NM" columnIndex="8"/>
|
||||||
<result property="creatDt" column="CREAT_DT" columnIndex="9"/>
|
<result property="creatDt" column="CREAT_DT" columnIndex="9"/>
|
||||||
<result property="fileSize" column="FILE_SIZE" columnIndex="10"/>
|
<result property="fileSize" column="FILE_SIZE" columnIndex="10"/>
|
||||||
<result property="scholInsttNm" column="scholInsttNm" columnIndex="11"/>
|
|
||||||
<result property="chrgNm" column="chrgNm" columnIndex="12"/>
|
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<resultMap id="fileDetail" class="kcc.com.cmm.service.FileVO">
|
<resultMap id="fileDetail" class="kcc.com.cmm.service.FileVO">
|
||||||
@ -43,8 +40,6 @@
|
|||||||
a.ATCH_FILE_ID, b.FILE_CN, b.FILE_SN, b.FILE_STRE_COURS, b.STRE_FILE_NM,
|
a.ATCH_FILE_ID, b.FILE_CN, b.FILE_SN, b.FILE_STRE_COURS, b.STRE_FILE_NM,
|
||||||
b.FILE_EXTSN, b.ORIGNL_FILE_NM, b.FILE_SIZE, TO_CHAR(a.CREAT_DT, 'YYYY-MM-DD HH24:MI:SS' ) AS CREAT_DT
|
b.FILE_EXTSN, b.ORIGNL_FILE_NM, b.FILE_SIZE, TO_CHAR(a.CREAT_DT, 'YYYY-MM-DD HH24:MI:SS' ) AS CREAT_DT
|
||||||
|
|
||||||
, '' AS scholInsttNm
|
|
||||||
, '' AS chrgNm
|
|
||||||
|
|
||||||
FROM
|
FROM
|
||||||
LETTNFILE a, LETTNFILEDETAIL b
|
LETTNFILE a, LETTNFILEDETAIL b
|
||||||
@ -65,8 +60,6 @@
|
|||||||
a.ATCH_FILE_ID, b.FILE_CN, b.FILE_SN, b.FILE_STRE_COURS, b.STRE_FILE_NM,
|
a.ATCH_FILE_ID, b.FILE_CN, b.FILE_SN, b.FILE_STRE_COURS, b.STRE_FILE_NM,
|
||||||
b.FILE_EXTSN, b.ORIGNL_FILE_NM, b.FILE_SIZE, TO_CHAR(a.CREAT_DT, 'YYYY-MM-DD HH24:MI:SS' ) AS CREAT_DT
|
b.FILE_EXTSN, b.ORIGNL_FILE_NM, b.FILE_SIZE, TO_CHAR(a.CREAT_DT, 'YYYY-MM-DD HH24:MI:SS' ) AS CREAT_DT
|
||||||
|
|
||||||
, '' AS scholInsttNm
|
|
||||||
, '' AS chrgNm
|
|
||||||
|
|
||||||
FROM
|
FROM
|
||||||
LETTNFILE a, LETTNFILEDETAIL b
|
LETTNFILE a, LETTNFILEDETAIL b
|
||||||
@ -103,8 +96,6 @@
|
|||||||
a.ATCH_FILE_ID, b.FILE_CN, b.FILE_SN, b.FILE_STRE_COURS, b.STRE_FILE_NM,
|
a.ATCH_FILE_ID, b.FILE_CN, b.FILE_SN, b.FILE_STRE_COURS, b.STRE_FILE_NM,
|
||||||
b.FILE_EXTSN, b.ORIGNL_FILE_NM, b.FILE_SIZE, TO_CHAR(a.CREAT_DT, 'YYYY-MM-DD HH24:MI:SS' ) AS CREAT_DT
|
b.FILE_EXTSN, b.ORIGNL_FILE_NM, b.FILE_SIZE, TO_CHAR(a.CREAT_DT, 'YYYY-MM-DD HH24:MI:SS' ) AS CREAT_DT
|
||||||
|
|
||||||
, c.schol_instt_nm AS scholInsttNm
|
|
||||||
, c.chrg_nm AS chrgNm
|
|
||||||
|
|
||||||
FROM
|
FROM
|
||||||
LETTNFILE a, LETTNFILEDETAIL b, VE_EDU_APLCT c
|
LETTNFILE a, LETTNFILEDETAIL b, VE_EDU_APLCT c
|
||||||
@ -229,8 +220,6 @@
|
|||||||
a.ATCH_FILE_ID, b.FILE_CN, b.FILE_SN, b.FILE_STRE_COURS, b.STRE_FILE_NM,
|
a.ATCH_FILE_ID, b.FILE_CN, b.FILE_SN, b.FILE_STRE_COURS, b.STRE_FILE_NM,
|
||||||
b.FILE_EXTSN, b.ORIGNL_FILE_NM, b.FILE_SIZE, TO_CHAR(a.CREAT_DT, 'YYYY-MM-DD HH24:MI:SS' ) AS CREAT_DT
|
b.FILE_EXTSN, b.ORIGNL_FILE_NM, b.FILE_SIZE, TO_CHAR(a.CREAT_DT, 'YYYY-MM-DD HH24:MI:SS' ) AS CREAT_DT
|
||||||
|
|
||||||
, '' AS scholInsttNm
|
|
||||||
, '' AS chrgNm
|
|
||||||
|
|
||||||
FROM
|
FROM
|
||||||
LETTNFILE a, LETTNFILEDETAIL b
|
LETTNFILE a, LETTNFILEDETAIL b
|
||||||
@ -281,8 +270,6 @@
|
|||||||
a.ATCH_FILE_ID, b.FILE_CN, b.FILE_SN, b.FILE_STRE_COURS, b.STRE_FILE_NM,
|
a.ATCH_FILE_ID, b.FILE_CN, b.FILE_SN, b.FILE_STRE_COURS, b.STRE_FILE_NM,
|
||||||
b.FILE_EXTSN, b.ORIGNL_FILE_NM, b.FILE_SIZE, a.CREAT_DT
|
b.FILE_EXTSN, b.ORIGNL_FILE_NM, b.FILE_SIZE, a.CREAT_DT
|
||||||
|
|
||||||
, '' AS scholInsttNm
|
|
||||||
, '' AS chrgNm
|
|
||||||
|
|
||||||
FROM
|
FROM
|
||||||
LETTNFILE a, LETTNFILEDETAIL b
|
LETTNFILE a, LETTNFILEDETAIL b
|
||||||
@ -326,14 +313,6 @@
|
|||||||
AND FILE_SN = #fileSn#
|
AND FILE_SN = #fileSn#
|
||||||
</update>
|
</update>
|
||||||
|
|
||||||
<update id="FileManageDAO.updateOffeduFileNull" parameterClass="VEEduAplctVO" >
|
|
||||||
UPDATE
|
|
||||||
$table$
|
|
||||||
SET
|
|
||||||
$type$ = null
|
|
||||||
WHERE 1=1
|
|
||||||
AND edu_aplct_ord = #eduAplctOrd#
|
|
||||||
</update>
|
|
||||||
|
|
||||||
<select id="FileManageDAO.selectZipFileOrderList" parameterClass="FileVO" resultMap="fileList" >
|
<select id="FileManageDAO.selectZipFileOrderList" parameterClass="FileVO" resultMap="fileList" >
|
||||||
/* FileManageDAO.selectZipFileOrderList */
|
/* FileManageDAO.selectZipFileOrderList */
|
||||||
@ -341,8 +320,6 @@
|
|||||||
a.ATCH_FILE_ID, b.FILE_CN, b.FILE_SN, b.FILE_STRE_COURS, b.STRE_FILE_NM,
|
a.ATCH_FILE_ID, b.FILE_CN, b.FILE_SN, b.FILE_STRE_COURS, b.STRE_FILE_NM,
|
||||||
b.FILE_EXTSN, b.ORIGNL_FILE_NM, b.FILE_SIZE, TO_CHAR(a.CREAT_DT, 'YYYY-MM-DD HH24:MI:SS' ) AS CREAT_DT
|
b.FILE_EXTSN, b.ORIGNL_FILE_NM, b.FILE_SIZE, TO_CHAR(a.CREAT_DT, 'YYYY-MM-DD HH24:MI:SS' ) AS CREAT_DT
|
||||||
|
|
||||||
, '' AS scholInsttNm
|
|
||||||
, '' AS chrgNm
|
|
||||||
|
|
||||||
FROM
|
FROM
|
||||||
LETTNFILE a, LETTNFILEDETAIL b
|
LETTNFILE a, LETTNFILEDETAIL b
|
||||||
|
|||||||
@ -485,17 +485,4 @@
|
|||||||
AND mber_seq = #key#
|
AND mber_seq = #key#
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<update id="loginDAO.updateMberSeqKeyAjax" parameterClass="loginVO">
|
|
||||||
/* 임시.*NOT_SQL_LOG.* loginDAO.updateMberSeqKeyAjax*/
|
|
||||||
UPDATE LETTNGNRLMBER
|
|
||||||
SET mber_seq = #mberSeq#
|
|
||||||
WHERE mber_id = #id#
|
|
||||||
</update>
|
|
||||||
|
|
||||||
<update id="loginDAO.updateMberSeqKeyNull" parameterClass="loginVO">
|
|
||||||
/* 임시.*NOT_SQL_LOG.* loginDAO.updateMberSeqKeyNull*/
|
|
||||||
UPDATE LETTNGNRLMBER
|
|
||||||
SET mber_seq = ''
|
|
||||||
WHERE mber_id = #user_id#
|
|
||||||
</update>
|
|
||||||
</sqlMap>
|
</sqlMap>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user