diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEEduSatisfactionExcelVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEEduSatisfactionExcelVO.java index db74d287..d08c0b5a 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEEduSatisfactionExcelVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEEduSatisfactionExcelVO.java @@ -33,6 +33,8 @@ public class VEEduSatisfactionExcelVO { private String disSatisfied; //정렬순서 private String veryDisSatisfied; //정렬순서 + private String qustnrCn; + public String getEduHopeDt() { return eduHopeDt; @@ -225,5 +227,13 @@ public class VEEduSatisfactionExcelVO { public void setInsttNm(String insttNm) { this.insttNm = insttNm; } + + public String getQustnrCn() { + return qustnrCn; + } + + public void setQustnrCn(String qustnrCn) { + this.qustnrCn = qustnrCn; + } } diff --git a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java index 115a4258..5ab4edcb 100644 --- a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java +++ b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java @@ -912,18 +912,21 @@ public class EduRsltMngAdultController { String title = "성인 찾아가는 저작권 교육 강사만족도"; int[] width = { 4000, 4000, 4000, 4000, 4000 - , 4000, 4000, 4000, 4000, 4000 + , 4000, 4000, 4000, 4000, 4000 + , 4000 }; // 너비 //33개 항목 String[] header = { "교육일자", "기관(단체)명", "강사명", "순번", "질문" , "매우만족", "만족", "보통", "불만족", "매우불만족" + , "기타의견" }; String[] order = { "EduHopeDt", "InsttNm", "InstrNm", "QestnSn", "QestnCn" , "VerySatisfied", "Satisfied", "Neither", "DisSatisfied", "VeryDisSatisfied" + , "QustnrCn" }; // 호출 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 0860e446..446e4eb8 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 @@ -7241,7 +7241,9 @@ VALUES , cc.satisfied , cc.neither , cc.dissatisfied - , cc.veryDissatisfied + , cc.veryDissatisfied + + , cc.qustnrCn FROM ( SELECT @@ -7492,7 +7494,9 @@ VALUES , g.qestn_cn , c.EDU_APLCT_ORD - , c.EDU_CHASI_ORD + , c.EDU_CHASI_ORD + + , CASE WHEN b.qestn_sn=1 THEN h.QUSTNR_CN ELSE '' END AS qustnrCn FROM LETTNQESTNRINFO a @@ -7505,13 +7509,14 @@ VALUES c00.qustnr_tmplat_id , c00.qestnr_id , c00.qustnr_qesitm_id - , max(c00.qustnr_rslt_id) AS qustnr_rslt_id + , c00.qustnr_rslt_id AS qustnr_rslt_id FROM LETTNQESTNRRSLTDetail c00 GROUP BY c00.qustnr_tmplat_id , c00.qestnr_id , c00.qustnr_qesitm_id + , c00.qustnr_rslt_id )c01 , LETTNQESTNRRSLTDetail c02 WHERE c01.qustnr_tmplat_id=c02.qustnr_tmplat_id @@ -7566,6 +7571,7 @@ VALUES , c.QUSTNR_QESITM_ID , c.EDU_APLCT_ORD , c.EDU_CHASI_ORD + , c.QUSTNR_RSLT_ID , sum(c.very_satisfied) AS cvery_satisfied , sum(c.satisfied) AS csatisfied @@ -7580,6 +7586,7 @@ VALUES , c.QUSTNR_QESITM_ID , c.EDU_APLCT_ORD , c.EDU_CHASI_ORD + , c.QUSTNR_RSLT_ID )F @@ -7587,8 +7594,19 @@ VALUES b.QUSTNR_TMPLAT_ID =f.QUSTNR_TMPLAT_ID AND b.QESTNR_ID =f.QESTNR_ID AND b.QUSTNR_QESITM_ID =f.QUSTNR_QESITM_ID + AND c.QUSTNR_RSLT_ID =f.QUSTNR_RSLT_ID - ) + ) + + LEFT OUTER JOIN ( + SELECT qestnr_id, edu_chasi_ord, max(qustnr_cn) AS qustnr_cn + FROM vea_sul_opinion + GROUP BY qestnr_id, edu_chasi_ord + ) h + on( b.QESTNR_ID = h.QESTNR_ID + AND c.edu_chasi_ord = h.edu_chasi_ord + ) + , LETTNQUSTNRQESITM G