xit-app
/
adds-fo
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 폐기보고 통계 상세 목록 추가 완료

Browse Source
dev
Jonguk. Lim 4 months ago
parent d3fe3aff67
commit 07de5eef52
15 changed files with 75 additions and 55 deletions
Show Stats Download Patch File Download Diff File

10
src/main/java/cokr/xit/adds/nims/DsuseMgtStatisticsQuery.java
Unescape Escape View File

@ -27,6 +27,7 @@ public class DsuseMgtStatisticsQuery extends QueryRequest{
private String indutyNm; // 취급자 업종 구분
private String prgrsSttsCd; // 진행상태코드
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 extends DsuseMgtStatisticsQuery> T setBsshCd(String bsshCd) {
this.bsshCd = bsshCd;
return self();
}
}

25
src/main/resources/sql/mapper/adds/nims/dsuseMgtStatistics-mapper.xml
Unescape Escape View File

@ -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}
<if test="deptCd != null and deptCd != ''">
AND tdm.dept_cd = #{deptCd} <!-- 관할 관청 -->
</if>
@ -521,11 +527,8 @@
<if test="schSttsCd != null">
AND tdm.prgrs_stts_cd = #{schSttsCd} <!-- 진행 상태 -->
</if>
<if test="nrcdSeNm != null">
AND tpi.nrcd_se_nm = #{nrcdSeNm} <!-- 진행 상태 -->
</if>
<if test="prtmSeNm != null">
AND tpi.prtm_se_nm = #{prtmSeNm} <!-- 진행 상태 -->
<if test="prgrsSttsCd != null">
AND tdm.prgrs_stts_cd = #{prgrsSttsCd} <!-- 진행 상태 -->
</if>
</select>
</mapper>

4
src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp
Unescape Escape View File

@ -100,7 +100,7 @@
</th>
<th class="cmn" style="width: 160.141px;">관할관청</th>
<th class="cmn" style="width: 120.141px;">폐기관리번호</th>
<th class="cmn" style="width: 120.469px;">폐기일자</th>
<th class="cmn" style="width: 110.469px;">폐기일자</th>
<th class="cmn" style="width: 150px;">폐기방법</th>
<th class="cmn" style="width: 250.469px;">업체명</th>
<th class="cmn" style="width: 90px;">폐기건수</th>
@ -110,7 +110,7 @@
<th class="cmn" style="width: 180.469px;">폐기사유</th>
<th class="cmn" style="width: 140px;">폐기구분</th>
<th class="cmn" style="width: 200.469px;">폐기장소</th>
<th class="cmn" style="width: 120.141px;">취급일자</th>
<th class="cmn" style="width: 110.141px;">취급일자</th>
</tr>
</thead>
<tbody id="tbody--${pageName}">

10
src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByBsshStatistics-info.jsp
Unescape Escape View File

@ -10,15 +10,16 @@
<thead class="sticky-thead">
<tr>
<th class="cmn" style="width: 72px;">No.</th>
<th class="cmn" style="width: 130.141px;">폐기관리번호</th>
<th class="cmn" style="width: 120.469px;">폐기일자</th>
<th class="cmn" style="width: 120.141px;">폐기관리번호</th>
<th class="cmn" style="width: 110.469px;">폐기일자</th>
<th class="cmn" style="width: 120px;">폐기방법</th>
<th class="cmn" style="width: 200.469px;">업체명</th>
<th class="cmn" style="width: 90px;">대표자</th>
<th class="cmn" style="width: 150.469px;">제품코드</th>
<th class="cmn" style="width: 300px;">제품명</th>
<%-- <th class="cmn" style="width: 90px;">폐기건수</th>--%>
<th class="cmn" style="width: 90px;">폐기수량</th>
<th class="cmn" style="width: 130px;">업종명</th>
<th class="cmn" style="width: 160px;">처리상태</th>
</tr>
</thead>
<tbody id="tbody--${pageName}">
@ -30,11 +31,12 @@
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_de}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_mth_nm}</td>
<td class="cmn text-start" onclick="{onclick}" ondblclick="{ondblclick}">{bssh_nm}</td>
<td class="text-start" onclick="{onclick}" ondblclick="{ondblclick}">{rprsntv_nm}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{prduct_cd}</td>
<td class="cmn text-start" onclick="{onclick}" ondblclick="{ondblclick}">{prduct_nm}</td>
<%-- <td class="cmn text-end" onclick="{onclick}" ondblclick="{ondblclick}">{rnd_dtl_rpt_cnt}</td>--%>
<td class="cmn text-end" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_qy}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{induty_nm}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{prgrs_stts_nm}</td>
</tr>
</template>
<template id="${infoPrefix}NotFound--${pageName}">

11
src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByBsshStatistics-main.jsp
Unescape Escape View File

@ -87,7 +87,7 @@
<th class="cmn align-content-center p-1" style="width: 170px;" rowspan="2">관할관청</th>
<th class="cmn align-content-center p-1" style="width: 140px;" rowspan="2">취급자번호</th>
<th class="cmn align-content-center p-1" style="width: 280px;" rowspan="2">취급업체명</th>
<th class="cmn align-content-center p-1" style="width: 120px;" rowspan="2">대표자</th>
<th class="cmn align-content-center p-1" style="width: 100px;" rowspan="2">대표자</th>
<th class="cmn fw-bold" colspan="4">처리상태 별 (폐기건수 / 폐기수량)</th>
<th class="cmn align-content-center p-1" style="width: 100px;" rowspan="2">폐기건수</th>
<th class="cmn align-content-center p-1" style="width: 100px;" rowspan="2">폐기수량</th>
@ -95,7 +95,7 @@
<tr id="theadTr--${pageName}"
data-by="by--${pageName}" data-by-output="byOutput--${pageName}" data-main-option="mainOption--${pageName}" data-sub-option="subOption--${pageName}">
<th class="cmn" style="width: 100px;">신청서접수</th>
<th class="cmn" style="width: 100px;">폐기결과[통보]처리</th>
<th class="cmn" style="width: 100px;">결과[통보]처리</th>
<th class="cmn" style="width: 100px;">폐기보고확인</th>
<th class="cmn" style="width: 100px;">보고완료</th>
</tr>
@ -200,10 +200,11 @@
};
$P.control.getInfo = (obj, bsshCd) => {
debugger;
if(bsshCd === undefined || bsshCd === '') return;
const row = $P.control.dataset.getCurrent();
const row = $P.control.dataset.getData(bsshCd);
if(row.dept_nm === 'TOTAL') return;
if(row[obj.dataset.val] === 0 || row[obj.dataset.val] === undefined) return;
let params = $P.formFields.get(); // 검색 조건
if(!$('#chkDsuseDe--${pageName}').is(":checked")){
@ -214,8 +215,6 @@
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

6
src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByIndutyStatistics-info.jsp
Unescape Escape View File

@ -10,10 +10,11 @@
<thead class="sticky-thead">
<tr>
<th class="cmn" style="width: 72px;">No.</th>
<th class="cmn" style="width: 130.141px;">폐기관리번호</th>
<th class="cmn" style="width: 120.469px;">폐기일자</th>
<th class="cmn" style="width: 120.141px;">폐기관리번호</th>
<th class="cmn" style="width: 110.469px;">폐기일자</th>
<th class="cmn" style="width: 120px;">폐기방법</th>
<th class="cmn" style="width: 200.469px;">업체명</th>
<th class="cmn" style="width: 100px;">대표자</th>
<th class="cmn" style="width: 150.469px;">제품코드</th>
<th class="cmn" style="width: 300px;">제품명</th>
<%-- <th class="cmn" style="width: 90px;">폐기건수</th>--%>
@ -30,6 +31,7 @@
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_de}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_mth_nm}</td>
<td class="cmn text-start" onclick="{onclick}" ondblclick="{ondblclick}">{bssh_nm}</td>
<td class="text-start" onclick="{onclick}" ondblclick="{ondblclick}">{rprsntv_nm}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{prduct_cd}</td>
<td class="cmn text-start" onclick="{onclick}" ondblclick="{ondblclick}">{prduct_nm}</td>
<%-- <td class="cmn text-end" onclick="{onclick}" ondblclick="{ondblclick}">{rnd_dtl_rpt_cnt}</td>--%>

6
src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByIndutyStatistics-main.jsp
Unescape Escape View File

@ -199,6 +199,9 @@
$P.control.getInfo = (obj, deptCd) => {
if(deptCd === undefined || deptCd === 'TOTAL') return;
const row = $P.control.dataset.getData(deptCd);
if(row[obj.dataset.val] === 0 || row[obj.dataset.val] === undefined) return;
let params = $P.formFields.get(); // 검색 조건
if(!$('#chkDsuseDe--${pageName}').is(":checked")){
params.schDateFrom = '';
@ -206,9 +209,6 @@
}
params.deptCd = deptCd;
const row = $P.control.dataset.getCurrent();
if(row[obj.dataset.val] === 0 || row[obj.dataset.val] === undefined) return;
if(obj.dataset.div === 'indutyNm') {
params.indutyNm = obj.dataset.val;
}

8
src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByPrdStatistics-info.jsp
Unescape Escape View File

@ -10,15 +10,16 @@
<thead class="sticky-thead">
<tr>
<th class="cmn" style="width: 72px;">No.</th>
<th class="cmn" style="width: 130.141px;">폐기관리번호</th>
<th class="cmn" style="width: 120.469px;">폐기일자</th>
<th class="cmn" style="width: 120.141px;">폐기관리번호</th>
<th class="cmn" style="width: 110.469px;">폐기일자</th>
<th class="cmn" style="width: 120px;">폐기방법</th>
<th class="cmn" style="width: 200.469px;">업체명</th>
<th class="cmn" style="width: 100px;">대표자</th>
<th class="cmn" style="width: 150.469px;">제품코드</th>
<th class="cmn" style="width: 300px;">제품명</th>
<%-- <th class="cmn" style="width: 90px;">폐기건수</th>--%>
<th class="cmn" style="width: 90px;">폐기수량</th>
<th class="cmn" style="width: 130px;">진행상태</th>
<th class="cmn" style="width: 160px;">처리상태</th>
</tr>
</thead>
<tbody id="tbody--${pageName}">
@ -30,6 +31,7 @@
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_de}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_mth_nm}</td>
<td class="cmn text-start" onclick="{onclick}" ondblclick="{ondblclick}">{bssh_nm}</td>
<td class="text-start" onclick="{onclick}" ondblclick="{ondblclick}">{rprsntv_nm}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{prduct_cd}</td>
<td class="cmn text-start" onclick="{onclick}" ondblclick="{ondblclick}">{prduct_nm}</td>
<%-- <td class="cmn text-end" onclick="{onclick}" ondblclick="{ondblclick}">{rnd_dtl_rpt_cnt}</td>--%>

6
src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByPrdStatistics-main.jsp
Unescape Escape View File

@ -202,8 +202,10 @@
$P.control.getInfo = (obj, prductCd) => {
if(prductCd === undefined || prductCd === '') return;
const row = $P.control.dataset.getCurrent();
const row = $P.control.dataset.getData(prductCd);
if(row.dept_nm === 'TOTAL') return;
if(row[obj.dataset.val] === 0 || row[obj.dataset.val] === undefined) return;
let params = $P.formFields.get(); // 검색 조건
if(!$('#chkDsuseDe--${pageName}').is(":checked")){
@ -214,8 +216,6 @@
params.prductCd = prductCd;
params.prgrsSttsCd = obj.dataset.div;
if(row[obj.dataset.val] === 0 || row[obj.dataset.val] === undefined) return;
ajax.get({
url : wctx.url("/adds/nims/getDsuseMgtDsuseQyByPrdStatisticsDtls.do")
, data : params

4
src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-info.jsp
Unescape Escape View File

@ -145,8 +145,8 @@
<%-- <th class="cmn" style="width: 230.469px;">업종명</th>--%>
<th class="cmn" style="width: 90px;">보고건수</th>
<th class="cmn" style="width: 230.469px;">폐기사유</th>
<th class="cmn" style="width: 120px;">취급일자</th>
<th class="cmn" style="width: 120.469px;">폐기일자</th>
<th class="cmn" style="width: 110px;">취급일자</th>
<th class="cmn" style="width: 110.469px;">폐기일자</th>
<th class="cmn" style="width: 180.469px;">폐기구분</th>
<th class="cmn" style="width: 180.469px;">폐기방법</th>
<th class="cmn" style="width: 180px;">폐기장소</th>

8
src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp
Unescape Escape View File

@ -88,17 +88,17 @@
data-by="by--${pageName}" data-by-output="byOutput--${pageName}" data-main-option="mainOption--${pageName}" data-sub-option="subOption--${pageName}">
<th class="cmn" style="width: 72px;">No.</th>
<th class="cmn" style="width: 170.141px;">관할관청</th>
<th class="cmn" style="width: 130.141px;">폐기관리번호</th>
<th class="cmn" style="width: 120.469px;">폐기일자</th>
<th class="cmn" style="width: 120.141px;">폐기관리번호</th>
<th class="cmn" style="width: 110.469px;">폐기일자</th>
<th class="cmn" style="width: 150px;">폐기방법</th>
<th class="cmn" style="width: 300.469px;">업체명</th>
<th class="cmn" style="width: 90px;">보고건수</th>
<th class="cmn" style="width: 270.469px;">NIMS보고ID</th>
<th class="cmn" style="width: 170.469px;">처리상태</th>
<th class="cmn" style="width: 160.469px;">처리상태</th>
<th class="cmn" style="width: 180.469px;">폐기사유</th>
<th class="cmn" style="width: 150px;">폐기구분</th>
<th class="cmn" style="width: 200.469px;">폐기장소</th>
<th class="cmn" style="width: 120.141px;">취급일자</th>
<th class="cmn" style="width: 110.141px;">취급일자</th>
</tr>
</thead>
<tbody id="tbody--${pageName}">

6
src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtNcrdAndPrtmStatistics-info.jsp
Unescape Escape View File

@ -10,10 +10,11 @@
<thead class="sticky-thead">
<tr>
<th class="cmn" style="width: 72px;">No.</th>
<th class="cmn" style="width: 130.141px;">폐기관리번호</th>
<th class="cmn" style="width: 120.469px;">폐기일자</th>
<th class="cmn" style="width: 120.141px;">폐기관리번호</th>
<th class="cmn" style="width: 110.469px;">폐기일자</th>
<th class="cmn" style="width: 120px;">폐기방법</th>
<th class="cmn" style="width: 200.469px;">업체명</th>
<th class="cmn" style="width: 100px;">대표자</th>
<th class="cmn" style="width: 150.469px;">제품코드</th>
<th class="cmn" style="width: 300px;">제품명</th>
<%-- <th class="cmn" style="width: 90px;">폐기건수</th>--%>
@ -31,6 +32,7 @@
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_de}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_mth_nm}</td>
<td class="cmn text-start" onclick="{onclick}" ondblclick="{ondblclick}">{bssh_nm}</td>
<td class="text-start" onclick="{onclick}" ondblclick="{ondblclick}">{rprsntv_nm}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{prduct_cd}</td>
<td class="cmn text-start" onclick="{onclick}" ondblclick="{ondblclick}">{prduct_nm}</td>
<%-- <td class="cmn text-end" onclick="{onclick}" ondblclick="{ondblclick}">{rnd_dtl_rpt_cnt}</td>--%>

6
src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtNcrdAndPrtmStatistics-main.jsp
Unescape Escape View File

@ -212,6 +212,9 @@
$P.control.getInfo = (obj, deptCd) => {
if(deptCd === undefined || deptCd === 'TOTAL') return;
const row = $P.control.dataset.getData(deptCd);
if(row[obj.dataset.val] === 0 || row[obj.dataset.val] === undefined) return;
let params = $P.formFields.get(); // 검색 조건
if(!$('#chkDsuseDe--${pageName}').is(":checked")){
params.schDateFrom = '';
@ -219,9 +222,6 @@
}
params.deptCd = deptCd;
const row = $P.control.dataset.getCurrent();
if(row[obj.dataset.val] === 0 || row[obj.dataset.val] === undefined) return;
if(obj.dataset.div === "NrcdSeNm") {
params.nrcdSeNm = obj.dataset.val;
}else if(obj.dataset.div === "prtmSeNm"){

10
src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp
Unescape Escape View File

@ -90,17 +90,17 @@
data-by="by--${pageName}" data-by-output="byOutput--${pageName}" data-main-option="mainOption--${pageName}" data-sub-option="subOption--${pageName}">
<th class="cmn" style="width: 72px;">No.</th>
<th class="cmn" style="width: 170.141px;">관할관청</th>
<th class="cmn" style="width: 130.141px;">폐기관리번호</th>
<th class="cmn" style="width: 120.469px;">폐기일자</th>
<th class="cmn" style="width: 120.141px;">폐기관리번호</th>
<th class="cmn" style="width: 110.469px;">폐기일자</th>
<th class="cmn" style="width: 150px;">폐기방법</th>
<th class="cmn" style="width: 300.469px;">업체명</th>
<th class="cmn" style="width: 90px;">폐기건수</th>
<th class="cmn" style="width: 170.469px;">처리상태</th>
<th class="cmn" style="width: 160.469px;">처리상태</th>
<th class="cmn" style="width: 180.469px;">폐기사유</th>
<th class="cmn" style="width: 120.141px;">사고발생일</th>
<th class="cmn" style="width: 110.141px;">사고발생일</th>
<th class="cmn" style="width: 150px;">폐기구분</th>
<th class="cmn" style="width: 200.469px;">폐기장소</th>
<th class="cmn" style="width: 120.141px;">취급일자</th>
<th class="cmn" style="width: 110.141px;">취급일자</th>
</tr>
</thead>
<tbody id="tbody--${pageName}">

8
src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp
Unescape Escape View File

@ -85,17 +85,17 @@
data-by="by--${pageName}" data-by-output="byOutput--${pageName}" data-main-option="mainOption--${pageName}" data-sub-option="subOption--${pageName}">
<th class="cmn" style="width: 72px;">No.</th>
<th class="cmn" style="width: 170.141px;">관할관청</th>
<th class="cmn" style="width: 130.141px;">폐기관리번호</th>
<th class="cmn" style="width: 120.469px;">폐기일자</th>
<th class="cmn" style="width: 120.141px;">폐기관리번호</th>
<th class="cmn" style="width: 110.469px;">폐기일자</th>
<th class="cmn" style="width: 150px;">폐기방법</th>
<th class="cmn" style="width: 250.469px;">업체명</th>
<th class="cmn" style="width: 90px;">폐기건수</th>
<th class="cmn" style="width: 170.469px;">처리상태</th>
<th class="cmn" style="width: 160.469px;">처리상태</th>
<th class="cmn" style="width: 180.469px;">폐기사유</th>
<th class="cmn" style="width: 120.141px;">사고발생일</th>
<th class="cmn" style="width: 150px;">폐기구분</th>
<th class="cmn" style="width: 200.469px;">폐기장소</th>
<th class="cmn" style="width: 120.141px;">취급일자</th>
<th class="cmn" style="width: 110.141px;">취급일자</th>
</tr>
</thead>
<tbody id="tbody--${pageName}">

Write Preview
Loading…
Cancel
Save