견문 검색 조건 추가.

강석 최 2022-10-05 10:05:36 +09:00
parent b0c10b233d
commit 4176b68920
2 changed files with 65 additions and 14 deletions

View File

@ -15,6 +15,18 @@
<if test='wrtOrgan != null and wrtOrgan != ""'>
and a.wrt_organ = #{wrtOrgan}
</if>
<if test='affairType1 != null and affairType1 != ""'>
and a.affair_type1 = #{affairType1}
</if>
<if test='affairType2 != null and affairType2 != ""'>
and a.affair_type2 = #{affairType2}
</if>
<if test='affairType3 != null and affairType3 != ""'>
and a.affair_type3 = #{affairType3}
</if>
<if test='affairType4 != null and affairType4 != ""'>
and a.affair_type4 = #{affairType4}
</if>
<if test='title != null and title != ""'>
and a.title like '%'||#{title}||'%'
</if>

View File

@ -28,17 +28,17 @@
<div class="tab-content border border-top-0 p-2">
<form method="get" th:action="${searchUrl}">
<input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
<div class="row justify-content-between pe-3 py-1">
<div class="col-auto">
<div class="row pe-3 py-1">
<div class="col-1">
<select class="form-select" name="rowCnt" id="rowCnt">
<th:block th:each="num : ${#numbers.sequence(1,5)}">
<option th:value="${num*10}" th:text="${num*10}" th:selected="${searchParams.rowCnt eq num*10}"></option>
</th:block>
</select>
</div>
<div class="col-auto">
<div class="row justify-content-end">
<div class="col-auto" th:if="${accessAuth eq 'ACC003'}">
<div class="col-10">
<div class="row justify-content-end pb-1" th:if="${accessAuth eq 'ACC003'}">
<div class="col-auto">
<select class="form-select form-select-sm" name="wrtOrgan">
<option value="">관서 선택</option>
<th:block th:each="commonCode:${session.commonCode.get('OG')}">
@ -49,11 +49,47 @@
</select>
</div>
<div class="col-auto">
<input type="text" class="form-control form-control-sm" placeholder="제목" name="title" th:value="${searchParams.title}">
</div>
<div class="col-auto" th:if="${accessAuth eq 'ACC003'}">
<input type="text" class="form-control form-control-sm" placeholder="작성자" name="wrtUserNm" th:value="${searchParams.wrtUserNm}">
</div>
</div>
<div class="row justify-content-end pb-1">
<div class="col-auto">
<select class="form-select form-select-sm" name="affairType1">
<option value="">분야1 선택</option>
<th:block th:each="commonCode:${session.commonCode.get('DC01')}">
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq searchParams.affairType1}"></option>
</th:block>
</select>
</div>
<div class="col-auto">
<select class="form-select form-select-sm" name="affairType2">
<option value="">분야2 선택</option>
<th:block th:each="commonCode:${session.commonCode.get('DC02')}">
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq searchParams.affairType2}"></option>
</th:block>
</select>
</div>
<div class="col-auto">
<select class="form-select form-select-sm" name="affairType3">
<option value="">분야3 선택</option>
<th:block th:each="commonCode:${session.commonCode.get('DC03')}">
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq searchParams.affairType3}"></option>
</th:block>
</select>
</div>
<div class="col-auto">
<select class="form-select form-select-sm" name="affairType4">
<option value="">분야4 선택</option>
<th:block th:each="commonCode:${session.commonCode.get('DC04')}">
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq searchParams.affairType4}"></option>
</th:block>
</select>
</div>
</div>
<div class="row justify-content-end">
<div class="col-auto">
<input type="text" class="form-control form-control-sm" placeholder="제목" name="title" th:value="${searchParams.title}">
</div>
<div class="col-auto">
<select class="form-select form-select-sm" name="affairStatus">
<option value="">상태 선택</option>
@ -62,15 +98,17 @@
</th:block>
</select>
</div>
<div class="col-4">
<div class="col-auto">
<div class="input-group w-auto input-daterange" id="dateSelectorDiv">
<input type="text" class="form-control form-control-sm" id="startDate" name="startDate" placeholder="시작일" autocomplete="off" readonly th:value="${searchParams.startDate}">
<input type="text" class="form-control form-control-sm" id="endDate" name="endDate" placeholder="종료일" autocomplete="off" readonly th:value="${searchParams.endDate}">
</div>
</div>
<input type="submit" class="btn btn-sm btn-primary col-auto" id="searchBtn" value="검색">
</div>
</div>
<div class="col-1 d-grid gap-2">
<input type="submit" class="btn btn-lg btn-primary col-auto" id="searchBtn" value="검색">
</div>
</div>
</form>
<div class="row justify-content-start">
@ -93,11 +131,12 @@
<th>작성일시</th>
<th>첨부파일</th>
<th>상태</th>
<th:block th:if="${page ne 'main' and apprvAuth ne null}">
<th:block th:if="${page eq 'stay' and apprvAuth ne null}">
<th>평가</th>
<th:block th:if="${page eq 'commit'}">
<th>상보</th>
</th:block>
</th:block>
<th:block th:if="${page eq 'commit'}">
<th>평가</th>
<th>상보</th>
</th:block>
</tr>
</thead>