diff --git a/src/main/java/kcc/let/uss/olp/qmc/web/EgovQustnrManageController.java b/src/main/java/kcc/let/uss/olp/qmc/web/EgovQustnrManageController.java
index 3e524075..cdca17ad 100644
--- a/src/main/java/kcc/let/uss/olp/qmc/web/EgovQustnrManageController.java
+++ b/src/main/java/kcc/let/uss/olp/qmc/web/EgovQustnrManageController.java
@@ -165,61 +165,69 @@ public class EgovQustnrManageController {
, RedirectAttributes redirectAttributes
, ModelMap model , HttpSession session) throws Exception {
- String sCmd = commandMap.get("cmd") == null ? "" : (String) commandMap.get("cmd");
- if (sCmd.equals("del")) {
- egovQustnrManageService.deleteQustnrManage(qustnrManageVO);
- redirectAttributes.addFlashAttribute("message", egovMessageSource.getMessage("success.common.delete"));
- RedirectUrlMaker redirectUrlMaker = new RedirectUrlMaker("/uss/olp/qmc/EgovQustnrManageList.do");
- return redirectUrlMaker.getRedirectUrl();
- }
+ try {
+ String sCmd = commandMap.get("cmd") == null ? "" : (String) commandMap.get("cmd");
+ if (sCmd.equals("del")) {
+ egovQustnrManageService.deleteQustnrManage(qustnrManageVO);
+ redirectAttributes.addFlashAttribute("message", egovMessageSource.getMessage("success.common.delete"));
+ RedirectUrlMaker redirectUrlMaker = new RedirectUrlMaker("/uss/olp/qmc/EgovQustnrManageList.do");
+ return redirectUrlMaker.getRedirectUrl();
+ }
- if(searchVO.getPageUnit() != 10) {
- searchVO.setPageUnit(searchVO.getPageUnit());
+ if(searchVO.getPageUnit() != 10) {
+ searchVO.setPageUnit(searchVO.getPageUnit());
+ }
+
+ /** pageing */
+ PaginationInfo paginationInfo = new PaginationInfo();
+ paginationInfo.setCurrentPageNo(searchVO.getPageIndex());
+ paginationInfo.setRecordCountPerPage(searchVO.getPageUnit());
+ paginationInfo.setPageSize(searchVO.getPageSize());
+
+ searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
+ searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
+ searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+
+ LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
+ if(null != loginVO && !"super".equals(loginVO.getSiteId())){ //리스트, 수정, 입력
+ searchVO.setSiteId(loginVO.getSiteId());
+ }
+
+ if("".equals(searchVO.getSearchSortCnd())){ //최초조회시 최신것 조회List
+ searchVO.setSearchSortCnd("qestnrId");
+ searchVO.setSearchSortOrd("desc");
+ }
+
+
+ List resultList = egovQustnrManageService.selectQustnrManageList(searchVO) ;
+
+ //System.out.println(((EgovMap)resultList.get(0)).get("totcnt"));
+
+ paginationInfo.setTotalRecordCount( resultList.size()> 0 ? ((int)((EgovMap)resultList.get(0)).get("totcnt")) : 0);
+ model.addAttribute("resultList", resultList);
+ model.addAttribute("paginationInfo", paginationInfo);
+
+ model.addAttribute("searchKeyword", commandMap.get("searchKeyword") == null ? "" : (String) commandMap.get("searchKeyword"));
+ model.addAttribute("searchCondition", commandMap.get("searchCondition") == null ? "" : (String) commandMap.get("searchCondition"));
+
+ ComDefaultCodeVO vo = new ComDefaultCodeVO();
+
+ vo.setCodeId("COM035"); //설문진행상태
+ List qustnrManageSttusList = cmmUseService.selectCmmCodeDetail(vo);
+ model.addAttribute("qustnrManageSttusList", qustnrManageSttusList);
+
+ /*설문참여권한 조회*/
+ AuthorManageVO authorManageVO = new AuthorManageVO();
+ authorManageVO.setFirstIndex(0);
+ authorManageVO.setLastIndex(10);
+ authorManageVO.setRecordCountPerPage(10);
+ authorManageVO.setAuthorManageList(egovAuthorManageService.selectAuthorList(authorManageVO));
+ model.addAttribute("qestnrTrgetList", authorManageVO.getAuthorManageList());
+
+ }catch(Exception ex) {
+ ex.printStackTrace();
}
- /** pageing */
- PaginationInfo paginationInfo = new PaginationInfo();
- paginationInfo.setCurrentPageNo(searchVO.getPageIndex());
- paginationInfo.setRecordCountPerPage(searchVO.getPageUnit());
- paginationInfo.setPageSize(searchVO.getPageSize());
-
- searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
- searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
- searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
-
- LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
- if(null != loginVO && !"super".equals(loginVO.getSiteId())){ //리스트, 수정, 입력
- searchVO.setSiteId(loginVO.getSiteId());
- }
-
- if("".equals(searchVO.getSearchSortCnd())){ //최초조회시 최신것 조회List
- searchVO.setSearchSortCnd("qestnrId");
- searchVO.setSearchSortOrd("desc");
- }
-
-
- List resultList = egovQustnrManageService.selectQustnrManageList(searchVO) ;
-
- paginationInfo.setTotalRecordCount( resultList.size()> 0 ? ((int)((EgovMap)resultList.get(0)).get("totcnt")) : 0);
- model.addAttribute("resultList", resultList);
- model.addAttribute("paginationInfo", paginationInfo);
-
- model.addAttribute("searchKeyword", commandMap.get("searchKeyword") == null ? "" : (String) commandMap.get("searchKeyword"));
- model.addAttribute("searchCondition", commandMap.get("searchCondition") == null ? "" : (String) commandMap.get("searchCondition"));
-
- ComDefaultCodeVO vo = new ComDefaultCodeVO();
-
- vo.setCodeId("COM035"); //설문진행상태
- List qustnrManageSttusList = cmmUseService.selectCmmCodeDetail(vo);
- model.addAttribute("qustnrManageSttusList", qustnrManageSttusList);
-
- /*설문참여권한 조회*/
- AuthorManageVO authorManageVO = new AuthorManageVO();
- authorManageVO.setFirstIndex(0);
- authorManageVO.setLastIndex(10);
- authorManageVO.setRecordCountPerPage(10);
- authorManageVO.setAuthorManageList(egovAuthorManageService.selectAuthorList(authorManageVO));
- model.addAttribute("qestnrTrgetList", authorManageVO.getAuthorManageList());
return "/uss/olp/qmc/EgovQustnrManageList";
}
diff --git a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java
index f6baf362..b457f388 100644
--- a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java
+++ b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java
@@ -585,6 +585,8 @@ public class EduEndTngrController {
qustnrRespondManageVO.setQestnrRespondent(qustnrRespondInfoVO.getQestnrRespondent());
qustnrRespondManageVO.setFrstRegisterId(loginVO.getId());
qustnrRespondManageVO.setLastUpdusrId(loginVO.getId());
+ //qustnrRespondManageVO.setQestnrTmplatId(qestnrTmplatId);
+
egovQustnrRespondManageService.insertQustnrRespondManage(qustnrRespondManageVO);
// 설문 문항 결과 등록
for(int i=0; i < qustnrRespondInfoVO.getResultList().size(); i++) {
diff --git a/src/main/resources/egovframework/sqlmap/let/uss/olp/qmc/EgovQustnrManage_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/uss/olp/qmc/EgovQustnrManage_SQL_Tibero.xml
index 1809ce83..4ed0e21e 100644
--- a/src/main/resources/egovframework/sqlmap/let/uss/olp/qmc/EgovQustnrManage_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/let/uss/olp/qmc/EgovQustnrManage_SQL_Tibero.xml
@@ -79,8 +79,8 @@
, a.qustnr_sj qestnrSj
, a.qustnr_purps qestnrPurps
, a.qustnr_writng_guidance_cn qestnrwritngguidancecn
- , date_format(a.qustnr_bgnde,'%y-%m-%d') qestnrBeginDe
- , date_format(a.qustnr_endde,'%y-%m-%d') qestnrEndDe
+ , a.qustnr_bgnde qestnrBeginDe
+ , a.qustnr_endde qestnrEndDe
, a.qustnr_trget qestnrtrget
, a.qustnr_tmplat_id qestnrtmplatid
, a.frst_regist_pnttm frstregisterpnttm
@@ -94,7 +94,7 @@
, ( select count(*) from lettnqustnrqesitm where qestnr_id = a.qestnr_id ) qustnrQesitmCnt
, ( select count(*) from lettnqustnrrespondinfo where qestnr_id = a.qestnr_id ) rrspnsResultCnt
, case
- when date_format(a.qustnr_endde,'%y%m%d') < date_format(now(), '%y%m%d') then '2' /* 종료 */
+ when a.qustnr_endde < TO_CHAR(SYSDATE, 'YYYYMMDD') then '2' /* 종료 */
else a.sttus
end as sttus
, (select qustnr_tmplat_path_nm from lettnqustnrtmplat where qustnr_tmplat_id = a.qustnr_tmplat_id ) template_url
@@ -115,7 +115,7 @@
- ORDER BY 1=1
+ ORDER BY 1
,$searchSortCnd$
@@ -123,7 +123,11 @@
$searchSortOrd$
- LIMIT #recordCountPerPage# OFFSET #firstIndex#
+
+ /*
+ LIMIT recordCountPerPage OFFSET firstIndex
+ */
+ OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY;
diff --git a/src/main/resources/egovframework/sqlmap/let/uss/olp/qrm/EgovQustnrRespondManage_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/uss/olp/qrm/EgovQustnrRespondManage_SQL_Tibero.xml
index e7f16503..6a94b06f 100644
--- a/src/main/resources/egovframework/sqlmap/let/uss/olp/qrm/EgovQustnrRespondManage_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/let/uss/olp/qrm/EgovQustnrRespondManage_SQL_Tibero.xml
@@ -77,7 +77,10 @@
@@ -122,9 +125,9 @@
, #eduChasiOrd#
, #qestnrParticipant#
, #qestnrRespondent#
- , NOW()
+ , SYSDATE
, #frstRegisterId#
- , NOW()
+ , SYSDATE
, #lastUpdusrId#
)
]]>
diff --git a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Tibero.xml
index 585300da..e9c0b16f 100644
--- a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Tibero.xml
@@ -929,13 +929,17 @@
diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
index 41c1f254..66752bb9 100644
--- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
@@ -2504,8 +2504,11 @@