From 35e10bd6d486307cc485d215660eb2d30674031a Mon Sep 17 00:00:00 2001 From: myname Date: Wed, 8 Nov 2023 13:51:33 +0900 Subject: [PATCH] =?UTF-8?q?2023-11-08=2013:51=20=EA=B0=95=EC=82=AC=20?= =?UTF-8?q?=EB=B0=B0=EC=A0=95=20excel=20=EC=B6=9C=EB=A0=A5=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/EduCnfrmMngAdultController.java | 190 ++++++++-------- .../web/EduCnfrmMngTngrController.java | 208 +++++++++--------- .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml | 33 ++- .../oprtn/adultVisitEdu/eduCnfrmMngList.jsp | 2 +- .../adultVisitEdu/popup/instrAsgnmPopup.jsp | 5 + 5 files changed, 242 insertions(+), 196 deletions(-) diff --git a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduCnfrmMng/web/EduCnfrmMngAdultController.java b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduCnfrmMng/web/EduCnfrmMngAdultController.java index 0d880b9e..3f488dec 100644 --- a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduCnfrmMng/web/EduCnfrmMngAdultController.java +++ b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduCnfrmMng/web/EduCnfrmMngAdultController.java @@ -661,7 +661,10 @@ public class EduCnfrmMngAdultController { vEInstrAsgnmVO.setAsgnmAprvlCd("30"); } */ - vEInstrAsgnmVO.setAsgnmAprvlCd("30"); + if ("".equals(vEInstrAsgnmVO.getAsgnmAprvlCd())) { //값이 없는 경우는 교육확정으로 + vEInstrAsgnmVO.setAsgnmAprvlCd("30"); + } + //선택한 강사 데이터 등록 처리 vEInstrAsgnmVO.setFrstRegisterId(loginVO.getUniqId()); //esntl_id //// 데이터 있으면 update, 없으면 insert 처리(MERGE) @@ -700,96 +703,105 @@ public class EduCnfrmMngAdultController { public ModelAndView eduCnfrmExcelDownLoad(@ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO , ModelMap model) throws Exception { - // 엑셀 페이징으로 변경 - vEEduAplctVO.setFirstIndex(0); - vEEduAplctVO.setRecordCountPerPage(10000000); - vEEduAplctVO.setInstrDiv("20"); //성인 - vEEduAplctVO.setLctrDivCd("20"); //성인강의 - vEEduAplctVO.setAprvlCd("60"); //확정코드 + ModelAndView modelAndView = null; - if(!"".equals(vEEduAplctVO.getSearchInstrNm())) { - vEEduAplctVO.setSearchInstrNm(egovCryptoUtil.encrypt(vEEduAplctVO.getSearchInstrNm())); + try{ + // 엑셀 페이징으로 변경 + vEEduAplctVO.setFirstIndex(0); + vEEduAplctVO.setRecordCountPerPage(10000000); + vEEduAplctVO.setInstrDiv("20"); //성인 + vEEduAplctVO.setLctrDivCd("20"); //성인강의 + vEEduAplctVO.setAprvlCd("60"); //확정코드 + + if(!"".equals(vEEduAplctVO.getSearchInstrNm())) { + vEEduAplctVO.setSearchInstrNm(egovCryptoUtil.encrypt(vEEduAplctVO.getSearchInstrNm())); + } + + List list = vEEduMIXService.selectTngrRsltPagingList(vEEduAplctVO); + VEEduAplctVO vVo = new VEEduAplctVO(); + for(int i=0; i < list.size(); i++) { + vVo = egovCryptoUtil.decryptVEEduAplctVOInfo(list.get(i)); + list.get(i).setUserId(vVo.getUserId()); + list.get(i).setChrgNm(vVo.getChrgNm()); + } + + list.forEach( vo -> { + ComDefaultCodeVO codeParam = new ComDefaultCodeVO(); + + // 교육일자 + //vo.setEduHopeDt(CmmUtil.getStrDateFormat(vo.getEduHopeDt())); + vo.setEduHopeDt(vo.getEduHopeDt()); + + // 교육요일 + vo.setEduHopeDtDayOfWeek(CmmUtil.getStrDayOfWeek(vo.getEduHopeDt())); + + /* + // 시작시간 + StringBuffer time = new StringBuffer(vo.getStrtTm()); + time.insert(2, ":"); + vo.setStrtTm(time.toString()); + // 종료시간 + time = new StringBuffer(vo.getEndTm()); + time.insert(2, ":"); + vo.setEndTm(time.toString()); + // 시간 범위 등록 + vo.setStrtTm(vo.getStrtTm() + " ~ " + vo.getEndTm() + "(" + vo.getLrnTm() + "분)" ); + */ + + // 온·오프라인 + codeParam.setCodeId("VE0007"); + codeParam.setCode(vo.getEduSlctCd()); + vo.setEduSlctCd(cmmUseService.selectCmmCodeDetailCodeValue(codeParam)); + + // 교육선택지역코드 + codeParam.setCodeId("VE0008"); + codeParam.setCode(vo.getEduSlctAreaCd()); + vo.setEduSlctAreaCd(cmmUseService.selectCmmCodeDetailCodeValue(codeParam)); + + // 확정여부 코드 + codeParam.setCodeId("VE0019"); + codeParam.setCode(vo.getAsgnmAprvlCd()); + vo.setAsgnmAprvlCd(cmmUseService.selectCmmCodeDetailCodeValue(codeParam)); + + }); + + List excelData = new ArrayList<>(); + excelData.addAll(list); + // 세팅값 + String title = "교육배치 목록"; + + // 너비 + int[] width = { + 4000, 3000, 3000, 4000, 4000 + , 8000, 4000, 4000, 4000 + }; + + // 헤더 + String[] header = { + "교육희망일자", "요일", "시간", "온·오프라인", "지역" + , "기관(학교)명", "교육대상", "강사명", "확정여부" + }; + + // 컬럼명 + String[] order = { + "EduHopeDt", "EduHopeDtDayOfWeek", "Chasi", "EduSlctCd", "EduSlctAreaCd" + , "InsttNm", "Trgt", "InstrNm", "AsgnmAprvlCd" + }; + + // 호출 + SXSSFWorkbook workbook = ExcelUtil.makeSimpleFruitExcelWorkbook(excelData , header, order, width, title); + model.addAttribute("locale", Locale.KOREA); + model.addAttribute("workbook", workbook); + model.addAttribute("workbookName", title); + + modelAndView = new ModelAndView(); + modelAndView.setViewName("excelDownloadView"); + modelAndView.addObject(model); + + }catch(Exception ex) { + ex.printStackTrace(); + } - - List list = vEEduMIXService.selectTngrRsltPagingList(vEEduAplctVO); - VEEduAplctVO vVo = new VEEduAplctVO(); - for(int i=0; i < list.size(); i++) { - vVo = egovCryptoUtil.decryptVEEduAplctVOInfo(list.get(i)); - list.get(i).setUserId(vVo.getUserId()); - list.get(i).setChrgNm(vVo.getChrgNm()); - } - - list.forEach( vo -> { - ComDefaultCodeVO codeParam = new ComDefaultCodeVO(); - - // 교육일자 - vo.setEduHopeDt(CmmUtil.getStrDateFormat(vo.getEduHopeDt())); - - // 교육요일 - vo.setEduHopeDtDayOfWeek(CmmUtil.getStrDayOfWeek(vo.getEduHopeDt())); - - /* - // 시작시간 - StringBuffer time = new StringBuffer(vo.getStrtTm()); - time.insert(2, ":"); - vo.setStrtTm(time.toString()); - // 종료시간 - time = new StringBuffer(vo.getEndTm()); - time.insert(2, ":"); - vo.setEndTm(time.toString()); - // 시간 범위 등록 - vo.setStrtTm(vo.getStrtTm() + " ~ " + vo.getEndTm() + "(" + vo.getLrnTm() + "분)" ); - */ - - // 온·오프라인 - codeParam.setCodeId("VE0007"); - codeParam.setCode(vo.getEduSlctCd()); - vo.setEduSlctCd(cmmUseService.selectCmmCodeDetailCodeValue(codeParam)); - - // 교육선택지역코드 - codeParam.setCodeId("VE0008"); - codeParam.setCode(vo.getEduSlctAreaCd()); - vo.setEduSlctAreaCd(cmmUseService.selectCmmCodeDetailCodeValue(codeParam)); - - // 확정여부 코드 - codeParam.setCodeId("VE0019"); - codeParam.setCode(vo.getAsgnmAprvlCd()); - vo.setAsgnmAprvlCd(cmmUseService.selectCmmCodeDetailCodeValue(codeParam)); - - }); - - List excelData = new ArrayList<>(); - excelData.addAll(list); - // 세팅값 - String title = "교육배치 목록"; - - // 너비 - int[] width = { - 4000, 3000, 3000, 4000, 4000 - , 8000, 4000, 4000, 4000 - }; - - // 헤더 - String[] header = { - "교육희망일자", "요일", "시간", "온·오프라인", "지역" - , "기관(학교)명", "교육대상", "강사명", "확정여부" - }; - - // 컬럼명 - String[] order = { - "EduHopeDt", "EduHopeDtDayOfWeek", "Chasi", "EduSlctCd", "EduSlctAreaCd" - , "InsttNm", "Trgt", "InstrNm", "AsgnmAprvlCd" - }; - - // 호출 - SXSSFWorkbook workbook = ExcelUtil.makeSimpleFruitExcelWorkbook(excelData , header, order, width, title); - model.addAttribute("locale", Locale.KOREA); - model.addAttribute("workbook", workbook); - model.addAttribute("workbookName", title); - - ModelAndView modelAndView = new ModelAndView(); - modelAndView.setViewName("excelDownloadView"); - modelAndView.addObject(model); return modelAndView; } diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduCnfrmMng/web/EduCnfrmMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduCnfrmMng/web/EduCnfrmMngTngrController.java index 35b2cb51..fa10f767 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduCnfrmMng/web/EduCnfrmMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduCnfrmMng/web/EduCnfrmMngTngrController.java @@ -912,110 +912,118 @@ public class EduCnfrmMngTngrController { public ModelAndView eduCnfrmExcelDownLoad(@ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO , ModelMap model) throws Exception { - // 엑셀 페이징으로 변경 - vEEduAplctVO.setFirstIndex(0); - vEEduAplctVO.setRecordCountPerPage(10000000); - vEEduAplctVO.setInstrDiv("10"); //청소년 - vEEduAplctVO.setLctrDivCd("10"); //청소년강의 - vEEduAplctVO.setAprvlCd("60"); //확정코드 + ModelAndView modelAndView = null; - //List list = vEEduMIXService.selectTngrRsltPagingList(vEEduAplctVO); - List list = vEEduMIXService.selectTngrRsltPagingList4Excel(vEEduAplctVO); - VEEduAplctVO vVo = new VEEduAplctVO(); - for(int i=0; i < list.size(); i++) { - vVo = egovCryptoUtil.decryptVEEduAplctVOInfo(list.get(i)); - list.get(i).setUserId(vVo.getUserId()); - list.get(i).setChrgNm(vVo.getChrgNm()); - - /* - System.out.println("+vVo.getUserIdNum()"); - System.out.println(vVo.getInstrNm()); - System.out.println(vVo.getUserIdNum()); - */ + try { + // 엑셀 페이징으로 변경 + vEEduAplctVO.setFirstIndex(0); + vEEduAplctVO.setRecordCountPerPage(10000000); + vEEduAplctVO.setInstrDiv("10"); //청소년 + vEEduAplctVO.setLctrDivCd("10"); //청소년강의 + vEEduAplctVO.setAprvlCd("60"); //확정코드 - if ("".equals(vVo.getUserIdNum())) { - list.get(i).setInstrNm(vVo.getInstrNm()); - }else { - list.get(i).setInstrNm(vVo.getInstrNm()+vVo.getUserIdNum()); + //List list = vEEduMIXService.selectTngrRsltPagingList(vEEduAplctVO); + List list = vEEduMIXService.selectTngrRsltPagingList4Excel(vEEduAplctVO); + VEEduAplctVO vVo = new VEEduAplctVO(); + for(int i=0; i < list.size(); i++) { + vVo = egovCryptoUtil.decryptVEEduAplctVOInfo(list.get(i)); + list.get(i).setUserId(vVo.getUserId()); + list.get(i).setChrgNm(vVo.getChrgNm()); + + /* + System.out.println("+vVo.getUserIdNum()"); + System.out.println(vVo.getInstrNm()); + System.out.println(vVo.getUserIdNum()); + */ + + if ("".equals(vVo.getUserIdNum())) { + list.get(i).setInstrNm(vVo.getInstrNm()); + }else { + list.get(i).setInstrNm(vVo.getInstrNm()+vVo.getUserIdNum()); + } } + + list.forEach( vo -> { + ComDefaultCodeVO codeParam = new ComDefaultCodeVO(); + + // 교육일자 + //vo.setEduHopeDt(CmmUtil.getStrDateFormat(vo.getEduHopeDt())); + vo.setEduHopeDt(vo.getEduHopeDt()); + + // 교육요일 + vo.setEduHopeDtDayOfWeek(CmmUtil.getStrDayOfWeek(vo.getEduHopeDt())); + + + /* + // 시작시간 + StringBuffer time = new StringBuffer(vo.getStrtTm()); + time.insert(2, ":"); + vo.setStrtTm(time.toString()); + // 종료시간 + time = new StringBuffer(vo.getEndTm()); + time.insert(2, ":"); + vo.setEndTm(time.toString()); + // 시간 범위 등록 + vo.setStrtTm(vo.getStrtTm() + " ~ " + vo.getEndTm() + "(" + vo.getLrnTm() + "분)" ); + */ + + /* + // 온·오프라인 + codeParam.setCodeId("VE0007"); + codeParam.setCode(vo.getEduSlctCd()); + vo.setEduSlctCd(cmmUseService.selectCmmCodeDetailCodeValue(codeParam)); + */ + + /* + // 교육선택지역코드 + codeParam.setCodeId("VE0008"); + codeParam.setCode(vo.getEduSlctAreaCd()); + vo.setEduSlctAreaCd(cmmUseService.selectCmmCodeDetailCodeValue(codeParam)); + + // 확정여부 코드 + codeParam.setCodeId("VE0019"); + codeParam.setCode(vo.getAsgnmAprvlCd()); + vo.setAsgnmAprvlCd(cmmUseService.selectCmmCodeDetailCodeValue(codeParam)); + */ + + }); + + List excelData = new ArrayList<>(); + excelData.addAll(list); + // 세팅값 + String title = "교육배치 목록"; + + // 너비 + int[] width = { + 4000, 3000, 4000, 3000, 4000, 4000, 8000, 12000, 10000 + , 4000, 4000, 4000, 4000, 4000 + }; + + // 헤더 + String[] header = { + "교육희망일자", "요일", "교육시간", "차시", "온/오프라인", "지역", "기관(학교)명", "주소", "상세주소" + , "교육대상", "강사명", "선택근거", "확정여부", "추가강사인원" + }; + + // 컬럼명 + String[] order = { + "EduHopeDt", "EduHopeDtDayOfWeek", "EndTm", "Chasi", "EduSlctCd", "EduSlctAreaCd", "ScholInsttNm", "Addr", "AddrDetail" + , "Trgt", "InstrNm", "Rmrks", "AsgnmAprvlCd", "HstryCnt" + }; + + // 호출 + SXSSFWorkbook workbook = ExcelUtil.makeSimpleFruitExcelWorkbook(excelData , header, order, width, title); + model.addAttribute("locale", Locale.KOREA); + model.addAttribute("workbook", workbook); + model.addAttribute("workbookName", title); + + modelAndView = new ModelAndView(); + modelAndView.setViewName("excelDownloadView"); + modelAndView.addObject(model); + + }catch(Exception ex) { + ex.printStackTrace(); } - - list.forEach( vo -> { - ComDefaultCodeVO codeParam = new ComDefaultCodeVO(); - - // 교육일자 - vo.setEduHopeDt(CmmUtil.getStrDateFormat(vo.getEduHopeDt())); - - // 교육요일 - vo.setEduHopeDtDayOfWeek(CmmUtil.getStrDayOfWeek(vo.getEduHopeDt())); - - - /* - // 시작시간 - StringBuffer time = new StringBuffer(vo.getStrtTm()); - time.insert(2, ":"); - vo.setStrtTm(time.toString()); - // 종료시간 - time = new StringBuffer(vo.getEndTm()); - time.insert(2, ":"); - vo.setEndTm(time.toString()); - // 시간 범위 등록 - vo.setStrtTm(vo.getStrtTm() + " ~ " + vo.getEndTm() + "(" + vo.getLrnTm() + "분)" ); - */ - - /* - // 온·오프라인 - codeParam.setCodeId("VE0007"); - codeParam.setCode(vo.getEduSlctCd()); - vo.setEduSlctCd(cmmUseService.selectCmmCodeDetailCodeValue(codeParam)); - */ - - /* - // 교육선택지역코드 - codeParam.setCodeId("VE0008"); - codeParam.setCode(vo.getEduSlctAreaCd()); - vo.setEduSlctAreaCd(cmmUseService.selectCmmCodeDetailCodeValue(codeParam)); - - // 확정여부 코드 - codeParam.setCodeId("VE0019"); - codeParam.setCode(vo.getAsgnmAprvlCd()); - vo.setAsgnmAprvlCd(cmmUseService.selectCmmCodeDetailCodeValue(codeParam)); - */ - - }); - - List excelData = new ArrayList<>(); - excelData.addAll(list); - // 세팅값 - String title = "교육배치 목록"; - - // 너비 - int[] width = { - 4000, 3000, 4000, 3000, 4000, 4000, 8000, 12000, 10000 - , 4000, 4000, 4000, 4000, 4000 - }; - - // 헤더 - String[] header = { - "교육희망일자", "요일", "교육시간", "차시", "온/오프라인", "지역", "기관(학교)명", "주소", "상세주소" - , "교육대상", "강사명", "선택근거", "확정여부", "추가강사인원" - }; - - // 컬럼명 - String[] order = { - "EduHopeDt", "EduHopeDtDayOfWeek", "EndTm", "Chasi", "EduSlctCd", "EduSlctAreaCd", "ScholInsttNm", "Addr", "AddrDetail" - , "Trgt", "InstrNm", "Rmrks", "AsgnmAprvlCd", "HstryCnt" - }; - - // 호출 - SXSSFWorkbook workbook = ExcelUtil.makeSimpleFruitExcelWorkbook(excelData , header, order, width, title); - model.addAttribute("locale", Locale.KOREA); - model.addAttribute("workbook", workbook); - model.addAttribute("workbookName", title); - - ModelAndView modelAndView = new ModelAndView(); - modelAndView.setViewName("excelDownloadView"); - modelAndView.addObject(model); return modelAndView; } 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 332573e1..b6b8577a 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 @@ -2989,15 +2989,20 @@ SELECT AA.*, 2 , + /* IF(aa.userId IS NOT null , '('||SUBSTRING(aa.userId,INSTR(aa.userId,'_')+1)*1||')' ,'' ) AS userIdNum, + */ + CASE WHEN aa.userId IS NOT NULL THEN '(' || SUBSTRING(aa.userId,INSTR(aa.userId,'_')+1)*1 || ')' + ELSE '' + END AS userIdNum , COUNT(1) OVER() AS totCnt FROM ( SELECT - a.edu_aplct_ord AS eduAplctOrd , - DATE_FORMAT(a.aprvl_pnttm,'%Y-%m-%d') AS aprvlPnttm , + a.edu_aplct_ord AS eduAplctOrd , + TO_CHAR(a.aprvl_pnttm,'YYYY-MM-DD') AS aprvlPnttm , /* a.edu_slct_cd AS eduSlctCd , a.edu_slct_area_cd AS eduSlctAreaCd , @@ -3040,12 +3045,15 @@ e.instr_nm AS instrNm, g.atch_file_id AS atchFileId, d.rmrks AS rmrks, - (select count(1) from ve_edu_rslt_rprt where edu_aplct_ord = a.edu_aplct_ord and edu_chasi_ord = b.edu_chasi_ord and sbmt_yn = 'Y') as cnt + (select count(1) + from ve_edu_rslt_rprt + where edu_aplct_ord = a.edu_aplct_ord and edu_chasi_ord = b.edu_chasi_ord and sbmt_yn = 'Y') as cnt , f.sbmt_yn AS feeSbmtYn, f.aprvl_cd AS feeAprvlCd, + /* NVL(TO_NUMBER(IF(f.instr_fee='',0,f.instr_fee)),0) + NVL(TO_NUMBER(IF(f.bsns_trip_fee='',0,f.bsns_trip_fee)),0) + NVL(TO_NUMBER(IF(f.spare_fee='',0,f.spare_fee)),0) @@ -3055,6 +3063,16 @@ - NVL(TO_NUMBER(IF(f.income_tax='',0,f.income_tax)),0) - NVL(TO_NUMBER(IF(f.local_income_tax='',0,f.local_income_tax)),0) AS totFee + */ + NVL(TO_NUMBER(DECODE(f.instr_fee ,'',0,f.instr_fee)),0) + + NVL(TO_NUMBER(DECODE(f.bsns_trip_fee ,'',0,f.bsns_trip_fee)),0) + + NVL(TO_NUMBER(DECODE(f.spare_fee ,'',0,f.spare_fee)),0) + + NVL(TO_NUMBER(DECODE(f.special_work_allow ,'',0,f.special_work_allow)),0) + + NVL(TO_NUMBER(DECODE(f.distance_allow ,'',0,f.distance_allow)),0) + + NVL(TO_NUMBER(DECODE(f.traffic_fee ,'',0,f.traffic_fee)),0) + - NVL(TO_NUMBER(DECODE(f.income_tax ,'',0,f.income_tax)),0) + - NVL(TO_NUMBER(DECODE(f.local_income_tax ,'',0,f.local_income_tax)),0) + AS totFee , ( SELECT COUNT(1) @@ -3088,7 +3106,7 @@ AND b.edu_aplct_ord = i.edu_aplct_ord AND b.edu_chasi_ord = i.edu_chasi_ord GROUP BY i.edu_aplct_ord , i.edu_chasi_ord - ),'-') AS hstryCnt + ),0) AS hstryCnt FROM ve_edu_aplct a , ve_edu_chasi b @@ -3232,7 +3250,7 @@ AND AA.insttNm LIKE '%'||#searchKeyword#||'%' - ORDER BY 1=1 + ORDER BY 1 , eduAplctOrd desc, eduChasiOrd @@ -3241,7 +3259,10 @@ , $orderByQuery$ - LIMIT #recordCountPerPage# OFFSET #firstIndex# + /* + LIMIT recordCountPerPage OFFSET firstIndex + */ + OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp index a6e322db..70a277a0 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp @@ -497,7 +497,7 @@ + title="Check" type="checkbox"/>${list.asgnmAprvlCd} diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/instrAsgnmPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/instrAsgnmPopup.jsp index b08efa0e..5ed1a522 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/instrAsgnmPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/instrAsgnmPopup.jsp @@ -72,6 +72,10 @@ $("#eduChasiOrd").val(p_eduChasiOrd); $("#userId").val(p_id); + //배정 승인 코드를 (교육확정==>수락요청전으로 변경) + $("#asgnmAprvlCd").val('10'); + + var data1 = new FormData(document.getElementById("createForm")); if(confirm("강사를 선택 하시겠습니까?")){ $.ajax({ @@ -108,6 +112,7 @@ +