DBNT
/
FAISP
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix : 첩보수집활동 외사첩보망 견문관리 운영실적 완료

master
TaehunPark 2023-01-19 13:04:46 +09:00
parent ef7d6b9c89
commit a1170fa22f
5 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/resources/mybatisMapper/IntelligenceNetworkMapper.xml
View File

@ -134,11 +134,21 @@
<if test='iaState != null and iaState != ""'> <if test='iaState != null and iaState != ""'>
and ia_state = #{iaState} and ia_state = #{iaState}
</if> </if>
<if test='startDate != null and startDate != ""'> <if test='dateSelector == "iaDt"'>
and wrt_dt >= #{startDate}::date <if test='startDate != null and startDate != ""'>
and ia_sdate >= #{startDate}::date
</if>
<if test='endDate != null and endDate != ""'>
and ia_edate &lt;= #{endDate}::date
</if>
</if> </if>
<if test='endDate != null and endDate != ""'> <if test='dateSelector == "wrtDt"'>
and wrt_dt &lt;= #{endDate}::date+1 <if test='startDate != null and startDate != ""'>
and wrt_dt >= #{startDate}::date
</if>
<if test='endDate != null and endDate != ""'>
and wrt_dt &lt;= #{endDate}::date+1
</if>
</if> </if>
<if test="downOrganCdList != null"> <if test="downOrganCdList != null">
and wrt_organ in and wrt_organ in

25
src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/IntelligenceAnalyzeList.html
View File

@ -28,7 +28,7 @@
</li> </li>
</ul> </ul>
<div class="tab-content bg-white border border-top-0 p-2" id="planContent"> <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}"> <input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
<div class="row justify-content-between py-1"> <div class="row justify-content-between py-1">
<div class="col-auto"> <div class="col-auto">
@ -41,8 +41,8 @@
<div class="col-8"> <div class="col-8">
<div class="row"> <div class="row">
<div class="col-11"> <div class="col-11">
<div class="row justify-content-end pb-1" th:if="${accessAuth eq 'ACC003'}"> <div class="row justify-content-end pb-1">
<div class="col-2"> <div class="col-2" th:if="${accessAuth eq 'ACC003'}">
<select class="form-select form-select-sm" name="wrtOrgan"> <select class="form-select form-select-sm" name="wrtOrgan">
<option value="">관서 선택</option> <option value="">관서 선택</option>
<th:block th:each="commonCode:${session.commonCode.get('OG')}"> <th:block th:each="commonCode:${session.commonCode.get('OG')}">
@ -52,20 +52,13 @@
</th:block> </th:block>
</select> </select>
</div> </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="col-4">
<div class="input-group input-daterange" id="dateSelectorDiv"> <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="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}"> <input type="text" class="form-control form-control-sm w-35" id="endDate" name="endDate" placeholder="종료일" autocomplete="off" readonly th:value="${searchParams.endDate}">
</div> </div>
@ -78,7 +71,7 @@
</div> </div>
</div> </div>
</div> </div>
</form> --> </form>
<div class="row justify-content-start"> <div class="row justify-content-start">
<div class="col-12"> <div class="col-12">
<table class="table table-sm table-bordered table-hover"> <table class="table table-sm table-bordered table-hover">

6
src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeEditModal.html
View File

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="ko" xmlns:th="http://www.thymeleaf.org"> <html lang="ko" xmlns:th="http://www.thymeleaf.org">
<div class="modal-header bg-dark"> <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> <button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
</div> </div>
<div class="modal-body" id="affairEditBody"> <div class="modal-body" id="affairEditBody">
@ -26,9 +26,9 @@
<div class="col-sm-2"> <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>
<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"> <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>
</div> </div>
<hr> <hr>

10
src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeViewModal.html
View File

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="ko" xmlns:th="http://www.thymeleaf.org"> <html lang="ko" xmlns:th="http://www.thymeleaf.org">
<div class="modal-header bg-dark"> <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> <button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
@ -16,16 +16,18 @@
<div class="row mb-1"> <div class="row mb-1">
<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="|${ia.wrtUserGrd} ${ia.wrtUserNm}|"></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-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-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> </div>
<hr> <hr>
<div class="row mb-1"> <div class="row mb-1">
<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="|${ia.iaSdate} ~ ${ia.iaEdate}|"></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 mb-1">
<div class="row justify-content-start text-center"> <div class="row justify-content-start text-center">
<table class="table table-sm table-bordered table-hover"> <table class="table table-sm table-bordered table-hover">

4
src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanList.html
View File

@ -41,8 +41,8 @@
<div class="col-8"> <div class="col-8">
<div class="row"> <div class="row">
<div class="col-11"> <div class="col-11">
<div class="row justify-content-end pb-1" th:if="${accessAuth eq 'ACC003'}"> <div class="row justify-content-end pb-1">
<!-- <div class="col-2"> <!-- <div class="col-2" th:if="${accessAuth eq 'ACC003'}">
<select class="form-select form-select-sm" name="wrtOrgan"> <select class="form-select form-select-sm" name="wrtOrgan">
<option value="">관서 선택</option> <option value="">관서 선택</option>
<th:block th:each="commonCode:${session.commonCode.get('OG')}"> <th:block th:each="commonCode:${session.commonCode.get('OG')}">