diff --git a/src/main/java/kcc/let/uss/olp/qri/service/EgovQustnrRespondInfoService.java b/src/main/java/kcc/let/uss/olp/qri/service/EgovQustnrRespondInfoService.java index 3e82df82..b5b7e79f 100644 --- a/src/main/java/kcc/let/uss/olp/qri/service/EgovQustnrRespondInfoService.java +++ b/src/main/java/kcc/let/uss/olp/qri/service/EgovQustnrRespondInfoService.java @@ -167,4 +167,6 @@ public interface EgovQustnrRespondInfoService { public List selectQustnrDetail(QustnrRespondInfoVO qustnrVO); public List selectQustnr5060(VEPrcsDetailVO vEPrcsDetailVO); + + public void deleteStatusFormlettnqestnrrslt(QustnrRespondInfoVO item); } diff --git a/src/main/java/kcc/let/uss/olp/qri/service/impl/EgovQustnrRespondInfoServiceImpl.java b/src/main/java/kcc/let/uss/olp/qri/service/impl/EgovQustnrRespondInfoServiceImpl.java index b5b8eb67..800c2c46 100644 --- a/src/main/java/kcc/let/uss/olp/qri/service/impl/EgovQustnrRespondInfoServiceImpl.java +++ b/src/main/java/kcc/let/uss/olp/qri/service/impl/EgovQustnrRespondInfoServiceImpl.java @@ -254,5 +254,9 @@ public class EgovQustnrRespondInfoServiceImpl extends EgovAbstractServiceImpl im public List selectQustnr5060(VEPrcsDetailVO vEPrcsDetailVO) { return dao.selectQustnr5060(vEPrcsDetailVO); } + @Override + public void deleteStatusFormlettnqestnrrslt(QustnrRespondInfoVO item) { + dao.deleteStatusFormlettnqestnrrslt(item); + } } diff --git a/src/main/java/kcc/let/uss/olp/qri/service/impl/QustnrRespondInfoDao.java b/src/main/java/kcc/let/uss/olp/qri/service/impl/QustnrRespondInfoDao.java index 02183a05..e40d6deb 100644 --- a/src/main/java/kcc/let/uss/olp/qri/service/impl/QustnrRespondInfoDao.java +++ b/src/main/java/kcc/let/uss/olp/qri/service/impl/QustnrRespondInfoDao.java @@ -219,4 +219,8 @@ public class QustnrRespondInfoDao extends EgovAbstractDAO { public List selectQustnr5060(VEPrcsDetailVO vEPrcsDetailVO) { return (List) list("QustnrRespondInfo.selectQustnr5060", vEPrcsDetailVO); } + + public void deleteStatusFormlettnqestnrrslt(QustnrRespondInfoVO item) { + delete("QustnrRespondInfo.deleteStatusFormlettnqestnrrslt", item); + } } diff --git a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java index a17fdf36..3799178f 100644 --- a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java +++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java @@ -47,6 +47,8 @@ import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsMIXService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsOnlnCntntService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsService; +import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngService; +import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngVO; import kcc.ve.oprtn.qestnr.service.VEALettnQestnrMIXService; /** @@ -167,7 +169,10 @@ public class FndtnEnhanceTrnController { @Resource(name = "egovQustnrRespondInfoService") private EgovQustnrRespondInfoService egovQustnrRespondInfoService; - + + //기소 대상자 관리 + @Resource(name = "cndtnTrgtInfoMngService") + private CndtnTrgtMngService cndtnTrgtInfoMngService; // 설문 util @@ -772,7 +777,6 @@ public class FndtnEnhanceTrnController { modelAndView.addObject("msg", "로그인 해주세요."); return modelAndView; } - qustnrRespondInfoVO.getResultList().stream() .forEach(item -> { diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java index f951a914..0b927d85 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java @@ -16,7 +16,7 @@ public interface CndtnTrgtMngService { void updateUserId(CndtnTrgtMngVO cndtnTrgtMngVO); int findCntreqNmber(String reqNmbrTemp); - + diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java index 1c4668de..1f3db861 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java @@ -57,7 +57,6 @@ public class CndtnTrgtMngServiceImpl implements CndtnTrgtMngService { public int findCntreqNmber(String reqNmbrTemp) { return cndtnTrgtInfoMngDAO.findCntreqNmber(reqNmbrTemp); } - /* //C public void insert(VEPrcsDetailVO vEPrcsDetailVO) throws Exception { diff --git a/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java b/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java index db34b473..aaa1a570 100644 --- a/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java +++ b/src/main/java/kcc/ve/oprtn/fndtnEnhanceTrn/prcsAplctPrdMng/web/FndthPrcsAplctPrdMngController.java @@ -1084,11 +1084,6 @@ public class FndthPrcsAplctPrdMngController { model.addAttribute("nonRespondents", nonRespondents); model.addAttribute("responseRate", String.format("%.2f", responseRate) + "%"); -System.out.println("참석자: " + totalParticipants); -System.out.println("응답자: " + respondents); -System.out.println("무응답: " + nonRespondents); -System.out.println("응답률: " + String.format("%.2f", responseRate) + "%"); - return "/oprtn/fndthEnhanceTrn/popup/lctrEvalPopup"; } @@ -1126,6 +1121,18 @@ System.out.println("응답률: " + String.format("%.2f", responseRate) + "%"); } + /** + * @methodName : adminMergeSrvyInfoAjax + * @author : 이호영 + * @date : 2023.11.27 + * @description : 관리자 설문결과 update + * @param request + * @param model + * @param veEduAplctVO + * @param qustnrRespondInfoVO + * @return + * @throws Exception + */ @RequestMapping("/kccadr/oprtn/fndthEnhanceTrn/mergeSrvyInfoAjax.do") public ModelAndView adminMergeSrvyInfoAjax( HttpServletRequest request , ModelMap model @@ -1175,21 +1182,6 @@ System.out.println("응답률: " + String.format("%.2f", responseRate) + "%"); } }); - // 설문 문항 결과 등록 -// for(int i=0; i < qustnrRespondInfoVO.getResultList().size(); i++) { -// qustnrRespondInfoVO.getResultList().get(i).setQustnrTmplatId(qustnrRespondInfoVO.getQustnrTmplatId()); -// qustnrRespondInfoVO.getResultList().get(i).setRespondId(loginVO.getId()); -// qustnrRespondInfoVO.getResultList().get(i).setFrstRegisterId(loginVO.getId()); -// qustnrRespondInfoVO.getResultList().get(i).setLastUpdusrId(loginVO.getId()); -// qustnrRespondInfoVO.getResultList().get(i).setLastUpdusrId(loginVO.getId()); -// qustnrRespondInfoVO.getResultList().get(i).setEduAplctOrd(veEduAplctVO.getEduAplctOrd()); - -// if("update".equals(qustnrRespondInfoVO.getQustnrIemType())) { -// egovQustnrRespondInfoService.updateSrvyInfo(qustnrRespondInfoVO.getResultList().get(i)); -// }else { -// egovQustnrRespondInfoService.insertSrvyInfo(qustnrRespondInfoVO.getResultList().get(i)); -// } -// } }catch(Exception ex) { System.out.println("Exception vEEduAplctOnlnService.updateBulk"); } @@ -1197,6 +1189,58 @@ System.out.println("응답률: " + String.format("%.2f", responseRate) + "%"); return modelAndView; } + /** + * @methodName : adminDelSrvyInfoAjax + * @author : 이호영 + * @date : 2023.11.27 + * @description : 관리자 설문결과 del + * @param request + * @param model + * @param veEduAplctVO + * @param qustnrRespondInfoVO + * @return + * @throws Exception + */ + @RequestMapping("/kccadr/oprtn/fndthEnhanceTrn/delSrvyInfoAjax.do") + public ModelAndView adminDelSrvyInfoAjax( HttpServletRequest request + , ModelMap model + , VEEduAplctVO veEduAplctVO + , QustnrRespondInfoVO qustnrRespondInfoVO) throws Exception { + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + try { + + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); + if (loginVO == null) { + modelAndView.addObject("result", "fail"); + modelAndView.addObject("msg", "로그인 해주세요."); + return modelAndView; + } + + qustnrRespondInfoVO.getResultList().stream() + .forEach(item -> { + + item.setQustnrTmplatId(qustnrRespondInfoVO.getQustnrTmplatId()); + item.setRespondId(qustnrRespondInfoVO.getRespondId()); + item.setFrstRegisterId(qustnrRespondInfoVO.getRespondId()); + item.setLastUpdusrId(loginVO.getId()); + item.setEduAplctOrd(veEduAplctVO.getEduAplctOrd()); + + try { + egovQustnrRespondInfoService.deleteStatusFormlettnqestnrrslt(item); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + }); + + }catch(Exception ex) { + System.out.println("Exception vEEduAplctOnlnService.updateBulk"); + } + modelAndView.addObject("result", "success"); + return modelAndView; + } + ////////////////////////////////////////////////////////////////////////////////////////////////////////////// // // diff --git a/src/main/resources/egovframework/sqlmap/let/uss/olp/qri/EgovQustnrRespondInfo_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/uss/olp/qri/EgovQustnrRespondInfo_SQL_Tibero.xml index 50255918..3ce64334 100644 --- a/src/main/resources/egovframework/sqlmap/let/uss/olp/qri/EgovQustnrRespondInfo_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/uss/olp/qri/EgovQustnrRespondInfo_SQL_Tibero.xml @@ -754,5 +754,12 @@ - + + + /* QustnrRespondInfo.deleteChasiStatusFormlettnqestnrrslt */ + DELETE FROM lettnqestnrrsltDetail + WHERE 1=1 + AND edu_aplct_ord = #eduAplctOrd# + AND respond_id = #respondId# + \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Cubrid.xml index 1bf741f1..11a7bc70 100644 --- a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Cubrid.xml @@ -127,7 +127,6 @@ 1=1 AND sspn_idtmt_trgt_ord = #sspnIdtmtTrgtOrd# - diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/popup/lctrEvalPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/popup/lctrEvalPopup.jsp index 94487da0..0dc4e1cf 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/popup/lctrEvalPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/popup/lctrEvalPopup.jsp @@ -181,6 +181,38 @@ } } + function fnDel(){ + + if(confirm("설문결과를 삭제 하시겠습니까?")){ + var data = new FormData(document.getElementById("createForm")); + + $.ajax({ + type:"POST" + ,url:"${pageContext.request.contextPath}/kccadr/oprtn/fndthEnhanceTrn/delSrvyInfoAjax.do" + ,data: data + ,dataType:'json' + ,async: false + ,processData: false + ,contentType: false + ,cache: false + ,success:function(returnData){ + if(returnData.result == 'success'){ + + alert("설문결과가 삭제 되었습니다."); + window.opener.location.reload(); + self.close(); + }else if(returnData.result == 'fail'){ + alert(returnData.msg); +// location.href="${pageContext.request.contextPath}/web/user/login/ssoLogin.do?test=test"; + } + } + ,error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + } + } + @@ -270,6 +302,7 @@
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp index d0aa15b3..0818535a 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp @@ -423,6 +423,7 @@ $(document).ready(function(){
+ diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp index e7651805..3226f25b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp @@ -655,6 +655,8 @@ $(document).ready(function(){ + +