diff --git a/src/main/resources/egovframework/sqlmap/let/uss/olp/qmc/EgovQustnrManage_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/let/uss/olp/qmc/EgovQustnrManage_SQL_Postgresql.xml index 8a72315e..7795359e 100644 --- a/src/main/resources/egovframework/sqlmap/let/uss/olp/qmc/EgovQustnrManage_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/let/uss/olp/qmc/EgovQustnrManage_SQL_Postgresql.xml @@ -272,6 +272,7 @@ LAST_UPDT_PNTTM, LAST_UPDUSR_ID, ATCH_FILE_ID + , SITE_ID_CD )VALUES( #qestnrId#, #qestnrSj#, @@ -288,6 +289,7 @@ NOW(), #lastUpdusrId#, #atchFileId# + , '10' ) diff --git a/src/main/resources/egovframework/sqlmap/ve/qustnr/VEALettnQestnrMIX_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/qustnr/VEALettnQestnrMIX_SQL_Postgresql.xml index 705c3eb1..03381c6c 100644 --- a/src/main/resources/egovframework/sqlmap/ve/qustnr/VEALettnQestnrMIX_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/ve/qustnr/VEALettnQestnrMIX_SQL_Postgresql.xml @@ -204,11 +204,11 @@ b.QUSTNR_QESITM_ID AS qestnrQesitmId , c.QUSTNR_RSLT_ID AS qustnrRsltId - , NVL(c.VERY_SATISFIED, cVERY_SATISFIED) AS verySatisfied - , NVL(c.SATISFIED, cSATISFIED) AS satisfied - , NVL(c.NEITHER, cNEITHER) AS neither - , NVL(c.DISSATISFIED, cDISSATISFIED) AS dissatisfied - , NVL(c.VERY_DISSATISFIED, cVERY_DISSATISFIED) AS veryDissatisfied + , COALESCE(c.VERY_SATISFIED::numeric, cVERY_SATISFIED) AS verySatisfied + , COALESCE(c.SATISFIED::numeric, cSATISFIED) AS satisfied + , COALESCE(c.NEITHER::numeric, cNEITHER) AS neither + , COALESCE(c.DISSATISFIED::numeric, cDISSATISFIED) AS dissatisfied + , COALESCE(c.VERY_DISSATISFIED::numeric, cVERY_DISSATISFIED) AS veryDissatisfied , c.ANSWER AS answer , c.QUSTNR_IEM_ID AS qustnrIemId @@ -304,11 +304,11 @@ , c.EDU_APLCT_ORD , c.EDU_CHASI_ORD - , sum(c.very_satisfied) AS cvery_satisfied - , sum(c.satisfied) AS csatisfied - , sum(c.neither) AS cneither - , sum(c.dissatisfied) AS cdissatisfied - , sum(c.very_dissatisfied) AS cvery_dissatisfied + , sum(c.very_satisfied::numeric) AS cvery_satisfied + , sum(c.satisfied::numeric) AS csatisfied + , sum(c.neither::numeric) AS cneither + , sum(c.dissatisfied::numeric) AS cdissatisfied + , sum(c.very_dissatisfied::numeric) AS cvery_dissatisfied FROM LETTNQESTNRRSLTEADetail c GROUP BY @@ -330,7 +330,7 @@ ) WHERE a.site_id=#siteId# - AND a.SITE_ID_CD =#siteIdCd# + AND COALESCE(a.SITE_ID_CD,'10') =#siteIdCd# AND b.QUSTNR_TMPLAT_ID =a.QUSTNR_TMPLAT_ID AND b.QESTNR_ID =a.QESTNR_ID @@ -346,11 +346,11 @@ , a.qustnr_birth AS qustnrBirth , count(*) AS rrspnsResultCnt - , ROUND(SUM(a.VERY_SATISFIED * 100 - + a.SATISFIED * 80 - + a.NEITHER * 60 - + a.dissatisfied * 40 - + a.very_dissatisfied * 20) + , ROUND(SUM(a.VERY_SATISFIED::numeric * 100 + + a.SATISFIED::numeric * 80 + + a.NEITHER::numeric * 60 + + a.dissatisfied::numeric * 40 + + a.very_dissatisfied::numeric * 20) / count(*),1) AS qustnrScore diff --git a/src/main/webapp/WEB-INF/jsp/uss/olp/qmc/EgovQustnrManageRegist.jsp b/src/main/webapp/WEB-INF/jsp/uss/olp/qmc/EgovQustnrManageRegist.jsp index f6df3c77..6377005d 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/olp/qmc/EgovQustnrManageRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/olp/qmc/EgovQustnrManageRegist.jsp @@ -202,6 +202,7 @@ function delete_item(obj, fileIdx){ +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/main.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/main.jsp index fd56bd33..03c7a160 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/main.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/main.jsp @@ -249,12 +249,13 @@ <%-- --%> +<%-- --%> - + - + 대상설문없음 - - - - - - - + + - - - 교육완료 + + + - - + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/main.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/main.jsp index e061dcec..6d6b4ae4 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/main.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/main.jsp @@ -184,7 +184,7 @@ -<%-- --%> + @@ -192,7 +192,7 @@ 교육일자 신청결과 설문조사 - + 이수증 @@ -246,14 +246,17 @@ <%-- --%> <%-- --%> - + + - +<%-- --%> + + - + - + 대상설문없음 - - - - - - - + + - - - 교육완료 + + + - - --> diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp index 2d9d4231..362861ca 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp @@ -295,12 +295,13 @@ - - +<%-- --%> + + - + - + 대상설문없음 - - - - - - - - + + + - - 교육완료 - -