From fe6ba0651d0920327d972e750207cbe1d7ea60ef Mon Sep 17 00:00:00 2001 From: itn Date: Tue, 4 Jul 2023 18:16:34 +0900 Subject: [PATCH 01/15] =?UTF-8?q?=EC=A3=BC=EC=86=8C=EB=A1=9D=20=EA=B7=B8?= =?UTF-8?q?=EB=A3=B9=EC=A0=95=EB=B3=B4=20=EB=A1=9C=EA=B7=B8=EC=9D=B8?= =?UTF-8?q?=EC=95=84=EC=9D=B4=20=EC=97=86=EC=9D=84=EA=B2=BD=EC=9A=B0=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=EC=95=88=EB=90=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itn/let/mjo/addr/web/AddrController.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/itn/let/mjo/addr/web/AddrController.java b/src/main/java/itn/let/mjo/addr/web/AddrController.java index fa1d76a8..5e42a7e9 100644 --- a/src/main/java/itn/let/mjo/addr/web/AddrController.java +++ b/src/main/java/itn/let/mjo/addr/web/AddrController.java @@ -1979,19 +1979,19 @@ public class AddrController { if(userId != "") { addrGroupVO.setMberId(userId); - } - - if(addrGroupVO.getPageUnit() != 10) { - addrGroupVO.setPageUnit(addrGroupVO.getPageUnit()); - } - - if("".equals(addrGroupVO.getSearchSortCnd())){ //최초조회시 최신것 조회List - addrGroupVO.setSearchSortCnd("grpOrder"); - addrGroupVO.setSearchSortOrd("desc"); - } - - addrGroupVO.setSiteId("web"); - addrGroupList = addrGroupService.selectAddrGroupList(addrGroupVO); + + if(addrGroupVO.getPageUnit() != 10) { + addrGroupVO.setPageUnit(addrGroupVO.getPageUnit()); + } + + if("".equals(addrGroupVO.getSearchSortCnd())){ //최초조회시 최신것 조회List + addrGroupVO.setSearchSortCnd("grpOrder"); + addrGroupVO.setSearchSortOrd("desc"); + } + + addrGroupVO.setSiteId("web"); + addrGroupList = addrGroupService.selectAddrGroupList(addrGroupVO); + } } catch(Exception e) { isSuccess = false; From 450772748583de46a7b57e9ef071f6c2dca300fe Mon Sep 17 00:00:00 2001 From: tolag3 Date: Wed, 5 Jul 2023 09:43:31 +0900 Subject: [PATCH 02/15] =?UTF-8?q?web.xml=20=EC=98=A4=ED=83=88=EC=9E=90=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/web.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 65c4db4c..8d5bda92 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -151,5 +151,5 @@ /common/error.jsp - + From 7976d83eafb42fd177ea6f5830fcbcf3d28eb900 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Wed, 5 Jul 2023 09:46:16 +0900 Subject: [PATCH 03/15] =?UTF-8?q?=EC=98=A4=ED=83=88=EC=9E=90=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 --- src/main/webapp/publish/mem3.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/publish/mem3.html b/src/main/webapp/publish/mem3.html index 9f546d73..8731f195 100644 --- a/src/main/webapp/publish/mem3.html +++ b/src/main/webapp/publish/mem3.html @@ -327,7 +327,7 @@ From 11f559fec5df98bae63b1dd7912c10cacc49e3fb Mon Sep 17 00:00:00 2001 From: itn Date: Wed, 5 Jul 2023 09:53:56 +0900 Subject: [PATCH 04/15] =?UTF-8?q?=ED=8C=A9=EC=8A=A4=20=EC=A3=BC=EC=86=8C?= =?UTF-8?q?=EB=A1=9D=EA=B4=80=EB=A6=AC=20=ED=8E=B8=EC=A7=91=EC=8B=9C=20?= =?UTF-8?q?=EA=B7=B8=EB=A3=B9=EC=A0=95=EB=B3=B4=20=EC=95=84=EC=9D=B4?= =?UTF-8?q?=EB=94=94=20=EC=97=86=EC=9C=BC=EB=A9=B4=20=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=EC=95=88=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../let/fax/addr/web/FaxAddrController.java | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/main/java/itn/let/fax/addr/web/FaxAddrController.java b/src/main/java/itn/let/fax/addr/web/FaxAddrController.java index 2959b4b8..f21c50ff 100644 --- a/src/main/java/itn/let/fax/addr/web/FaxAddrController.java +++ b/src/main/java/itn/let/fax/addr/web/FaxAddrController.java @@ -57,8 +57,6 @@ import itn.let.fax.addr.service.FaxAddrGroupVO; import itn.let.fax.addr.service.FaxAddrService; import itn.let.fax.addr.service.FaxAddrTransHistVO; import itn.let.fax.addr.service.FaxAddrVO; -import itn.let.mjo.addr.service.AddrGroupVO; -import itn.let.mjo.addr.service.AddrVO; import itn.let.mjo.msgdata.service.PhoneVO; @Controller @@ -1679,19 +1677,19 @@ public class FaxAddrController { if(userId != "") { addrGroupVO.setMberId(userId); - } - if(addrGroupVO.getPageUnit() != 10) { - addrGroupVO.setPageUnit(addrGroupVO.getPageUnit()); + if(addrGroupVO.getPageUnit() != 10) { + addrGroupVO.setPageUnit(addrGroupVO.getPageUnit()); + } + + if("".equals(addrGroupVO.getSearchSortCnd())){ //최초조회시 최신것 조회List + addrGroupVO.setSearchSortCnd("grpOrder"); + addrGroupVO.setSearchSortOrd("desc"); + } + + addrGroupVO.setSiteId("web"); + addrGroupList = faxAddrGroupService.selectFaxAddrGroupList(addrGroupVO); } - - if("".equals(addrGroupVO.getSearchSortCnd())){ //최초조회시 최신것 조회List - addrGroupVO.setSearchSortCnd("grpOrder"); - addrGroupVO.setSearchSortOrd("desc"); - } - - addrGroupVO.setSiteId("web"); - addrGroupList = faxAddrGroupService.selectFaxAddrGroupList(addrGroupVO); } catch(Exception e) { isSuccess = false; From 1b6f5e22afedffc119e127497f126fe56ea5e230 Mon Sep 17 00:00:00 2001 From: itn Date: Wed, 5 Jul 2023 16:02:39 +0900 Subject: [PATCH 05/15] =?UTF-8?q?=EB=93=B1=EA=B8=89=EC=A0=9C=20=EC=8B=A0?= =?UTF-8?q?=EC=B2=AD=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../let/sym/grd/service/MberGrdService.java | 15 +++ .../itn/let/sym/grd/service/MberGrdVO.java | 10 +- .../let/sym/grd/service/impl/MberGrdDAO.java | 22 ++++ .../grd/service/impl/MberGrdServiceImpl.java | 95 +++++++++++++++- .../let/sym/grd/web/MberGrdController.java | 35 ++++++ .../sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml | 105 ++++++++++++++++-- .../WEB-INF/jsp/sym/grd/mberGrdSetting.jsp | 27 +++++ 7 files changed, 294 insertions(+), 15 deletions(-) diff --git a/src/main/java/itn/let/sym/grd/service/MberGrdService.java b/src/main/java/itn/let/sym/grd/service/MberGrdService.java index a482082e..df51edd0 100644 --- a/src/main/java/itn/let/sym/grd/service/MberGrdService.java +++ b/src/main/java/itn/let/sym/grd/service/MberGrdService.java @@ -14,12 +14,21 @@ public interface MberGrdService { // 등급제 설정 목록 List selectMberGrdSettingList(MberGrdVO mberGrdVO) throws Exception; + // 회원별 설정 상세 + public MberGrdVO selectMberGrdSettingDetail(MberGrdVO mberGrdVO) throws Exception; + // 등급제 설정 일괄변경 public int updateGrdSettingList(MberGrdVO mberGrdVO) throws Exception; + + // 등급제 등급 목록 + List selectMberGrdList(MberGrdVO mberGrdVO) throws Exception; // 회원별 등급 상세 public MberGrdVO selectMberGrdDetail(MberGrdVO mberGrdVO) throws Exception; + // 회원별 등급 누적결제액 상세 + public MberGrdVO selectMberGrdAmtDetail(MberGrdVO mberGrdVO) throws Exception; + // 회원별 등급 등록 public void insertMberGrd(MberGrdVO mberGrdVO) throws Exception; @@ -32,9 +41,15 @@ public interface MberGrdService { // 회원별 등급 초기화 public int updateMberGrdEndAll(MberGrdVO mberGrdVO) throws Exception; + // 회원별 등급 적용 + public void mberGrdSaveByUser(MberGrdVO mberGrdVO) throws Exception; + // 회원별 등급 진행여부 int selectMberGrdPrgCnt(String userId) throws Exception; + // 회원별 등급 저장여부 + int selectMberGrdSaveCnt(String userId) throws Exception; + // 회원별 등급 히스토리 등록 public void insertMberGrdHist(MberGrdVO mberGrdVO) throws Exception ; diff --git a/src/main/java/itn/let/sym/grd/service/MberGrdVO.java b/src/main/java/itn/let/sym/grd/service/MberGrdVO.java index 028b99f4..fdc3c344 100644 --- a/src/main/java/itn/let/sym/grd/service/MberGrdVO.java +++ b/src/main/java/itn/let/sym/grd/service/MberGrdVO.java @@ -30,7 +30,7 @@ public class MberGrdVO { private String mberId; private String amt; private String grdStartDate; - private String grd_endDate; + private String grdEndDate; private String grdStatus; private int mberGrdHistNo; @@ -184,11 +184,11 @@ public class MberGrdVO { public void setGrdStartDate(String grdStartDate) { this.grdStartDate = grdStartDate; } - public String getGrd_endDate() { - return grd_endDate; + public String getGrdEndDate() { + return grdEndDate; } - public void setGrd_endDate(String grd_endDate) { - this.grd_endDate = grd_endDate; + public void setGrdEndDate(String grd_endDate) { + this.grdEndDate = grd_endDate; } public String getGrdStatus() { return grdStatus; diff --git a/src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java b/src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java index c21ad015..c8003ae9 100644 --- a/src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java +++ b/src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java @@ -20,22 +20,39 @@ public class MberGrdDAO extends EgovAbstractDAO { return (MberGrdVO) select("mberGrdDAO.selectMberSettingDetail", mberGrdVO); } + // 등급제 설정 목록 @SuppressWarnings("unchecked") public List selectMberGrdSettingList(MberGrdVO mberGrdVO) throws Exception{ return (List)list("mberGrdDAO.selectMberGrdSettingList", mberGrdVO); } + // 회원별 설정 상세 + public MberGrdVO selectMberGrdSettingDetail(MberGrdVO mberGrdVO) throws Exception{ + return (MberGrdVO) select("mberGrdDAO.selectMberGrdSettingDetail", mberGrdVO); + } + // 등급제 설정 일괄변경 public int updateGrdSetting(MberGrdVO mberGrdVO) throws Exception { return update("mberGrdDAO.updateGrdSetting", mberGrdVO); } + // 등급제 등급 목록 + @SuppressWarnings("unchecked") + public List selectMberGrdList(MberGrdVO mberGrdVO) throws Exception{ + return (List)list("mberGrdDAO.selectMberGrdList", mberGrdVO); + } + // 회원별 등급 상세 public MberGrdVO selectMberGrdDetail(MberGrdVO mberGrdVO) throws Exception{ return (MberGrdVO) select("mberGrdDAO.selectMberGrdDetail", mberGrdVO); } + // 회원별 등급 누적결제액 상세 + public MberGrdVO selectMberGrdAmtDetail(MberGrdVO mberGrdVO) throws Exception{ + return (MberGrdVO) select("mberGrdDAO.selectMberGrdAmtDetail", mberGrdVO); + } + // 회원별 등급 등록 public void insertMberGrd(MberGrdVO mberGrdVO) throws Exception{ insert("mberGrdDAO.insertMberGrd", mberGrdVO); @@ -61,6 +78,11 @@ public class MberGrdDAO extends EgovAbstractDAO { return (int) select("mberGrdDAO.selectMberGrdPrgCnt", userId); } + // 회원별 등급 저장여부 + public int selectMberGrdSaveCnt(String userId) throws Exception{ + return (int) select("mberGrdDAO.selectMberGrdSaveCnt", userId); + } + // 회원별 등급 히스토리 등록 public void insertMberGrdHist(MberGrdVO mberGrdVO) throws Exception{ diff --git a/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java b/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java index dde47c86..740b4958 100644 --- a/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java +++ b/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java @@ -29,11 +29,18 @@ public class MberGrdServiceImpl extends EgovAbstractServiceImpl implements MberG } + // 등급제 설정 목록 @Override public List selectMberGrdSettingList(MberGrdVO mberGrdVO) throws Exception { return mberGrdDAO.selectMberGrdSettingList(mberGrdVO); } + // 회원별 설정 상세 + @Override + public MberGrdVO selectMberGrdSettingDetail(MberGrdVO mberGrdVO) throws Exception { + return mberGrdDAO.selectMberGrdSettingDetail(mberGrdVO); + } + // 등급제 설정 일괄변경 @Override public int updateGrdSettingList(MberGrdVO mberGrdVO) throws Exception { @@ -56,6 +63,12 @@ public class MberGrdServiceImpl extends EgovAbstractServiceImpl implements MberG return updateCnt; } + + // 등급제 등급 목록 + @Override + public List selectMberGrdList(MberGrdVO mberGrdVO) throws Exception { + return mberGrdDAO.selectMberGrdList(mberGrdVO); + } // 회원별 등급 상세 @Override @@ -63,6 +76,12 @@ public class MberGrdServiceImpl extends EgovAbstractServiceImpl implements MberG return mberGrdDAO.selectMberGrdDetail(mberGrdVO); } + // 회원별 등급 누적결제액 상세 + @Override + public MberGrdVO selectMberGrdAmtDetail(MberGrdVO mberGrdVO) throws Exception { + return mberGrdDAO.selectMberGrdAmtDetail(mberGrdVO); + } + // 회원별 등급 등록 @Override public void insertMberGrd(MberGrdVO mberGrdVO) throws Exception { @@ -78,7 +97,16 @@ public class MberGrdServiceImpl extends EgovAbstractServiceImpl implements MberG // 회원별 등급 초기화 @Override public int updateMberGrdAll(MberGrdVO mberGrdVO) throws Exception { - return mberGrdDAO.updateMberGrdAll(mberGrdVO); + int updateCnt = 0; + + // Step 1. 등급제 시행 ON 일경우 + MberGrdVO mberGrdVO1 = new MberGrdVO(); + mberGrdVO1 = selectMberSettingDetail(mberGrdVO); + if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate()) { + updateCnt = mberGrdDAO.updateMberGrdAll(mberGrdVO); + } + + return updateCnt; } // 회원별 등급 일괄변경 @@ -87,12 +115,77 @@ public class MberGrdServiceImpl extends EgovAbstractServiceImpl implements MberG return mberGrdDAO.updateMberGrdEndAll(mberGrdVO); } + // 회원별 등급 적용 + @Override + public void mberGrdSaveByUser(MberGrdVO mberGrdVO) throws Exception { + mberGrdVO.setRegId(mberGrdVO.getMberId()); + mberGrdVO.setEditId(mberGrdVO.getMberId()); + + // Step 1. 등급제 시행 ON 일경우 + MberGrdVO mberGrdVO1 = new MberGrdVO(); + mberGrdVO1 = selectMberSettingDetail(mberGrdVO); + if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate()) { + mberGrdVO.setGrdDate(mberGrdVO1.getGrdDate()); + + // Step 2. 누적결제금액(이벤트금액 제외) 추출 및 등급 조회 + MberGrdVO mberGrdVO2 = new MberGrdVO(); + mberGrdVO2 = selectMberGrdAmtDetail(mberGrdVO); + if (null != mberGrdVO2) { + mberGrdVO.setTotAmt(mberGrdVO2.getTotAmt()); + mberGrdVO.setGrdSetNo(mberGrdVO2.getGrdSetNo()); + + // Step 3. 등급제 설정값 조회 + MberGrdVO mberGrdVO3 = new MberGrdVO(); + mberGrdVO3 = selectMberGrdSettingDetail(mberGrdVO); + if (null != mberGrdVO3) { + mberGrdVO.setAmt("0"); + mberGrdVO.setTotAmt(mberGrdVO.getTotAmt()); + mberGrdVO.setShortPrice(mberGrdVO3.getShortPrice()); + mberGrdVO.setLongPrice(mberGrdVO3.getLongPrice()); + mberGrdVO.setPicturePrice(mberGrdVO3.getPicturePrice()); + mberGrdVO.setPicture2Price(mberGrdVO3.getPicture2Price()); + mberGrdVO.setPicture3Price(mberGrdVO3.getPicture3Price()); + mberGrdVO.setGrdStartDate(mberGrdVO.getGrdDate() + " 00:00:00"); + mberGrdVO.setGrdEndDate("9999:12:31 23:59:59"); + mberGrdVO.setGrdStatus("Y"); + + // Step 4. 인서트 Or 업데이트 + MberGrdVO mberGrdVO4 = new MberGrdVO(); + mberGrdVO4 = selectMberGrdDetail(mberGrdVO); + if (null != mberGrdVO4) { + // 업데이트 => 현재 등급보다 낮거나 같으면 업데이트 처리 + if (mberGrdVO4.getGrdSetNo() >= mberGrdVO.getGrdSetNo()) { + updateMberGrd(mberGrdVO); + + // 회원별 등급 히스토리 인서트 + insertMberGrdHist(mberGrdVO); + } + } + else { + // 인서트 + insertMberGrd(mberGrdVO); + + // 회원별 등급 히스토리 인서트 + insertMberGrdHist(mberGrdVO); + } + } + } + } + + } + // 회원별 등급 진행여부 @Override public int selectMberGrdPrgCnt(String userId) throws Exception{ return mberGrdDAO.selectMberGrdPrgCnt(userId); } + // 회원별 등급 저장여부 + @Override + public int selectMberGrdSaveCnt(String userId) throws Exception{ + return mberGrdDAO.selectMberGrdSaveCnt(userId); + } + // 회원별 등급 히스토리 등록 @Override diff --git a/src/main/java/itn/let/sym/grd/web/MberGrdController.java b/src/main/java/itn/let/sym/grd/web/MberGrdController.java index adba000f..eafc621f 100644 --- a/src/main/java/itn/let/sym/grd/web/MberGrdController.java +++ b/src/main/java/itn/let/sym/grd/web/MberGrdController.java @@ -127,4 +127,39 @@ public class MberGrdController { return modelAndView; } + // 회원별 등급 적용 테스트 + @RequestMapping(value = "/sym/grd/mberGrdSaveAjax.do") + public ModelAndView mberGrdSaveAjax( + @ModelAttribute("mberGrdVO") MberGrdVO mberGrdVO) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + boolean isSuccess = true; + String msg = ""; + + // 로그인VO에서 사용자 정보 가져오기 + LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); + String frstRegisterId = loginVO == null ? "" : loginVO.getId(); + mberGrdVO.setEditId(frstRegisterId); // 최초등록자ID + + try{ + + // 회원별 등급 적용 + mberGrdVO.setMberId("nopay"); + mberGrdService.mberGrdSaveByUser(mberGrdVO); + + } + catch(Exception e) { + isSuccess = false; + msg = e.getMessage(); + } + + modelAndView.addObject("isSuccess", isSuccess); + modelAndView.addObject("msg", msg); + + return modelAndView; + } + + } diff --git a/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml index 016f2a91..e4512cbc 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml @@ -17,7 +17,7 @@ + + + UPDATE mj_mber_grd_setting A @@ -59,6 +79,39 @@ WHERE A.GRD_SET_NO = #grdSetNo# + + + + + + INSERT INTO mj_mber_grd_info @@ -117,7 +198,7 @@ , #amt# , #totAmt# , #grdStartDate# - , #grd_endDate# + , #grdEndDate# , #grdStatus# , #regId# , NOW() @@ -136,12 +217,9 @@ , PICTURE_PRICE = #picturePrice# , PICTURE2_PRICE = #picture2Price# , PICTURE3_PRICE = #picture3Price# - , AMT = #amt# + , AMT = #amt# , TOT_AMT = #totAmt# - , GRD_START_DATE = #grdStartDate# - , GRD_END_DATE = #grd_endDate# - , GRD_STATUS = #grdStatus# - , EDIT_ID = #editId# + , EDIT_ID = #editId# , EDIT_DATE = NOW() WHERE MBER_ID = #mberId# @@ -216,7 +294,16 @@ AND NOW() BETWEEN GRD_START_DATE AND GRD_END_DATE LIMIT 1 - + + + + diff --git a/src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdSetting.jsp b/src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdSetting.jsp index eec67867..bc7aa820 100644 --- a/src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdSetting.jsp +++ b/src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdSetting.jsp @@ -84,6 +84,32 @@ } } + // 등급제 적용 테스트 + function setMberGrdSave() { + if(confirm("등급제 적용하시겠습니까?")) { + $.ajax({ + type: "POST", + url: "/sym/grd/mberGrdSaveAjax.do", + data: {}, + dataType:'json', + async: false, + success: function (data) { + if (data.isSuccess) { + alert("저장 완료했습니다."); + location.reload(); + } + else { + alert("Msg : " + data.msg); + } + }, + error: function (e) { + alert("ERROR : " + JSON.stringify(e)); + } + }); + } + } + + @@ -172,6 +198,7 @@
+
From 06b3c39614714df650035bdd681e5f4454474e00 Mon Sep 17 00:00:00 2001 From: itn Date: Wed, 5 Jul 2023 17:09:19 +0900 Subject: [PATCH 06/15] =?UTF-8?q?1:1=EB=AC=B8=EC=9D=98,=20=EB=B6=88?= =?UTF-8?q?=ED=8E=B8=EC=8B=A0=EA=B3=A0=20=EA=B0=9C=EC=9D=B8=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=B2=98=EB=A6=AC=EB=B0=A9=EC=B9=A8=20=EB=82=B4?= =?UTF-8?q?=EC=9A=A9=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cop/bbs/web/EgovBBSManageController.java | 52 +++++++++++++++++++ .../jsp/web/cop/bbs/EgovNoticeRegist.jsp | 40 +++----------- 2 files changed, 58 insertions(+), 34 deletions(-) diff --git a/src/main/java/itn/let/cop/bbs/web/EgovBBSManageController.java b/src/main/java/itn/let/cop/bbs/web/EgovBBSManageController.java index be44c270..087de32c 100644 --- a/src/main/java/itn/let/cop/bbs/web/EgovBBSManageController.java +++ b/src/main/java/itn/let/cop/bbs/web/EgovBBSManageController.java @@ -1572,6 +1572,32 @@ public class EgovBBSManageController { if(pattern.equals("/web/cop/bbs/addSuggestBoardArticle.do")){ // 불편신고 model.addAttribute("boardType", "suggest"); } + + // NEW + // 공통 + List resultList = new ArrayList(); + + // 이용약관, 개인정보보호방침 최신버전 List + TermsVO termsVO3 = new TermsVO(); + termsVO3.setFirstIndex(0); + termsVO3.setRecordCountPerPage(1); + termsVO3.setSearchDiv("03"); + termsVO3.setSearchUseYn("Y"); + termsVO3.setSearchSortCnd("effectDate"); + termsVO3.setSearchSortOrd("desc"); + List termsMastList2 = egovSiteManagerService.selectTermsMastMngList(termsVO3); + if (termsMastList2.size() > 0) { + TermsVO termsVO4 = new TermsVO(); + termsVO4.setFirstIndex(0); + termsVO4.setRecordCountPerPage(20); + termsVO4.setTermsMastNo(termsMastList2.get(0).getTermsMastNo()); + termsVO4.setSearchUseYn("Y"); + termsVO4.setSearchSortCnd("sort"); + termsVO4.setSearchSortOrd("ASC"); + resultList = egovSiteManagerService.selectTermsSubMngList(termsVO4); + } + + model.addAttribute("resultList", resultList); return "web/cop/bbs/EgovNoticeRegist"; } @@ -1641,6 +1667,32 @@ public class EgovBBSManageController { model.addAttribute("board", boardVO); //최대 첨부파일 갯수 지정 + // NEW + // 공통 + List resultList = new ArrayList(); + + // 이용약관, 개인정보보호방침 최신버전 List + TermsVO termsVO3 = new TermsVO(); + termsVO3.setFirstIndex(0); + termsVO3.setRecordCountPerPage(1); + termsVO3.setSearchDiv("03"); + termsVO3.setSearchUseYn("Y"); + termsVO3.setSearchSortCnd("effectDate"); + termsVO3.setSearchSortOrd("desc"); + List termsMastList2 = egovSiteManagerService.selectTermsMastMngList(termsVO3); + if (termsMastList2.size() > 0) { + TermsVO termsVO4 = new TermsVO(); + termsVO4.setFirstIndex(0); + termsVO4.setRecordCountPerPage(20); + termsVO4.setTermsMastNo(termsMastList2.get(0).getTermsMastNo()); + termsVO4.setSearchUseYn("Y"); + termsVO4.setSearchSortCnd("sort"); + termsVO4.setSearchSortOrd("ASC"); + resultList = egovSiteManagerService.selectTermsSubMngList(termsVO4); + } + + model.addAttribute("resultList", resultList); + return "web/cop/bbs/EgovNoticeRegist"; } diff --git a/src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeRegist.jsp b/src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeRegist.jsp index ba0ab4ed..60ab3028 100644 --- a/src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeRegist.jsp @@ -177,40 +177,12 @@
-
-
-

서비스 이용약관

-

제정 2022. 06. 13

-

제1장 총 칙

-

제1조(목적) 이 약관은 주식회사 아이티앤(이하“회사”)이 제공하는 - 인터넷 서비스 문자온(www.munjaon.co.kr, 이하 “서비스”)를 이용함에 있어 회사와 회원(이용자)의 - 권리, 의무, 책임사항 및 기타 필요한 사항을 규정함을목적으로 합니다.

-

제2조(용어의 정의) 이 약관에서 사용하는 용어의정의는 다음과 - 같습니다.

-
    -
  • 1. 문자온 : 회사의 서비스명으로 회원이전송하고자 하는 - 내용‧정보 등을 문자메시지, 멀티미디어메시지,카카오톡, 팩스 등 다양한 메시지 형태로 변화시켜 전송하는 서비스 - 및 회원이 제3자로부터 메시지를 수신할 수 있도록 하는 서비스
    • -
  • 2. 회원 : 회사에 개인정보를 제공하여 이용계약을체결하고, 이용자 - 아이디(ID)를 부여 받은자로서 회사가 제공하는서비스를 지속적으로 이용할 수 있는 자
    • -
  • 3. 아이디(ID) : 회원의 식별과 서비스 이용을 위하여회원이 정하고 - 회사가 승인하는 문자와 숫자의 조합
    • -
  • 4. 비밀번호 : 회원이 부여 받은 아이디(ID)와 일치된회원임을 - 확인하고, 회원의 비밀을 보호하기 위해 회원이 설정한 문자와숫자의 조합
    • -
  • 5. 휴면아이디 : 12개월 이상 계속해서 로그인을포함한 서비스 이용이 - 없는 아이디
    • -
  • 6. 해지 : 회사와 회원 간 맺은 이용계약을 해지하는것
    • -
  • 7. 스팸메시지 : 정보통신망을 통해 수신자의명시적인 사전 동의없이 - 일방적으로 전송 또는 게시되는 영리목적의광고성 정보
    • -
  • 8. 불법스팸메시지 : 『정보통신망법』 제50조 내지제50조의8의 규정을 - 위반하여 전송 또는 게시되는 영리목적의 광고성정보를 말하며, 불법스팸은 형사처벌 및 과태료 부과의 대상이 됨
    • -
  • 9. 문자피싱메시지 : 전자금융사기를 목적으로 전송또는 게시되는 정보
    • -
  • 10. 스미싱메시지 : 메시지 내용 중 인터넷 주소를클릭하면 악성코드가 - 설치되어 수신자가 모르는 사이에 금전적 피해 또는개인‧금융정보 탈취 피해를 야기하는 메시지
    • -
  • 11. 카카오톡 : 주식회사 카카오(이하 ”카카오”)가운영하는 모바일 - 메신저 기반의 실시간 커뮤니케이션 서비스로 알림톡,친구톡 또는 해당 서비스를 제공하는 어플리케이션
    • -
-
+
+ +

+ +

+
From 0c6647ea53dcfc9ded95efecc87d2c7965d372ae Mon Sep 17 00:00:00 2001 From: itn Date: Thu, 6 Jul 2023 11:00:26 +0900 Subject: [PATCH 07/15] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EB=93=B1=EA=B8=89?= =?UTF-8?q?=EC=A0=9C=20=EC=8B=9C=ED=96=89=EC=9D=BC=EC=9E=90=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../let/sym/grd/service/impl/MberGrdServiceImpl.java | 10 +++++++++- .../sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml | 8 ++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java b/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java index 740b4958..81fe6c20 100644 --- a/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java +++ b/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java @@ -1,5 +1,7 @@ package itn.let.sym.grd.service.impl; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; import java.util.List; import javax.annotation.Resource; @@ -118,6 +120,11 @@ public class MberGrdServiceImpl extends EgovAbstractServiceImpl implements MberG // 회원별 등급 적용 @Override public void mberGrdSaveByUser(MberGrdVO mberGrdVO) throws Exception { + // 현재 날짜 구하기 + LocalDate now = LocalDate.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); // 포맷 정의 + String nowDate = now.format(formatter); // 포맷 적용 + mberGrdVO.setRegId(mberGrdVO.getMberId()); mberGrdVO.setEditId(mberGrdVO.getMberId()); @@ -145,7 +152,8 @@ public class MberGrdServiceImpl extends EgovAbstractServiceImpl implements MberG mberGrdVO.setPicturePrice(mberGrdVO3.getPicturePrice()); mberGrdVO.setPicture2Price(mberGrdVO3.getPicture2Price()); mberGrdVO.setPicture3Price(mberGrdVO3.getPicture3Price()); - mberGrdVO.setGrdStartDate(mberGrdVO.getGrdDate() + " 00:00:00"); + mberGrdVO.setGrdDate(mberGrdVO.getGrdDate()); + mberGrdVO.setGrdStartDate(nowDate + " 00:00:00"); mberGrdVO.setGrdEndDate("9999:12:31 23:59:59"); mberGrdVO.setGrdStatus("Y"); diff --git a/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml index e4512cbc..e3905a82 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml @@ -178,6 +178,7 @@ , PICTURE3_PRICE , AMT , TOT_AMT + , GRD_DATE , GRD_START_DATE , GRD_END_DATE , GRD_STATUS @@ -197,6 +198,7 @@ , #picture3Price# , #amt# , #totAmt# + , #grdDate# , #grdStartDate# , #grdEndDate# , #grdStatus# @@ -264,10 +266,10 @@ , A.PICTURE2_PRICE = C.PICTURE2_PRICE , A.PICTURE3_PRICE = C.PICTURE3_PRICE , A.TOT_AMT = B.AMT_SUM - , A.GRD_START_DATE = CONCAT(DATE_FORMAT(#grdDate#, '%Y-%m-%d'), ' ', '00:00:00') + , A.GRD_DATE = CONCAT(DATE_FORMAT(#grdDate#, '%Y-%m-%d'), ' ', '00:00:00') , A.EDIT_DATE = NOW() WHERE B.GRD_SET_NO IS NOT NULL - AND A.GRD_SET_NO >= B.GRD_SET_NO + AND A.GRD_SET_NO > B.GRD_SET_NO AND GRD_STATUS NOT IN ('N', 'E') AND NOW() BETWEEN GRD_START_DATE AND GRD_END_DATE ]]> @@ -318,6 +320,7 @@ , PICTURE3_PRICE , AMT , TOT_AMT + , GRD_DATE , REG_ID , REG_DATE , EDIT_ID @@ -334,6 +337,7 @@ , #picture3Price# , #amt# , #totAmt# + , #grdDate# , #regId# , NOW() , #editId# From b347d9d01926755535898d9c57df7d8c68b37d7d Mon Sep 17 00:00:00 2001 From: itn Date: Thu, 6 Jul 2023 12:46:55 +0900 Subject: [PATCH 08/15] =?UTF-8?q?=EB=93=B1=EA=B8=89=EC=A0=9C=20=EB=82=B4?= =?UTF-8?q?=EC=97=AD=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../let/sym/grd/service/MberGrdService.java | 9 +- .../itn/let/sym/grd/service/MberGrdVO.java | 18 +- .../let/sym/grd/service/impl/MberGrdDAO.java | 13 ++ .../grd/service/impl/MberGrdServiceImpl.java | 13 ++ .../let/sym/grd/web/MberGrdController.java | 34 ++++ .../sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml | 137 ++++++++++--- .../WEB-INF/jsp/sym/grd/mberGrdList.jsp | 187 ++++++++++++++++++ 7 files changed, 383 insertions(+), 28 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdList.jsp diff --git a/src/main/java/itn/let/sym/grd/service/MberGrdService.java b/src/main/java/itn/let/sym/grd/service/MberGrdService.java index df51edd0..b86da814 100644 --- a/src/main/java/itn/let/sym/grd/service/MberGrdService.java +++ b/src/main/java/itn/let/sym/grd/service/MberGrdService.java @@ -52,5 +52,12 @@ public interface MberGrdService { // 회원별 등급 히스토리 등록 - public void insertMberGrdHist(MberGrdVO mberGrdVO) throws Exception ; + public void insertMberGrdHist(MberGrdVO mberGrdVO) throws Exception; + + // 회원별 등급 히스토리 목록 => 등급제 시행일이후 목록(사용자화면용) + List selectMberGrdHistByGrdDateList(MberGrdVO mberGrdVO) throws Exception; + + // 회원별 등급 히스토리 목록 + List selectMberGrdHistList(MberGrdVO mberGrdVO) throws Exception; + } diff --git a/src/main/java/itn/let/sym/grd/service/MberGrdVO.java b/src/main/java/itn/let/sym/grd/service/MberGrdVO.java index fdc3c344..e069bdc8 100644 --- a/src/main/java/itn/let/sym/grd/service/MberGrdVO.java +++ b/src/main/java/itn/let/sym/grd/service/MberGrdVO.java @@ -2,7 +2,9 @@ package itn.let.sym.grd.service; import java.util.List; -public class MberGrdVO { +import itn.let.uss.umt.service.UserDefaultVO; + +public class MberGrdVO extends UserDefaultVO { private int grdSetNo; // 등급설정번호 private String grdSetNm; // 등급설정명 @@ -28,10 +30,12 @@ public class MberGrdVO { private List picture3Prices; private String mberId; + private String mberNm; private String amt; private String grdStartDate; private String grdEndDate; private String grdStatus; + private String grdStatusNm; private int mberGrdHistNo; private String grdNoti; // 회원등급제 시행 여부 @@ -172,6 +176,12 @@ public class MberGrdVO { public void setMberId(String mberId) { this.mberId = mberId; } + public String getMberNm() { + return mberNm; + } + public void setMberNm(String mberNm) { + this.mberNm = mberNm; + } public String getAmt() { return amt; } @@ -196,6 +206,12 @@ public class MberGrdVO { public void setGrdStatus(String grdStatus) { this.grdStatus = grdStatus; } + public String getGrdStatusNm() { + return grdStatusNm; + } + public void setGrdStatusNm(String grdStatusNm) { + this.grdStatusNm = grdStatusNm; + } public int getMberGrdHistNo() { return mberGrdHistNo; } diff --git a/src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java b/src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java index c8003ae9..3b4a8561 100644 --- a/src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java +++ b/src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java @@ -88,4 +88,17 @@ public class MberGrdDAO extends EgovAbstractDAO { public void insertMberGrdHist(MberGrdVO mberGrdVO) throws Exception{ insert("mberGrdDAO.insertMberGrdHist", mberGrdVO); } + + // 회원별 등급 히스토리 목록 => 등급제 시행일이후 목록(사용자화면용) + @SuppressWarnings("unchecked") + public List selectMberGrdHistByGrdDateList(MberGrdVO mberGrdVO) throws Exception{ + return (List)list("mberGrdDAO.selectMberGrdHistByGrdDateList", mberGrdVO); + } + + // 회원별 등급 히스토리 목록 + @SuppressWarnings("unchecked") + public List selectMberGrdHistList(MberGrdVO mberGrdVO) throws Exception{ + return (List)list("mberGrdDAO.selectMberGrdHistList", mberGrdVO); + } + } diff --git a/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java b/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java index 81fe6c20..37f2c939 100644 --- a/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java +++ b/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java @@ -200,4 +200,17 @@ public class MberGrdServiceImpl extends EgovAbstractServiceImpl implements MberG public void insertMberGrdHist(MberGrdVO mberGrdVO) throws Exception { mberGrdDAO.insertMberGrdHist(mberGrdVO); } + + // 회원별 등급 히스토리 목록 => 등급제 시행일이후 목록(사용자화면용) + @Override + public List selectMberGrdHistByGrdDateList(MberGrdVO mberGrdVO) throws Exception { + return mberGrdDAO.selectMberGrdHistByGrdDateList(mberGrdVO); + } + + // 회원별 등급 히스토리 목록 + @Override + public List selectMberGrdHistList(MberGrdVO mberGrdVO) throws Exception { + return mberGrdDAO.selectMberGrdHistList(mberGrdVO); + } + } diff --git a/src/main/java/itn/let/sym/grd/web/MberGrdController.java b/src/main/java/itn/let/sym/grd/web/MberGrdController.java index eafc621f..0e77d03c 100644 --- a/src/main/java/itn/let/sym/grd/web/MberGrdController.java +++ b/src/main/java/itn/let/sym/grd/web/MberGrdController.java @@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; +import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import itn.com.cmm.LoginVO; import itn.let.sym.grd.service.MberGrdService; import itn.let.sym.grd.service.MberGrdVO; @@ -161,5 +162,38 @@ public class MberGrdController { return modelAndView; } + /** + * 회원별 등급제 목록 화면 + * + * @param mberGrdVO + * @param model + * @return + * @throws Exception + */ + @RequestMapping("/sym/grd/selectMberGrdList.do") + public String selectMetaTagList(@ModelAttribute("searchVO") MberGrdVO mberGrdVO, ModelMap model) throws Exception{ + + /** paging */ + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(mberGrdVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(mberGrdVO.getPageUnit()); + paginationInfo.setPageSize(mberGrdVO.getPageSize()); + + mberGrdVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); + mberGrdVO.setLastIndex(paginationInfo.getLastRecordIndex()); + mberGrdVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); + + if("".equals(mberGrdVO.getSearchSortCnd())){ //최초조회시 최신것 조회List + mberGrdVO.setSearchSortCnd("regDate"); + mberGrdVO.setSearchSortOrd("desc"); + } + + List resultList = mberGrdService.selectMberGrdList(mberGrdVO); + model.addAttribute("resultList", resultList); + paginationInfo.setTotalRecordCount( resultList.size()> 0 ? resultList.get(0).getTotCnt() : 0); + model.addAttribute("paginationInfo", paginationInfo); + + return "/sym/grd/mberGrdList"; + } } diff --git a/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml index e3905a82..64dcef9a 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml @@ -40,7 +40,7 @@ , A.REG_DATE AS regDate , A.EDIT_ID AS editId , A.EDIT_DATE AS editDate - FROM mj_mber_grd_setting A + FROM MJ_MBER_GRD_SETTING A ORDER BY A.GRD_SET_NO ASC @@ -60,13 +60,13 @@ , A.REG_DATE AS regDate , A.EDIT_ID AS editId , A.EDIT_DATE AS editDate - FROM mj_mber_grd_setting A + FROM MJ_MBER_GRD_SETTING A WHERE A.GRD_SET_NO = #grdSetNo# - UPDATE mj_mber_grd_setting A + UPDATE MJ_MBER_GRD_SETTING A SET A.STD_AMT = #stdAmt# , A.SHORT_PRICE = #shortPrice# @@ -82,26 +82,51 @@ @@ -167,7 +192,7 @@ - INSERT INTO mj_mber_grd_info + INSERT INTO MJ_MBER_GRD_INFO ( MBER_ID , GRD_SET_NO @@ -211,7 +236,7 @@ - UPDATE mj_mber_grd_info SET + UPDATE MJ_MBER_GRD_INFO SET MBER_ID = #mberId# , GRD_SET_NO = #grdSetNo# , SHORT_PRICE = #shortPrice# @@ -277,7 +302,7 @@ - UPDATE mj_mber_grd_info SET + UPDATE MJ_MBER_GRD_INFO SET GRD_END_DATE = NOW() , GRD_STATUS = 'E' , EDIT_ID = #editId# @@ -309,7 +334,7 @@ - INSERT INTO mj_mber_grd_hist + INSERT INTO MJ_MBER_GRD_HIST ( MBER_ID , GRD_SET_NO @@ -345,4 +370,64 @@ ) + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdList.jsp b/src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdList.jsp new file mode 100644 index 00000000..1f296cb2 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdList.jsp @@ -0,0 +1,187 @@ +<%-- + Class Name : webTitleList.jsp + Description : webTitleList 화면 + Modification Information + + 수정일 수정자 수정내용 + ------- -------- --------------------------- + 2009.02.01 lee.m.j 최초 생성 + 2011.08.31 JJY 경량환경 버전 생성 + + author : 공통서비스 개발팀 lee.m.j + since : 2009.02.01 +--%> +<%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ page import="itn.com.cmm.LoginVO"%> + + + + +등급제 내역 + + + + +
+ + + " /> + " /> + +
+
+
+

등급제 내역

+

+
+
+
+ + + + + +
+
+

총 건

+
+ + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
번호아이디이름등급누적결제액시행일시작일종료일 등록일 상태
+ + + + + + + + '); return false;"> + + + + + + () + + + + + + + + + + + + +
+
+
+ +
+ + +
+
    + +
+
+ + +
+
+
+ +
+ +
+ +
+ + + +
+ + \ No newline at end of file From 7a452902fc10f522f6101dc23b21ff1cabafd696 Mon Sep 17 00:00:00 2001 From: itn Date: Thu, 6 Jul 2023 16:26:08 +0900 Subject: [PATCH 09/15] =?UTF-8?q?=EB=93=B1=EA=B8=89=EC=A0=9C=20=EB=82=B4?= =?UTF-8?q?=EC=97=AD=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itn/let/sym/grd/service/MberGrdVO.java | 13 ++++++++-- .../sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml | 9 ++++--- .../WEB-INF/jsp/sym/grd/mberGrdList.jsp | 25 ++++++++++++++++--- 3 files changed, 38 insertions(+), 9 deletions(-) diff --git a/src/main/java/itn/let/sym/grd/service/MberGrdVO.java b/src/main/java/itn/let/sym/grd/service/MberGrdVO.java index e069bdc8..4fa19779 100644 --- a/src/main/java/itn/let/sym/grd/service/MberGrdVO.java +++ b/src/main/java/itn/let/sym/grd/service/MberGrdVO.java @@ -5,7 +5,8 @@ import java.util.List; import itn.let.uss.umt.service.UserDefaultVO; public class MberGrdVO extends UserDefaultVO { - + private static final long serialVersionUID = 1L; + private int grdSetNo; // 등급설정번호 private String grdSetNm; // 등급설정명 private long stdAmt; // 기준결제액 @@ -40,7 +41,9 @@ public class MberGrdVO extends UserDefaultVO { private String grdNoti; // 회원등급제 시행 여부 private String grdDate; // 회원등급제 시행일자 - + + // 검색필터 + private String searchGrdStatus; public int getGrdSetNo() { return grdSetNo; @@ -230,4 +233,10 @@ public class MberGrdVO extends UserDefaultVO { public void setGrdDate(String grdDate) { this.grdDate = grdDate; } + public String getSearchGrdStatus() { + return searchGrdStatus; + } + public void setSearchGrdStatus(String searchGrdStatus) { + this.searchGrdStatus = searchGrdStatus; + } } diff --git a/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml index 64dcef9a..d8507540 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml @@ -95,8 +95,8 @@ , A.AMT AS amt , A.TOT_AMT AS totAmt , DATE_FORMAT(A.GRD_DATE, '%Y-%m-%d') AS grdDate - , DATE_FORMAT(A.GRD_START_DATE, '%Y-%m-%d %H:%i') AS grdStartDate - , DATE_FORMAT(A.GRD_END_DATE, '%Y-%m-%d %H:%i') AS grdEndDate + , DATE_FORMAT(A.GRD_START_DATE, '%Y-%m-%d') AS grdStartDate + , DATE_FORMAT(A.GRD_END_DATE, '%Y-%m-%d') AS grdEndDate , A.GRD_STATUS AS grdStatus , CASE WHEN A.GRD_STATUS = 'Y' @@ -126,7 +126,10 @@ A.MBER_ID = #searchKeyword# - + + + A.GRD_STATUS = #searchGrdStatus# + ORDER BY 1=1 ,$searchSortCnd$ diff --git a/src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdList.jsp b/src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdList.jsp index 1f296cb2..7d2a7a25 100644 --- a/src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdList.jsp +++ b/src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdList.jsp @@ -24,6 +24,13 @@ 등급제 내역