From 3d504f4392d96e438549951579d80f514baadd19 Mon Sep 17 00:00:00 2001 From: myname Date: Tue, 18 Mar 2025 18:06:53 +0900 Subject: [PATCH] # WARNING: head commit changed in the meantime MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet 2025-03-18 18:06 이전 결재 문서 보기 --- .../config/mappers/common/common_sql.xml | 19 + .../logs/ClipReport4.2025-02-24-1.log | 21808 -------------- .../logs/ClipReport4.2025-02-24-2.log | 13978 --------- .../logs/ClipReport4.2025-02-25-1.log | 14344 --------- .../logs/ClipReport4.2025-02-26-1.log | 21873 -------------- .../logs/ClipReport4.2025-02-26-2.log | 24469 ---------------- .../logs/ClipReport4.2025-02-26-3.log | 22198 -------------- .../logs/ClipReport4.2025-02-26-4.log | 3238 -- .../logs/ClipReport4.2025-02-27-1.log | 22462 -------------- .../logs/ClipReport4.2025-02-27-2.log | 304 - .../logs/ClipReport4.2025-03-12-1.log | 134 + .../2bae138f8de64242b6955ddfe0d8ef01count | 1 - .../2bae138f8de64242b6955ddfe0d8ef01document | 1 - .../2bae138f8de64242b6955ddfe0d8ef01page0 | Bin 1696 -> 0 bytes .../2bae138f8de64242b6955ddfe0d8ef01page1 | Bin 1712 -> 0 bytes .../2bae138f8de64242b6955ddfe0d8ef01page2 | Bin 1168 -> 0 bytes ...4cbadc7b2027419ae192e4e1bb8d83859251514af} | Bin .../4df7449dc2454887aae3cf94cbadc7b2count | 1 + .../4df7449dc2454887aae3cf94cbadc7b2document | 1 + ...nd => 4df7449dc2454887aae3cf94cbadc7b2end} | 0 ...4cbadc7b2fc807df9a7df40a595ba5d3e34547ff8} | Bin .../4df7449dc2454887aae3cf94cbadc7b2page0 | Bin 0 -> 1536 bytes .../4df7449dc2454887aae3cf94cbadc7b2page1 | Bin 0 -> 544 bytes .../4df7449dc2454887aae3cf94cbadc7b2page2 | Bin 0 -> 784 bytes .../4df7449dc2454887aae3cf94cbadc7b2page3 | Bin 0 -> 336 bytes .../4df7449dc2454887aae3cf94cbadc7b2page4 | 1 + ...5a33289ca6659b49c1c134ec1842f5dd3805bc6a0} | Bin .../58e9ede6f5fc4c689c125a45a33289cacount | 1 + .../58e9ede6f5fc4c689c125a45a33289cadocument | 1 + ...5a33289cae88c759f9c4a42caae8e3ea527b933bd} | Bin ...nd => 58e9ede6f5fc4c689c125a45a33289caend} | 0 .../58e9ede6f5fc4c689c125a45a33289capage0 | Bin 0 -> 1536 bytes .../58e9ede6f5fc4c689c125a45a33289capage1 | Bin 0 -> 544 bytes .../58e9ede6f5fc4c689c125a45a33289capage2 | Bin 0 -> 784 bytes .../58e9ede6f5fc4c689c125a45a33289capage3 | Bin 0 -> 336 bytes .../58e9ede6f5fc4c689c125a45a33289capage4 | 1 + .../797616ba0c7744899aac7b18be355269count | 1 - .../797616ba0c7744899aac7b18be355269document | 1 - .../797616ba0c7744899aac7b18be355269page0 | Bin 1696 -> 0 bytes .../797616ba0c7744899aac7b18be355269page1 | Bin 1712 -> 0 bytes .../797616ba0c7744899aac7b18be355269page2 | Bin 1168 -> 0 bytes ...2abfeb636275c9fafd92094913800280d265dfc08f | Bin 2180 -> 0 bytes .../7bc287b9aa6a46c581af862abfeb6362count | 1 - .../7bc287b9aa6a46c581af862abfeb6362document | 1 - .../temp/7bc287b9aa6a46c581af862abfeb6362end | 1 - ...2abfeb6362f7b1ca37eb094159b3492731e4296472 | Bin 5714 -> 0 bytes .../7bc287b9aa6a46c581af862abfeb6362page0 | Bin 1696 -> 0 bytes .../7bc287b9aa6a46c581af862abfeb6362page1 | Bin 1712 -> 0 bytes .../7bc287b9aa6a46c581af862abfeb6362page2 | Bin 1168 -> 0 bytes .../9ed5dc1a85454842bbbaea4028e4bde3count | 1 - ...4028e4bde3d30408e4aff54269be8180f7ba229bbf | Bin 2180 -> 0 bytes .../9ed5dc1a85454842bbbaea4028e4bde3document | 1 - ...4028e4bde3e85a437d005f45cf9362519004695cc8 | Bin 5714 -> 0 bytes .../temp/9ed5dc1a85454842bbbaea4028e4bde3end | 1 - .../9ed5dc1a85454842bbbaea4028e4bde3page0 | Bin 2880 -> 0 bytes ...2230a5a16901284b5f889a4418a58019bd65687cea | Bin 5714 -> 0 bytes ...2230a5a16981183974d81848e6b58bebd0fb9de9de | Bin 2180 -> 0 bytes .../d5f27723c4324d3da38cd42230a5a169count | 1 - .../d5f27723c4324d3da38cd42230a5a169document | 1 - .../temp/d5f27723c4324d3da38cd42230a5a169end | 1 - .../d5f27723c4324d3da38cd42230a5a169page0 | Bin 1696 -> 0 bytes .../d5f27723c4324d3da38cd42230a5a169page1 | Bin 1712 -> 0 bytes .../d5f27723c4324d3da38cd42230a5a169page2 | Bin 1168 -> 0 bytes ...168e075f2a0542b72936da49de9fb82f15f99947b2 | Bin 2180 -> 0 bytes ...168e075f2a1f858916026042d2a91e758cc2295563 | Bin 5714 -> 0 bytes .../e51b4bd85f2b4d179853e1168e075f2acount | 1 - .../e51b4bd85f2b4d179853e1168e075f2adocument | 1 - .../temp/e51b4bd85f2b4d179853e1168e075f2aend | 1 - .../e51b4bd85f2b4d179853e1168e075f2apage0 | Bin 1696 -> 0 bytes .../e51b4bd85f2b4d179853e1168e075f2apage1 | Bin 1712 -> 0 bytes .../e51b4bd85f2b4d179853e1168e075f2apage2 | Bin 1168 -> 0 bytes ...ab8d4beb844e9ce36981e6482ba07d0f276a62d8dc | Bin 5714 -> 0 bytes .../f00f0dcf6b8d4b44b33ca9ab8d4beb84count | 1 - .../f00f0dcf6b8d4b44b33ca9ab8d4beb84document | 1 - .../temp/f00f0dcf6b8d4b44b33ca9ab8d4beb84end | 1 - ...ab8d4beb84fc725aafd8444a1d8a075c5aff81e410 | Bin 2180 -> 0 bytes .../f00f0dcf6b8d4b44b33ca9ab8d4beb84page0 | Bin 1696 -> 0 bytes .../f00f0dcf6b8d4b44b33ca9ab8d4beb84page1 | Bin 1712 -> 0 bytes .../f00f0dcf6b8d4b44b33ca9ab8d4beb84page2 | Bin 1168 -> 0 bytes .../_extra/gtm/trublprocessmng/rceptEdit.jsp | 43 +- 80 files changed, 199 insertions(+), 144696 deletions(-) delete mode 100644 src/main/webapp/WEB-INF/clipreport4/logs/ClipReport4.2025-02-24-1.log delete mode 100644 src/main/webapp/WEB-INF/clipreport4/logs/ClipReport4.2025-02-24-2.log delete mode 100644 src/main/webapp/WEB-INF/clipreport4/logs/ClipReport4.2025-02-25-1.log delete mode 100644 src/main/webapp/WEB-INF/clipreport4/logs/ClipReport4.2025-02-26-1.log delete mode 100644 src/main/webapp/WEB-INF/clipreport4/logs/ClipReport4.2025-02-26-2.log delete mode 100644 src/main/webapp/WEB-INF/clipreport4/logs/ClipReport4.2025-02-26-3.log delete mode 100644 src/main/webapp/WEB-INF/clipreport4/logs/ClipReport4.2025-02-26-4.log delete mode 100644 src/main/webapp/WEB-INF/clipreport4/logs/ClipReport4.2025-02-27-1.log delete mode 100644 src/main/webapp/WEB-INF/clipreport4/logs/ClipReport4.2025-02-27-2.log create mode 100644 src/main/webapp/WEB-INF/clipreport4/logs/ClipReport4.2025-03-12-1.log delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/2bae138f8de64242b6955ddfe0d8ef01count delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/2bae138f8de64242b6955ddfe0d8ef01document delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/2bae138f8de64242b6955ddfe0d8ef01page0 delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/2bae138f8de64242b6955ddfe0d8ef01page1 delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/2bae138f8de64242b6955ddfe0d8ef01page2 rename src/main/webapp/WEB-INF/clipreport4/temp/{2bae138f8de64242b6955ddfe0d8ef013d6e2d9d9cf14831a481d2e18c0ce4e8 => 4df7449dc2454887aae3cf94cbadc7b2027419ae192e4e1bb8d83859251514af} (100%) create mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/4df7449dc2454887aae3cf94cbadc7b2count create mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/4df7449dc2454887aae3cf94cbadc7b2document rename src/main/webapp/WEB-INF/clipreport4/temp/{2bae138f8de64242b6955ddfe0d8ef01end => 4df7449dc2454887aae3cf94cbadc7b2end} (100%) rename src/main/webapp/WEB-INF/clipreport4/temp/{2bae138f8de64242b6955ddfe0d8ef012e032e4fe0b047d1bea477c3007ac3af => 4df7449dc2454887aae3cf94cbadc7b2fc807df9a7df40a595ba5d3e34547ff8} (100%) create mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/4df7449dc2454887aae3cf94cbadc7b2page0 create mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/4df7449dc2454887aae3cf94cbadc7b2page1 create mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/4df7449dc2454887aae3cf94cbadc7b2page2 create mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/4df7449dc2454887aae3cf94cbadc7b2page3 create mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/4df7449dc2454887aae3cf94cbadc7b2page4 rename src/main/webapp/WEB-INF/clipreport4/temp/{797616ba0c7744899aac7b18be355269865c44e8891b4a65ab56f55efe0b54ce => 58e9ede6f5fc4c689c125a45a33289ca6659b49c1c134ec1842f5dd3805bc6a0} (100%) create mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/58e9ede6f5fc4c689c125a45a33289cacount create mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/58e9ede6f5fc4c689c125a45a33289cadocument rename src/main/webapp/WEB-INF/clipreport4/temp/{797616ba0c7744899aac7b18be355269367e894abf614a60909bae380037bce6 => 58e9ede6f5fc4c689c125a45a33289cae88c759f9c4a42caae8e3ea527b933bd} (100%) rename src/main/webapp/WEB-INF/clipreport4/temp/{797616ba0c7744899aac7b18be355269end => 58e9ede6f5fc4c689c125a45a33289caend} (100%) create mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/58e9ede6f5fc4c689c125a45a33289capage0 create mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/58e9ede6f5fc4c689c125a45a33289capage1 create mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/58e9ede6f5fc4c689c125a45a33289capage2 create mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/58e9ede6f5fc4c689c125a45a33289capage3 create mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/58e9ede6f5fc4c689c125a45a33289capage4 delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/797616ba0c7744899aac7b18be355269count delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/797616ba0c7744899aac7b18be355269document delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/797616ba0c7744899aac7b18be355269page0 delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/797616ba0c7744899aac7b18be355269page1 delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/797616ba0c7744899aac7b18be355269page2 delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/7bc287b9aa6a46c581af862abfeb636275c9fafd92094913800280d265dfc08f delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/7bc287b9aa6a46c581af862abfeb6362count delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/7bc287b9aa6a46c581af862abfeb6362document delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/7bc287b9aa6a46c581af862abfeb6362end delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/7bc287b9aa6a46c581af862abfeb6362f7b1ca37eb094159b3492731e4296472 delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/7bc287b9aa6a46c581af862abfeb6362page0 delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/7bc287b9aa6a46c581af862abfeb6362page1 delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/7bc287b9aa6a46c581af862abfeb6362page2 delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/9ed5dc1a85454842bbbaea4028e4bde3count delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/9ed5dc1a85454842bbbaea4028e4bde3d30408e4aff54269be8180f7ba229bbf delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/9ed5dc1a85454842bbbaea4028e4bde3document delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/9ed5dc1a85454842bbbaea4028e4bde3e85a437d005f45cf9362519004695cc8 delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/9ed5dc1a85454842bbbaea4028e4bde3end delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/9ed5dc1a85454842bbbaea4028e4bde3page0 delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/d5f27723c4324d3da38cd42230a5a16901284b5f889a4418a58019bd65687cea delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/d5f27723c4324d3da38cd42230a5a16981183974d81848e6b58bebd0fb9de9de delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/d5f27723c4324d3da38cd42230a5a169count delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/d5f27723c4324d3da38cd42230a5a169document delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/d5f27723c4324d3da38cd42230a5a169end delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/d5f27723c4324d3da38cd42230a5a169page0 delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/d5f27723c4324d3da38cd42230a5a169page1 delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/d5f27723c4324d3da38cd42230a5a169page2 delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/e51b4bd85f2b4d179853e1168e075f2a0542b72936da49de9fb82f15f99947b2 delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/e51b4bd85f2b4d179853e1168e075f2a1f858916026042d2a91e758cc2295563 delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/e51b4bd85f2b4d179853e1168e075f2acount delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/e51b4bd85f2b4d179853e1168e075f2adocument delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/e51b4bd85f2b4d179853e1168e075f2aend delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/e51b4bd85f2b4d179853e1168e075f2apage0 delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/e51b4bd85f2b4d179853e1168e075f2apage1 delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/e51b4bd85f2b4d179853e1168e075f2apage2 delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/f00f0dcf6b8d4b44b33ca9ab8d4beb844e9ce36981e6482ba07d0f276a62d8dc delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/f00f0dcf6b8d4b44b33ca9ab8d4beb84count delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/f00f0dcf6b8d4b44b33ca9ab8d4beb84document delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/f00f0dcf6b8d4b44b33ca9ab8d4beb84end delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/f00f0dcf6b8d4b44b33ca9ab8d4beb84fc725aafd8444a1d8a075c5aff81e410 delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/f00f0dcf6b8d4b44b33ca9ab8d4beb84page0 delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/f00f0dcf6b8d4b44b33ca9ab8d4beb84page1 delete mode 100644 src/main/webapp/WEB-INF/clipreport4/temp/f00f0dcf6b8d4b44b33ca9ab8d4beb84page2 diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/common/common_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/common/common_sql.xml index 9c2dc548..11a8d275 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/common/common_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/common/common_sql.xml @@ -569,6 +569,25 @@ ORDER BY CODE_ORDER ASC + + +