Merge branch 'dev-grid-array' into dev

src/main/java/kr/xit/fims/biz/cmm/dto/FimsCrackdownDTO.java

@@ -154,4 +154,33 @@ public class FimsCrackdownDTO {
         private String resnCode;
         private String vhcleNo;
     }
+
+    @EqualsAndHashCode(callSuper = true)
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @SuperBuilder
+    public static class CtznSttemntCmplt extends RtDTO.Reglt {
+        /**
+         * 민원 id
+         */
+        private String cmpltId;
+        /**
+         * 내용
+         */
+        private String content;
+        /**
+         * 구분
+         */
+        private String gubun;
+        /**
+         * 수정 일시
+         */
+        private String updtDt;
+        /**
+         * 수정자
+         */
+        private String updusr;
+
+    }
 }

src/main/java/kr/xit/fims/biz/cmm/mapper/IFimsCrackdownMgtMapper.java

@@ -3,6 +3,7 @@ package kr.xit.fims.biz.cmm.mapper;
 import java.util.List;
 import java.util.Map;
 
+import kr.xit.fims.biz.cmm.fimsTotalPopup.dto.FimsTotalPopupVO;
 import org.apache.ibatis.session.RowBounds;
 
 import egovframework.rte.psl.dataaccess.mapper.Mapper;
@@ -28,4 +29,10 @@ public interface IFimsCrackdownMgtMapper {
     CtznStmtDTO.Ans selectEcCtznSttemntAnswer(final String interfaceSeqN);
 
     CmmAnsTmplDTO.Dtl selectCtznAnswerTmplInfo(final FimsCrackdownDTO.AnsRequest dto);
+    List<FimsTotalPopupVO> selectProcessSttusChangeHist(final FimsCrackdownDTO.AnsRequest dto);
+    List<FimsTotalPopupVO> selectPayerAdresHist(final FimsCrackdownDTO.AnsRequest dto);
+    List<CmmAnsTmplDTO.Dtl> selectElctrnNticSndng(final FimsCrackdownDTO.AnsRequest dto);
+    List<FimsCrackdownDTO.CtznSttemntCmplt> selectCtznSttemntCmplt(final FimsCrackdownDTO.CtznSttemntCmplt dto);
+
+    void saveCtznSttemntCmplt(FimsCrackdownDTO.CtznSttemntCmplt dto);
 }

src/main/java/kr/xit/fims/biz/cmm/service/FimsCrackdownMgtService.java

@@ -278,16 +278,26 @@ public class FimsCrackdownMgtService implements IFimsCrackdownMgtService {
         return ecCtznSttemntMapper.selectEcCtznSttemntAnswer(dto);
     }
     @Override
-    public FimsTotalPopupVO findProcessSttusChangeHist(final FimsCrackdownDTO.AnsRequest dto){
+    public List<FimsTotalPopupVO> findProcessSttusChangeHist(final FimsCrackdownDTO.AnsRequest dto){
-        return null;
+        return mapper.selectProcessSttusChangeHist(dto);
     }
     @Override
-    public FimsTotalPopupVO findPayerAdresHist(final FimsCrackdownDTO.AnsRequest dto){
+    public List<FimsTotalPopupVO> findPayerAdresHist(final FimsCrackdownDTO.AnsRequest dto){
-        return null;
+        return mapper.selectPayerAdresHist(dto);
     }
     @Override
-    public CmmAnsTmplDTO.Dtl findElctrnNticSndng(final FimsCrackdownDTO.AnsRequest dto){
+    public List<CmmAnsTmplDTO.Dtl> findElctrnNticSndng(final FimsCrackdownDTO.AnsRequest dto){
-        return null;
+        return mapper.selectElctrnNticSndng(dto);
+    }
+    @Override
+    public List<FimsCrackdownDTO.CtznSttemntCmplt> findCtznSttemntCmplt(final FimsCrackdownDTO.CtznSttemntCmplt dto) {
+        return mapper.selectCtznSttemntCmplt(dto);
+    }
+
+    @Override
+    public void addCtznSttemntCmplt(final FimsCrackdownDTO.CtznSttemntCmplt dto) {
+        dto.setRegister(getUserInfo().getUniqId());
+        mapper.saveCtznSttemntCmplt(dto);
     }
 
     @Override

src/main/java/kr/xit/fims/biz/cmm/service/IFimsCrackdownMgtService.java

@@ -27,9 +27,11 @@ public interface IFimsCrackdownMgtService {
 
     CmmAnsTmplDTO.Dtl findCtznAnswerTmplInfo(final FimsCrackdownDTO.AnsRequest dto);
     CtznStmtDTO.Ans findCtznStmtAnswer(final FimsCrackdownDTO.AnsRequest dto);
-    FimsTotalPopupVO findProcessSttusChangeHist(final FimsCrackdownDTO.AnsRequest dto);
+    List<FimsTotalPopupVO> findProcessSttusChangeHist(final FimsCrackdownDTO.AnsRequest dto);
-    FimsTotalPopupVO findPayerAdresHist(final FimsCrackdownDTO.AnsRequest dto);
+    List<FimsTotalPopupVO> findPayerAdresHist(final FimsCrackdownDTO.AnsRequest dto);
-    CmmAnsTmplDTO.Dtl findElctrnNticSndng(final FimsCrackdownDTO.AnsRequest dto);
+    List<CmmAnsTmplDTO.Dtl> findElctrnNticSndng(final FimsCrackdownDTO.AnsRequest dto);
+    List<FimsCrackdownDTO.CtznSttemntCmplt> findCtznSttemntCmplt(final FimsCrackdownDTO.CtznSttemntCmplt dto);
+    void addCtznSttemntCmplt(final FimsCrackdownDTO.CtznSttemntCmplt dto);
 
     void modifyCtznStmtAnswer(final CtznStmtDTO.Ans dto);
     String addCtznStmtAnswer(final String interfaceSeqN);

src/main/java/kr/xit/fims/biz/cmm/web/FimsCrackDownMgtController.java

@@ -230,4 +230,17 @@ public class FimsCrackDownMgtController {
     public ModelAndView findElctrnNticSndng(final FimsCrackdownDTO.AnsRequest dto){
         return ResultResponse.of(service.findElctrnNticSndng(dto));
     }
+
+    @RequestMapping(value = "/findCtznSttemntCmplt")
+    public ModelAndView findCtznSttemntCmplt(final FimsCrackdownDTO.CtznSttemntCmplt dto){
+        return ResultResponse.of(service.findCtznSttemntCmplt(dto));
+    }
+
+    @RequestMapping("/addCtznSttemntCmplt")
+    public ModelAndView addCtznSttemntCmplt(final FimsCrackdownDTO.CtznSttemntCmplt dto) {
+        ModelAndView mav = new ModelAndView(FrameworkConstants.JSON_VIEW);
+        service.addCtznSttemntCmplt(dto);
+        AjaxMessageMapRenderer.success(mav, MessageKey.CMM_SUCCESS);
+        return mav;
+    }
 }

src/main/resources/sqlmapper/biz/cmm/cmm-fims-crackdown-mysql-mapper.xml

@@ -295,6 +295,32 @@
             , cvpl_process_compt_dt = DATE_FORMAT(NOW(), '%Y%m%d%H%i%s')
     </insert>
 
+    <insert id="saveCtznSttemntCmplt">
+        <selectKey resultType="string" keyProperty="cmpltId" order="BEFORE">
+            SELECT LPAD(NEXTVAL(seq_ec_ctzn_sttemnt_cmplt), 12, '0')
+        </selectKey>
+        INSERT
+          INTO tb_ec_ctzn_sttemnt_cmplt (
+             cmplt_id
+             , reglt_id
+             , instt_code
+             , content
+             , gubun
+             , vhcle_no
+             , regist_dt
+             , register
+          ) VALUES (
+           #{cmpltId}
+           , #{regltId}
+           , #{insttCode}
+           , #{content}
+           , #{gubun}
+           , #{vhcleNo}
+           , DATE_FORMAT(NOW(), '%Y%m%d%H%i%s')
+           , #{register}
+          )
+    </insert>
+
     <select id="selectEcCtznSttemntAnswer" resultType="kr.xit.fims.biz.ec.dto.CtznStmtDTO$Ans">
         /*cmm-fims-crackdown-mysql-mapper|selectEcCtznSttemntAnswer-시민신고답변 데이타 조회|cjm */
         SELECT tecsa.interface_seq_n
@@ -319,4 +345,76 @@
             ON tecsa.interface_seq_n = teei.interface_seq_n
          WHERE tecsa.interface_seq_n = #{interfaceSeqN}
     </select>
+
+    <select id="selectProcessSttusChangeHist" resultType="kr.xit.fims.biz.cmm.fimsTotalPopup.dto.FimsTotalPopupVO">
+        SELECT hist_sn
+             , reglt_process_sttus_code
+             , regist_dt
+             , spcmnt_matter
+          FROM tb_rt_process_sttus_change_hist
+         WHERE reglt_id = #{regltId}
+    </select>
+
+    <select id="selectPayerAdresHist" resultType="kr.xit.fims.biz.cmm.fimsTotalPopup.dto.FimsTotalPopupVO">
+        SELECT regist_dt
+             , all_adres
+        FROM tb_rt_payer_hist
+        WHERE payer_id = #{payerId}
+    </select>
+
+    <select id="selectElctrnNticSndng" resultType="kr.xit.framework.biz.cmm.dto.CmmAnsTmplDTO$Dtl">
+        SELECT tens.elctrn_ntic_sndng_id
+             , tens.signgu_code
+             , tens.nht_tmplat_id
+             , tens.sndng_ty_code
+             , tens.sndng_co
+             , tens.sndng_process_sttus
+             , tens.sndng_dt
+             , tens.clos_dt
+             , tens.regist_dt
+             , tens.register
+             , tens.updt_dt
+             , tens.updusr
+             , tensd.elctrn_ntic_sndng_detail_id
+             , tensd.main_code
+             , tensd.ihidnum
+             , tensd.cn_detail
+             , tensd.mobile_page_cn
+             , tensd.external_document_uuid
+             , tensr.elctrn_ntic_sndng_detail_id
+             , tensr.sndng_result_code
+             , tensr.requst_dt
+             , tensr.inqire_dt
+             , tensr.readng_dt
+             , IFNULL(tens.error_cn, tensr.error_cn) AS errorCn
+        FROM tb_elctrn_ntic_sndng tens
+        JOIN tb_elctrn_ntic_sndng_detail tensd
+          ON tens.ELCTRN_NTIC_SNDNG_ID = tensd.ELCTRN_NTIC_SNDNG_ID
+        LEFT OUTER JOIN tb_elctrn_ntic_sndng_result tensr
+          ON tensd.ELCTRN_NTIC_SNDNG_DETAIL_ID = tensr.ELCTRN_NTIC_SNDNG_DETAIL_ID
+       WHERE tensd.main_code = #{regltId}
+    </select>
+
+    <select id="selectCtznSttemntCmplt" resultType="kr.xit.fims.biz.cmm.dto.FimsCrackdownDTO$CtznSttemntCmplt">
+        SELECT tecsc.cmplt_id
+             , tecsc.reglt_id
+             , tecsc.instt_code
+             , tecsc.content
+             , tecsc.gubun
+             , tecsc.vhcle_no
+             , tecsc.regist_dt
+             , tecsc.register
+             , tecsc.updt_dt
+             , tecsc.updusr
+        FROM tb_ec_ctzn_sttemnt_cmplt tecsc
+        <if test='gubun eq "0"'>
+            JOIN tb_rt_reglt trr
+              ON (tecsc.reglt_id = trr.reglt_id AND (trr.payer_id = #{payerId} OR trr.reglt_id = #{regltId}))
+        </if>
+        <where>
+            <if test='gubun eq "1"'>
+                AND tecsc.vhcle_no = #{vhcleNo}
+            </if>
+        </where>
+    </select>
 </mapper>

src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownTotMgtPopup.jsp

@@ -301,7 +301,7 @@ Date       Author       Description
               <input type="text">
             </td>
             <th>진술일</th>
-                <td>
+            <td colspan="2">
               <input type="text">
             </td>
           </tr>
@@ -311,19 +311,19 @@ Date       Author       Description
               <input type="text">
             </td>
             <th>주민등록번호</th>
-                <td>
+            <td colspan="2">
               <input type="text">
             </td>
           </tr>
           <tr>
             <th>주소</th>
-                <td colspan="5">
+            <td colspan="6">
               <input type="text">
             </td>
           </tr>
           <tr>
             <th>번지</th>
-                <td colspan="5">
+            <td colspan="6">
               <input type="text">
             </td>
           </tr>
@@ -333,7 +333,7 @@ Date       Author       Description
               <input type="text">
             </td>
             <th>연락처</th>
-                <td>
+            <td colspan="2">
               <input type="text">
             </td>
           </tr>
@@ -343,26 +343,26 @@ Date       Author       Description
               <input type="text">
             </td>
             <th>이메일 주소</th>
-                <td>
+            <td colspan="2">
               <input type="text">
             </td>
           </tr>
           <tr>
             <th>회신방법</th>
-                <td colspan="3">
+            <td colspan="6">
               <input type="text">
             </td>
           </tr>
           <tr>
             <th>진술요지</th>
             <td colspan="6">
-                  <input type="text" style=" width:88%;">
+              <input type="text">
             </td>
           </tr>
           <tr>
             <th>진술 내용</th>
             <td colspan="6">
-                    <textarea cols="0" rows="15" style="overflow-y: scroll; width:90%;"></textarea>
+              <textarea rows="15" style="overflow-y: scroll; width:100%;"></textarea>
             </td>
           </tr>
           </tbody>
@@ -380,20 +380,20 @@ Date       Author       Description
           <tbody>
           <tr>
             <th>처리일시</th>
-                <td colspan="3">
+            <td colspan="5">
               <input type="text">
             </td>
           </tr>
           <tr>
             <th>처리결과</th>
-                <td colspan="3">
+            <td colspan="5">
               <input type="text">
             </td>
           </tr>
           <tr>
             <th>담당자<br/>의견</th>
-                <td colspan="4">
+            <td colspan="5">
-                  <textarea cols="50" rows="15" style="overflow-y: scroll; width:90%;"></textarea>
+              <textarea rows="15" style="overflow-y: scroll; width:100%;"></textarea>
             </td>
           </tr>
           </tbody>
@@ -420,13 +420,13 @@ Date       Author       Description
             <tr>
               <th>처리일</th>
               <td colspan="4">
-                  <input type="text" id="erppProcessDe" name="erppProcessDe" readonly/>
+                <input type="text" id="test1" name="test1" readonly/>
               </td>
             </tr>
             <tr>
-                <th>서손사유</th>
+              <th>감경사유</th>
               <td colspan="4">
-                  <input type="text" id="erppResnCode" name="erppResnCode" readonly/>
+                <input type="text" id="test2" name="test2" readonly/>
               </td>
             </tr>
             <tr>
@@ -462,14 +462,14 @@ Date       Author       Description
             <tr>
               <th>처리일</th>
               <td colspan="4">
-                  <input type="text" id="" name="" readonly/>
+                <input type="text" id="erppProcessDe" name="erppProcessDe" readonly/>
               </td>
               </td>
             </tr>
             <tr>
-                <th>감경사유</th>
+              <th>서손사유</th>
               <td colspan="4">
-                  <input type="text" id="" name="" readonly/>
+                <input type="text" id="erppSeCode" name="erppSeCode" readonly/>
               </td>
             </tr>
             <tr>
@@ -501,14 +501,47 @@ Date       Author       Description
         </div>
       </div>
 
-<form id="frmSendSearch">
       <div class="w_fix06 gridGroup" style="width: 1100px; margin-top:17px;">
         <p class="title deco_02">발송 이력</p>
+        <form id="frmSendSearch">
+          <div class="search r2">
+            <table>
+              <caption>검색조건</caption>
+              <colgroup>
+                <col style="width: 7%">
+                <col>
+                <col style="width: 8%;">
+                <col>
+                <col style="width: 7%;">
+                <col>
+                <col style="width: 7%;">
+                <col>
+              </colgroup>
+              <tbody>
+              <th>등기번호</th>
+              <td>
+                <input name="test3" id="test3" type="text" title="등기번호">
+              </td>
+              <th>전자납부번호</th>
+              <td>
+                <input name="test4" id="test4" type="text" title="전자납부번호">
+              </td>
+              <th>가상계좌</th>
+              <td>
+                <input name="test5" id="test5" type="text" title="가상계좌">
+              </td>
+              <th>공시송달일</th>
+              <td>
+                <input name="test6" id="test6" type="text" title="공시송달일">
+              </td>
+              </tbody>
+            </table>
+          </div>
+        </form>
         <div style="display: flex; width: 100%; height:150px; border:0px solid black; margin-bottom: 20px;">
           <div id="grid_d2" style="width:100%;"></div>
         </div>
       </div>
-</form>
 
       <%--        <div class="topBtnArea-a" style="/*width: 990px;*/ width:75%; min-width: 430px;">--%>
       <%--          <ul class="btnList">--%>
@@ -520,16 +553,19 @@ Date       Author       Description
 
     </div>
     <div id="tabs_3">
+<form id="frmCmplt">
       <div class="w_fix05">
         <div class="w_fix04 gridGroup">
           <div style="width: 100%; border:0px solid black">
             <p class="title deco_01">개별자료 민원 등록내역</p>
+            <a href="#" class="btn green" id="btnMinWonNew">신규작성</a>
             <div id="grid_m1"></div>
           </div>
         </div>
         <div class="w_fix04 gridGroup">
           <div style="width: 100%; border:0px solid black">
             <p class="title deco_01">차량번호 민원 등록내역</p>
+            <a href="#" class="btn green" id="btnCarMinWonNew">신규작성</a>
             <div id="grid_m2"></div>
           </div>
         </div>
@@ -537,29 +573,33 @@ Date       Author       Description
       <div class="w_fix05">
         <div class="box mT_02">
           <div class="w_fix04 gridGroup">
-              <p class="title deco_01">민원 새로등록</p>
+            <p class="title deco_01">민원 내용</p>
-<%--              <div style="height: 200px; border:1px solid #a1a1a1; margin:11px; border-radius: 4px;">--%>
+            <input type="hidden" id="content" name="content">
-<%--                &lt;%&ndash;<div id="grid"></div>&ndash;%&gt;--%>
+            <textarea id="content1" name="content1" cols="0" rows="15" style="overflow-y: scroll; width:100%;"></textarea>
-<%--              </div>--%>
+            <div class="popup_btn_02">
-              <textarea cols="0" rows="15" style="overflow-y: scroll; width:100%;"></textarea>
+				<span>
-              <li>
+					<a href="#" class="btn blue" id="btnMinWonRegist" style="display: none;">등록</a>
-                <%@include file="/WEB-INF/jsp/framework/biz-popup-btn.jsp" %>
+					<a href="#" class="btn blue" id="btnMinWonModify" style="display: none;">변경</a>
-              </li>
+					<a href="#" class="btn red" id="btnMinWonRemove" style="display: none;">삭제</a>
+				</span>
+            </div>
           </div>
         </div><%--box--%>
         <div class="box mT_02">
           <div class="w_fix04 gridGroup">
-              <p class="title deco_01">차량번호 민원 수정</p>
+            <p class="title deco_01">차량번호 민원 내용</p>
-<%--              <div style="height: 200px; border:1px solid #a1a1a1; margin:11px; border-radius: 4px;">--%>
+            <textarea id="content2" name="content2" cols="0" rows="15" style="overflow-y: scroll; width:100%;"></textarea>
-<%--                &lt;%&ndash;<div id="grid"></div>&ndash;%&gt;--%>
+            <div class="popup_btn_02">
-<%--              </div>--%>
+				<span>
-              <textarea cols="0" rows="15" style="overflow-y: scroll; width:100%;"></textarea>
+					<a href="#" class="btn blue" id="btnCarMinWonRegist" style="display: none;">등록</a>
-              <li>
+					<a href="#" class="btn blue" id="btnCarMinWonModify" style="display: none;">변경</a>
-                <%@include file="/WEB-INF/jsp/framework/biz-popup-btn.jsp" %>
+					<a href="#" class="btn red" id="btnCarMinWonRemove" style="display: none;">삭제</a>
-              </li>
+				</span>
+            </div>
           </div>
         </div><%--box--%>
       </div>
+</form>
     <%--        <div class="topBtnArea-a" style="min-width: 440px; width:75%;">--%>
     <%--          <ul class="btnList" style="padding-left:10px;">--%>
       <%--            <li>--%>
@@ -571,8 +611,6 @@ Date       Author       Description
   </div><!--popupTabs -->
 </div><!--row -->
 
-</form>
-
 <script type="text/javascript" src="${pageContext.request.contextPath}/resources/framework/js/cmm/cmmDownloadImg.js"></script>
 <script type="text/javaScript">
 
@@ -583,6 +621,8 @@ Date       Author       Description
   var callbackReloadImage = () => fnPopupBiz.downloadImg();
   let orgData;
   const ARR_TAP_GRID = [null,null,null,null,null];
+  const ARR_TAP_NAV = [null,null,null,null,null];
+  const ARR_TAP_TOTCNT = [0, 0, 0, 0, 0];
   let CUR_TAB_SEQ = 0;
   //var callbackSearch = () => fnPopupBiz.search();
 
@@ -721,20 +761,42 @@ Date       Author       Description
 
     $("#popupTabs").on("click", "li", function () {
       const popTab = parseInt($("#popupTabs .ui-tabs-active a").attr("id"));
-      console.log(popTab);
       if(popTab === 2){
-        console.log(ARR_TAP_GRID[0]);
         ARR_TAP_GRID[0].reloadData();
-        //ARR_TAP_GRID[0].refreshLayout();
-        console.log(ARR_TAP_GRID[1].dataProvider.readData);
         ARR_TAP_GRID[1].reloadData();
-        //ARR_TAP_GRID[1].refreshLayout();
-        console.log(ARR_TAP_GRID[2]);
         ARR_TAP_GRID[2].reloadData();
-        //ARR_TAP_GRID[2].refreshLayout();
+      }else if(popTab === 3){
+        ARR_TAP_GRID[3].reloadData();
+        ARR_TAP_GRID[4].reloadData();
       }
+    });
 
+    $('#btnMinWonNew').on('click', () => {
+      $('#content').val('');
+      $('#content1').val('');
+      $("#btnMinWonRegist").show();
     });
+
+    $('#btnCarMinWonNew').on('click', () => {
+      $('#content').val('');
+      $('#content2').val('');
+      $("#btnCarMinWonRegist").show();
+    });
+
+    $('#btnMinWonRegist').on('click', () => {
+      $('#content').val($('#content1').val());
+      const formData = $("#frmCmplt").serialize() + `&regltId=${param.regltId}&gubun=0`;
+
+      cmmBizAjax('저장', {
+        url: fimsApiUrl.ADD_CTZN_STTEMNT_CMPLT
+        , data: formData
+      })
+    });
+
+    $('#btnCarMinWonRegist').on('click', () => {
+      $('#content').val($('#content2').val());
+    });
+
   });
 
 
@@ -758,7 +820,7 @@ Date       Author       Description
       },
       {
         header: '처리상태',
-        name: 'changeProcessSttusCode',
+        name: 'regltProcessSttusCode',
         width: 90,
         //editor: 'text',
         sortable: true,
@@ -776,7 +838,7 @@ Date       Author       Description
     const tab1Columns = [	//Grid 컬럼 정보(명칭,매핑 field, 기타옵션 등)
       {
         header: '변경일시',
-        name: 'registDt1',
+        name: 'registDt',
         width: 120,
         //editor: 'text',
         sortable: true,
@@ -784,7 +846,7 @@ Date       Author       Description
       },
       {
         header: '내용',
-        name: 'registDt2',
+        name: 'allAdres',
         width: 900,
         //editor: 'text',
         sortable: true,
@@ -850,7 +912,7 @@ Date       Author       Description
       },
       {
         header: '발송일',
-        name: '',
+        name: 'sndngDt',
         width: 90,
         //editor: 'text',
         sortable: true,
@@ -898,7 +960,7 @@ Date       Author       Description
       },
       {
         header: '반송사유',
-        name: '',
+        name: 'errorCn',
         width: 90,
         //editor: 'text',
         sortable: true,
@@ -937,50 +999,50 @@ Date       Author       Description
         align: 'center'
       }
     ];
-    const tab3Columns = [	//Grid 컬럼 정보(명칭,매핑 field, 기타옵션 등)
+    const tab4Columns = [	//Grid 컬럼 정보(명칭,매핑 field, 기타옵션 등)
       {
         header: '등록일시',
-        name: 'registDt1',
+        name: 'registDt',
-        width: 90,
-        //editor: 'text',
-        sortable: true,
-        align: 'center'
-      },
-      {
-        header: '요일',
-        name: 'registDt2',
         width: 90,
         //editor: 'text',
         sortable: true,
         align: 'center'
       },
+      // {
+      //   header: '요일',
+      //   name: 'registDt2',
+      //   width: 90,
+      //   //editor: 'text',
+      //   sortable: true,
+      //   align: 'center'
+      // },
       {
         header: '등록자',
-        name: 'registDt3',
+        name: 'register',
         width: 90,
         //editor: 'text',
-        sortable: true,
+        sortable: false,
         align: 'center'
       },
       {
         header: '차량번호',
-        name: 'registDt4',
+        name: 'vhcleNo',
         width: 90,
         //editor: 'text',
-        sortable: true,
+        sortable: false,
         align: 'center'
       },
       {
         header: '내용',
-        name: 'registDt5',
+        name: 'content',
         width: 90,
         //editor: 'text',
-        sortable: true,
+        sortable: false,
         align: 'center'
       }
     ];
 
-    const tab4Columns = tab3Columns.filter((_, index) => index !== 3 );
+    const tab3Columns = tab4Columns.filter((_, index) => index !== 3 );
 
     //DataSource
     const tab0Datasource = {
@@ -998,7 +1060,7 @@ Date       Author       Description
         readData: {
           url: fimsApiUrl.FIND_PAYER_ADRES_HIST
           , serializer: (params) => {
-            return fnAddPageInfo(document.frmReglt, params)
+            return fnAddPageInfo(document.frmPayer, params)
           }
         }
       }
@@ -1018,9 +1080,10 @@ Date       Author       Description
       //initialRequest: false,  // 화면 load시 조회 안함 - default
       api: {
         readData: {
-          url: fimsApiUrl.FIND_PROCESS_STTUS_CHANGE_HIST
+          url: fimsApiUrl.FIND_CTZN_STTEMNT_CMPLT
           , serializer: (params) => {
-            return fnAddPageInfo(document.frmReglt, params);
+            params = Object.assign(params,{gubun:0, payerId: $("#payerId").val(), regltId: '${param.regltId}'});
+            return fnAddPageInfo(document.frmCmplt, params);
           }
         }
       }
@@ -1029,9 +1092,10 @@ Date       Author       Description
       //initialRequest: false,  // 화면 load시 조회 안함 - default
       api: {
         readData: {
-          url: fimsApiUrl.FIND_PROCESS_STTUS_CHANGE_HIST
+          url: fimsApiUrl.FIND_CTZN_STTEMNT_CMPLT
           , serializer: (params) => {
-            return fnAddPageInfo(document.frmReglt, params);
+            params = Object.assign(params,{gubun:1, vhcleNo: $("#vhcleNo").val()});
+            return fnAddPageInfo(document.frmCmplt, params);
           }
         }
       }
@@ -1060,46 +1124,39 @@ Date       Author       Description
     });
 
     ARR_TAP_GRID[0] = TuiGrid.of({...tab0Options, columns: tab0Columns}, tab0Datasource, (res) => {
-      // ARR_TOTCNT[0] = res.data.pagination.totalCount;
+      // ARR_TAP_TOTCNT[0] = res.data.pagination.totalCount;
-      //console.log(ARR_TAP_GRID[0].defaultOptions.data.api.readData.url);
     });
-    //console.log(TuiGrid.defaultOptions.data.api.readData.url);
-    console.log(ARR_TAP_GRID[0]);
-    //TuiGrid.defaultOptions.columns = []; //컬럼 중복 초기화
-    // ARR_TAP_GRID[1] = TuiGrid.of({...tab0Options, el: 'grid_d1', columns: tab1Columns}, tab1Datasource, (res) => {
     ARR_TAP_GRID[1] = TuiGrid.of({...tab1Options, el: 'grid_d1', columns: tab1Columns}, tab1Datasource, (res) => {
-
+      // ARR_TAP_TOTCNT[1] = res.data.pagination.totalCount;
-      // ARR_TOTCNT[1] = res.data.pagination.totalCount;
-      console.log(res);
-      //console.log(ARR_TAP_GRID[1].defaultOptions.data.api.readData.url);
     });
-    //console.log(TuiGrid.defaultOptions.data.api.readData.url);
-    console.log(ARR_TAP_GRID[1]);
-    // console.log(ARR_TAP_GRID[1].defaultOptions.data.api.readData.url);
-    //TuiGrid.defaultOptions.columns = []; //컬럼 중복 초기화
     ARR_TAP_GRID[2] = TuiGrid.of({...tab1Options, el: 'grid_d2', columns: tab2Columns}, tab2Datasource, (res) => {
-      // ARR_TOTCNT[2] = res.data.pagination.totalCount;
+      // ARR_TAP_TOTCNT[2] = res.data.pagination.totalCount;
-      console.log(res);
-      //console.log(TuiGrid.defaultOptions.data.api.readData.url);
     });
-    //TuiGrid.defaultOptions.columns = []; //컬럼 중복 초기화
+    ARR_TAP_GRID[3] = TuiGrid.of({...tab2Options, el: 'grid_m1', columns: tab3Columns}, tab3Datasource, (res) => {
-    ARR_TAP_GRID[3] = TuiGrid.of({...tab2Options, el: 'grid_m1', columns: tab4Columns}, tab0Datasource, (res) => {
+      // ARR_TAP_TOTCNT[3] = res.data.pagination.totalCount;
-      // ARR_TOTCNT[3] = res.data.pagination.totalCount;
       console.log(res);
+      ARR_TAP_GRID[3].resetData(res.data?.contents);
     });
-    //TuiGrid.defaultOptions.columns = []; //컬럼 중복 초기화
+    ARR_TAP_GRID[4] = TuiGrid.of({...tab2Options, el: 'grid_m2', columns: tab4Columns}, tab4Datasource, (res) => {
-    ARR_TAP_GRID[4] = TuiGrid.of({...tab2Options, el: 'grid_m2', columns: tab3Columns}, tab0Datasource, (res) => {
+      // ARR_TAP_TOTCNT[4] = res.data.pagination.totalCount;
-      // ARR_TOTCNT[4] = res.data.pagination.totalCount;
-      console.log(res);
     });
-    //tab 클릭 이벤트
+
-    /*$("#popupTabs").on("click", "li", function(){
+    const gridResposeSet = (res, idx) => {
-        var tab = parseInt($("#popupTabs .ui-tabs-active a").attr("id"));
+      ARR_TAP_TOTCNT[idx] = res.data.pagination.totalCount;
-        var tabbb = $('#popupTabs').children('div').not($('#tabs_'+tab));
+      $('#totCnt span').text(ARR_TAP_TOTCNT[idx]);
-        $('#tabs_'+tab).show(500);
+      const gridInfo = ARR_TAP_NAV[idx]?.gridInfo;
-        $('#sch_tab_id').val(tab);
+      if(gridInfo && gridInfo?.pageMove) {
-        //ARR_TAP_GRID[tab].refreshLayout();
+
-    });*/
+        let datas = res.data?.contents.map(d => {
+          return {content: d.content}
+        })
+
+        ARR_TAP_NAV[idx].resetGrid(res, datas, (pagiNavigation)=>{
+          ARR_TAP_NAV[idx] = pagiNavigation;
+          fnBiz.pagePopup(popupDiv, ARR_TAP_NAV[idx].gridInfo.curRowData);
+        })
+      }
+    }
   }
 
 

src/main/webapp/resources/biz/common/js/fimsApiURL.js

@@ -21,6 +21,8 @@ const fimsApiUrl = {
     ,FIND_PROCESS_STTUS_CHANGE_HIST: '/fims/biz/cmm/findProcessSttusChangeHist.do'
     ,FIND_PAYER_ADRES_HIST: '/fims/biz/cmm/findPayerAdresHist.do'
     ,FIND_ELCTRN_NTIC_SNDNG: '/fims/biz/cmm/findElctrnNticSndng.do'
+    ,FIND_CTZN_STTEMNT_CMPLT: '/fims/biz/cmm/findCtznSttemntCmplt.do'
+    ,ADD_CTZN_STTEMNT_CMPLT: '/fims/biz/cmm/addCtznSttemntCmplt.do'
 
     /**
      * fims API URL