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 9ccf317eb3
commit 3d27e6effc
8 changed files with 73 additions and 54 deletions
Show Stats Download Patch File Download Diff File

19
src/main/java/cokr/xit/adds/nims/DsuseMgtReceiptQuery.java
Unescape Escape View File

@ -18,13 +18,6 @@ public class DsuseMgtReceiptQuery extends QueryRequest{
//폐기관리
private String dscdmngId; // 폐기관리 ID
/* public String getDscdmngId() {
return dscdmngId;
}
public void setDscdmngId(String dscdmngId) {
this.dscdmngId = dscdmngId;
}*/
private String deptCd; // 부서 코드
private String userId; // 사용자 ID
@ -60,6 +53,18 @@ public class DsuseMgtReceiptQuery extends QueryRequest{
private String bsshSttsNm; // 상태
private String prmisnNo; // 허가 번호
private String nimsRptYn; // NIMS 보고 여부
public String getNimsRptYn() {
return ifEmpty(nimsRptYn, () -> null);
}
public <T extends DsuseMgtReceiptQuery> T setNimsRptYn(String nimsRptYn) {
this.nimsRptYn = nimsRptYn;
return self();
}
public String getSchSggCd() {
return ifEmpty(schSggCd, () -> null);
}

4
src/main/resources/sql/mapper/adds/nims/dsuseMgtDoc-mapper.xml
Unescape Escape View File

@ -53,10 +53,10 @@
AND tdm.dept_cd = #{schSggCd} <!-- 관할 관청 -->
</if>
<if test="schDateFrom != null">
AND tdm.hdr_de <![CDATA[>=]]> #{schDateFrom} <!-- 취급 일자 시작 -->
AND tdm.dsuse_de <![CDATA[>=]]> #{schDateFrom} <!-- 취급 일자 시작 -->
</if>
<if test="schDateTo != null">
AND tdm.hdr_de <![CDATA[<=]]> #{schDateTo} <!-- 취급 일자 종료 -->
AND tdm.dsuse_de <![CDATA[<=]]> #{schDateTo} <!-- 취급 일자 종료 -->
</if>
<if test="schBsshCd != null">
AND tdm.bssh_cd = #{schBsshCd}

13
src/main/resources/sql/mapper/adds/nims/dsuseMgtReceipt-mapper.xml
Unescape Escape View File

@ -58,12 +58,25 @@
<if test="schSggCd != null">
AND A.DEPT_CD = #{schSggCd} <!-- 관할 관청 -->
</if>
<choose>
<when test="nimsRptYn != null and nimsRptYn != ''">
<if test="schDateFrom != null">
AND A.HDR_DE <![CDATA[>=]]> #{schDateFrom} <!-- 취급 일자 시작 -->
</if>
<if test="schDateTo != null">
AND A.HDR_DE <![CDATA[<=]]> #{schDateTo} <!-- 취급 일자 종료 -->
</if>
</when>
<otherwise>
<if test="schDateFrom != null">
AND A.DSUSE_DE <![CDATA[>=]]> #{schDateFrom} <!-- 폐기 일자 시작 -->
</if>
<if test="schDateTo != null">
AND A.DSUSE_DE <![CDATA[<=]]> #{schDateTo} <!-- 폐기 일자 종료 -->
</if>
</otherwise> <!-- 취급 일자 시작 -->
</choose>
<if test="schBsshCd != null">
AND B.BSSH_CD = #{schBsshCd}
</if>

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

@ -22,14 +22,14 @@
</select>
</div>
<div class="col-5">
<label class="form-label fw-bold form-search-title text-end"">취급일자</label>
<label class="form-label fw-bold form-search-title text-end">폐기일자</label>
<span class="form-search-linebox">
<input type="text" class="form-control form-date" id="schDateFrom--${pageName}" name="schDateFrom" data-fmt-type="day" autocomplete="off" title="시작 날짜 선택" />
<button type="button" class="bx bx-lg bx-calendar bg-white"></button>
~
<input type="text" class="form-control form-date" id="schDateTo--${pageName}" name="schDateTo" data-fmt-type="day" autocomplete="off" title="종료 날짜 선택" />
<button type="button" class="bx bx-lg bx-calendar bg-white"></button>
<input type="checkbox" id="chkHdrDe--${pageName}" name="chkHdrDe" title="취급일자 적용" style="align-items: baseline"/>&nbsp;<strong>취급일자 적용</strong>
<input type="checkbox" id="chkDsuseDe--${pageName}" name="chkDsuseDe" title="폐기일자 적용" style="align-items: baseline"/>&nbsp;<strong>폐기일자 적용</strong>
</span>
</div>
<!-- 업체명 -->
@ -103,14 +103,14 @@
<th class="cmn" style="width: 120.469px;">폐기일자</th>
<th class="cmn" style="width: 150px;">폐기방법</th>
<th class="cmn" style="width: 250.469px;">업체명</th>
<th class="cmn" style="width: 150px;">폐기결과보고서</th>
<th class="cmn" style="width: 150px;">처리내역및사진</th>
<th class="cmn" style="width: 120.141px;">취급일자</th>
<th class="cmn" style="width: 90px;">폐기건수</th>
<th class="cmn" style="width: 140.469px;">폐기결과보고서</th>
<th class="cmn" style="width: 140.469px;">처리내역및사진</th>
<th class="cmn" style="width: 160.469px;">처리상태</th>
<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>
</tr>
</thead>
<tbody id="tbody--${pageName}">
@ -127,19 +127,18 @@
<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="cmn text-end" onclick="{onclick}" ondblclick="{ondblclick}">{rnd_dtl_rpt_cnt}</td>
<td class="cmn text-center" onclick="{onclick}">
<a href="/file/download.do?fileID={dsuse_rslt_doc}">{dsuse_rslt_doc}</a>
</td>
<td class="cmn text-center" onclick="{onclick}">
<a href="/file/download.do?fileID={dsuse_rslt_list_photo}">{dsuse_rslt_list_photo}</a>
</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{hdr_de}</td>
<td class="cmn text-end" onclick="{onclick}" ondblclick="{ondblclick}">{rnd_dtl_rpt_cnt}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{prgrs_stts_nm}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_prv_nm}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_se_nm}</td>
<td class="cmn text-start" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_loc}</td>
<%-- <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{USR_RPT_ID_NO}</td>--%>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{hdr_de}</td>
</tr>
</template>
<template id="${infoPrefix}NotFound--${pageName}">

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

@ -22,7 +22,7 @@
</select>
</div>
<div class="col-5">
<label class="form-label fw-bold form-search-title text-end"">취급일자</label>
<label class="form-label fw-bold form-search-title text-end">취급일자</label>
<span class="form-search-linebox">
<input type="text" class="form-control form-date" id="schDateFrom--${pageName}" name="schDateFrom" data-fmt-type="day" autocomplete="off" title="시작 날짜 선택" />
<button type="button" class="bx bx-lg bx-calendar bg-white"></button>
@ -30,6 +30,7 @@
<input type="text" class="form-control form-date" id="schDateTo--${pageName}" name="schDateTo" data-fmt-type="day" autocomplete="off" title="종료 날짜 선택" />
<button type="button" class="bx bx-lg bx-calendar bg-white"></button>
</span>
<strong style="padding-left: 5px; color: #696cff">NIMS폐기보고는 취급일자 기준</strong>
</div>
<!-- 업체명 -->
<div class="col-5">
@ -87,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: 120.141px;">취급일자</th>
<th class="cmn" style="width: 130.141px;">폐기관리번호</th>
<th class="cmn" style="width: 120.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: 270.469px;">NIMS보고ID</th>
<th class="cmn" style="width: 120.469px;">폐기일자</th>
<th class="cmn" style="width: 150px;">폐기방법</th>
<th class="cmn" style="width: 170.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>
</tr>
</thead>
<tbody id="tbody--${pageName}">
@ -106,19 +107,19 @@
<tr data-key="{DSCDMNG_ID}">
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{ROW_NUM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DEPT_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{HDR_DE}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSCDMNG_ID}</td>
<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="cmn text-end" onclick="{onclick}" ondblclick="{ondblclick}">{RND_DTL_RPT_CNT}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{PRGRS_STTS_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">
<a href="#">{USR_RPT_ID_NO}</a>
</td>
<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-center" onclick="{onclick}" ondblclick="{ondblclick}">{PRGRS_STTS_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_PRV_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_SE_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_LOC}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{HDR_DE}</td>
</tr>
</template>
<template id="${infoPrefix}NotFound--${pageName}">
@ -532,7 +533,8 @@
// 검색 버튼 클릭 이벤트
$P.fnSearchList = () => {
// 검색조건
$P.control.query = $P.formFields.get(); // 검색 조건
$P.control.query = $P.formFields.get();
$P.control.query.nimsRptYn = 'Y';// 검색 조건
$P.control.query.fetchSize = $P.control.defaultFetchSize; // 한번에 조회되는 자료 건수
$P.control.query.delYn = "N"; // 삭제 여부

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

@ -23,7 +23,7 @@
</div>
<div class="col-7">
<label class="form-label fw-bold form-search-title text-end">취급일자</label>
<label class="form-label fw-bold form-search-title text-end">폐기일자</label>
<span class="form-search-linebox" id="inputHdrDe">
<input type="text" class="form-control form-date" id="schDateFrom--${pageName}" name="schDateFrom" data-fmt-type="day" autocomplete="off" title="시작 날짜 선택" />
<button type="button" class="bx bx-lg bx-calendar bg-white"></button>
@ -31,7 +31,7 @@
<input type="text" class="form-control form-date" id="schDateTo--${pageName}" name="schDateTo" data-fmt-type="day" autocomplete="off" title="종료 날짜 선택" />
<button type="button" class="bx bx-lg bx-calendar bg-white"></button>
</span>
<input type="checkbox" id="chkHdrDe--${pageName}" name="chkHdrDe" title="취급일자 적용" style="align-items: baseline"/>&nbsp;<strong>취급일자 적용</strong>
<input type="checkbox" id="chkDsuseDe--${pageName}" name="chkDsuseDe" title="폐기일자 적용" style="align-items: baseline"/>&nbsp;<strong>폐기일자 적용</strong>
</div>
<!-- 업체명 -->
@ -91,16 +91,16 @@
<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: 170.469px;">처리상태</th>
<th class="cmn" style="width: 120.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: 180.469px;">폐기사유</th>
<th class="cmn" style="width: 120.141px;">사고발생일</th>
<th class="cmn" style="width: 120.141px;">취급일자</th>
<th class="cmn" style="width: 120.469px;">폐기일자</th>
<th class="cmn" style="width: 150px;">폐기방법</th>
<th class="cmn" style="width: 150px;">폐기구분</th>
<th class="cmn" style="width: 200.469px;">폐기장소</th>
<th class="cmn" style="width: 120.141px;">취급일자</th>
</tr>
</thead>
<tbody id="tbody--${pageName}">
@ -110,16 +110,16 @@
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{ROW_NUM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DEPT_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSCDMNG_ID}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{PRGRS_STTS_NM}</td>
<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="cmn text-end" onclick="{onclick}" ondblclick="{ondblclick}">{RND_DTL_RPT_CNT}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{PRGRS_STTS_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_PRV_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_ACDT_DE}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{HDR_DE}</td>
<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-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_SE_NM}</td>
<td class="cmn" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_LOC}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{HDR_DE}</td>
</tr>
</template>
<template id="${infoPrefix}NotFound--${pageName}">
@ -515,7 +515,7 @@
$P.fnSearchList = () => {
// 검색조건
$P.control.query = $P.formFields.get(); // 검색 조건
if(!$('#chkHdrDe--${pageName}').is(":checked")){
if(!$('#chkDsuseDe--${pageName}').is(":checked")){
$P.control.query.schDateFrom = '';
$P.control.query.schDateTo = '';
}

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

@ -47,7 +47,7 @@
<%-- <label for="bssh--${pageName}">폐기 정보</label>--%>
<div class="row my-1 mx-4 g-1 border-card rounded-3">
<div class="col-md-4">
<label for="hdrDe--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">취급일자</label>
<label for="hdrDe--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">폐기일자</label>
<input type="text" class="form-control w-45 form-date" id="hdrDe--${pageName}" name="hdrDe" data-fmt-type="day" data-map="hdrDe" autocomplete="off" title="종료 날짜 선택" />
<button type="button" class="bx bx-lg bx-calendar bg-white"></button>
</div>
@ -179,7 +179,7 @@
for(let idx = 0; idx < list.length; idx++){
let item = list[idx];
tagsTextArr.push('기등록 폐기 사진 - 폐기관리ID: [' + item.DSCDMNG_ID + ']<br>폐기일자: ' + item.DSUSE_DE + ', 폐기방법: ' + item.DSUSE_MTH_NM);
tagsTextArr.push('폐기관리번호[' + item.DSCDMNG_ID + ']의 폐기 이미지를 사용합니다<br>폐기일자: ' + item.DSUSE_DE + ', 폐기방법: ' + item.DSUSE_MTH_NM);
}
document.getElementById("rsltImgList").innerHTML = tagsTextArr.join("");
}

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

@ -22,14 +22,14 @@
</select>
</div>
<div class="col-5">
<label class="form-label fw-bold form-search-title text-end"">취급일자</label>
<label class="form-label fw-bold form-search-title text-end">폐기일자</label>
<span class="form-search-linebox">
<input type="text" class="form-control form-date" id="schDateFrom--${pageName}" name="schDateFrom" data-fmt-type="day" autocomplete="off" title="시작 날짜 선택" />
<button type="button" class="bx bx-lg bx-calendar bg-white"></button>
~
<input type="text" class="form-control form-date" id="schDateTo--${pageName}" name="schDateTo" data-fmt-type="day" autocomplete="off" title="종료 날짜 선택" />
<button type="button" class="bx bx-lg bx-calendar bg-white"></button>
<input type="checkbox" id="chkHdrDe--${pageName}" name="chkHdrDe" title="취급일자 적용" style="align-items: baseline"/>&nbsp;<strong>취급일자 적용</strong>
<input type="checkbox" id="chkDsuseDe--${pageName}" name="chkDsuseDe" title="폐기일자 적용" style="align-items: baseline"/>&nbsp;<strong>폐기일자 적용</strong>
</span>
</div>
<!-- 업체명 -->
@ -86,16 +86,16 @@
<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: 170.469px;">처리상태</th>
<th class="cmn" style="width: 250.469px;">업체명</th>
<th class="cmn" style="width: 120.141px;">취급일자</th>
<th class="cmn" style="width: 120.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: 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>
</tr>
</thead>
<tbody id="tbody--${pageName}">
@ -105,16 +105,16 @@
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{ROW_NUM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DEPT_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSCDMNG_ID}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{PRGRS_STTS_NM}</td>
<td class="cmn text-start" onclick="{onclick}" ondblclick="{ondblclick}">{BSSH_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{HDR_DE}</td>
<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="cmn text-end" onclick="{onclick}" ondblclick="{ondblclick}">{RND_DTL_RPT_CNT}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{PRGRS_STTS_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_PRV_NM}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_ACDT_DE}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_SE_NM}</td>
<td class="cmn" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_LOC}</td>
<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{HDR_DE}</td>
</tr>
</template>
<template id="${infoPrefix}NotFound--${pageName}">
@ -468,7 +468,7 @@
$P.fnSearchList = () => {
// 검색조건
$P.control.query = $P.formFields.get(); // 검색 조건
if(!$('#chkHdrDe--${pageName}').is(":checked")){
if(!$('#chkDsuseDe--${pageName}').is(":checked")){
$P.control.query.schDateFrom = '';
$P.control.query.schDateTo = '';
}

Write Preview
Loading…
Cancel
Save