DBNT
/
geoinfo_eGov_work
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

집합교육 버그 수정

main
thkim 2024-10-25 08:56:06 +09:00
parent a6a37290f2
commit b639e65807
5 changed files with 60 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
list.txt
View File

@ -25,3 +25,4 @@ src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Bold.woff
src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Bold.otf
src\main\resources\egovframework\sqlmap\mapper\main\Login_SQL.xml
src\main\resources\egovframework\spring\context-mybatis.xml
src\main\webapp\WEB-INF\views\home\main.jsp

9
src/main/java/geoinfo/main/main/MainController.java
View File

@ -10,6 +10,7 @@ import java.text.MessageFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@ -162,6 +163,14 @@ public class MainController
RedirectAttributes rda) throws Exception
{
ModelAndView mv = new ModelAndView();
Enumeration<String> enumeration = request.getSession().getAttributeNames();
while (enumeration.hasMoreElements()) {
String attributeName = enumeration.nextElement();
System.out.println(attributeName);
}
if (request.getSession().getAttribute("USERID") == null)
{
// login 아래 btn 설정 html

51
src/main/java/geoinfo/training/home/service/impl/HomeTrainingServiceImpl.java
View File

@ -4,6 +4,7 @@ import java.math.BigDecimal;
import java.sql.SQLException;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
@ -37,6 +38,14 @@ public class HomeTrainingServiceImpl implements HomeTrainingService {
}
Enumeration<String> enumeration = request.getSession().getAttributeNames();
while (enumeration.hasMoreElements()) {
String attributeName = enumeration.nextElement();
System.out.println(attributeName);
}
String userId = (String)request.getSession().getAttribute("USERID");
params.put("userId", userId);
@ -55,9 +64,6 @@ public class HomeTrainingServiceImpl implements HomeTrainingService {
List<EgovMap> dto = new ArrayList<EgovMap>();
for( EgovMap item : list ) {
TIMESTAMP oracleTimestamp = (TIMESTAMP) item.get("crtDt");
item.put("crtDt", new Timestamp(oracleTimestamp.timestampValue().getTime())); // oracle.sql.TIMESTAMP -> java.sql.Timestamp 변환
//신청 여부를 판단하여 stateCode를 T로 변환한다. A:신청중,D:삭제,C:취소,T:참석
webHomeTrainingReqCountParams.put("whtRegId", item.get("whtRegId"));
@ -67,9 +73,26 @@ public class HomeTrainingServiceImpl implements HomeTrainingService {
item.put("stateCode", "T");
}
if( item.get("crtDt") != null ) {
TIMESTAMP oracleTimestampCrtDt = (TIMESTAMP) item.get("crtDt");
item.put("crtDt", new Timestamp(oracleTimestampCrtDt.timestampValue().getTime())); // oracle.sql.TIMESTAMP -> java.sql.Timestamp 변환
}
if( item.get("modDt") != null ) {
TIMESTAMP oracleTimestampModDt = (TIMESTAMP) item.get("modDt");
item.put("modDt", new Timestamp(oracleTimestampModDt.timestampValue().getTime()));
}
List<EgovMap> webHomeTrainingReqlist = homeTrainingMapper.getWebHomeTrainingReqByWhtRegIdAndUserId(webHomeTrainingReqCountParams);
for( EgovMap webHomeTrainingReqItem : webHomeTrainingReqlist ) {
if( webHomeTrainingReqItem.get("crtDt") != null ) {
TIMESTAMP oracleTimestampCrtDt = (TIMESTAMP) webHomeTrainingReqItem.get("crtDt");
item.put("registryCrtDt", new Timestamp(oracleTimestampCrtDt.timestampValue().getTime()));
}
if( webHomeTrainingReqItem.get("modDt") != null ) {
TIMESTAMP oracleTimestampModDt = (TIMESTAMP) webHomeTrainingReqItem.get("modDt");
item.put("registryModDt", new Timestamp(oracleTimestampModDt.timestampValue().getTime()));
}
TIMESTAMP oracleTs = (TIMESTAMP) webHomeTrainingReqItem.get("crtDt");
item.put("registryCrtDt", new Timestamp(oracleTs.timestampValue().getTime()));
item.put("registryReqPosition", webHomeTrainingReqItem.get("reqPosition"));
@ -185,10 +208,15 @@ public class HomeTrainingServiceImpl implements HomeTrainingService {
throw new Exception( "신청한 교육이 존재하지 않습니다." );
}
for( EgovMap item : list ) {
TIMESTAMP oracleTimestamp = (TIMESTAMP) item.get("crtDt");
item.put("crtDt", new Timestamp(oracleTimestamp.timestampValue().getTime())); // oracle.sql.TIMESTAMP -> java.sql.Timestamp 변환
if( item.get("crtDt") != null ) {
TIMESTAMP oracleTimestampCrtDt = (TIMESTAMP) item.get("crtDt");
item.put("crtDt", new Timestamp(oracleTimestampCrtDt.timestampValue().getTime())); // oracle.sql.TIMESTAMP -> java.sql.Timestamp 변환
}
if( item.get("modDt") != null ) {
TIMESTAMP oracleTimestampModDt = (TIMESTAMP) item.get("modDt");
item.put("modDt", new Timestamp(oracleTimestampModDt.timestampValue().getTime()));
}
whtId = Long.valueOf( ((BigDecimal)item.get("whtId")).longValue() );
}
@ -220,9 +248,14 @@ public class HomeTrainingServiceImpl implements HomeTrainingService {
throw new Exception( "취소할 교육이 존재하지 않습니다." );
}
for( EgovMap item : list ) {
TIMESTAMP oracleTimestamp = (TIMESTAMP) item.get("crtDt");
item.put("crtDt", new Timestamp(oracleTimestamp.timestampValue().getTime())); // oracle.sql.TIMESTAMP -> java.sql.Timestamp 변환
if( item.get("crtDt") != null ) {
TIMESTAMP oracleTimestampCrtDt = (TIMESTAMP) item.get("crtDt");
item.put("crtDt", new Timestamp(oracleTimestampCrtDt.timestampValue().getTime())); // oracle.sql.TIMESTAMP -> java.sql.Timestamp 변환
}
if( item.get("modDt") != null ) {
TIMESTAMP oracleTimestampModDt = (TIMESTAMP) item.get("modDt");
item.put("modDt", new Timestamp(oracleTimestampModDt.timestampValue().getTime()));
}
whtId = Long.valueOf( ((BigDecimal)item.get("whtId")).longValue() );

2
src/main/webapp/WEB-INF/views/home/main.jsp
View File

@ -441,7 +441,7 @@
</script>
<!-- 마이페이지 > 비밀번호 수정 끝 -->
</c:if>
<c:if test="${eGovUrl == 'loginCount_reset.do' && userid == 'admin_user' || userid == 'jisong14'}">
<c:if test="${eGovUrl == 'loginCount_reset.do' && userid == 'admin_user'}">
<!-- 마이페이지 > 비밀번호 초기화 시작 -->
<h1 class="page-title">
<span class="page-title-text">비밀번호 초기화</span>

6
src/main/webapp/WEB-INF/views/homeEducationApplication/inquiry/homeEducationApplicationInquiry.jsp
View File

@ -106,6 +106,9 @@
} else if( item.stateCode === 'T' ) {
// 이미 신청이 완료된 교육
return '<a href="#request-button" class="approved-button open-popup-link" data-seq="' + item.whtRegId + '" data-mode="modification" onClick="onClickOpenPopupLink(this)" data-registry-crt-dt="' + item.registryCrtDt + '" data-registry-req-position="' + item.registryReqPosition + '">수정</a>';
} else if( item.stateCode === 'D' ) {
// 삭제된 교육
return '<button type="button" class="deadline-button" disabled="disabled" data-seq="' + item.whtRegId + '">불가</button>';
}
}
@ -124,6 +127,9 @@
let homeVisitListHTML = '';
for( idx in data ) {
if( data[idx].stateCode === 'D' ) {
continue;
}
homeVisitListHTML +=
`
<tr>