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

외사분실현황 요청사항 반영 

외사분실실적 요청사항 반영
master
강석 최 2023-01-13 18:35:45 +09:00
parent f4380878d2
commit 45f2c92840
5 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/resources/mybatisMapper/FipTarget.xml
View File

@ -6,7 +6,7 @@
<mapper namespace="com.dbnt.faisp.main.fipTarget.mapper.FipTargetMapper"> <mapper namespace="com.dbnt.faisp.main.fipTarget.mapper.FipTargetMapper">
<select id="selectPartInfoList" resultType="PartInfo" parameterType="PartInfo"> <select id="selectPartInfoList" resultType="PartInfo" parameterType="PartInfo">
select pi.pi_seq, select pi.pi_seq,
version_no, version_no,
(select item_value from code_mgt where item_cd = mgt_organ) as mgt_organ, (select item_value from code_mgt where item_cd = mgt_organ) as mgt_organ,
land_police, land_police,
@ -50,7 +50,7 @@
<if test='startDate != null and startDate != ""'> <if test='startDate != null and startDate != ""'>
and to_char(wrt_dt, 'YYYY-MM-DD') = #{startDate} and to_char(wrt_dt, 'YYYY-MM-DD') = #{startDate}
</if> </if>
order by wrt_dt desc order by pi_seq desc
<if test='excel != "Y"'> <if test='excel != "Y"'>
limit #{rowCnt} offset #{firstIndex} limit #{rowCnt} offset #{firstIndex}
</if> </if>
@ -302,7 +302,7 @@
<foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")"> <foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
order by wrt_dt desc order by pw_seq desc
<if test='excel != "Y"'> <if test='excel != "Y"'>
limit #{rowCnt} offset #{firstIndex} limit #{rowCnt} offset #{firstIndex}
</if> </if>

8
src/main/resources/static/js/fipTarget/partInfo.js
View File

@ -76,7 +76,7 @@ function changeManager(ogCd){
}); });
} }
$(document).on('change', '#mMgtOrgan', function (){ $(document).on('change', '#mgtOrgan', function (){
const ogCd = $(this).val(); const ogCd = $(this).val();
if(ogCd != ''){ if(ogCd != ''){
$.ajax({ $.ajax({
@ -238,9 +238,9 @@ $(document).on('change', '#mUtilityType', function (){
}); });
$(document).on('click', '#updatePartInfo', function (){ $(document).on('click', '#updatePartInfo', function (){
if($('#mMgtOrgan').val() == ''){ if($('#mgtOrgan').val() == ''){
alert('해경서를 선택해주세요'); alert('해경서를 선택해주세요');
$('#mMgtOrgan').focus(); $('#mgtOrgan').focus();
return false; return false;
} }
if($('#mPiUserSeq').val() == ''){ if($('#mPiUserSeq').val() == ''){
@ -282,7 +282,7 @@ $(document).on('click', '#updatePartInfo', function (){
} }
} }
if(confirm("수정하시겠습니까?")){ if(confirm("수정하시겠습니까?")){
document.getElementById("mMgtOrgan").disabled = false; document.getElementById("mgtOrgan").disabled = false;
contentFade("in"); contentFade("in");
const formData = new FormData($("#partInfoUpdate")[0]); const formData = new FormData($("#partInfoUpdate")[0]);
for(const file of files) { for(const file of files) {

25
src/main/resources/templates/fipTarget/partInfoList.html
View File

@ -95,14 +95,14 @@
<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="4">해경</th>
<th colspan="3">육경</th> <th colspan="3">육경</th>
<th rowspan="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>
</tr> </tr>
<tr class="table-secondary"> <tr class="table-secondary">
<th>담당자</th>
<th>근무방법</th> <th>근무방법</th>
<th:block th:if="${not #strings.isEmpty(total)}"> <th:block th:if="${not #strings.isEmpty(total)}">
<th th:text="|${total.mp_sangju_total+total.mp_bsangju_total+total.mp_closure_total}명|"></th> <th th:text="|${total.mp_sangju_total+total.mp_bsangju_total+total.mp_closure_total}명|"></th>
@ -130,13 +130,13 @@
<td th:text="${pi.mgtOrgan}"></td> <td th:text="${pi.mgtOrgan}"></td>
<td th:text="${pi.landPolice}"></td> <td th:text="${pi.landPolice}"></td>
<td th:text="${pi.terminalNm}"></td> <td th:text="${pi.terminalNm}"></td>
<td th:text="${pi.piManagerName}"></td>
<td th:text="${pi.mpWorkType}"></td> <td th:text="${pi.mpWorkType}"></td>
<td th:text="|${pi.mpPeopleCnt eq null?0:pi.mpPeopleCnt}명|"></td> <td th:text="|${pi.mpPeopleCnt eq null?0:pi.mpPeopleCnt}명|"></td>
<td th:text="${pi.mpDescription}"></td> <td th:text="${pi.mpDescription}"></td>
<td th:text="${pi.plWorkType}"></td> <td th:text="${pi.plWorkType}"></td>
<td th:text="|${pi.plPeopleCnt eq null?0:pi.plPeopleCnt}명|"></td> <td th:text="|${pi.plPeopleCnt eq null?0:pi.plPeopleCnt}명|"></td>
<td th:text="${pi.plDescription}"></td> <td th:text="${pi.plDescription}"></td>
<td th:text="${pi.piManagerName}"></td>
<td th:if="${pi.rentType eq 'Y'}" th:text="|${pi.rentPrice}만/年|"></td> <td th:if="${pi.rentType eq 'Y'}" th:text="|${pi.rentPrice}만/年|"></td>
<td th:unless="${pi.rentType eq 'Y'}">무상</td> <td th:unless="${pi.rentType eq 'Y'}">무상</td>
<td th:if="${pi.utilityType eq 'Y'}" th:text="|${pi.utilityPrice}만/年|"></td> <td th:if="${pi.utilityType eq 'Y'}" th:text="|${pi.utilityPrice}만/年|"></td>
@ -151,28 +151,25 @@
<th></th> <th></th>
<th:block th:if="${not #strings.isEmpty(total)}"> <th:block th:if="${not #strings.isEmpty(total)}">
<th th:text="|상주 ${total.mp_sangju}개소 ${total.mp_sangju_total}명|"></th> <th th:text="|상주 ${total.mp_sangju}개소 ${total.mp_sangju_total}명|"></th>
<th th:text="|비상주 ${total.mp_bsangju}개소 ${total.mp_bsangju_total}명|"></th> <th th:text="|비상주 ${total.mp_bsangju}개소|"></th>
<!--<th th:text="|폐쇄 ${total.mp_closure}개소 ${total.mp_closure_total}명|"></th>--> <th th:text="|폐쇄 ${total.mp_closure}개소|"></th>
<th></th> <th></th>
<th th:text="|상주 ${total.pl_sangju}개소 ${total.pl_sangju_total}명|"></th> <th th:text="|상주 ${total.pl_sangju}개소 ${total.pl_sangju_total}명|"></th>
<th th:text="|비상주 ${total.pl_bsangju}개소 ${total.pl_bsangju_total}명|"></th> <th th:text="|비상주 ${total.pl_bsangju}개소|"></th>
<!--<th th:text="|폐쇄 ${total.pl_closure}개소 ${total.pl_closure_total}명|"></th>--> <th th:text="|폐쇄 ${total.pl_closure}개소|"></th>
<th></th>
</th:block> </th:block>
<th:block th:unless="${not #strings.isEmpty(total)}"> <th:block th:unless="${not #strings.isEmpty(total)}">
<th>상주 0개소 0명</th> <th>상주 0개소 0명</th>
<th>비상주 0개소 0명</th> <th>비상주 0개소</th>
<!--<th>폐쇄 0개소 0명</th>--> <th>폐쇄 0개소</th>
<th></th> <th></th>
<th>상주 0개소 0명</th> <th>상주 0개소 0명</th>
<th>비상주 0개소 0명</th> <th>비상주 0개소</th>
<!--<th>폐쇄 0개소 0명</th>--> <th>폐쇄 0개소</th>
<th></th>
</th:block> </th:block>
<th></th> <th></th>
<th></th> <th></th>
<th></th> <th></th>
<th></th>
</tr> </tr>
</tfoot> </tfoot>
</table> </table>

2
src/main/resources/templates/fipTarget/partInfoModifyModal.html
View File

@ -71,7 +71,7 @@
</div> </div>
<label for="piUserSeq" class="col-sm-2 col-form-label col-form-label-sm text-center">담당자</label> <label for="piUserSeq" class="col-sm-2 col-form-label col-form-label-sm text-center">담당자</label>
<div class="col-sm-2"> <div class="col-sm-2">
<select class="form-select form-select-sm" id="piUserSeq" name="piUserSeq" disabled> <select class="form-select form-select-sm" id="piUserSeq" name="piUserSeq" th:disabled="${accessAuth ne 'ACC003'}">
<option value="">선택</option> <option value="">선택</option>
<th:block th:each="info:${managerList}"> <th:block th:each="info:${managerList}">
<option th:value="${info.user_seq}" th:text="|${info.title_cd} ${info.user_nm}|" th:selected="${info.user_seq eq partInfo.piUserSeq}"></option> <option th:value="${info.user_seq}" th:text="|${info.title_cd} ${info.user_nm}|" th:selected="${info.user_seq eq partInfo.piUserSeq}"></option>

14
src/main/resources/templates/fipTarget/partWorkList.html
View File

@ -39,6 +39,20 @@
<input type="hidden" id="selectedKey"> <input type="hidden" id="selectedKey">
<input type="hidden" id="selectedVerNo"> <input type="hidden" id="selectedVerNo">
<table class="table table-sm table-hover table-bordered"> <table class="table table-sm table-hover table-bordered">
<colgroup>
<col>
<col>
<col>
<col style="width: 7%">
<col style="width: 7%">
<col style="width: 7%">
<col style="width: 7%">
<col style="width: 7%">
<col style="width: 7%">
<col>
<col>
<col>
</colgroup>
<thead> <thead>
<tr class="table-secondary"> <tr class="table-secondary">
<th rowspan="2">외사<br>터미널명</th> <th rowspan="2">외사<br>터미널명</th>