diff --git a/src/main/java/cokr/xit/adds/nims/DsuseMgtStatisticsQuery.java b/src/main/java/cokr/xit/adds/nims/DsuseMgtStatisticsQuery.java index d5e620a..665da48 100644 --- a/src/main/java/cokr/xit/adds/nims/DsuseMgtStatisticsQuery.java +++ b/src/main/java/cokr/xit/adds/nims/DsuseMgtStatisticsQuery.java @@ -26,7 +26,8 @@ public class DsuseMgtStatisticsQuery extends QueryRequest{ private String prtmSeNm; // 중점/일반 구분드 private String indutyNm; // 취급자 업종 구분 private String prgrsSttsCd; // 진행상태코드 - private String prductCd; // 진행상태코드 + private String prductCd; // 진행상태코드 + private String bsshCd; // 취급자번호 public String getCellDefs() { return ifEmpty(cellDefs, () -> null); @@ -162,4 +163,13 @@ public class DsuseMgtStatisticsQuery extends QueryRequest{ this.prductCd = prductCd; return self(); } + + public String getBsshCd() { + return ifEmpty(bsshCd, () -> null); + } + + public T setBsshCd(String bsshCd) { + this.bsshCd = bsshCd; + return self(); + } } 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 e914c49..c8579f1 100644 --- a/src/main/resources/sql/mapper/adds/nims/dsuseMgtStatistics-mapper.xml +++ b/src/main/resources/sql/mapper/adds/nims/dsuseMgtStatistics-mapper.xml @@ -108,6 +108,7 @@ , tdm.dsuse_de , tcc.code_val AS dsuse_mth_nm , tbi.bssh_nm + , tbi.rprsntv_nm , tdm.dscdmng_id , tdmd.prduct_cd , tpi.prduct_nm @@ -230,6 +231,7 @@ , tcc.code_val AS prgrs_stts_nm , tcc2.code_val AS dsuse_mth_nm , tbi.bssh_nm + , tbi.rprsntv_nm , tdm.dscdmng_id , tdm.rnd_dtl_rpt_cnt , tdmd.prduct_cd @@ -366,6 +368,7 @@ , tdm.dsuse_de , tcc.code_val AS dsuse_mth_nm , tbi.bssh_nm + , tbi.rprsntv_nm , tbi.induty_nm , tdm.dscdmng_id , tdm.rnd_dtl_rpt_cnt @@ -486,16 +489,15 @@ , tdm.dept_cd , td.dept_nm , tdm.dsuse_de - , tcc.code_val AS dsuse_mth_nm + , tcc.code_val AS prgrs_stts_nm + , tcc2.code_val AS dsuse_mth_nm , tbi.bssh_nm + , tbi.rprsntv_nm , tdm.dscdmng_id , tdm.rnd_dtl_rpt_cnt , tdmd.prduct_cd , tpi.prduct_nm - , tpi.nrcd_se_nm - , tpi.prtm_se_nm , tdmd.dsuse_qy - , tpi.nrcd_se_nm FROM tb_dsuse_mgt tdm JOIN tb_dsuse_mgt_dtl tdmd ON tdm.dscdmng_id = tdmd.dscdmng_id @@ -506,9 +508,13 @@ JOIN tb_bssh_info tbi ON tdm.bssh_cd = tbi.bssh_cd LEFT JOIN tb_cmn_code tcc - ON (tcc.grp_id = 'ADDS05' - AND tdm.dsuse_mth_cd = tcc.code) + ON (tcc.grp_id = 'ADDS11' + AND tdm.prgrs_stts_cd = tcc.code) + LEFT JOIN tb_cmn_code tcc2 + ON (tcc2.grp_id = 'ADDS05' + AND tdm.dsuse_mth_cd = tcc2.code) WHERE tdm.use_yn = 'Y' + AND tdm.bssh_cd = #{bsshCd} AND tdm.dept_cd = #{deptCd} @@ -521,11 +527,8 @@ AND tdm.prgrs_stts_cd = #{schSttsCd} - - AND tpi.nrcd_se_nm = #{nrcdSeNm} - - - AND tpi.prtm_se_nm = #{prtmSeNm} + + AND tdm.prgrs_stts_cd = #{prgrsSttsCd} diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp index 86d2eeb..0d8b656 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp @@ -100,7 +100,7 @@ 관할관청 폐기관리번호 - 폐기일자 + 폐기일자 폐기방법 업체명 폐기건수 @@ -110,7 +110,7 @@ 폐기사유 폐기구분 폐기장소 - 취급일자 + 취급일자 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 index 78a7b94..7d0ff77 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByBsshStatistics-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByBsshStatistics-info.jsp @@ -10,15 +10,16 @@ No. - 폐기관리번호 - 폐기일자 + 폐기관리번호 + 폐기일자 폐기방법 업체명 + 대표자 제품코드 제품명 <%-- 폐기건수--%> 폐기수량 - 업종명 + 처리상태 @@ -30,11 +31,12 @@ {dsuse_de} {dsuse_mth_nm} {bssh_nm} + {rprsntv_nm} {prduct_cd} {prduct_nm} <%-- {rnd_dtl_rpt_cnt}--%> {dsuse_qy} - {induty_nm} + {prgrs_stts_nm}