From 45f2c9284027fb611a7cc0d39001a628dc14d2e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Fri, 13 Jan 2023 18:35:45 +0900
Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EC=82=AC=EB=B6=84=EC=8B=A4=ED=98=84?=
 =?UTF-8?q?=ED=99=A9=20=EC=9A=94=EC=B2=AD=EC=82=AC=ED=95=AD=20=EB=B0=98?=
 =?UTF-8?q?=EC=98=81=20=EC=99=B8=EC=82=AC=EB=B6=84=EC=8B=A4=EC=8B=A4?=
 =?UTF-8?q?=EC=A0=81=20=EC=9A=94=EC=B2=AD=EC=82=AC=ED=95=AD=20=EB=B0=98?=
 =?UTF-8?q?=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mybatisMapper/FipTarget.xml     |  6 ++---
 .../resources/static/js/fipTarget/partInfo.js |  8 +++---
 .../templates/fipTarget/partInfoList.html     | 25 ++++++++-----------
 .../fipTarget/partInfoModifyModal.html        |  2 +-
 .../templates/fipTarget/partWorkList.html     | 14 +++++++++++
 5 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/src/main/resources/mybatisMapper/FipTarget.xml b/src/main/resources/mybatisMapper/FipTarget.xml
index 71f604f7..d0a5bd6e 100644
--- a/src/main/resources/mybatisMapper/FipTarget.xml
+++ b/src/main/resources/mybatisMapper/FipTarget.xml
@@ -6,7 +6,7 @@
 <mapper namespace="com.dbnt.faisp.main.fipTarget.mapper.FipTargetMapper">
  
   <select id="selectPartInfoList" resultType="PartInfo" parameterType="PartInfo">
-	     select pi.pi_seq,
+     select pi.pi_seq,
 			     version_no,
 				 (select item_value from code_mgt where item_cd = mgt_organ) as mgt_organ,
 				 land_police,
@@ -50,7 +50,7 @@
      	 <if test='startDate != null and startDate != ""'>
            and to_char(wrt_dt, 'YYYY-MM-DD') = #{startDate}
      	 </if>
-     	order by wrt_dt desc
+     	order by pi_seq desc
      	<if test='excel != "Y"'>
 		limit #{rowCnt} offset #{firstIndex}
 		</if>    	
@@ -302,7 +302,7 @@
       <foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")">
         #{item}
       </foreach>
-      order by wrt_dt desc
+      order by pw_seq desc
       <if test='excel != "Y"'>
         limit #{rowCnt} offset #{firstIndex}
       </if>
diff --git a/src/main/resources/static/js/fipTarget/partInfo.js b/src/main/resources/static/js/fipTarget/partInfo.js
index 2ca93b13..07566953 100644
--- a/src/main/resources/static/js/fipTarget/partInfo.js
+++ b/src/main/resources/static/js/fipTarget/partInfo.js
@@ -76,7 +76,7 @@ function changeManager(ogCd){
   });
 }
 
-$(document).on('change', '#mMgtOrgan', function (){
+$(document).on('change', '#mgtOrgan', function (){
   const ogCd = $(this).val();
   if(ogCd != ''){
     $.ajax({
@@ -238,9 +238,9 @@ $(document).on('change', '#mUtilityType', function (){
 });
 
 $(document).on('click', '#updatePartInfo', function (){
-  if($('#mMgtOrgan').val() == ''){
+  if($('#mgtOrgan').val() == ''){
     alert('해경서를 선택해주세요');
-    $('#mMgtOrgan').focus();
+    $('#mgtOrgan').focus();
     return false;
   }
   if($('#mPiUserSeq').val() == ''){
@@ -282,7 +282,7 @@ $(document).on('click', '#updatePartInfo', function (){
     }
   }
   if(confirm("수정하시겠습니까?")){
-    document.getElementById("mMgtOrgan").disabled = false;
+    document.getElementById("mgtOrgan").disabled = false;
     contentFade("in");
     const formData = new FormData($("#partInfoUpdate")[0]);
     for(const file of files) {
diff --git a/src/main/resources/templates/fipTarget/partInfoList.html b/src/main/resources/templates/fipTarget/partInfoList.html
index b3d45fea..d498bf42 100644
--- a/src/main/resources/templates/fipTarget/partInfoList.html
+++ b/src/main/resources/templates/fipTarget/partInfoList.html
@@ -95,14 +95,14 @@
                       <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 rowspan="3">담당자</th>
                       <th rowspan="2">임차료</th>
                       <th rowspan="2">공공요금</th>
                       <th rowspan="2">최종수정일</th>
                     </tr>
                     <tr class="table-secondary">
+                      <th>담당자</th>
                       <th>근무방법</th>
                       <th:block th:if="${not #strings.isEmpty(total)}">
                         <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.landPolice}"></td>
                       <td th:text="${pi.terminalNm}"></td>
+                      <td th:text="${pi.piManagerName}"></td>
                       <td th:text="${pi.mpWorkType}"></td>
                       <td th:text="|${pi.mpPeopleCnt eq null?0:pi.mpPeopleCnt}명|"></td>
                       <td th:text="${pi.mpDescription}"></td>
                       <td th:text="${pi.plWorkType}"></td>
                       <td th:text="|${pi.plPeopleCnt eq null?0:pi.plPeopleCnt}명|"></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:unless="${pi.rentType eq 'Y'}">무상</td>
                       <td th:if="${pi.utilityType eq 'Y'}" th:text="|${pi.utilityPrice}만/年|"></td>
@@ -151,28 +151,25 @@
                       <th></th>
                       <th:block th:if="${not #strings.isEmpty(total)}">
                         <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_closure}개소 ${total.mp_closure_total}명|"></th>-->
+                        <th th:text="|비상주 ${total.mp_bsangju}개소|"></th>
+                        <th th:text="|폐쇄 ${total.mp_closure}개소|"></th>
                         <th></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_closure}개소 ${total.pl_closure_total}명|"></th>-->
-                        <th></th>
+                        <th th:text="|비상주 ${total.pl_bsangju}개소|"></th>
+                        <th th:text="|폐쇄 ${total.pl_closure}개소|"></th>
                       </th:block>
                       <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개소</th>
                         <th></th>
                         <th>상주 0개소 0명</th>
-                        <th>비상주 0개소 0명</th>
-                        <!--<th>폐쇄 0개소 0명</th>-->
-                        <th></th>
+                        <th>비상주 0개소</th>
+                        <th>폐쇄 0개소</th>
                       </th:block>
                       <th></th>
                       <th></th>
                       <th></th>
-                      <th></th>
                     </tr>
                     </tfoot>
                   </table>
diff --git a/src/main/resources/templates/fipTarget/partInfoModifyModal.html b/src/main/resources/templates/fipTarget/partInfoModifyModal.html
index 56287c4c..9251b04f 100644
--- a/src/main/resources/templates/fipTarget/partInfoModifyModal.html
+++ b/src/main/resources/templates/fipTarget/partInfoModifyModal.html
@@ -71,7 +71,7 @@
             </div>
             <label for="piUserSeq" class="col-sm-2 col-form-label col-form-label-sm text-center">담당자</label>
             <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>
                 <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>
diff --git a/src/main/resources/templates/fipTarget/partWorkList.html b/src/main/resources/templates/fipTarget/partWorkList.html
index 65ebc4ed..07b052b0 100644
--- a/src/main/resources/templates/fipTarget/partWorkList.html
+++ b/src/main/resources/templates/fipTarget/partWorkList.html
@@ -39,6 +39,20 @@
                       <input type="hidden" id="selectedKey">
                       <input type="hidden" id="selectedVerNo">
                       <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>
                         <tr class="table-secondary">
                           <th rowspan="2">외사<br>터미널명</th>