diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Postgresql.xml index 95aa09bb..02374842 100644 --- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Postgresql.xml @@ -1101,25 +1101,35 @@ WHEN vid.POST IS NOT NULL THEN '(' || vid.POST || ')' ELSE '' END || vid.ADDR || ' ' || vid.ADDR_DETAIL AS addr /* 주소 */ - , aaa.yNowEduCnt - , aaa.yNowMoneEduCnt - , aaa.yNowMtwoEduCnt - , aaa.yNowMthreeEduCnt - , aaa.yNowMfourEduCnt - , ddd.yNowStsfc - , ddd.yNowMoneStsfc - , ddd.yNowMtwoStsfc - , ddd.yNowMthreeStsfc - , ddd.yNowMfourStsfc + , aaa."yNowEduCnt" + , aaa."yNowMoneEduCnt" + , aaa."yNowMtwoEduCnt" + , aaa."yNowMthreeEduCnt" + , aaa."yNowMfourEduCnt" + , ddd."yNowStsfc" + , ddd."yNowMoneStsfc" + , ddd."yNowMtwoStsfc" + , ddd."yNowMthreeStsfc" + , ddd."yNowMfourStsfc" FROM ve_instr_detail vid - LEFT JOIN ( + LEFT JOIN ( SELECT aa.cc + + , SUM(CASE WHEN aa.bb = EXTRACT(YEAR FROM CURRENT_DATE)::text THEN aa.aa ELSE 0 END) AS "yNowEduCnt" + , SUM(CASE WHEN aa.bb = (EXTRACT(YEAR FROM CURRENT_DATE) - 1)::text THEN aa.aa ELSE 0 END) AS "yNowMoneEduCnt" + , SUM(CASE WHEN aa.bb = (EXTRACT(YEAR FROM CURRENT_DATE) - 2)::text THEN aa.aa ELSE 0 END) AS "yNowMtwoEduCnt" + , SUM(CASE WHEN aa.bb = (EXTRACT(YEAR FROM CURRENT_DATE) - 3)::text THEN aa.aa ELSE 0 END) AS "yNowMthreeEduCnt" + , SUM(CASE WHEN aa.bb = (EXTRACT(YEAR FROM CURRENT_DATE) - 4)::text THEN aa.aa ELSE 0 END) AS "yNowMfourEduCnt" + + /* , sum(decode(aa.bb,to_char(NOW(),'YYYY'),aa.aa,0)) AS yNowEduCnt , sum(decode(aa.bb,to_char(NOW(),'YYYY')-1,aa.aa,0)) AS yNowMoneEduCnt , sum(decode(aa.bb,to_char(NOW(),'YYYY')-2,aa.aa,0)) AS yNowMtwoEduCnt , sum(decode(aa.bb,to_char(NOW(),'YYYY')-3,aa.aa,0)) AS yNowMthreeEduCnt , sum(decode(aa.bb,to_char(NOW(),'YYYY')-4,aa.aa,0)) AS yNowMfourEduCnt + */ + FROM ( SELECT COUNT(EC.edu_chasi_ord) AS AA @@ -1145,14 +1155,56 @@ LEFT JOIN ( SELECT COUNT(*) - , ccc.userId + , ccc."userId" + + , ROUND(SUM(CASE WHEN ccc.eduHopeDt = EXTRACT(YEAR FROM CURRENT_DATE)::text THEN ccc.ave ELSE 0 END)::numeric / COUNT(*), 1) AS "yNowStsfc" + , ROUND(SUM(CASE WHEN ccc.eduHopeDt = (EXTRACT(YEAR FROM CURRENT_DATE) - 1)::text THEN ccc.ave ELSE 0 END)::numeric / COUNT(*), 1) AS "yNowMoneStsfc" + , ROUND(SUM(CASE WHEN ccc.eduHopeDt = (EXTRACT(YEAR FROM CURRENT_DATE) - 2)::text THEN ccc.ave ELSE 0 END)::numeric / COUNT(*), 1) AS "yNowMtwoStsfc" + , ROUND(SUM(CASE WHEN ccc.eduHopeDt = (EXTRACT(YEAR FROM CURRENT_DATE) - 3)::text THEN ccc.ave ELSE 0 END)::numeric / COUNT(*), 1) AS "yNowMthreeStsfc" + , ROUND(SUM(CASE WHEN ccc.eduHopeDt = (EXTRACT(YEAR FROM CURRENT_DATE) - 4)::text THEN ccc.ave ELSE 0 END)::numeric / COUNT(*), 1) AS "yNowMfourStsfc" + + + /* , TRUNC(sum(decode(ccc.eduHopeDt, to_char(NOW(), 'YYYY'), ccc.ave, 0))/ COUNT(*), 1) AS yNowStsfc , TRUNC(sum(decode(ccc.eduHopeDt,to_char(NOW(),'YYYY')-1,ccc.ave,0))/COUNT(*), 1) AS yNowMoneStsfc , TRUNC(sum(decode(ccc.eduHopeDt,to_char(NOW(),'YYYY')-2,ccc.ave,0))/COUNT(*), 1) AS yNowMtwoStsfc , TRUNC(sum(decode(ccc.eduHopeDt,to_char(NOW(),'YYYY')-3,ccc.ave,0))/COUNT(*), 1) AS yNowMthreeStsfc , TRUNC(sum(decode(ccc.eduHopeDt,to_char(NOW(),'YYYY')-4,ccc.ave,0))/COUNT(*), 1) AS yNowMfourStsfc + */ FROM ( + + SELECT + COUNT(*) AS cnt, + ECI.USER_ID AS "userId", + SUBSTRING(CA.EDU_HOPE_DT FROM 1 FOR 4) AS eduHopeDt, + ( + /* + SUM(aa.VERY_SATISFIED) * 100 + + SUM(aa.SATISFIED) * 80 + + SUM(aa.NEITHER) * 60 + + SUM(aa.DISSATISFIED) * 40 + + SUM(aa.VERY_DISSATISFIED) * 20 + */ + + SUM(CAST(aa.VERY_SATISFIED AS integer)) * 100 + + SUM(CAST(aa.SATISFIED AS integer)) * 80 + + SUM(CAST(aa.NEITHER AS integer)) * 60 + + SUM(CAST(aa.DISSATISFIED AS integer)) * 40 + + SUM(CAST(aa.VERY_DISSATISFIED AS integer)) * 20 + + )::float / + NULLIF(SUM( + + CAST(aa.VERY_SATISFIED AS integer) + CAST(aa.SATISFIED AS integer) + CAST(aa.NEITHER AS integer) + CAST(aa.DISSATISFIED AS integer) + CAST(aa.VERY_DISSATISFIED AS integer) + + /* + aa.VERY_SATISFIED + aa.SATISFIED + aa.NEITHER + aa.DISSATISFIED + aa.VERY_DISSATISFIED + */ + ), 0) AS ave + FROM lettnqestnrrsltDetail aa + + /* SELECT count(*) , aa.EDU_CHASI_ORD @@ -1163,6 +1215,7 @@ / (SUM(aa.VERY_SATISFIED) + SUM(aa.SATISFIED) + SUM(aa.NEITHER) + SUM(aa.DISSATISFIED) + SUM(aa.VERY_DISSATISFIED)) AS ave from lettnqestnrrsltDetail aa + */ JOIN ve_edu_chasi_instr_asgnm ECI ON aa.EDU_CHASI_ORD =ECI.EDU_CHASI_ORD @@ -1175,11 +1228,11 @@ ECI.USER_ID , aa.EDU_CHASI_ORD , aa.EDU_APLCT_ORD - , SUBSTRING(CA.EDU_HOPE_DT, 0, 4) + , SUBSTRING(CA.EDU_HOPE_DT from 1 for 4) ) ccc - GROUP BY ccc.userId + GROUP BY ccc."userId" ) ddd - ON ddd.userId = vid.USER_ID + ON ddd."userId" = vid.USER_ID WHERE vid.USE_YN ='Y' and vid.INSTR_DIV =#instrDiv# AND vid.USER_ID IN diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp index 6cb3cf5b..c7271367 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngList.jsp @@ -333,7 +333,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/trgtDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/trgtDetail.jsp index 5bad007b..9074b8c9 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/trgtDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/trgtDetail.jsp @@ -352,7 +352,7 @@ - +

하위 병합 대상자

@@ -451,7 +451,7 @@
- +

상위 중복자

@@ -551,7 +551,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgtEdu/instrMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgtEdu/instrMngList.jsp index 1e2b6716..a67dadaf 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgtEdu/instrMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgtEdu/instrMngList.jsp @@ -333,7 +333,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp index 180af3cf..00ff62df 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp @@ -352,7 +352,7 @@ - +

하위 병합 대상자

@@ -451,7 +451,7 @@
- +

상위 중복자

@@ -551,7 +551,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/preventEdu/instrMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/preventEdu/instrMngList.jsp index 56ee6c5a..2a84d550 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/preventEdu/instrMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/preventEdu/instrMngList.jsp @@ -333,7 +333,7 @@
- +