From 5fd1a852201419c89696690e7de3a77028082ea8 Mon Sep 17 00:00:00 2001 From: myname Date: Tue, 19 Dec 2023 14:42:11 +0900 Subject: [PATCH] =?UTF-8?q?2023-12-19=2014:42=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EC=9E=90=20=ED=95=84=ED=84=B0=EC=A1=B0=EA=B1=B4=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/kcc/let/my/web/MyPageController.java | 80 ++++--------------- .../web/CndtnPrcsInfoMngController.java | 5 +- .../web/FndthPrcsAplctPrdMngController.java | 2 +- .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml | 56 ++++++++++++- .../ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml | 53 +++++++++--- .../WEB-INF/jsp/web/my/myPageDashBoard.jsp | 44 +++++++--- .../aplct/fndtnEnhanceTrn/eduAplctDetail.jsp | 6 ++ .../fndtnEnhanceTrn/fndtnEduAplctList.jsp | 9 ++- .../jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp | 2 +- .../jsp/web/ve/aplct/sspnIdtmt/main.jsp | 2 +- .../aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp | 7 +- 11 files changed, 161 insertions(+), 105 deletions(-) diff --git a/src/main/java/kcc/let/my/web/MyPageController.java b/src/main/java/kcc/let/my/web/MyPageController.java index 6f35d776..d4088542 100644 --- a/src/main/java/kcc/let/my/web/MyPageController.java +++ b/src/main/java/kcc/let/my/web/MyPageController.java @@ -1,95 +1,29 @@ package kcc.let.my.web; -import java.io.OutputStream; -import java.security.SecureRandom; -import java.text.SimpleDateFormat; -import java.time.LocalDate; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; import java.util.List; -import java.util.Locale; import java.util.Map; -import java.util.Map.Entry; import java.util.stream.Collectors; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.CellStyle; -import org.apache.poi.ss.usermodel.Font; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.xssf.streaming.SXSSFWorkbook; -import org.jsoup.Jsoup; -import org.jsoup.nodes.Document; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; import org.springframework.ui.ModelMap; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.support.SessionStatus; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; -import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; -import org.springmodules.validation.commons.DefaultBeanValidator; -import com.penta.scpdb.ScpDbAgent; -import com.sci.v2.pcc.secu.SciSecuManager; -import com.sci.v2.pcc.secu.hmac.SciHmac; - -import NiceID.Check.CPClient; -import egovframework.rte.fdl.property.EgovPropertyService; -import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; -import egovframework.rte.psl.dataaccess.util.EgovMap; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; -import kcc.com.cmm.ComDefaultCodeVO; -import kcc.com.cmm.EgovMessageSource; -import kcc.com.cmm.EgovMultiPartEmail; import kcc.com.cmm.LoginVO; -import kcc.com.cmm.ReadVO; -import kcc.com.cmm.UserVO; -import kcc.com.cmm.service.EgovCmmUseService; -import kcc.com.cmm.service.EgovFileMngService; -import kcc.com.cmm.service.EgovFileMngUtil; -import kcc.com.cmm.service.FileVO; -import kcc.com.cmm.service.ReadService; -import kcc.com.cmm.util.StringUtil; -import kcc.com.cmm.util.WebUtil; -import kcc.com.uss.ion.cnf.service.ProhibitMngService; -import kcc.com.uss.ion.cnf.service.WordFilterService; -import kcc.com.uss.ion.cnf.service.WordFilterVO; -import kcc.com.utl.fcc.service.EgovStringUtil; import kcc.com.utl.user.service.CheckLoginUtil; -import kcc.let.cop.bbs.service.Board; -import kcc.let.cop.bbs.service.BoardChgHst; -import kcc.let.cop.bbs.service.BoardMaster; import kcc.let.cop.bbs.service.BoardMasterVO; import kcc.let.cop.bbs.service.BoardVO; -import kcc.let.cop.bbs.service.EgovBBSAttributeManageService; -import kcc.let.cop.bbs.service.EgovBBSManageService; -import kcc.let.sym.mnu.mpm.service.EgovMenuManageService; -import kcc.let.sym.mnu.mpm.service.MenuManageVO; -import kcc.let.sym.site.service.EgovSiteManagerService; -import kcc.let.sym.site.service.SiteManagerVO; import kcc.let.uat.uia.service.SsoLoginVO; import kcc.let.utl.fcc.service.EgovCryptoUtil; -import kcc.let.utl.sim.service.EgovClntInfo; import kcc.ve.aplct.fndtnEnhanceTrn.service.FndtnEnhanceTrnService; import kcc.ve.cmm.VeConstants; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; @@ -186,6 +120,7 @@ public class MyPageController { Map tngrMap = tngrList.stream() .collect(Collectors.partitioningBy(vo -> "30".equals(vo.getAsgnmAprvlCd()), Collectors.counting())) + //.collect(Collectors.partitioningBy(vo -> "60".equals(vo.getAprvlCd()), Collectors.counting())) .entrySet().stream() .collect(Collectors.toMap( entry -> entry.getKey() ? "tngrEnd" : "tngrIng", @@ -251,10 +186,15 @@ public class MyPageController { System.out.println("vEEduAplctVOList.size() :: "+vEEduAplctVOList.size()); // vEEduAplctVOList에서 10, 11, 12, 13 값 제거 List filteredList = vEEduAplctVOList.stream() + /* .filter(item -> !item.getAprvlCd().equals("10") && !item.getAprvlCd().equals("11") && !item.getAprvlCd().equals("12") && !item.getAprvlCd().equals("13")) + */ + .filter(item -> item.getAprvlCd().equals("80") + || item.getAprvlCd().equals("20") + ) .collect(Collectors.toList()); // -- 종료 80 // -- 진행중 20~70 @@ -277,6 +217,7 @@ public class MyPageController { * */ { + VEPrcsDetailVO vEPrcsDetailVO = new VEPrcsDetailVO(); vEPrcsDetailVO.setUserId(loginVO.getUniqId()); @@ -285,6 +226,7 @@ public class MyPageController { vEPrcsDetailVO.setRecordCountPerPage(1000000); vEPrcsDetailVO.setFirstIndex(0); + /* List vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlList(vEPrcsDetailVO); // 요청 long cont = vEPrcsDetailVOList.stream().filter(t-> "10".equals(t.getAprvlCd())).count(); @@ -299,9 +241,15 @@ public class MyPageController { model.addAttribute("fndtnMap", fndtnMap); model.addAttribute("fndtnList", vEPrcsDetailVOList); + */ + + //신청중, 수강중, 종료된 수량 + Map countMap = vEPrcsAplctPrdService.findAllDashboardCnt(vEPrcsDetailVO); + model.addAttribute("countMap", countMap); } + //내 문의 목록 { VEPrcsDetailVO vEPrcsDetailVO = new VEPrcsDetailVO(); diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java index aa1a14f5..5f323f47 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java @@ -2,7 +2,6 @@ package kcc.ve.oprtn.cndtnSspnIdtmt.web; import java.util.Comparator; import java.util.List; -import java.util.Optional; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -25,10 +24,8 @@ import kcc.com.cmm.ComDefaultCodeVO; import kcc.com.cmm.ComDefaultVO; import kcc.com.cmm.LoginVO; import kcc.com.cmm.service.EgovFileMngService; -import kcc.com.cmm.service.FileVO; import kcc.com.cmm.service.impl.CmmUseDAO; import kcc.com.cmm.util.StringUtil; -import kcc.com.utl.fcc.service.EgovDateUtil; import kcc.com.utl.user.service.CheckLoginUtil; import kcc.let.uat.uia.service.SsoLoginVO; import kcc.let.utl.fcc.service.EgovCryptoUtil; @@ -1760,7 +1757,7 @@ public class CndtnPrcsInfoMngController { // 데이터가 없으면 Insert if(vEDetail_DVO == null) { - vEDetailVO.setAplctStateCd("10"); // 신청상태코드 VEA003 10:미이수 20:이수 + //vEDetailVO.setAplctStateCd("10"); // 신청상태코드 VEA003 10:미이수 20:이수 vEDetailVO.setFrstRegisterId(uniqId); vEAPrcsAplctPrdInstrAsgnmService.insertAprvlCdEduAplctDetail(vEDetailVO); 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 ec5a1efc..20ea3566 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 @@ -991,7 +991,7 @@ public class FndthPrcsAplctPrdMngController { // 데이터가 없으면 Insert if(vEDetail_DVO == null) { - vEDetailVO.setAplctStateCd("10"); // 신청상태코드 VEA003 10:미이수 20:이수 + //vEDetailVO.setAplctStateCd("10"); // 신청상태코드 VEA003 10:미이수 20:이수 vEDetailVO.setFrstRegisterId(uniqId); vEAPrcsAplctPrdInstrAsgnmService.insertAprvlCdEduAplctDetail(vEDetailVO); 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 b771f0d5..43893e2a 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 @@ -3960,9 +3960,61 @@ + + + - + + + +
" method="post"> + +
+
@@ -95,7 +113,7 @@

찾아가는 교육 청소년 마이페이지 아이콘 찾교(청소년)

- +

교육진행 ${tngrMap['tngrIng']}건

 @@ -110,7 +128,7 @@

찾아가는 성인 마이페이지 아이콘 찾교(성인)

- +

교육진행 ${adultMap['adultIng']}건

 @@ -125,10 +143,10 @@

체험교실 마이페이지 아이콘 찾교(체험교실)

- -

교육진행 ${exprnMap['exprnIng']}건

+ +

운영확정 ${exprnMap['exprnIng']}건

 - +

교육종료 ${exprnMap['exprnEnd']}건
@@ -140,11 +158,11 @@

실무역량강화 마이페이지 아이콘 실무역량강화

- -

교육진행 ${fndtnMap['fndtnIng']}건

+ +

교육진행 건

 - -

교육종료 ${fndtnMap['fndtnEnd']}건

+ +

교육종료 건
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp index 733d2c4a..80b4ee4f 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp @@ -80,9 +80,12 @@ } function fncGoList(){ + /* var listForm = document.listForm ; listForm.action = ""; listForm.submit(); + */ + history.back(-1); } function fncGoEdit(){ @@ -304,6 +307,9 @@
+
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 d5ed5043..df73014e 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 @@ -310,8 +310,9 @@ $(document).ready(function(){
@@ -357,6 +358,8 @@ $(document).ready(function(){ ');" style="cursor:pointer;"> <%-- () --%> + + () ~ @@ -405,7 +408,7 @@ $(document).ready(function(){ - + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp index ff22803e..5c70c159 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp @@ -124,7 +124,7 @@
  • 신청중 강의

    건

    • -
  • +
  • 수강중 강의

    건

  • 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 0740e859..c2bf5504 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 @@ -128,7 +128,7 @@
    • 신청중 강의

      건

      • -
    • 수강중 강의

      건

      • +
    • 수강중 강의

      건

    • 종료된 강의

      건

    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 64458d42..8aa09fdb 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 @@ -414,9 +414,10 @@ $(document).ready(function(){