From 61040f78e932c933712def1959a3ccd3e6568971 Mon Sep 17 00:00:00 2001 From: subsub Date: Tue, 12 Dec 2023 11:32:21 +0900 Subject: [PATCH 1/2] =?UTF-8?q?2023/12/12=20=EC=84=A0=EA=B1=B0=EB=AC=B8?= =?UTF-8?q?=EC=9E=90=20=EC=A0=84=EC=B2=B4=20=EC=B2=B4=ED=81=AC=EB=B0=95?= =?UTF-8?q?=EC=8A=A4=20=ED=81=B4=EB=A6=AD=20=EC=8B=9C=20=EC=88=9C=EC=B0=A8?= =?UTF-8?q?=EC=A0=81=EC=9C=BC=EB=A1=9C=20=EC=84=A0=ED=83=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/publish/js/publish.js | 6 +++++- src/main/webapp/publish/sub_election_2023.html | 16 +++++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/publish/js/publish.js b/src/main/webapp/publish/js/publish.js index 618d79e6..2bcd292e 100644 --- a/src/main/webapp/publish/js/publish.js +++ b/src/main/webapp/publish/js/publish.js @@ -12,7 +12,7 @@ var onlongclick = function ($target, time, callback) { var publishCommon = { count: 0, - longMousePressCheck: function (checkTarget, checkTime) { + longMousePressCheck: function (checkTarget, checkTime , $target) { // checkTarget → 체크박스([name='']) / checkTime → 몇초 간격으로 체크 될지 var checkLength = checkTarget.length; // 체크박스 몇개인지 var cnt = 0; // 몇개 체크됐는지 @@ -22,6 +22,10 @@ var publishCommon = { clearInterval(checkEvent); // 자동체크 끝. } $(checkTarget[cnt]).prop('checked', true); // 체크박스 체크. + $($target).on("mouseup",function(){ + //마우스떼면 멈춤 + clearInterval(checkEvent); + }); cnt++; }, checkTime); }, diff --git a/src/main/webapp/publish/sub_election_2023.html b/src/main/webapp/publish/sub_election_2023.html index e71f818c..97242a10 100644 --- a/src/main/webapp/publish/sub_election_2023.html +++ b/src/main/webapp/publish/sub_election_2023.html @@ -54,10 +54,20 @@ } }); - onlongclick(".btn_check_one", 1000, function () { + $(".input_wrap #checkAll").click(function(){ var checkbox = $('[name=receipt_number_check]'); - publishCommon.longMousePressCheck(checkbox, 300); + if($(this).is(":checked") !== true){ + checkbox.prop("checked",false); + }else{ + publishCommon.longMousePressCheck(checkbox, 100); + } }); + + onlongclick(".btn_check_one", 100, function (e) { + var checkbox = $('[name=receipt_number_check]'); + publishCommon.longMousePressCheck(checkbox, 100, $(".btn_check_one")); + }); + $(".btn_check_one").click(function(){ var checkbox = $('[name=receipt_number_check]'); @@ -1339,7 +1349,7 @@
    -
  • +
  • 번호 From 2eb1939055bb6bd81d0cb360ebd88686be8bc38b Mon Sep 17 00:00:00 2001 From: wyh Date: Tue, 12 Dec 2023 12:26:53 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EB=AC=B8=EC=9E=90=EC=98=A8=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=9A=94=EA=B8=88=EB=82=B4=EC=97=AD=20=ED=91=9C?= =?UTF-8?q?=EC=8B=9C=20=EC=98=A4=EB=A5=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/itn/let/mjo/pay/service/MjonPayService.java | 5 +++-- .../java/itn/let/mjo/pay/service/impl/MjonPayDAO.java | 4 ++++ .../let/mjo/pay/service/impl/MjonPayServiceImpl.java | 9 +++++++-- .../java/itn/let/mjo/pay/web/MjonPayController.java | 4 ++-- .../egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml | 10 +++++++++- 5 files changed, 25 insertions(+), 7 deletions(-) diff --git a/src/main/java/itn/let/mjo/pay/service/MjonPayService.java b/src/main/java/itn/let/mjo/pay/service/MjonPayService.java index 8f6cdf38..cce02bc6 100644 --- a/src/main/java/itn/let/mjo/pay/service/MjonPayService.java +++ b/src/main/java/itn/let/mjo/pay/service/MjonPayService.java @@ -76,9 +76,10 @@ public interface MjonPayService { void updatePointUseByCase(MjonPayVO mjonPayVO) throws Exception; - String selectSumPayMoney(String userId) throws Exception; - + + String selectAgentSumPayMoney(String userId) throws Exception; + String selectSumPoint(String userId) throws Exception; List selectPayListForRefund(MjonPayVO mjonPayVO) throws Exception; diff --git a/src/main/java/itn/let/mjo/pay/service/impl/MjonPayDAO.java b/src/main/java/itn/let/mjo/pay/service/impl/MjonPayDAO.java index ab25a946..ed872913 100644 --- a/src/main/java/itn/let/mjo/pay/service/impl/MjonPayDAO.java +++ b/src/main/java/itn/let/mjo/pay/service/impl/MjonPayDAO.java @@ -179,6 +179,10 @@ public class MjonPayDAO extends EgovAbstractDAO { return (String) select("mjonPayDAO.selectSumPayMoney", userId); } + public String selectAgentSumPayMoney(String userId) throws Exception{ + return (String) select("mjonPayDAO.selectAgentSumPayMoney", userId); + } + public String selectSumPoint(String userId) throws Exception{ return (String) select("mjonPayDAO.selectSumPoint", userId); } diff --git a/src/main/java/itn/let/mjo/pay/service/impl/MjonPayServiceImpl.java b/src/main/java/itn/let/mjo/pay/service/impl/MjonPayServiceImpl.java index a70ca870..1c870c2c 100644 --- a/src/main/java/itn/let/mjo/pay/service/impl/MjonPayServiceImpl.java +++ b/src/main/java/itn/let/mjo/pay/service/impl/MjonPayServiceImpl.java @@ -2499,13 +2499,16 @@ public class MjonPayServiceImpl extends EgovAbstractServiceImpl implements MjonP } } - - @Override public String selectSumPayMoney(String userId) throws Exception{ return mjonPayDAO.selectSumPayMoney(userId); } + @Override + public String selectAgentSumPayMoney(String userId) throws Exception { + return mjonPayDAO.selectAgentSumPayMoney(userId); + } + @Override public String selectSumPoint(String userId) throws Exception{ return mjonPayDAO.selectSumPoint(userId); @@ -2740,4 +2743,6 @@ public class MjonPayServiceImpl extends EgovAbstractServiceImpl implements MjonP return mjonPayDAO.selectPointInfoList(userId); } + + } 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 55d5f1c5..eca2dbcc 100644 --- a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java +++ b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java @@ -2409,7 +2409,7 @@ public class MjonPayController { mjonMsgVO.setUserId(userId); { // 충전캐시 - String sumPayMoney = mjonPayService.selectSumPayMoney(userId); + String sumPayMoney = mjonPayService.selectAgentSumPayMoney(userId); model.addAttribute("sumPayMoney", sumPayMoney); } @@ -2480,7 +2480,7 @@ public class MjonPayController { { // 충전캐시 - String sumPayMoney = mjonPayService.selectSumPayMoney(userId); + String sumPayMoney = mjonPayService.selectAgentSumPayMoney(userId); model.addAttribute("sumPayMoney", sumPayMoney); } diff --git a/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml index 9a722b58..e80b4936 100644 --- a/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml @@ -1285,6 +1285,14 @@ + + SELECT 'chargeCash' AS divFlag - ,SUM(AMT) AS cashSum + ,SUM(CASH) AS cashSum FROM MJ_PG WHERE 1=1