Merge branch 'master' of https://dev.azure.com/DBNTech/ForeignAffairs/_git/ForeignAffairs
commit
a43cf98b8d
|
|
@ -100,50 +100,51 @@
|
||||||
<table class="table table-sm table-bordered table-hover">
|
<table class="table table-sm table-bordered table-hover">
|
||||||
<thead>
|
<thead>
|
||||||
<tr class="table-secondary">
|
<tr class="table-secondary">
|
||||||
<th>등급</th>
|
<th>순번</th>
|
||||||
<th>공작명</th>
|
|
||||||
<th>착수일<br>/종결일</th>
|
|
||||||
<th>관서</th>
|
<th>관서</th>
|
||||||
<th>부서</th>
|
<th>공작명</th>
|
||||||
|
<th>등급</th>
|
||||||
|
<th>착수일<br>/종결일</th>
|
||||||
|
<th>재평가일</th>
|
||||||
|
<th>첨부파일</th>
|
||||||
|
|
||||||
<th>작성자</th>
|
<th>작성자</th>
|
||||||
<th>작성일시</th>
|
<th>작성일시</th>
|
||||||
<th>첨부파일</th>
|
|
||||||
<th>재평가일</th>
|
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody class="table-group-divider">
|
<tbody class="table-group-divider">
|
||||||
<tr class="ciWorkTr" th:each="ciWork:${ciWorkList}">
|
<tr class="ciWorkTr" th:each="ciWork,cnt:${ciWorkList}">
|
||||||
<input type="hidden" class="ciwKey" th:value="${ciWork.ciwKey}">
|
<input type="hidden" class="ciwKey" th:value="${ciWork.ciwKey}">
|
||||||
|
<td th:text="${cnt.count}"></td>
|
||||||
|
<th:block th:each="commonCode:${session.commonCode.get('OG')}">
|
||||||
|
<td th:if="${ciWork.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
|
||||||
|
</th:block>
|
||||||
|
<td>
|
||||||
|
<th:block th:if="${ciWork.status eq 'DST001'}">[임시]</th:block>
|
||||||
|
<th:block th:text="${ciWork.title}"></th:block>
|
||||||
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<th:block th:each="code:${session.commonCode.get('CIWR')}">
|
<th:block th:each="code:${session.commonCode.get('CIWR')}">
|
||||||
<th:block th:if="${code.itemCd eq ciWork.workRating}" th:text="${code.itemValue}"></th:block>
|
<th:block th:if="${code.itemCd eq ciWork.workRating}" th:text="${code.itemValue}"></th:block>
|
||||||
</th:block>
|
</th:block>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
|
||||||
<th:block th:if="${ciWork.status eq 'DST001'}">[임시]</th:block>
|
|
||||||
<th:block th:text="${ciWork.title}"></th:block>
|
|
||||||
</td>
|
|
||||||
<td>
|
<td>
|
||||||
<div th:text="${ciWork.workStartDate}"></div>
|
<div th:text="${ciWork.workStartDate}"></div>
|
||||||
<div th:text="${#strings.concat('~ ', ciWork.workEndDate)}"></div>
|
<div th:text="${#strings.concat('~ ', ciWork.workEndDate)}"></div>
|
||||||
</td>
|
</td>
|
||||||
<th:block th:each="commonCode:${session.commonCode.get('OG')}">
|
<td>
|
||||||
<td th:if="${ciWork.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
|
<div th:text="|1차: ${ciWork.reRatingDate1}|"></div>
|
||||||
</th:block>
|
<div th:text="|2차: ${ciWork.reRatingDate2}|"></div>
|
||||||
<th:block th:each="commonCode:${session.commonCode.get('OFC')}">
|
</td>
|
||||||
<td th:if="${ciWork.wrtPart eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
|
<td th:text="${ciWork.fileCnt eq null?'파일 없음':#strings.concat(ciWork.fileCnt,' 건')}"></td>
|
||||||
</th:block>
|
|
||||||
<td>
|
<td>
|
||||||
<th:block th:each="code:${session.commonCode.get('JT')}">
|
<th:block th:each="code:${session.commonCode.get('JT')}">
|
||||||
<th:block th:if="${code.itemCd eq ciWork.wrtUserGrd}" th:text="|${code.itemValue} ${ciWork.wrtUserNm}|"></th:block>
|
<th:block th:if="${code.itemCd eq ciWork.wrtUserGrd}" th:text="|${code.itemValue} ${ciWork.wrtUserNm}|"></th:block>
|
||||||
</th:block>
|
</th:block>
|
||||||
</td>
|
</td>
|
||||||
<td th:text="${#temporals.format(ciWork.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
|
<td th:text="${#temporals.format(ciWork.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
|
||||||
<td th:text="${ciWork.fileCnt eq null?'파일 없음':#strings.concat(ciWork.fileCnt,' 건')}"></td>
|
|
||||||
<td>
|
|
||||||
<div th:text="|1차: ${ciWork.reRatingDate1}|"></div>
|
|
||||||
<div th:text="|2차: ${ciWork.reRatingDate2}|"></div>
|
|
||||||
</td>
|
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
|
|
||||||
|
|
@ -73,24 +73,26 @@
|
||||||
<table class="table table-sm table-bordered table-hover" id="ciaEduTb">
|
<table class="table table-sm table-bordered table-hover" id="ciaEduTb">
|
||||||
<thead>
|
<thead>
|
||||||
<tr class="table-secondary">
|
<tr class="table-secondary">
|
||||||
<th>상태</th>
|
<th>순번</th>
|
||||||
<th>시행일자</th>
|
<th>시행일자</th>
|
||||||
<th>시행관서</th>
|
<th>시행관서</th>
|
||||||
<th>교육방식</th>
|
<th>교육방식</th>
|
||||||
<th>교육인원</th>
|
<th>교육인원</th>
|
||||||
<th>비고</th>
|
<th>비고</th>
|
||||||
|
<th>상태</th>
|
||||||
<th>작성자</th>
|
<th>작성자</th>
|
||||||
<th>작성일</th>
|
<th>작성일</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody class="table-group-divider">
|
<tbody class="table-group-divider">
|
||||||
<tr class="eiTr" th:each="list:${eiList}">
|
<tr class="eiTr" th:each="list,cnt:${eiList}">
|
||||||
<td th:text="${list.contentStatus}"></td>
|
<td th:text="${cnt.count}"></td>
|
||||||
<td th:text="${list.eduDate}"></td>
|
<td th:text="${list.eduDate}"></td>
|
||||||
<td th:text="${list.mgtOrgan}"></td>
|
<td th:text="${list.mgtOrgan}"></td>
|
||||||
<td th:text="${list.eduType}"></td>
|
<td th:text="${list.eduType}"></td>
|
||||||
<td th:text="${list.peopleCnt}"></td>
|
<td th:text="${list.peopleCnt}"></td>
|
||||||
<td th:utext="${list.description}"></td>
|
<td th:utext="${list.description}"></td>
|
||||||
|
<td th:text="${list.contentStatus}"></td>
|
||||||
<td th:text="|${list.wrtUserGrd} ${list.wrtUserNm}|"></td>
|
<td th:text="|${list.wrtUserGrd} ${list.wrtUserNm}|"></td>
|
||||||
<td th:text="${#temporals.format(list.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
|
<td th:text="${#temporals.format(list.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
|
||||||
<th:block>
|
<th:block>
|
||||||
|
|
|
||||||
|
|
@ -76,13 +76,14 @@
|
||||||
<table class="table table-sm table-bordered table-hover" id="ciaForeignerTb">
|
<table class="table table-sm table-bordered table-hover" id="ciaForeignerTb">
|
||||||
<thead>
|
<thead>
|
||||||
<tr class="table-secondary">
|
<tr class="table-secondary">
|
||||||
<th rowspan="2">상태</th>
|
<th rowspan="2">순번</th>
|
||||||
<th rowspan="2">관리관서</th>
|
<th rowspan="2">관리관서</th>
|
||||||
<th rowspan="2">담당관</th>
|
<th rowspan="2">담당관</th>
|
||||||
<th colspan="3">대상커뮤니티</th>
|
<th colspan="3">대상커뮤니티</th>
|
||||||
<th rowspan="2">선정사유</th>
|
<th rowspan="2">선정사유</th>
|
||||||
<th rowspan="2">모니터링 사항</th>
|
<th rowspan="2">모니터링 사항</th>
|
||||||
<th rowspan="2">선정일</th>
|
<th rowspan="2">선정일</th>
|
||||||
|
<th rowspan="2">상태</th>
|
||||||
<th rowspan="2">작성자</th>
|
<th rowspan="2">작성자</th>
|
||||||
<th rowspan="2">작성일</th>
|
<th rowspan="2">작성일</th>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -93,8 +94,8 @@
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody class="table-group-divider">
|
<tbody class="table-group-divider">
|
||||||
<tr class="fiTr" th:each="list:${fiList}">
|
<tr class="fiTr" th:each="list,cnt:${fiList}">
|
||||||
<td th:text="${list.contentStatus}"></td>
|
<td th:text="${cnt.count}"></td>
|
||||||
<td th:text="${list.mgtOrgan}"></td>
|
<td th:text="${list.mgtOrgan}"></td>
|
||||||
<td th:text="${list.manager}"></td>
|
<td th:text="${list.manager}"></td>
|
||||||
<td th:text="${list.commuLocation}"></td>
|
<td th:text="${list.commuLocation}"></td>
|
||||||
|
|
@ -103,6 +104,7 @@
|
||||||
<td th:utext="${list.selectReason}"></td>
|
<td th:utext="${list.selectReason}"></td>
|
||||||
<td th:utext="${list.monitoringInfo}"></td>
|
<td th:utext="${list.monitoringInfo}"></td>
|
||||||
<td th:text="${list.fixDate}"></td>
|
<td th:text="${list.fixDate}"></td>
|
||||||
|
<td th:text="${list.contentStatus}"></td>
|
||||||
<td th:text="|${list.wrtUserGrd} ${list.wrtUserNm}|"></td>
|
<td th:text="|${list.wrtUserGrd} ${list.wrtUserNm}|"></td>
|
||||||
<td th:text="${#temporals.format(list.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
|
<td th:text="${#temporals.format(list.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
|
||||||
<th:block>
|
<th:block>
|
||||||
|
|
|
||||||
|
|
@ -73,20 +73,22 @@
|
||||||
<table class="table table-sm table-bordered table-hover" id="mciTb">
|
<table class="table table-sm table-bordered table-hover" id="mciTb">
|
||||||
<thead>
|
<thead>
|
||||||
<tr class="table-secondary">
|
<tr class="table-secondary">
|
||||||
<th>상태</th>
|
<th>순번</th>
|
||||||
<th>관리관서</th>
|
<th>관서</th>
|
||||||
|
|
||||||
<th>업체명</th>
|
<th>업체명</th>
|
||||||
<th>소재지</th>
|
<th>소재지</th>
|
||||||
<th>관련<br>분야</th>
|
<th>관련<br>분야</th>
|
||||||
<th>특이사항</th>
|
<th>특이사항</th>
|
||||||
<th>연락처<br>(부서,이름)</th>
|
<th>연락처<br>(부서,이름)</th>
|
||||||
|
<th>상태</th>
|
||||||
<th>작성자</th>
|
<th>작성자</th>
|
||||||
<th>작성일</th>
|
<th>작성일</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody class="table-group-divider">
|
<tbody class="table-group-divider">
|
||||||
<tr class="mciTr" th:each="list:${mciList}">
|
<tr class="mciTr" th:each="list,cnt:${mciList}">
|
||||||
<td th:text="${list.contentStatus}"></td>
|
<td th:text="${cnt.count}"></td>
|
||||||
<td th:text="${list.mgtOrgan}"></td>
|
<td th:text="${list.mgtOrgan}"></td>
|
||||||
<td th:text="${list.companyNm}"></td>
|
<td th:text="${list.companyNm}"></td>
|
||||||
<td th:text="${list.companyLocation}"></td>
|
<td th:text="${list.companyLocation}"></td>
|
||||||
|
|
@ -97,6 +99,7 @@
|
||||||
<br>
|
<br>
|
||||||
([[${list.department}]] [[${list.name}]])
|
([[${list.department}]] [[${list.name}]])
|
||||||
</td>
|
</td>
|
||||||
|
<td th:text="${list.contentStatus}"></td>
|
||||||
<td th:text="|${list.wrtUserGrd} ${list.wrtUserNm}|"></td>
|
<td th:text="|${list.wrtUserGrd} ${list.wrtUserNm}|"></td>
|
||||||
<td th:text="${#temporals.format(list.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
|
<td th:text="${#temporals.format(list.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
|
||||||
<th:block>
|
<th:block>
|
||||||
|
|
|
||||||
|
|
@ -70,17 +70,18 @@
|
||||||
<table class="table table-sm table-bordered table-hover" id="sdiTb">
|
<table class="table table-sm table-bordered table-hover" id="sdiTb">
|
||||||
<thead>
|
<thead>
|
||||||
<tr class="table-secondary">
|
<tr class="table-secondary">
|
||||||
<th>상태</th>
|
<th>순번</th>
|
||||||
<th>관서</th>
|
<th>관서</th>
|
||||||
<th>지역특성</th>
|
<th>지역특성</th>
|
||||||
<th>예상문제점</th>
|
<th>예상문제점</th>
|
||||||
|
<th>상태</th>
|
||||||
<th>작성자</th>
|
<th>작성자</th>
|
||||||
<th>작성일</th>
|
<th>작성일</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody class="table-group-divider">
|
<tbody class="table-group-divider">
|
||||||
<tr class="sdiTr" th:each="list:${sdiList}">
|
<tr class="sdiTr" th:each="list ,cnt:${sdiList}">
|
||||||
<td th:text="${list.contentStatus}"></td>
|
<td th:text="${cnt.count}"></td>
|
||||||
<td th:text="${list.wrtOrgan}"></td>
|
<td th:text="${list.wrtOrgan}"></td>
|
||||||
<td>
|
<td>
|
||||||
<th:block th:if="${#strings.length(list.localInfo)>35}" th:utext="|${#strings.substring(list.localInfo, 0, 35)}...|"></th:block>
|
<th:block th:if="${#strings.length(list.localInfo)>35}" th:utext="|${#strings.substring(list.localInfo, 0, 35)}...|"></th:block>
|
||||||
|
|
@ -90,6 +91,7 @@
|
||||||
<th:block th:if="${#strings.length(list.outlookProblem)>35}" th:utext="|${#strings.substring(list.outlookProblem, 0, 35)}...|"></th:block>
|
<th:block th:if="${#strings.length(list.outlookProblem)>35}" th:utext="|${#strings.substring(list.outlookProblem, 0, 35)}...|"></th:block>
|
||||||
<th:block th:unless="${#strings.length(list.outlookProblem)>35}" th:utext="${list.outlookProblem}"></th:block>
|
<th:block th:unless="${#strings.length(list.outlookProblem)>35}" th:utext="${list.outlookProblem}"></th:block>
|
||||||
</td>
|
</td>
|
||||||
|
<td th:text="${list.contentStatus}"></td>
|
||||||
<td th:text="|${list.wrtUserGrd} ${list.wrtUserNm}|"></td>
|
<td th:text="|${list.wrtUserGrd} ${list.wrtUserNm}|"></td>
|
||||||
<td th:text="${#temporals.format(list.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
|
<td th:text="${#temporals.format(list.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
|
||||||
<th:block>
|
<th:block>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue