fix : 첩보수집활동 외사첩보망 견문관리 운영실적 완료
parent
ef7d6b9c89
commit
a1170fa22f
|
|
@ -134,11 +134,21 @@
|
|||
<if test='iaState != null and iaState != ""'>
|
||||
and ia_state = #{iaState}
|
||||
</if>
|
||||
<if test='startDate != null and startDate != ""'>
|
||||
and wrt_dt >= #{startDate}::date
|
||||
<if test='dateSelector == "iaDt"'>
|
||||
<if test='startDate != null and startDate != ""'>
|
||||
and ia_sdate >= #{startDate}::date
|
||||
</if>
|
||||
<if test='endDate != null and endDate != ""'>
|
||||
and ia_edate <= #{endDate}::date
|
||||
</if>
|
||||
</if>
|
||||
<if test='endDate != null and endDate != ""'>
|
||||
and wrt_dt <= #{endDate}::date+1
|
||||
<if test='dateSelector == "wrtDt"'>
|
||||
<if test='startDate != null and startDate != ""'>
|
||||
and wrt_dt >= #{startDate}::date
|
||||
</if>
|
||||
<if test='endDate != null and endDate != ""'>
|
||||
and wrt_dt <= #{endDate}::date+1
|
||||
</if>
|
||||
</if>
|
||||
<if test="downOrganCdList != null">
|
||||
and wrt_organ in
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
</li>
|
||||
</ul>
|
||||
<div class="tab-content bg-white border border-top-0 p-2" id="planContent">
|
||||
<!-- <form method="get" th:action="${searchUrl}">
|
||||
<form method="get" th:action="${searchUrl}">
|
||||
<input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
|
||||
<div class="row justify-content-between py-1">
|
||||
<div class="col-auto">
|
||||
|
|
@ -41,8 +41,8 @@
|
|||
<div class="col-8">
|
||||
<div class="row">
|
||||
<div class="col-11">
|
||||
<div class="row justify-content-end pb-1" th:if="${accessAuth eq 'ACC003'}">
|
||||
<div class="col-2">
|
||||
<div class="row justify-content-end pb-1">
|
||||
<div class="col-2" th:if="${accessAuth eq 'ACC003'}">
|
||||
<select class="form-select form-select-sm" name="wrtOrgan">
|
||||
<option value="">관서 선택</option>
|
||||
<th:block th:each="commonCode:${session.commonCode.get('OG')}">
|
||||
|
|
@ -52,20 +52,13 @@
|
|||
</th:block>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<input type="text" class="form-control form-control-sm" placeholder="협력자 성명" name="opName" th:value="${searchParams.opName}">
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<select class="form-select form-select-sm" name="opState">
|
||||
<option value="">상태 선택</option>
|
||||
<th:block th:each="commonCode:${session.commonCode.get('DST')}">
|
||||
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq searchParams.opState}"></option>
|
||||
</th:block>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<div class="input-group input-daterange" id="dateSelectorDiv">
|
||||
등록일:
|
||||
<select class="form-select form-select-sm w-30" name="dateSelector">
|
||||
<option value="">조건선택</option>
|
||||
<option value="iaDt" th:selected="${searchParams.dateSelector eq 'iaDt'}">실적기간</option>
|
||||
<option value="wrtDt" th:selected="${searchParams.dateSelector eq 'wrtDt'}">등록일</option>
|
||||
</select>
|
||||
<input type="text" class="form-control form-control-sm w-35" id="startDate" name="startDate" placeholder="시작일" autocomplete="off" readonly th:value="${searchParams.startDate}">
|
||||
<input type="text" class="form-control form-control-sm w-35" id="endDate" name="endDate" placeholder="종료일" autocomplete="off" readonly th:value="${searchParams.endDate}">
|
||||
</div>
|
||||
|
|
@ -78,7 +71,7 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form> -->
|
||||
</form>
|
||||
<div class="row justify-content-start">
|
||||
<div class="col-12">
|
||||
<table class="table table-sm table-bordered table-hover">
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="ko" xmlns:th="http://www.thymeleaf.org">
|
||||
<div class="modal-header bg-dark">
|
||||
<h5 class="modal-title text-white" id="affairEditModalLabel" th:text="${ia.iaKey eq null?'운영 계획서 작성':'운영 계획서 수정'}"></h5>
|
||||
<h5 class="modal-title text-white" id="affairEditModalLabel" th:text="${ia.iaKey eq null?'분석평가서 작성':'분석 평가서 수정'}"></h5>
|
||||
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||
</div>
|
||||
<div class="modal-body" id="affairEditBody">
|
||||
|
|
@ -26,9 +26,9 @@
|
|||
<div class="col-sm-2">
|
||||
<input type="text" class="form-control form-control-sm" placeholder="작성자 자동입력" readonly>
|
||||
</div>
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">작성일</label>
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">등록일</label>
|
||||
<div class="col-sm-2">
|
||||
<input type="text" class="form-control form-control-sm" placeholder="작성일 자동입력" readonly>
|
||||
<input type="text" class="form-control form-control-sm" placeholder="등록일 자동입력" readonly>
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="ko" xmlns:th="http://www.thymeleaf.org">
|
||||
<div class="modal-header bg-dark">
|
||||
<h5 class="modal-title text-white" id="affairViewModalLabel">운영 실적 열람</h5>
|
||||
<h5 class="modal-title text-white" id="affairViewModalLabel">분석평가서 열람</h5>
|
||||
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
|
|
@ -16,16 +16,18 @@
|
|||
<div class="row mb-1">
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="|${ia.wrtUserGrd} ${ia.wrtUserNm}|"></label>
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">작성일</label>
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">등록일</label>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(ia.wrtDt, 'yyyy-MM-dd HH:mm')}"></label>
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">상태</label>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${ia.iaState}"></label>
|
||||
<th:block th:each="commonCode:${session.commonCode.get('DST')}">
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:if="${commonCode.itemCd eq ia.iaState}" th:text="${commonCode.itemValue}"></label>
|
||||
</th:block>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="row mb-1">
|
||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">실적기간</label>
|
||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="|${ia.iaSdate} ~ ${ia.iaEdate}|"></label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-1">
|
||||
<div class="row justify-content-start text-center">
|
||||
<table class="table table-sm table-bordered table-hover">
|
||||
|
|
|
|||
|
|
@ -41,8 +41,8 @@
|
|||
<div class="col-8">
|
||||
<div class="row">
|
||||
<div class="col-11">
|
||||
<div class="row justify-content-end pb-1" th:if="${accessAuth eq 'ACC003'}">
|
||||
<!-- <div class="col-2">
|
||||
<div class="row justify-content-end pb-1">
|
||||
<!-- <div class="col-2" th:if="${accessAuth eq 'ACC003'}">
|
||||
<select class="form-select form-select-sm" name="wrtOrgan">
|
||||
<option value="">관서 선택</option>
|
||||
<th:block th:each="commonCode:${session.commonCode.get('OG')}">
|
||||
|
|
|
|||
Loading…
Reference in New Issue