From 7b8a70b0f24b05f332a2f1c8133c1704d4240a05 Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Tue, 30 Jul 2024 12:54:21 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=ED=8F=90=EA=B8=B0=EB=B3=B4=EA=B3=A0=20?= =?UTF-8?q?=ED=86=B5=EA=B3=84=20=EC=83=81=EC=84=B8=20=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adds/nims/dsuseMgtStatistics-mapper.xml | 222 +++++++++--------- .../dsuseMgtDsuseQyByBsshStatistics-main.jsp | 12 + ...dsuseMgtDsuseQyByIndutyStatistics-main.jsp | 18 ++ .../dsuseMgtDsuseQyByPrdStatistics-main.jsp | 10 + .../dsuseMgtNcrdAndPrtmStatistics-main.jsp | 40 +++- 5 files changed, 180 insertions(+), 122 deletions(-) diff --git a/src/main/resources/sql/mapper/adds/nims/dsuseMgtStatistics-mapper.xml b/src/main/resources/sql/mapper/adds/nims/dsuseMgtStatistics-mapper.xml index c8579f1..13f9185 100644 --- a/src/main/resources/sql/mapper/adds/nims/dsuseMgtStatistics-mapper.xml +++ b/src/main/resources/sql/mapper/adds/nims/dsuseMgtStatistics-mapper.xml @@ -19,15 +19,15 @@ , IF(tpi.prtm_se_nm = '비마약류', 1, 0) AS 비마약류 , IF(tpi.prtm_se_nm = '일반관리대상', 1, 0) AS 일반관리대상 , IF(tpi.prtm_se_nm = '중점관리대상', 1, 0) AS 중점관리대상 - , IF(tpi.nrcd_se_nm = '대마', tdmd.dsuse_qy, '0') AS 대마qy - , IF(tpi.nrcd_se_nm = '마약', tdmd.dsuse_qy, '0') AS 마약qy - , IF(tpi.nrcd_se_nm = '한외마약', tdmd.dsuse_qy, '0') AS 한외마약qy - , IF(tpi.nrcd_se_nm = '향정', tdmd.dsuse_qy, '0') AS 향정qy - , IF(tpi.nrcd_se_nm = '향정제외', tdmd.dsuse_qy, '0') AS 향정제외qy - , IF(tpi.nrcd_se_nm IS NULL, tdmd.dsuse_qy, '0') AS 기타qy - , IF(tpi.prtm_se_nm = '비마약류', tdmd.dsuse_qy, 0) AS 비마약류qy - , IF(tpi.prtm_se_nm = '일반관리대상', tdmd.dsuse_qy, 0) AS 일반관리대상qy - , IF(tpi.prtm_se_nm = '중점관리대상', tdmd.dsuse_qy, 0) AS 중점관리대상qy + , IF(tpi.nrcd_se_nm = '대마', tdmd.dsuse_qy, '0') AS 대마Qy + , IF(tpi.nrcd_se_nm = '마약', tdmd.dsuse_qy, '0') AS 마약Qy + , IF(tpi.nrcd_se_nm = '한외마약', tdmd.dsuse_qy, '0') AS 한외마약Qy + , IF(tpi.nrcd_se_nm = '향정', tdmd.dsuse_qy, '0') AS 향정Qy + , IF(tpi.nrcd_se_nm = '향정제외', tdmd.dsuse_qy, '0') AS 향정제외Qy + , IF(tpi.nrcd_se_nm IS NULL, tdmd.dsuse_qy, '0') AS 기타Qy + , IF(tpi.prtm_se_nm = '비마약류', tdmd.dsuse_qy, 0) AS 비마약류Qy + , IF(tpi.prtm_se_nm = '일반관리대상', tdmd.dsuse_qy, 0) AS 일반관리대상Qy + , IF(tpi.prtm_se_nm = '중점관리대상', tdmd.dsuse_qy, 0) AS 중점관리대상Qy FROM tb_dsuse_mgt tdm JOIN tb_dsuse_mgt_dtl tdmd ON tdm.dscdmng_id = tdmd.dscdmng_id JOIN tb_prduct_info tpi ON tdmd.prduct_cd = tpi.prduct_cd @@ -61,15 +61,15 @@ , SUM(tgt.비마약류) AS 비마약류 , SUM(tgt.일반관리대상) AS 일반관리대상 , SUM(tgt.중점관리대상) AS 중점관리대상 - , SUM(tgt.대마qy) AS 대마qy - , SUM(tgt.마약qy) AS 마약qy - , SUM(tgt.한외마약qy) AS 한외마약qy - , SUM(tgt.향정qy) AS 향정qy - , SUM(tgt.향정제외qy) AS 향정제외qy - , SUM(tgt.기타qy) AS 기타qy - , SUM(tgt.비마약류qy) AS 비마약류qy - , SUM(tgt.일반관리대상qy) AS 일반관리대상qy - , SUM(tgt.중점관리대상qy) AS 중점관리대상qy + , SUM(tgt.대마Qy) AS 대마Qy + , SUM(tgt.마약Qy) AS 마약Qy + , SUM(tgt.한외마약Qy) AS 한외마약Qy + , SUM(tgt.향정Qy) AS 향정Qy + , SUM(tgt.향정제외Qy) AS 향정제외Qy + , SUM(tgt.기타Qy) AS 기타Qy + , SUM(tgt.비마약류Qy) AS 비마약류Qy + , SUM(tgt.일반관리대상Qy) AS 일반관리대상Qy + , SUM(tgt.중점관리대상Qy) AS 중점관리대상Qy FROM tgt GROUP BY tgt.dept_cd UNION ALL @@ -85,15 +85,15 @@ , SUM(tgt.비마약류) AS 비마약류 , SUM(tgt.일반관리대상) AS 일반관리대상 , SUM(tgt.중점관리대상) AS 중점관리대상 - , SUM(tgt.대마qy) AS 대마qy - , SUM(tgt.마약qy) AS 마약qy - , SUM(tgt.한외마약qy) AS 한외마약qy - , SUM(tgt.향정qy) AS 향정qy - , SUM(tgt.향정제외qy) AS 향정제외qy - , SUM(tgt.기타qy) AS 기타qy - , SUM(tgt.비마약류qy) AS 비마약류qy - , SUM(tgt.일반관리대상qy) AS 일반관리대상qy - , SUM(tgt.중점관리대상qy) AS 중점관리대상qy + , SUM(tgt.대마Qy) AS 대마Qy + , SUM(tgt.마약Qy) AS 마약Qy + , SUM(tgt.한외마약Qy) AS 한외마약Qy + , SUM(tgt.향정Qy) AS 향정Qy + , SUM(tgt.향정제외Qy) AS 향정제외Qy + , SUM(tgt.기타Qy) AS 기타Qy + , SUM(tgt.비마약류Qy) AS 비마약류Qy + , SUM(tgt.일반관리대상Qy) AS 일반관리대상Qy + , SUM(tgt.중점관리대상Qy) AS 중점관리대상Qy FROM tgt ) T LEFT JOIN tb_dept td @@ -129,22 +129,22 @@ AND tdm.dsuse_mth_cd = tcc.code) WHERE tdm.use_yn = 'Y' - AND tdm.dept_cd = #{deptCd} + AND tdm.dept_cd = #{deptCd} - AND tdm.dsuse_de =]]> #{schDateFrom} + AND tdm.dsuse_de =]]> #{schDateFrom} - AND tdm.dsuse_de #{schDateTo} + AND tdm.dsuse_de #{schDateTo} - AND tdm.prgrs_stts_cd = #{schSttsCd} + AND tdm.prgrs_stts_cd = #{schSttsCd} - AND tpi.nrcd_se_nm = #{nrcdSeNm} + AND tpi.nrcd_se_nm = #{nrcdSeNm} - AND tpi.prtm_se_nm = #{prtmSeNm} + AND tpi.prtm_se_nm = #{prtmSeNm} @@ -225,49 +225,49 @@ @@ -363,45 +363,45 @@ @@ -486,49 +486,49 @@ diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByBsshStatistics-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByBsshStatistics-main.jsp index 1e54d7a..230c323 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByBsshStatistics-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByBsshStatistics-main.jsp @@ -146,6 +146,18 @@ , dataGetter: obj => obj.${infoPrefix}List , appendData: true , infoSize: "xl" + , formats: { + receiptCnt: numberFormat + , receiptQy: numberFormat + , rsltCnt: numberFormat + , rsltQy: numberFormat + , mappingCnt: numberFormat + , mappingQy: numberFormat + , cpltCnt: numberFormat + , cpltQy: numberFormat + , dsuseCnt: numberFormat + , dsuseQy: numberFormat + } }); // $P.control 설정 $P.control.defaultFetchSize = FETCH_XXS; // 1 페이지당 조회되는 자료 건수 index.jsp에서 확인 FETCH_XS = 30 diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByIndutyStatistics-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByIndutyStatistics-main.jsp index bdcef45..58ab003 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByIndutyStatistics-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByIndutyStatistics-main.jsp @@ -150,6 +150,24 @@ , dataGetter: obj => obj.${infoPrefix}List , appendData: true , infoSize: "xl" + , formats: { + 마약류취급의료업: numberFormat + , 마약류취급의료업Qy: numberFormat + , 마약류소매업: numberFormat + , 마약류소매업Qy: numberFormat + , 마약류도매업: numberFormat + , 마약류도매업Qy: numberFormat + , 마약류제조업: numberFormat + , 마약류제조업Qy: numberFormat + , 마약류수출입업: numberFormat + , 마약류수출입업Qy: numberFormat + , 마약류원료사용: numberFormat + , 마약류원료사용Qy: numberFormat + , 마약류취급학술연구: numberFormat + , 마약류취급학술연구Qy: numberFormat + , dsuseCnt: numberFormat + , dsuseQy: numberFormat + } }); // $P.control 설정 $P.control.defaultFetchSize = FETCH_XXS; // 1 페이지당 조회되는 자료 건수 index.jsp에서 확인 FETCH_XS = 30 diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByPrdStatistics-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByPrdStatistics-main.jsp index bd28e82..0ebc87c 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByPrdStatistics-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByPrdStatistics-main.jsp @@ -145,6 +145,16 @@ , appendData: true , infoSize: "xl" , formats: { + receiptCnt: numberFormat + , receiptQy: numberFormat + , rsltCnt: numberFormat + , rsltQy: numberFormat + , mappingCnt: numberFormat + , mappingQy: numberFormat + , cpltCnt: numberFormat + , cpltQy: numberFormat + , dsuseCnt: numberFormat + , dsuseQy: numberFormat } }); // $P.control 설정 diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtNcrdAndPrtmStatistics-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtNcrdAndPrtmStatistics-main.jsp index bcbfa73..a150a71 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtNcrdAndPrtmStatistics-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtNcrdAndPrtmStatistics-main.jsp @@ -94,15 +94,15 @@