From a41ab640bbc598b2cf12b9eb750550e17779ea49 Mon Sep 17 00:00:00 2001 From: rosewiper Date: Wed, 27 Dec 2023 09:49:24 +0900 Subject: [PATCH 01/64] =?UTF-8?q?=EC=97=91=EC=8A=A4=ED=8D=BC=20=EB=8B=A4?= =?UTF-8?q?=EC=9D=B4=ED=8A=B8=20=EA=B3=84=EC=A0=95=20=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/egovframework/egovProps/globals_dev.properties | 2 +- .../resources/egovframework/egovProps/globals_local.properties | 2 +- .../resources/egovframework/egovProps/globals_prod.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/egovframework/egovProps/globals_dev.properties b/src/main/resources/egovframework/egovProps/globals_dev.properties index 397b3988..1ee51c85 100644 --- a/src/main/resources/egovframework/egovProps/globals_dev.properties +++ b/src/main/resources/egovframework/egovProps/globals_dev.properties @@ -99,7 +99,7 @@ Globals.mjon.biz.kakao.apiKey=dheBWCONP6J5 Globals.fax.xpedite.id=kr/itn0202 -Globals.fax.xpedite.pw=easytour7! +Globals.fax.xpedite.pw=on240101! Globals.fax.file.save.path=/usr/local/tomcat/file/sht/fax Globals.fax.file.convert.path=/usr/local/tomcat/file/sht/fax/Convert Globals.fax.file.ori.path=/usr/local/tomcat/file/sht/fax diff --git a/src/main/resources/egovframework/egovProps/globals_local.properties b/src/main/resources/egovframework/egovProps/globals_local.properties index 864aefb1..4812a29c 100644 --- a/src/main/resources/egovframework/egovProps/globals_local.properties +++ b/src/main/resources/egovframework/egovProps/globals_local.properties @@ -100,7 +100,7 @@ Globals.mjon.biz.kakao.apiKey=dheBWCONP6J5 Globals.fax.xpedite.id=kr/itn0202 -Globals.fax.xpedite.pw=easytour7! +Globals.fax.xpedite.pw=on240101! Globals.fax.file.save.path=/usr/local/tomcat/file/sht/fax Globals.fax.file.convert.path=/usr/local/tomcat/file/sht/fax/Convert Globals.fax.file.ori.path=/usr/local/tomcat/file/sht/fax diff --git a/src/main/resources/egovframework/egovProps/globals_prod.properties b/src/main/resources/egovframework/egovProps/globals_prod.properties index 6abf5356..119f4134 100644 --- a/src/main/resources/egovframework/egovProps/globals_prod.properties +++ b/src/main/resources/egovframework/egovProps/globals_prod.properties @@ -87,7 +87,7 @@ Globals.mjon.biz.id=itn0202 Globals.mjon.biz.kakao.apiKey=dheBWCONP6J5 Globals.fax.xpedite.id=kr/itn0202 -Globals.fax.xpedite.pw=easytour7! +Globals.fax.xpedite.pw=on240101! Globals.fax.file.save.path=/usr/local/tomcat/file/sht/fax Globals.fax.file.convert.path=/usr/local/tomcat/file/sht/fax/Convert Globals.fax.file.ori.path=/usr/local/tomcat/file/sht/fax From c5e2063a03b45fb962727acfbea7278a02e21efe Mon Sep 17 00:00:00 2001 From: rosewiper Date: Wed, 27 Dec 2023 12:20:20 +0900 Subject: [PATCH 02/64] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=201.=20=EC=82=AC=EC=9A=A9=EC=9E=90=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=ED=8C=9D=EC=97=85=20"=ED=9B=84=EB=B6=88=EC=A0=9C?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD"=20=EA=B8=B0=EB=8A=A5=EC=8B=9C?= =?UTF-8?q?=20=EC=84=B8=EA=B8=88=EA=B3=84=EC=82=B0=EC=84=9C=20=EC=9E=90?= =?UTF-8?q?=EB=8F=99=20=EB=B0=9C=ED=96=89=20=EB=B0=8F=20=EA=B2=B0=EC=A0=9C?= =?UTF-8?q?=EB=82=B4=EC=97=AD=20=EC=97=AC=EB=B6=80=20=EB=AF=B8=EB=A6=AC=20?= =?UTF-8?q?=EC=B2=B4=ED=81=AC=20=202.=20=EC=BB=A8=ED=8A=B8=EB=A1=A4?= =?UTF-8?q?=EB=9F=AC=EC=97=90=EC=84=9C=EB=8F=84=20=EC=84=B8=EA=B8=88?= =?UTF-8?q?=EA=B3=84=EC=82=B0=EC=84=9C=20=EC=9E=90=EB=8F=99=EB=B0=9C?= =?UTF-8?q?=ED=96=89=20=EB=B0=8F=20=EA=B2=B0=EC=A0=9C=EB=82=B4=EC=97=AD=20?= =?UTF-8?q?=EC=97=AC=EB=B6=80=20=EC=B2=B4=ED=81=AC=20=EB=A1=9C=EC=A7=81=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../uss/umt/web/EgovUserManageController.java | 19 +++++++++++++++++++ .../cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp | 18 ++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java index f27f65e8..c0916816 100644 --- a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java +++ b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java @@ -2714,6 +2714,25 @@ public class EgovUserManageController { msg = "로그인이 필요합니다."; } else { + + MberManageVO mberManageVO = mberManageService.selectMber(userManageVO.getMberId()); + + System.out.println(mberManageVO.getTaxbillAuto()); + + String taxbillAuto = mberManageVO.getTaxbillAuto(); + + if(taxbillAuto == null || taxbillAuto.equals("N")) { + + isSuccess = false; + msg = "세금계산서 자동발행의 선택이 안되어 있습니다. 확인 부탁드리겠습니다."; + + modelAndView.addObject("isSuccess", isSuccess); + modelAndView.addObject("msg", msg); + + return modelAndView; + + } + int payCnt = userManageService.selectPayCountByUser(userManageVO); if (payCnt > 0) { isSuccess = false; diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp index 5e5163b5..f724f8e5 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp @@ -1439,6 +1439,23 @@ function fnMberHotlineAgentYn(){ //후불제 여부 function fnMberPrePaymentYn(prePaymentYn){ + + var form = document.mberManageVO; + var taxbillAuto = form.taxbillAuto.value; + var sumPayMoney = '${sumPayMoney}'; + + //기존 결재 내역 존재 여부 확인 + if(sumPayMoney > 0){ + alert("회원의 결제내역 정보가 존재합니다. 확인 부탁드리겠습니다."); + return false; + } + + //세금계산서 자동발행 여부 확인 + if(taxbillAuto == '' || taxbillAuto == 'N'){ + alert("세금계산서 자동발행의 선택이 안되어 있습니다. 확인 부탁드리겠습니다."); + return false; + } + if(confirm("후불제로 변경하시겠습니까?\n후불제로 변경하면 선불제로 변경 불가합니다.")){ $.ajax({ @@ -2965,6 +2982,7 @@ function kakaoATDelayCancel(msgGroupId){ +

· 이용자 정보 조회

From 1dfa0ce825c882c164d1a38540c911413ba4867e Mon Sep 17 00:00:00 2001 From: rosewiper Date: Wed, 27 Dec 2023 12:55:31 +0900 Subject: [PATCH 03/64] =?UTF-8?q?=EC=84=B8=EA=B8=88=EA=B3=84=EC=82=B0?= =?UTF-8?q?=EC=84=9C=20=EC=9E=90=EB=8F=99=EB=B0=9C=ED=96=89=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20=20-=20?= =?UTF-8?q?=EA=B0=9C=EC=9D=B8=20=ED=9A=8C=EC=9B=90=20=ED=9B=84=EB=B3=B4?= =?UTF-8?q?=EC=9E=90=EB=93=B1=EB=A1=9D=20=EC=A0=95=EB=B3=B4=EA=B0=80=20?= =?UTF-8?q?=EC=97=86=EB=8A=94=20=EA=B2=BD=EC=9A=B0=20=EC=84=B8=EA=B8=88?= =?UTF-8?q?=EA=B3=84=EC=82=B0=EC=84=9C=20=EC=9E=90=EB=8F=99=EB=B0=9C?= =?UTF-8?q?=ED=96=89=20=EC=A0=80=EC=9E=A5=20=EC=8B=9C=20=EC=98=A4=EB=A5=98?= =?UTF-8?q?=20=EC=88=98=EC=A0=95=20=20-=20=EC=9E=90=EB=8F=99=20=EB=B0=9C?= =?UTF-8?q?=ED=96=89=20=EC=A0=80=EC=9E=A5=20=ED=9B=84=20=ED=99=94=EB=A9=B4?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=9E=90=EB=8F=99=EB=B0=9C=ED=96=89=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=ED=91=9C=EC=8B=9C=20=EC=98=A4=EB=A5=98=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/java/itn/let/mjo/pay/web/MjonPayController.java | 6 ++++-- .../itn/let/uss/umt/web/EgovUserManageController.java | 2 -- src/main/webapp/WEB-INF/jsp/web/pay/BillPub.jsp | 9 +++++++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java index 3664c25d..99f05b15 100644 --- a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java +++ b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java @@ -3844,9 +3844,11 @@ public class MjonPayController { MberManageVO tmpMberManageVO = mjonMsgDataService.selectMberManageInfo(mberId); String dept = tmpMberManageVO.getDept(); - if(dept.equals("p") && taxCNm != null && taxCNm.length() > 0) { + //후보자 정보 조회 + MjonCandidateVO mjonCandidateVO = mjonCandidateService.selectCandidateDataInfo(mberId); + + if(mjonCandidateVO != null && dept.equals("p") && taxCNm != null && taxCNm.length() > 0) { - MjonCandidateVO mjonCandidateVO = mjonCandidateService.selectCandidateDataInfo(mberId); String candidateNm = mjonCandidateVO.getCandidateNm(); if(candidateNm != null && candidateNm.length() > 0) { diff --git a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java index c0916816..c367dd89 100644 --- a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java +++ b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java @@ -2717,8 +2717,6 @@ public class EgovUserManageController { MberManageVO mberManageVO = mberManageService.selectMber(userManageVO.getMberId()); - System.out.println(mberManageVO.getTaxbillAuto()); - String taxbillAuto = mberManageVO.getTaxbillAuto(); if(taxbillAuto == null || taxbillAuto.equals("N")) { diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/BillPub.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/BillPub.jsp index 6966bde3..bd5735aa 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/BillPub.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/BillPub.jsp @@ -23,6 +23,7 @@ + + + + + + + + + + + + +
+ + + + +
+
+

QUICK
MENU

+

QUICK

+ + +
+
+ + + + + + +
+
+ +
+ +
    +
  • +
  • +
  • +
  • +
  • +
+ + +
+
+

요금 사용내역

+
+
+
+

누적 사용금액

+
+

캐시

+

120

+
+
+

포인트

+

120

+
+
+
+

누적 납부금액

+
+

캐시

+

120

+
+
+

포인트

+

120

+
+
+
+

당월 납부 예상금액

+
+

캐시

+

120

+
+
+

포인트

+

120

+
+
+
+

잔액 (사용가능금액)

+
+

캐시

+

43,898.6

+
+
+

포인트

+

120

+
+
+
+
+

발송내역

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
구분문자알림톡팩스
발송건(매)수100,000,000100,000,000100,000,000100,000,000
예약건수100,000,000100,000,000100,000,000100,000,000
+
+
+

세부내역

+
+
+
+ 기간선택 +
+ + ~ + +
+ + + + + * 조회기간의 사용내역만 보여집니다. +
+
+
+
+
+
+ +
    +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
+ +
+
+
+

10

+
+ + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 발송일시 +
+ + +
+
+ 문자유형 +
+ + +
+
+ 내용 + + 발송건수 + 사용
충전금포인트
+

2023-12-28 07:32

+
+

장문

+
+

+
+

8888

+
+

0

+
+

50

+
+

2023-12-28 07:32

+
+

장문

+
+

+
+

8

+
+

0

+
+

50

+
+

2023-12-28 07:32

+
+

장문

+
+

+
+

8

+
+

0

+
+

50

+
+

2023-12-28 07:32

+
+

장문

+
+

+
+

8

+
+

0

+
+

50

+
+

2023-12-28 07:32

+
+

장문

+
+

+
+

8

+
+

0

+
+

50

+
+

2023-12-28 07:32

+
+

장문

+
+

+
+

8(1)

+
+

0

+
+

50

+
+

2023-12-28 07:32

+
+

장문

+
+

+
+

5897

+
+

0

+
+

500

+
+
+
+
+ + + + +
+
+ +
+
+ +
    +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
+
+
+
+ +
+
+ + +
+ + +
+ + + + \ No newline at end of file From 7aa549de445cf118b49139ec60d8bfda62dec0d3 Mon Sep 17 00:00:00 2001 From: kmg Date: Wed, 27 Dec 2023 17:33:47 +0900 Subject: [PATCH 08/64] =?UTF-8?q?2023/12/27=20=ED=9B=84=EB=B6=88=ED=9A=8C?= =?UTF-8?q?=EC=9B=90=20=EC=9A=94=EA=B8=88=20=EC=82=AC=EC=9A=A9=EB=82=B4?= =?UTF-8?q?=EC=97=AD=20'=EC=82=AC=EC=9A=A9=EA=B8=88=EC=95=A1=20=ED=95=A9?= =?UTF-8?q?=EA=B3=84'=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/publish/payment6.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/publish/payment6.html b/src/main/webapp/publish/payment6.html index bd4b829a..af25d0da 100644 --- a/src/main/webapp/publish/payment6.html +++ b/src/main/webapp/publish/payment6.html @@ -325,7 +325,7 @@
-

10

+

10건 / 사용금액 합계 : 25,000

From e6c36a55c0bcf5aced77f140a82714c70df931e0 Mon Sep 17 00:00:00 2001 From: kmg Date: Wed, 27 Dec 2023 17:41:09 +0900 Subject: [PATCH 09/64] =?UTF-8?q?2023/12/27=20=ED=97=A4=EB=8D=94=20?= =?UTF-8?q?=EB=B3=B4=EC=9C=A0=EC=9E=94=EC=95=A1=20=EC=95=88=EB=82=B4=20?= =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=96=B4=20=EC=A3=BC=EC=84=9D=EC=B2=98?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp index 9423b3c2..333eb962 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp @@ -1639,9 +1639,9 @@ function actionLogin() {

보유잔액(캐시)

-
+