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

fix: 보고문서 검색 조건 변경 적용

Browse Source
dev
Jonguk. Lim 5 months ago
parent 1455db3210
commit 44f5175a94
3 changed files with 43 additions and 10 deletions
Show Stats Download Patch File Download Diff File

13
src/main/java/cokr/xit/adds/nims/DsuseMgtDocQuery.java
Unescape Escape View File

@ -14,6 +14,7 @@ public class DsuseMgtDocQuery extends QueryRequest{
private String schDateFrom; // 검색 일자 시작
private String schDateTo; // 검색 일자 종료
private String schBsshCd; // 검색 일자 종료
private String schSttsCd; // 진행상태
//폐기관리
private String dscdmngId; // 폐기관리 ID
@ -372,5 +373,15 @@ public class DsuseMgtDocQuery extends QueryRequest{
public <T extends DsuseMgtDocQuery> T setPrmisnNo(String prmisnNo) {
this.prmisnNo = prmisnNo;
return self();
}
}
public String getSchSttsCd() {
return ifEmpty(schSttsCd, () -> null);
}
public <T extends DsuseMgtDocQuery> T setSchSttsCd(String schSttsCd) {
this.schSttsCd = schSttsCd;
return self();
}
}

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

@ -56,6 +56,13 @@
<if test="schBsshCd != null">
AND tdm.bssh_cd = #{schBsshCd}
</if>
<if test="schSttsCd eq 'ing'">
AND tdm.prgrs_stts_cd &gt;= '06'
AND tdm.prgrs_stts_cd &lt; '99'
</if>
<if test="schSttsCd eq 'end'">
AND tdm.prgrs_stts_cd = '99'
</if>
<include refid="utility.orderBy" />
GROUP BY tdm.dscdmng_id,
tdm.dept_cd,

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

@ -29,6 +29,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-sm bx-calendar bg-white"></button>
<input type="checkbox" id="chkHdrDe--${pageName}" name="chkHdrDe" title="취급일자 적용" style="align-items: baseline"/>&nbsp;<strong>취급일자 적용</strong>
</span>
</div>
<!-- 업체명 -->
@ -43,11 +44,19 @@
<!-- 처리상태 -->
<div class="col-6">
<label class="form-label fw-bold form-search-title text-end" for="schSttsCd--${pageName}">처리상태</label>
<select class="form-select" id="schSttsCd--${pageName}" name="schSttsCd">
<c:forEach items="${ADDS11}" var="item">
<option value="${item.code}">${item.value}</option>
</c:forEach>
</select>
<%-- <select class="form-select" id="schSttsCd--${pageName}" name="schSttsCd">--%>
<%-- <c:forEach items="${ADDS11}" var="item">--%>
<%-- <option value="${item.code}">${item.value}</option>--%>
<%-- </c:forEach>--%>
<%-- </select>--%>
<div class="form-check form-check-inline mt-3">
<input id="ing" name="schSttsCd" value="ing" type="radio" class="form-check-input"/>
<label class="form-check-label" for="ing">진행</label>
</div>
<div class="form-check form-check-inline">
<input id="end" name="schSttsCd" value="end" type="radio" class="form-check-input"/>
<label class="form-check-label" for="end">완료</label>
</div>
</div>
<div class="col-1">
<button type="button" class="btn btn-search w-px-120" id="btnSearch--${pageName}" title="검색">
@ -89,10 +98,10 @@
<th class="cmn" style="width: 120.141px;">취급일자</th>
<th class="cmn" style="width: 120.469px;">폐기일자</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: 150.469px;">폐기결과보고서</th>
<th class="cmn" style="width: 170.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: 150px;">폐기구분</th>
<th class="cmn" style="width: 150px;">폐기방법</th>
@ -108,14 +117,14 @@
<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-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}">
<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-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-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_mth_nm}</td>
@ -425,6 +434,10 @@
$P.fnSearchList = () => {
// 검색조건
$P.control.query = $P.formFields.get(); // 검색 조건
if(!$('#chkHdrDe--${pageName}').is(":checked")){
$P.control.query.schDateFrom = '';
$P.control.query.schDateTo = '';
}
$P.control.query.fetchSize = $P.control.defaultFetchSize; // 한번에 조회되는 자료 건수
$P.control.query.delYn = "N"; // 삭제 여부
@ -519,6 +532,8 @@
// FIXME: 로그인 사용자의 관할관청 코드를 설정한다.
<%--$('#schSggCd--${pageName}').val("${currentUser.deptCd}");--%>
$('#schSggCd--${pageName}').val("4050149");
$('input:radio[name="schSttsCd"]').filter('[value="ing"]').prop('checked', true);
}
/**************************************************************************

Write Preview
Loading…
Cancel
Save