Merge branch 'master' of http://118.219.150.34:50501/DBNT/FAISP

src/main/resources/mybatisMapper/BoardInvestigationMapper.xml

@@ -18,6 +18,12 @@
         <if test='contentTitle != null and contentTitle != ""'>
             AND a.content_title LIKE '%'||#{contentTitle}||'%'
         </if>
+        <if test='arrestCd != null and arrestCd != ""'>
+            AND t.arrest_cd = #{arrestCd}
+        </if>
+        <if test='arrestCd2 != null and arrestCd2 != ""'>
+            AND t.arrest_cd2 = #{arrestCd2}
+        </if>
         <if test='dateSelector == "wrtDt"'>
             <if test='startDate != null and startDate != ""'>
                 And a.wrt_dt >= #{startDate}::DATE
@@ -68,6 +74,20 @@
     <select id="selectBoardInvestigationListCnt" resultType="int" parameterType="BoardInvestigation">
     SELECT count(*)
     FROM board_investigation a
+    LEFT OUTER JOIN (
+        SELECT
+            ivsgt_key,
+            count(file_seq) AS fileCnt
+        FROM ivsgt_file
+        GROUP BY ivsgt_key
+    ) b
+    ON a.ivsgt_key = b.ivsgt_key
+    INNER JOIN arrest_type t
+    ON a.ivsgt_key = t.ivsgt_key
+    INNER JOIN code_mgt cm
+    ON t.arrest_cd  = cm.item_cd
+    INNER JOIN code_mgt cm2
+    ON t.arrest_cd2  = cm2.item_cd
     <include refid="selectBoardInvestigationListWhere"></include>
     </select>
     <select id="selectHashTags" resultType="string" parameterType="int">

src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml

@@ -24,6 +24,24 @@
             <if test='crimeName != null and crimeName != ""'>
                 AND crime_name LIKE CONCAT('%', #{crimeName}, '%')
             </if>
+            <if test='occurTable != null and occurTable != ""'>
+                AND occur_table LIKE CONCAT('%', #{occurTable}, '%')
+            </if>
+            <if test='arrestTable != null and arrestTable != ""'>
+                AND arrest_table LIKE CONCAT('%', #{arrestTable}, '%')
+            </if>
+            <if test='suspectTable != null and suspectTable != ""'>
+                AND suspect_table LIKE CONCAT('%', #{suspectTable}, '%')
+            </if>
+            <if test='crimeAwarenessDt != null'>
+                And crime_awareness_dt = #{crimeAwarenessDt}::DATE
+            </if>
+            <if test='caseSentDt != null'>
+                AND case_sent_dt = #{caseSentDt}::DATE
+            </if>
+            <if test='processResult != null and processResult != ""'>
+                AND process_result = #{processResult}
+            </if>
             <if test='dateSelector == "wrtDt"'>
                 <if test='startDate != null and startDate != ""'>
                     And wrt_dt >= #{startDate}::DATE

src/main/resources/static/js/common.js

@@ -188,7 +188,7 @@ function fileCheck(flag, files){
   return flag;
 }
 
-function dynamicOption(targetTagName, code) {
+function dynamicOption(targetTagName, code, defaultOptionName='') {
   $(targetTagName).empty();
   let option = '';
 
@@ -198,7 +198,7 @@ function dynamicOption(targetTagName, code) {
     });
   }
 
-  $(targetTagName).append('<option value="">선택</option>' + option);
+  $(targetTagName).append('<option value="">' +defaultOptionName + '선택</option>' + option);
 }
 
 function departmentDynamicOption(targetTagName, code, defaultOptionName='') {

src/main/resources/static/js/faStatistics/internationalCrimeArrest.js

@@ -3,6 +3,14 @@ $(function(){
         format: "yyyy-mm-dd",
         language: "ko"
     });
+    $("#searchCrimeAwarenessDtDiv").datepicker({
+        format: "yyyy-mm-dd",
+        language: "ko"
+    });
+    $("#searchCaseSentDtDiv").datepicker({
+        format: "yyyy-mm-dd",
+        language: "ko"
+    });
 });
 
 
@@ -32,8 +40,12 @@ $(document).on('change', 'select[name="organ"]', function (){
     departmentDynamicOption('select[name="department"]', $(this).val());
 });
 
-$(document).on('change', 'select[name="crimeType"]', function (){
+$(document).on('change', '#crimeType', function (){
-    dynamicOption('select[name="violationType"]', $(this).val());
+    dynamicOption('#violationType', $(this).val());
+});
+
+$(document).on('change', '#searchCrimeType', function (){
+    dynamicOption('#searchViolationType', $(this).val(), '위반유형');
 });
 
 

src/main/resources/static/js/ivsgt/ivsgt.js

@@ -55,6 +55,13 @@ $(document).on('click', '.cancel-btn', function (){
     $("#ivsgtEditForm").append('<input type="hidden" name="deleteKeyList" value="' + deleteKey + '">');
 });
 
+$(document).on('change', '#arrestCd', function (){
+    dynamicOption('#arrestCd2', $(this).val());
+});
+
+$(document).on('change', '#searchArrestCd', function (){
+    dynamicOption('#searchArrestCd2', $(this).val(), '검거유형2');
+});
 
 $(function(){
     $("#dateSelectorDiv").datepicker({

src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html

@@ -56,7 +56,7 @@
                                         </select>
                                     </div>
                                     <div class="col-auto">
-                                        <select class="form-select form-select-sm" name="crimeType">
+                                        <select class="form-select form-select-sm" name="crimeType" id="searchCrimeType">
                                             <option value="">범죄테마 선택</option>
                                             <th:block th:each="commonCode:${session.commonCode.get('CTH')}">
                                                 <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq searchParams.crimeType}"></option>
@@ -64,7 +64,7 @@
                                         </select>
                                     </div>
                                     <div class="col-auto">
-                                        <select class="form-select form-select-sm" name="violationType" id="violationType">
+                                        <select class="form-select form-select-sm" name="violationType" id="searchViolationType">
                                             <option value="">위반유형 선택</option>
                                             <th:block th:each="num : ${#numbers.sequence(1,#lists.size(session.commonCode.get('CTH')))}">
                                                 <th:block th:each="commonCode:${session.commonCode.get('CTH'+num)}">
@@ -76,6 +76,34 @@
                                     <div class="col-auto">
                                         <input type="text" class="form-control form-control-sm" placeholder="죄명" name="crimeName" th:value="${searchParams.crimeName}">
                                     </div>
+                                    <div class="col-auto">
+                                        <input type="text" class="form-control form-control-sm" placeholder="발생원표" name="occurTable" th:value="${searchParams.occurTable}">
+                                    </div>
+                                    <div class="col-auto">
+                                        <input type="text" class="form-control form-control-sm" placeholder="검거원표" name="arrestTable" th:value="${searchParams.arrestTable}">
+                                    </div>
+                                    <div class="col-auto">
+                                        <input type="text" class="form-control form-control-sm" placeholder="피의자원표" name="suspectTable" th:value="${searchParams.suspectTable}">
+                                    </div>
+                                    <div class="col-auto">
+                                        <div class="col-auto input-daterange" id="searchCrimeAwarenessDtDiv">
+                                            <input type="text" class="form-control form-control-sm" placeholder="범죄인지" name="crimeAwarenessDt" id="crimeAwarenessDt" th:value="${#temporals.format(searchParams.crimeAwarenessDt, 'yyyy-MM-dd')}">
+                                        </div>
+                                    </div>
+                                    <div class="col-auto">
+                                        <div class="col-auto input-daterange" id="searchCaseSentDtDiv">
+                                            <input type="text" class="form-control form-control-sm" placeholder="사건송치" name="caseSentDt" id="caseSentDt" th:value="${#temporals.format(searchParams.caseSentDt, 'yyyy-MM-dd')}">
+                                        </div>
+                                    </div>
+                                    <div class="col-auto">
+                                        <select class="form-select form-select-sm" name="processResult" id="processResult">
+                                            <option value="">신병처리 선택</option>
+                                            <th:block th:each="commonCode:${session.commonCode.get('PCR')}">
+                                                <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
+                                                        th:selected="${commonCode.itemCd eq searchParams.processResult}"></option>
+                                            </th:block>
+                                        </select>
+                                    </div>
                                     <div class="col-4">
                                         <div class="input-group w-auto input-daterange" id="dateSelectorDiv">
                                             <input type="text" class="form-control form-control-sm" id="startDate" name="startDate" placeholder="시작일" autocomplete="off" readonly th:value="${searchParams.startDate}">

src/main/resources/templates/ivsgt/ivsgt.html

@@ -4,6 +4,9 @@
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
       layout:decorate="~{layout/layout}">
 <th:block layout:fragment="script">
+    <script th:inline="javascript">
+        const commonCode = [[${session.commonCode}]];
+    </script>
     <script type="text/javascript" th:src="@{/js/ivsgt/ivsgt.js}"></script>
 </th:block>
 <div layout:fragment="content">
@@ -38,9 +41,31 @@
                                             </th:block>
                                         </select>
                                     </div>
+                                    <div class="col-sm-2">
+                                        <select class="form-select form-select-sm" name="arrestCd" id="searchArrestCd">
+                                            <option value="">검거유형1 선택</option>
+                                            <th:block th:each="commonCode:${session.commonCode.get('AT')}">
+                                                <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
+                                                        th:selected="${searchParams.arrestCd != null and commonCode.itemCd eq searchParams.arrestCd}"></option>
+                                            </th:block>
+                                        </select>
+                                    </div>
+                                    <div class="col-sm-2">
+                                        <select class="form-select form-select-sm" name="arrestCd2" id="searchArrestCd2">
+                                            <option value="">검거유형2 선택</option>
+                                            <th:block th:each="num : ${#numbers.sequence(1,#lists.size(session.commonCode.get('AT')))}">
+                                                <th:block th:if="${'AT'+num == searchParams.arrestCd}" th:each="commonCode:${session.commonCode.get('AT'+num)}">
+                                                    <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${searchParams.arrestCd2 eq commonCode.itemCd}"></option>
+                                                </th:block>
+                                            </th:block>
+                                        </select>
+                                    </div>
                                     <div class="col-auto">
                                         <input type="text" class="form-control form-control-sm" placeholder="제목" name="contentTitle" th:value="${searchParams.contentTitle}">
                                     </div>
+                                    <div class="col-auto">
+                                        <input type="text" class="form-control form-control-sm" placeholder="작성자" name="wrtNm" th:value="${searchParams.wrtNm}">
+                                    </div>
                                     <div class="col-4">
                                         <div class="input-group w-auto input-daterange" id="dateSelectorDiv">
                                             <input type="text" class="form-control form-control-sm" id="startDate" name="startDate" placeholder="시작일" autocomplete="off" readonly th:value="${searchParams.startDate}">
@@ -76,8 +101,8 @@
                         <div class="tab-content">
                             <div class="tab-pane fade show active" id="arrest" role="tabpanel"
                                  aria-labelledby="arrest-tab">
-                                <table class="table table-striped">
+                                <table class="table table-hover table-bordered ws-nowrap">
-                                    <thead>
+                                    <thead class="align-middle text-center">
                                     <tr>
                                         <th>문서번호</th>
                                         <th>관서</th>
@@ -88,7 +113,7 @@
                                         <th>작성일</th>
                                     </tr>
                                     </thead>
-                                    <tbody>
+                                    <tbody class="table-group-divider align-middle text-center">
                                         <tr class="tr" th:each="boardInvestigation:${boardInvestigationList}" th:data-key="${boardInvestigation.ivsgtKey}">
                                             <td th:text="${boardInvestigation.ivsgtKey}"></td>
                                             <th:block th:each="commonCode:${session.commonCode.get('OG')}">
@@ -102,7 +127,7 @@
                                         </tr>
                                     </tbody>
                                 </table>
-                                <button id="ivsgtAddBtn">등록</button>
+                                <button class="btn btn-sm btn-primary" id="ivsgtAddBtn">등록</button>
                             </div>
                             <div class="tab-pane fade" id="proceeding" role="tabpanel"
                                  aria-labelledby="proceeding-tab">진행보고서</div>

src/main/resources/templates/ivsgt/ivsgtEditModal.html

@@ -55,7 +55,7 @@
         <div class="col-sm-2">
           <select class="form-select form-select-sm" name="arrestCd" id="arrestCd">
             <option value="">검거유형1 선택-</option>
-            <th:block th:each="commonCode:${session.commonCode.get('AT1')}">
+            <th:block th:each="commonCode:${session.commonCode.get('AT')}">
                 <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
                         th:selected="${boardInvestigation.arrestType != null and commonCode.itemCd eq boardInvestigation.arrestType.arrestCd}"></option>
             </th:block>
@@ -65,9 +65,10 @@
         <div class="col-sm-2">
           <select class="form-select form-select-sm" name="arrestCd2" id="arrestCd2">
             <option value="">검거유형2 선택-</option>
-            <th:block th:each="commonCode:${session.commonCode.get('AT2')}">
+            <th:block th:each="num : ${#numbers.sequence(1,#lists.size(session.commonCode.get('AT')))}">
-              <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
+              <th:block th:if="${boardInvestigation.arrestType ne null && 'AT'+num == boardInvestigation.arrestType.arrestCd}" th:each="commonCode:${session.commonCode.get('AT'+num)}">
-                      th:selected="${boardInvestigation.arrestType != null and commonCode.itemCd eq boardInvestigation.arrestType.arrestCd2}"></option>
+                <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${boardInvestigation.arrestType.arrestCd2 eq commonCode.itemCd}"></option>
+              </th:block>
             </th:block>
           </select>
         </div>