From 180f57bba76d4140dbcea7bca99a91ede97dadc4 Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Mon, 29 Jul 2024 18:04:12 +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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cokr/xit/adds/nims/ApiKeyQuery.java | 4 +- .../xit/adds/nims/DsuseMgtReceiptQuery.java | 12 +- .../adds/nims/DsuseMgtStatisticsQuery.java | 63 +++++- .../nims/dao/DsuseMgtStatisticsMapper.java | 4 + .../adds/nims/service/AddsNimsService.java | 7 + .../service/bean/AddsNimsServiceBean.java | 19 ++ .../xit/adds/nims/web/AddsNimsController.java | 25 +++ .../adds/nims/dsuseMgtStatistics-mapper.xml | 202 +++++++++++++++++- .../dsuseMgtDsuseQyByBsshStatistics-info.jsp | 145 +++++++++++++ .../dsuseMgtDsuseQyByBsshStatistics-main.jsp | 48 ++++- ...dsuseMgtDsuseQyByIndutyStatistics-info.jsp | 145 +++++++++++++ ...dsuseMgtDsuseQyByIndutyStatistics-main.jsp | 67 ++++-- .../dsuseMgtDsuseQyByPrdStatistics-info.jsp | 146 +++++++++++++ .../dsuseMgtDsuseQyByPrdStatistics-main.jsp | 51 ++++- .../dsuseMgtNcrdAndPrtmStatistics-info.jsp | 146 +++++++++++++ .../dsuseMgtNcrdAndPrtmStatistics-main.jsp | 74 +++---- 16 files changed, 1063 insertions(+), 95 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByBsshStatistics-info.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByIndutyStatistics-info.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByPrdStatistics-info.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtNcrdAndPrtmStatistics-info.jsp diff --git a/src/main/java/cokr/xit/adds/nims/ApiKeyQuery.java b/src/main/java/cokr/xit/adds/nims/ApiKeyQuery.java index 24cd71f..021fdea 100644 --- a/src/main/java/cokr/xit/adds/nims/ApiKeyQuery.java +++ b/src/main/java/cokr/xit/adds/nims/ApiKeyQuery.java @@ -63,11 +63,11 @@ public class ApiKeyQuery extends QueryRequest{ return self(); } - public String getuseYn() { + public String getUseYn() { return ifEmpty(useYn, () -> null); } - public T setuseYn(String useYn) { + public T setUseYn(String useYn) { this.useYn = useYn; return self(); } diff --git a/src/main/java/cokr/xit/adds/nims/DsuseMgtReceiptQuery.java b/src/main/java/cokr/xit/adds/nims/DsuseMgtReceiptQuery.java index e321aa1..8fb06c2 100644 --- a/src/main/java/cokr/xit/adds/nims/DsuseMgtReceiptQuery.java +++ b/src/main/java/cokr/xit/adds/nims/DsuseMgtReceiptQuery.java @@ -95,29 +95,29 @@ public class DsuseMgtReceiptQuery extends QueryRequest{ return self(); } - public String getdeptCd() { + public String getDeptCd() { return ifEmpty(deptCd, () -> null); } - public T setdeptCd(String deptCd) { + public T setDeptCd(String deptCd) { this.deptCd = deptCd; return self(); } - public String getuserId() { + public String getUserId() { return ifEmpty(userId, () -> null); } - public T setuserId(String userId) { + public T setUserId(String userId) { this.userId = userId; return self(); } - public String getuseYn() { + public String getUseYn() { return ifEmpty(useYn, () -> null); } - public T setuseYn(String useYn) { + public T setUseYn(String useYn) { this.useYn = useYn; return self(); } diff --git a/src/main/java/cokr/xit/adds/nims/DsuseMgtStatisticsQuery.java b/src/main/java/cokr/xit/adds/nims/DsuseMgtStatisticsQuery.java index 198cd18..d5e620a 100644 --- a/src/main/java/cokr/xit/adds/nims/DsuseMgtStatisticsQuery.java +++ b/src/main/java/cokr/xit/adds/nims/DsuseMgtStatisticsQuery.java @@ -22,6 +22,12 @@ public class DsuseMgtStatisticsQuery extends QueryRequest{ private String useYn; // 사용 여부 private String nimsRptYn; // NIMS 보고 여부 + private String nrcdSeNm; // 폐기/항정 구분 + private String prtmSeNm; // 중점/일반 구분드 + private String indutyNm; // 취급자 업종 구분 + private String prgrsSttsCd; // 진행상태코드 + private String prductCd; // 진행상태코드 + public String getCellDefs() { return ifEmpty(cellDefs, () -> null); } @@ -85,30 +91,75 @@ public class DsuseMgtStatisticsQuery extends QueryRequest{ return self(); } - public String getdeptCd() { + public String getDeptCd() { return ifEmpty(deptCd, () -> null); } - public T setdeptCd(String deptCd) { + public T setDeptCd(String deptCd) { this.deptCd = deptCd; return self(); } - public String getuserId() { + public String getUserId() { return ifEmpty(userId, () -> null); } - public T setuserId(String userId) { + public T setUserId(String userId) { this.userId = userId; return self(); } - public String getuseYn() { + public String getUseYn() { return ifEmpty(useYn, () -> null); } - public T setuseYn(String useYn) { + public T setUseYn(String useYn) { this.useYn = useYn; return self(); } + + public String getNrcdSeNm() { + return ifEmpty(nrcdSeNm, () -> null); + } + + public T setNrcdSeNm(String nrcdSeNm) { + this.nrcdSeNm = nrcdSeNm; + return self(); + } + + public String getPrtmSeNm() { + return ifEmpty(prtmSeNm, () -> null); + } + + public T setPrtmSeNm(String prtmSeNm) { + this.prtmSeNm = prtmSeNm; + return self(); + } + + public String getIndutyNm() { + return ifEmpty(indutyNm, () -> null); + } + + public T setIndutyNm(String indutyNm) { + this.indutyNm = indutyNm; + return self(); + } + + public String getPrgrsSttsCd() { + return ifEmpty(prgrsSttsCd, () -> null); + } + + public T setPrgrsSttsCd(String prgrsSttsCd) { + this.prgrsSttsCd = prgrsSttsCd; + return self(); + } + + public String getPrductCd() { + return ifEmpty(prductCd, () -> null); + } + + public T setPrductCd(String prductCd) { + this.prductCd = prductCd; + return self(); + } } diff --git a/src/main/java/cokr/xit/adds/nims/dao/DsuseMgtStatisticsMapper.java b/src/main/java/cokr/xit/adds/nims/dao/DsuseMgtStatisticsMapper.java index 08dea16..e0aacfe 100644 --- a/src/main/java/cokr/xit/adds/nims/dao/DsuseMgtStatisticsMapper.java +++ b/src/main/java/cokr/xit/adds/nims/dao/DsuseMgtStatisticsMapper.java @@ -19,23 +19,27 @@ public interface DsuseMgtStatisticsMapper extends AbstractMapper { * @return 마약/항정 and 중점/일반 별 통계 목록 */ List selectDsuseMgtNcrdAndPrtmStatistics(DsuseMgtStatisticsQuery query); + List selectDsuseMgtNcrdAndPrtmStatisticsDtls(DsuseMgtStatisticsQuery query); /** * 제품별 폐기 현황 * @return 제품별 폐기 현황 목록 */ List selectDsuseMgtDsuseQyByPrdStatistics(DsuseMgtStatisticsQuery query); + List selectDsuseMgtDsuseQyByPrdStatisticsDtls(DsuseMgtStatisticsQuery query); /** * 취급자 업종별 폐기 현황 * @return 취급자 업종별 폐기 현황 목록 */ List selectDsuseMgtDsuseQyByIndutyStatistics(DsuseMgtStatisticsQuery query); + List selectDsuseMgtDsuseQyByIndutyStatisticsDtls(DsuseMgtStatisticsQuery query); /** * 취급자별 폐기 현황 * @return 취급자별 폐기 현황 목록 */ List selectDsuseMgtDsuseQyByBsshStatistics(DsuseMgtStatisticsQuery query); + List selectDsuseMgtDsuseQyByBsshStatisticsDtls(DsuseMgtStatisticsQuery query); } diff --git a/src/main/java/cokr/xit/adds/nims/service/AddsNimsService.java b/src/main/java/cokr/xit/adds/nims/service/AddsNimsService.java index f7e4b57..a2dd55e 100644 --- a/src/main/java/cokr/xit/adds/nims/service/AddsNimsService.java +++ b/src/main/java/cokr/xit/adds/nims/service/AddsNimsService.java @@ -12,7 +12,14 @@ public interface AddsNimsService { List getDsuseMgtRsltImgList(DsuseMgtRsltQuery query); List getDsuseMgtNcrdAndPrtmStatistics(DsuseMgtStatisticsQuery query); + List getDsuseMgtNcrdAndPrtmStatisticsDtls(DsuseMgtStatisticsQuery query); + List getDsuseMgtDsuseQyByPrdStatistics(DsuseMgtStatisticsQuery query); + List getDsuseMgtDsuseQyByPrdStatisticsDtls(DsuseMgtStatisticsQuery query); + List getDsuseMgtDsuseQyByIndutyStatistics(DsuseMgtStatisticsQuery query); + List getDsuseMgtDsuseQyByIndutyStatisticsDtls(DsuseMgtStatisticsQuery query); + List getDsuseMgtDsuseQyByBsshStatistics(DsuseMgtStatisticsQuery query); + List getDsuseMgtDsuseQyByBsshStatisticsDtls(DsuseMgtStatisticsQuery query); } diff --git a/src/main/java/cokr/xit/adds/nims/service/bean/AddsNimsServiceBean.java b/src/main/java/cokr/xit/adds/nims/service/bean/AddsNimsServiceBean.java index f4f6fb6..35d5072 100644 --- a/src/main/java/cokr/xit/adds/nims/service/bean/AddsNimsServiceBean.java +++ b/src/main/java/cokr/xit/adds/nims/service/bean/AddsNimsServiceBean.java @@ -42,19 +42,38 @@ public class AddsNimsServiceBean extends AbstractServiceBean implements AddsNims public List getDsuseMgtNcrdAndPrtmStatistics(DsuseMgtStatisticsQuery query) { return dsuseMgtStatisticsMapper.selectDsuseMgtNcrdAndPrtmStatistics(query); } + @Override + public List getDsuseMgtNcrdAndPrtmStatisticsDtls(DsuseMgtStatisticsQuery query) { + return dsuseMgtStatisticsMapper.selectDsuseMgtNcrdAndPrtmStatisticsDtls(query); + } @Override public List getDsuseMgtDsuseQyByPrdStatistics(DsuseMgtStatisticsQuery query) { return dsuseMgtStatisticsMapper.selectDsuseMgtDsuseQyByPrdStatistics(query); } + @Override + public List getDsuseMgtDsuseQyByPrdStatisticsDtls(DsuseMgtStatisticsQuery query) { + return dsuseMgtStatisticsMapper.selectDsuseMgtDsuseQyByPrdStatisticsDtls(query); + } + @Override public List getDsuseMgtDsuseQyByIndutyStatistics(DsuseMgtStatisticsQuery query) { return dsuseMgtStatisticsMapper.selectDsuseMgtDsuseQyByIndutyStatistics(query); } + @Override + public List getDsuseMgtDsuseQyByIndutyStatisticsDtls(DsuseMgtStatisticsQuery query) { + return dsuseMgtStatisticsMapper.selectDsuseMgtDsuseQyByIndutyStatisticsDtls(query); + } + @Override public List getDsuseMgtDsuseQyByBsshStatistics(DsuseMgtStatisticsQuery query) { return dsuseMgtStatisticsMapper.selectDsuseMgtDsuseQyByBsshStatistics(query); } + + @Override + public List getDsuseMgtDsuseQyByBsshStatisticsDtls(DsuseMgtStatisticsQuery query) { + return dsuseMgtStatisticsMapper.selectDsuseMgtDsuseQyByBsshStatisticsDtls(query); + } } diff --git a/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java b/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java index 23cdc1c..9fa21c8 100644 --- a/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java +++ b/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java @@ -369,6 +369,13 @@ public class AddsNimsController extends ApplicationController { return excelDownloadDsuseMgtNcrdAndPrtmStatistics(query); } + @RequestMapping(value = "/getDsuseMgtNcrdAndPrtmStatisticsDtls.do", name="마약/항정 and 중점/일반 별 상세 목록") + public ModelAndView getDsuseMgtNcrdAndPrtmStatisticsDtls(DsuseMgtStatisticsQuery query) { + ModelAndView mav = new ModelAndView("adds/nims/dsuseMgtNcrdAndPrtmStatistics-info"); + return mav.addObject("statisticsDtlList", toJson(addsNimsService.getDsuseMgtNcrdAndPrtmStatisticsDtls(query))); + } + + @RequestMapping(value = "/getDsuseMgtDsuseQyByPrdStatistics.do", name="제품별 폐기 현황 통계") public ModelAndView getDsuseMgtDsuseQyByPrdStatistics(DsuseMgtStatisticsQuery query) { if(!"xls".equals(query.getDownload())) { @@ -378,6 +385,12 @@ public class AddsNimsController extends ApplicationController { return excelDownloadDsuseMgtDsuseQyByPrdStatistics(query); } + @RequestMapping(value = "/getDsuseMgtDsuseQyByPrdStatisticsDtls.do", name="제품별 폐기 현황 상세 목록") + public ModelAndView getDsuseMgtDsuseQyByPrdStatisticsDtls(DsuseMgtStatisticsQuery query) { + ModelAndView mav = new ModelAndView("adds/nims/dsuseMgtDsuseQyByPrdStatistics-info"); + return mav.addObject("statisticsDtlList", toJson(addsNimsService.getDsuseMgtDsuseQyByPrdStatisticsDtls(query))); + } + @RequestMapping(value = "/getDsuseMgtDsuseQyByIndutyStatistics.do", name="취급자 업종별 폐기 현황 통계") public ModelAndView getDsuseMgtDsuseQyByIndutyStatistics(DsuseMgtStatisticsQuery query) { if(!"xls".equals(query.getDownload())) { @@ -387,6 +400,12 @@ public class AddsNimsController extends ApplicationController { return excelDownloadDsuseMgtDsuseQyByIndutyStatistics(query); } + @RequestMapping(value = "/getDsuseMgtDsuseQyByIndutyStatisticsDtls.do", name="취급자 업종별 상세 목록") + public ModelAndView getDsuseMgtDsuseQyByIndutyStatisticsDtls(DsuseMgtStatisticsQuery query) { + ModelAndView mav = new ModelAndView("adds/nims/dsuseMgtDsuseQyByIndutyStatistics-info"); + return mav.addObject("statisticsDtlList", toJson(addsNimsService.getDsuseMgtDsuseQyByIndutyStatisticsDtls(query))); + } + @RequestMapping(value = "/getDsuseMgtDsuseQyByBsshStatistics.do", name="취급자별 폐기 현황 통계") public ModelAndView getDsuseMgtDsuseQyByBsshStatistics(DsuseMgtStatisticsQuery query) { if(!"xls".equals(query.getDownload())) { @@ -395,6 +414,12 @@ public class AddsNimsController extends ApplicationController { } return excelDownloadDsuseMgtDsuseQyByBsshStatistics(query); } + + @RequestMapping(value = "/getDsuseMgtDsuseQyByBsshStatisticsDtls.do", name="제품별 폐기 현황 상세 목록") + public ModelAndView getDsuseMgtDsuseQyByBsshStatisticsDtls(DsuseMgtStatisticsQuery query) { + ModelAndView mav = new ModelAndView("adds/nims/dsuseMgtDsuseQyByBsshStatistics-info"); + return mav.addObject("statisticsDtlList", toJson(addsNimsService.getDsuseMgtDsuseQyByBsshStatisticsDtls(query))); + } //------------------------------------------------------------------------------------------------- // 폐기 관리 통계 //------------------------------------------------------------------------------------------------- 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 f1b6767..e914c49 100644 --- a/src/main/resources/sql/mapper/adds/nims/dsuseMgtStatistics-mapper.xml +++ b/src/main/resources/sql/mapper/adds/nims/dsuseMgtStatistics-mapper.xml @@ -100,6 +100,53 @@ ON T.dept_cd = td.dept_cd + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByBsshStatistics-info.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByBsshStatistics-info.jsp new file mode 100644 index 0000000..78a7b94 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByBsshStatistics-info.jsp @@ -0,0 +1,145 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> +<%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> + +취급별 폐기 현황 상세 + +
+
+
+ + + + + + + + + + +<%-- --%> + + + + + + + + +
No.폐기관리번호폐기일자폐기방법업체명제품코드제품명폐기건수폐기수량업종명
+
+
+
+
+ + +
+ + 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 63c6fb8..9a5153a 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 @@ -89,8 +89,8 @@ 취급업체명 대표자 처리상태 별 (폐기건수 / 폐기수량) - 폐기건수 - 폐기수량 + 폐기건수 + 폐기수량 @@ -161,7 +161,7 @@ } , prefix: "dsuseMgtDsuseQyByBsshStatistics" , prefixName: "제품별 폐기 현황" - , keymapper: info => info ? info.dept_cd : "" + , keymapper: info => info ? info.bssh_cd : "" , dataGetter: obj => obj.${infoPrefix}List , appendData: true , infoSize: "xl" @@ -177,7 +177,7 @@ **************************************************************************/ // Dataset 변경 이벤트 $P.control.onDatasetChange = (obj) => { - $P.renderList(obj.${infoPrefix}Total); + $P.renderList(); $("#${infoPrefix}Paging--${pageName}").setPagingInfo({ //list: $P.control.dataset prefix: "${infoPrefix}Paging--${pageName}" @@ -195,16 +195,48 @@ return; } - let key = item.data.dept_cd; + let key = item.data.bssh_cd; $("#tbody--${pageName}").setCurrentRow(key); }; + $P.control.getInfo = (obj, bsshCd) => { + if(bsshCd === undefined || bsshCd === '') return; + const row = $P.control.dataset.getCurrent(); + if(row.dept_nm === 'TOTAL') return; + + let params = $P.formFields.get(); // 검색 조건 + if(!$('#chkDsuseDe--${pageName}').is(":checked")){ + params.schDateFrom = ''; + params.schDateTo = ''; + } + params.deptCd = row.dept_cd; + params.bsshCd = bsshCd; + params.prgrsSttsCd = obj.dataset.div; + + if(row[obj.dataset.val] === 0 || row[obj.dataset.val] === undefined) return; + + ajax.get({ + url : wctx.url("/adds/nims/getDsuseMgtDsuseQyByBsshStatisticsDtls.do") + , data : params + , success : resp => { + dialog.open({ + id : $P.control.prefixed("Dialog") + , title : '취급자별 폐기 현황 상세 목록' + , content : resp + , size : "xxl" + , onClose : () => { + $P.control.reload({all : true}); + } + }); + } + }); + } /************************************************************************** * DataTables 이벤트 **************************************************************************/ // DataTables에 click, dbclick 이벤트 - $P.renderList = (totalSize) => { + $P.renderList = () => { let ${infoPrefix}List = $P.control.dataset; let empty = ${infoPrefix}List.empty; @@ -218,10 +250,11 @@ }); let replacer = (str, dataItem) => { - str = str.replace(/{onclick}/gi, "pageObject['${pageName}'].control.setCurrent('" + dataItem.getValue("bssh_cd") + "');") + str = str.replace(/{onclick}/gi, "pageObject['${pageName}'].control.getInfo(this, '" + dataItem.getValue("bssh_cd") + "');"); if(dataItem.getValue("dept_cd") === "TOTAL"){ str = str.replace(/{fw-bold-if-total}/gi, "fw-bold"); str = str.replace(/{ROW_NUM}/gi, "") + str = str.replace(/text-blue/gi, "") } else { str = str.replace(/{fw-bold-if-total}/gi, ""); } @@ -233,6 +266,7 @@ $("#tbody--${pageName}").html(trs.join()); } + $P.control.getBsshInfo = (gdccId) => { let dialogTitle = "마약류 취급업체 조회"; let params = {openPage : "frmSearch--${pageName}"}; diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByIndutyStatistics-info.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByIndutyStatistics-info.jsp new file mode 100644 index 0000000..88468f2 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByIndutyStatistics-info.jsp @@ -0,0 +1,145 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> +<%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> + +취급 업종별 현황 상세 + +
+
+
+ + + + + + + + + + +<%-- --%> + + + + + + + + +
No.폐기관리번호폐기일자폐기방법업체명제품코드제품명폐기건수폐기수량업종명
+
+
+
+
+ + +
+ + 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 e48eeeb..a76085b 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 @@ -30,7 +30,7 @@ -  폐기일자 적용 +  폐기일자 적용 @@ -85,8 +85,8 @@ 관할관청 업종별 구분 (폐기건수 / 폐기수량) - 폐기건수 - 폐기수량 + 폐기건수 + 폐기수량 @@ -104,15 +104,15 @@