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

Merge branch 'advc' of http://yongjoon.cho@vcs.iten.co.kr:9999/hylee/offedu into advc

Browse Source
This commit is contained in:
myname 2023-07-28 14:05:06 +09:00
commit 8670e65a9a
15 changed files with 242 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
src/main/java/kcc/kccadr/sch/service/SchduleManageVO.java
View File

@ -97,6 +97,21 @@ public class SchduleManageVO extends ComDefaultVO {
private Date todate;
//23.07.26 엑셀 다운로드 항목 추가
private String eduSlctCd; //교육구분
private String insttDivCd; //기관구분
private String eduMd; //교육매체
private String addr; // 주소
private String addrDetail; //상세주소
private String chrgNm; //담당자
private String jobNm; //담당자
private String clphone; //휴대폰
private String phone; //번호
private String email; //이메일
private String hopeSbjct; //희망주제
private String rqstCn; //교육 주제 관련 상세 요청사항 및 사전 질의
public Date getTodate() {
return todate;
@ -298,4 +313,102 @@ public class SchduleManageVO extends ComDefaultVO {
public void setTimeTxt(String timeTxt) {
this.timeTxt = timeTxt;
}
public String getEduSlctCd() {
return eduSlctCd;
}
public void setEduSlctCd(String eduSlctCd) {
this.eduSlctCd = eduSlctCd;
}
public String getInsttDivCd() {
return insttDivCd;
}
public void setInsttDivCd(String insttDivCd) {
this.insttDivCd = insttDivCd;
}
public String getEduMd() {
return eduMd;
}
public void setEduMd(String eduMd) {
this.eduMd = eduMd;
}
public String getAddr() {
return addr;
}
public void setAddr(String addr) {
this.addr = addr;
}
public String getAddrDetail() {
return addrDetail;
}
public void setAddrDetail(String addrDetail) {
this.addrDetail = addrDetail;
}
public String getChrgNm() {
return chrgNm;
}
public void setChrgNm(String chrgNm) {
this.chrgNm = chrgNm;
}
public String getJobNm() {
return jobNm;
}
public void setJobNm(String jobNm) {
this.jobNm = jobNm;
}
public String getClphone() {
return clphone;
}
public void setClphone(String clphone) {
this.clphone = clphone;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public String getHopeSbjct() {
return hopeSbjct;
}
public void setHopeSbjct(String hopeSbjct) {
this.hopeSbjct = hopeSbjct;
}
public String getRqstCn() {
return rqstCn;
}
public void setRqstCn(String rqstCn) {
this.rqstCn = rqstCn;
}
}

2
src/main/java/kcc/let/sym/ccm/cca/web/EgovCcmCmmnCodeManageController.java
View File

@ -307,7 +307,7 @@ public class EgovCcmCmmnCodeManageController {
@ModelAttribute("searchVO") CmmnDetailCodeVO searchVO,
ModelMap model, HttpServletResponse response) throws Exception {
ObjectMapper mapper = new ObjectMapper();
response.setHeader("Content-Type", "text/html;charset=utf-8");
//response.setHeader("Content-Type", "text/html;charset=utf-8");
PrintWriter out = new PrintWriter(new OutputStreamWriter(response.getOutputStream(), "UTF-8"));
//CmmnDetailCodeVO searchVO = new CmmnDetailCodeVO();

8
src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java
View File

@ -439,9 +439,9 @@ public class EgovMenuCreateManageController {
int usingOtherSiteCnt = menuCreateManageDAO.selectMenuCreatAuthCnt(menuCreatVO) ; //다른 사이트 아이디가 매뉴를 사용할시 매뉴 삭제안한다.
if(usingOtherSiteCnt == 1){
//if(usingOtherSiteCnt == 1){
menuManageService.deleteMenuManage(menuManageVO);
}
//}
/*LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
if(null == loginVO){
@ -452,9 +452,9 @@ public class EgovMenuCreateManageController {
menuCreateManageDAO.deleteMenuCreatAuthNo(menuCreatVO);
if(null != progrmManageVO.getProgrmFileNm() && !progrmManageVO.getProgrmFileNm().equals("dir")){ //프로그램만 지움
if(usingOtherSiteCnt == 1){ //다른 사이트 아이디가 매뉴를 사용할시 매뉴 삭제안한다.
//if(usingOtherSiteCnt == 1){ //다른 사이트 아이디가 매뉴를 사용할시 매뉴 삭제안한다.
progrmManageService.deleteProgrm(progrmManageVO);
}
//}
}
modelAndView.addObject("status", "success");
}catch (Exception e) {

26
src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java
View File

@ -14,6 +14,7 @@ import kcc.com.cmm.ComDefaultCodeVO;
import kcc.com.cmm.ComDefaultVO;
import kcc.com.cmm.service.CmmnDetailCode;
import kcc.com.cmm.service.EgovCmmUseService;
import kcc.kccadr.sch.service.SchduleManageVO;
import kcc.let.uat.uia.service.SsoLoginVO;
import kcc.let.uss.umt.service.UserManageVO;
import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEEduExcelVO;
@ -454,6 +455,31 @@ public class EgovCryptoUtil {
return p_VEEduSatisfactionExcelVO;
}
//SchduleManageVO
//- 복호화
public List<SchduleManageVO> decryptSchduleManageVOList(List<SchduleManageVO> p_schduleManageVOList){
for (int i=0;i<p_schduleManageVOList.size();i++) {
SchduleManageVO schduleManageVO = this.decryptSchduleManageVOInfo(p_schduleManageVOList.get(i));
p_schduleManageVOList.set(i, schduleManageVO);
}
return p_schduleManageVOList;
}
//VEEduAplctVO - 복호화
public SchduleManageVO decryptSchduleManageVOInfo(SchduleManageVO p_schduleManageVO){
if (!"".equals(p_schduleManageVO.getChrgNm())) p_schduleManageVO.setChrgNm(this.decrypt(p_schduleManageVO.getChrgNm()));
if (!"".equals(p_schduleManageVO.getClphone())) p_schduleManageVO.setClphone(this.decrypt(p_schduleManageVO.getClphone()));
if (!"".equals(p_schduleManageVO.getPhone())) p_schduleManageVO.setPhone(this.decrypt(p_schduleManageVO.getPhone()));
if (!"".equals(p_schduleManageVO.getEmail())) p_schduleManageVO.setEmail(this.decrypt(p_schduleManageVO.getEmail()));
return p_schduleManageVO;
}
//////////////////////////////////////////////////
//
// 1.common

35
src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAplctMng/web/EduAplctMngAdultController.java
View File

@ -492,6 +492,7 @@ public class EduAplctMngAdultController {
schduleManageVO.setSearchStartDt(schduleManageVO.getSearchStartDt().split("T")[0].replaceAll("-", ""));
List<SchduleManageVO> list= schduleManageService.selectSchManageStatusList(schduleManageVO);
list = egovCryptoUtil.decryptSchduleManageVOList(list);
List<Object> excelData = new ArrayList<>();
excelData.addAll(list);
@ -501,19 +502,49 @@ public class EduAplctMngAdultController {
4000
, 4000
, 4000
, 4000
, 4000
, 12000
, 4000
, 4000
, 4000
, 4000
, 6000
, 8000
, 12000
}; // 너비
String[] header = {
"교육일자"
, "교육구분"
, "기관(단체)명"
, "교육시간"
, "기관구분"
, "교육매체"
, "장소"
, "담당자"
, "직함"
, "휴대폰"
, "전화"
, "이메일"
, "희망주제"
, "교육 주제 관련 상세 요청사항"
};
//VO name과 일치 시킨다.
String[] order = {
"DateTxt"
, "EduSlctCd"
, "Title"
, "TimeTxt"
, "InsttDivCd"
, "EduMd"
, "AddrDetail"
, "ChrgNm"
, "JobNm"
, "Clphone"
, "Phone"
, "Email"
, "HopeSbjct"
, "RqstCn"
};
// 호출

1
src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java
View File

@ -486,6 +486,7 @@ public class EduAplctMngTngrController {
//사용자 교육신청 차시 리스트
VEEduChasiVO vEEduChasiVO = new VEEduChasiVO();
vEEduChasiVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd());
vEEduChasiVO.setInstrDiv(VeConstants.LCTR_DIV_CD_10);
List<VEEduChasiVO> vEEduChasiVOList = vVEEduChasiService.selectList(vEEduChasiVO);

32
src/main/resources/egovframework/sqlmap/kccadr/sch/SchduleManage_SQL_Mysql.xml
View File

@ -67,6 +67,17 @@
, to_char( TO_DATETIME(CONCAT(aa.edu_hope_dt, aa.strt_tm),'YYYYMMDDHH24MI'), 'HH24:MI:SS' ) AS timeTxt
, aa.url
, aa.allDay
, aa.eduSlctCd
, aa.insttDivCd
, aa.eduMd
, aa.addr + ' ' + aa.addrDetail AS addrDetail
, aa.chrgNm
, aa.jobNm
, aa.clphone
, aa.phone
, aa.email
, aa.hopeSbjct
, aa.rqstCn
FROM(
SELECT
@ -86,10 +97,24 @@
b.strt_tm,
b.end_tm,
'' url ,
0 allDay
0 allDay,
c.code_nm eduSlctCd,
d.code_nm insttDivCd,
a.EDU_MD eduMd,
a.ADDR addr,
a.ADDR_DETAIL addrDetail,
a.CHRG_NM chrgNm,
a.JOB_NM jobNm,
a.CLPHONE clphone,
a.PHONE phone,
a.EMAIL email,
a.HOPE_SBJCT hopeSbjct,
a.RQST_CN rqstCn
FROM ve_edu_aplct a
, ve_edu_chasi b
, lettccmmndetailcode c
, lettccmmndetailcode d
WHERE 1=1
AND IFNULL(A.USE_YN, 'Y') != 'N'
<isNotEmpty property="aprvlCd">
@ -106,7 +131,10 @@
<isNotEmpty property="searchStartDt">
AND SUBSTRING(b.edu_hope_dt,1,6) = SUBSTRING(DATE_FORMAT(DATE_ADD(TO_DATE(#searchStartDt#,'YYYYMMDD'), INTERVAL 7 day),'%Y%m%d'),1,6)
</isNotEmpty>
AND c.code_id = 'VE0007'
AND c.code = a.edu_slct_cd
AND d.code_id = 'VE0012'
AND d.code = a.instt_div_cd
)aa
ORDER BY START

10
src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Mysql.xml
View File

@ -211,13 +211,12 @@
A.MENU_NO > 0
]]>
<isEqual property="authorCode" compareValue="ROLE_ANONYMOUS">
AND (B.AUTHOR_CODE = #authorCode#
OR B.AUTHOR_CODE = 'ROLE_USER_MEMBER'
OR B.AUTHOR_CODE = 'ROLE_USER_MANAGER')
AND B.AUTHOR_CODE IN ('ROLE_ANONYMOUS', 'ROLE_USER_MEMBER', 'ROLE_USER_MANAGER')
GROUP BY A.MENU_NO
</isEqual>
<isNotEqual property="authorCode" compareValue="ROLE_ANONYMOUS">
AND B.AUTHOR_CODE = #authorCode#
AND B.AUTHOR_CODE IN ('ROLE_ADMIN', 'ROLE_ADR_ADMIN', 'ROLE_VISIT')
GROUP BY A.MENU_NO
</isNotEqual>
ORDER BY
A.UPPER_MENU_NO,
@ -235,8 +234,7 @@
<delete id="menuManageDAO.deleteMenuCreatAuthNo" parameterClass="menuCreatVO" >
DELETE FROM LETTNMENUCREATDTLS
WHERE AUTHOR_CODE=#authorCode#
AND MENU_NO= #menuNo#
WHERE MENU_NO= #menuNo#
</delete>
<select id="menuManageDAO.selectMenuListJtreeWeb" parameterClass="menuManageJTreeVO" resultClass="menuManageJTreeVO" cacheModel="cache-webMainMenu">

14
src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMenuManage_SQL_Mysql.xml
View File

@ -98,14 +98,12 @@
<isNotEmpty property="authorCode" > /* 매뉴사용여부 조회 */
<isEqual property="authorCode" compareValue="ROLE_ANONYMOUS">
AND (B.AUTHOR_CODE = #authorCode#
OR B.AUTHOR_CODE = 'ROLE_USER_MEMBER'
OR B.AUTHOR_CODE = 'ROLE_USER_MANAGER')
</isEqual>
<isNotEqual property="authorCode" compareValue="ROLE_ANONYMOUS">
AND B.AUTHOR_CODE = #authorCode#
</isNotEqual>
<isEqual property="authorCode" compareValue="ROLE_ANONYMOUS">
AND B.AUTHOR_CODE IN ('ROLE_ANONYMOUS', 'ROLE_USER_MEMBER', 'ROLE_USER_MANAGER')
</isEqual>
<isNotEqual property="authorCode" compareValue="ROLE_ANONYMOUS">
AND B.AUTHOR_CODE IN ('ROLE_ADMIN', 'ROLE_ADR_ADMIN', 'ROLE_VISIT')
</isNotEqual>
</isNotEmpty>
LIMIT 1
</select>

1
src/main/resources/egovframework/sqlmap/ve/edu/VEEduChasi_SQL_Cubrid.xml
View File

@ -20,7 +20,6 @@
LEFT OUTER JOIN VE_INSTR_DETAIL D
ON (B.USER_ID = D.USER_ID
AND D.USE_YN = 'Y'
AND D.instr_div = '10'
<isNotEmpty property="instrDiv">
AND D.instr_div = #instrDiv#

1
src/main/webapp/WEB-INF/jsp/cmm/sym/ccm/EgovCcmCmmnCodeTree.jsp
View File

@ -53,6 +53,7 @@ function jstreeInit() {
"data" : {
"url" : "<c:url value='/sym/ccm/ccc/EgovCcmCmmnCodeTreeInitAjax.do'/>",
"dataType" : "json",
"error": function (jqXHR, textStatus, errorThrown) {$('#kopost_organization').html(textStatus + "//" + errorThrown); },
"data" : function (node) {
return {'id' : node.id }
}

2
src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngList.jsp
View File

@ -79,7 +79,7 @@
<input type="hidden" name="searchSortCnd" value="<c:out value="${vEEduAplctVO.searchSortCnd}" />" />
<input type="hidden" name="searchSortOrd" value="<c:out value="${vEEduAplctVO.searchSortOrd}" />" />
<input type="hidden" name="orderByQuery" id="orderByQuery" value="<c:out value="${vEEduAplctVO.orderByQuery}" />" />
<!-- <input type="hidden" name="eduAplctOrd" id="eduAplctOrd" value="" /> -->
<input type="hidden" name="eduAplctOrd" id="eduAplctOrd" value="" />
<div class="cont_wrap">
<div class="box">

5
src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp
View File

@ -204,7 +204,10 @@
<th scope="row"><p>희망주제</p></th>
<td><c:out value='${info.hopeSbjct}'/></td>
</tr>
<tr>
<th scope="row"><p style="font-size:14px;">교육 주제 관련 상세 요청사항<br/>및 사전 질의</p></th>
<td><p><c:out value='${fn:replace(info.rqstCn, replaceChar, "<br/>")}' escapeXml="false" /></p></td>
</tr>
</tbody>

22
src/main/webapp/WEB-INF/jsp/oprtn/cmm/SchduleManagerPopDetailAdult.jsp
View File

@ -134,12 +134,22 @@
<td>
<kc:code codeId="VE0012" code="${info.insttDivCd}"/>
</td>
<th scope="row">
<p>교육매체</p>
</th>
<td>
<c:out value="${info.eduMd}"/>
</td>
<c:if test="${info.eduSlctCd eq '10'}">
<th scope="row">
<p>교육매체</p>
</th>
<td>
<c:out value="${info.eduMd}"/>
</td>
</c:if>
<c:if test="${info.eduSlctCd eq '20'}">
<th scope="row">
<p>주소</p>
</th>
<td>
<c:out value="${info.addr}"/> <c:out value="${info.addrDetail}"/>
</td>
</c:if>
</tr>
<!--
<tr>

1
src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuCreatSelectJtree.jsp
View File

@ -48,6 +48,7 @@ function jstreeInit() {
"data" : {
"url" : "<c:url value='/sym/mnu/mcm/EgovMenuCreatSelectJtreeAjax.do'/>",
"dataType" : "json",
"error": function (jqXHR, textStatus, errorThrown) {$('#kopost_organization').html(textStatus + "//" + errorThrown); },
"data" : function (node) {
return {'id' : node.id, 'authorCode' : $('#authorCode').val() };
}