국제범죄 검거현황 수정 오류 작업.

src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java

@@ -60,7 +60,7 @@ public class InternationalCrimeArrestController {
     return mav;
   }
 
-  @GetMapping("/internationalCrimeArrest/internationalCrimeArrestEditModal")
+  @GetMapping("/internationalCrimeArrestEditModal")
   public ModelAndView internationalCrimeArrestEditModal(@AuthenticationPrincipal UserInfo loginUser, InternationalCrimeArrest internationalCrimeArrest){
     ModelAndView mav = new ModelAndView("faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal");
     if(internationalCrimeArrest.getIcaKey()!=null){
@@ -76,7 +76,7 @@ public class InternationalCrimeArrestController {
     return mav;
   }
 
-  @GetMapping("/internationalCrimeArrest/internationalCrimeArrestViewModal")
+  @GetMapping("/internationalCrimeArrestViewModal")
   public ModelAndView internationalCrimeArrestViewModal(@AuthenticationPrincipal UserInfo loginUser, InternationalCrimeArrest internationalCrimeArrest){
     ModelAndView mav = new ModelAndView("faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal");
     internationalCrimeArrest = internationalCrimeArrestService.selectInternationalCrimeArrest(internationalCrimeArrest.getIcaKey());
@@ -88,7 +88,7 @@ public class InternationalCrimeArrestController {
     return mav;
   }
 
-  @PostMapping("/internationalCrimeArrest/saveInternationalCrimeArrest")
+  @PostMapping("/saveInternationalCrimeArrest")
   public Integer saveInternationalCrimeArrest(@AuthenticationPrincipal UserInfo loginUser,
                                               InternationalCrimeArrest internationalCrimeArrest){
     internationalCrimeArrest.setWrtUserSeq(loginUser.getUserSeq());

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

@@ -414,7 +414,7 @@ function makeViolationAmountDiv() {
 
 function getIcaViewModal(icaKey){
   $.ajax({
-    url: '/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal',
+    url: '/faStatistics/internationalCrimeArrestViewModal',
     data: {icaKey: icaKey},
     type: 'GET',
     dataType:"html",
@@ -430,7 +430,7 @@ function getIcaViewModal(icaKey){
 
 function getIcaEditModal(icaKey){
   $.ajax({
-    url: '/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal',
+    url: '/faStatistics/internationalCrimeArrestEditModal',
     data: {
       icaKey: icaKey
     },
@@ -500,7 +500,7 @@ function saveInternationalCrimeArrest(contentState){
       $.ajax({
         type : 'POST',
         data : formData,
-        url : "/faStatistics/internationalCrimeArrest/saveInternationalCrimeArrest",
+        url : "/faStatistics/saveInternationalCrimeArrest",
         processData: false,
         contentType: false,
         success : function(result) {

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

@@ -164,40 +164,32 @@
                     <th:block th:each="internationalCrimeArrest,cnt:${internationalCrimeArrestList}">
                       <tr class="tr" th:data-key="${internationalCrimeArrest.icaKey}">
                         <td th:text="${cnt.count}"></td>
-                        <th:block th:if="${internationalCrimeArrest.organ eq null || internationalCrimeArrest.organ eq ''}">
-                          <td></td>
-                        </th:block>
+                        <td>
                           <th:block th:each="commonCode:${session.commonCode.get('OG')}">
-                          <td th:if="${internationalCrimeArrest.organ eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
-                        </th:block>
-                        <th:block th:if="${internationalCrimeArrest.department eq null || internationalCrimeArrest.department eq ''}">
-                          <td></td>
+                            <th:block th:if="${internationalCrimeArrest.organ eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
                           </th:block>
+                        </td>
+                        <td>
                           <th:block th:each="commonCode:${session.commonCode.get('OG')}">
-                          <td th:if="${internationalCrimeArrest.department eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
-                        </th:block>
-                        <th:block th:if="${internationalCrimeArrest.crimeType eq null || internationalCrimeArrest.crimeType eq ''}">
-                          <td></td>
+                            <th:block th:if="${internationalCrimeArrest.department eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
                           </th:block>
+                        </td>
+                        <td>
                           <th:block th:each="commonCode:${session.commonCode.get('CTH')}">
-                          <td th:if="${internationalCrimeArrest.crimeType eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
+                            <th:block th:if="${internationalCrimeArrest.crimeType eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
                           </th:block>
-                        <th:block th:each="num : ${#numbers.sequence(1,#lists.size(session.commonCode.get('CTH')))}">
-                          <th:block th:each="commonCode:${session.commonCode.get('CTH'+num)}">
-                            <td th:if="${internationalCrimeArrest.violationType eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
-                          </th:block>
-                        </th:block>
-                        <th:block th:if="${internationalCrimeArrest.violationType eq null || internationalCrimeArrest.violationType eq ''}">
-                          <td></td>
+                        </td>
+                        <td>
+                          <th:block th:each="commonCode:${session.commonCode.get(internationalCrimeArrest.crimeType)}">
+                            <th:block th:if="${internationalCrimeArrest.violationType eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
                           </th:block>
+                        </td>
                         <td th:text="${internationalCrimeArrest.crimeName}"></td>
                         <td th:text="${internationalCrimeArrest.occurTable}"></td>
                         <td th:text="${internationalCrimeArrest.arrestTable}"></td>
                         <td th:text="${internationalCrimeArrest.suspectTable}"></td>
-                        <th:block th:if="${#lists.size(internationalCrimeArrest.suspectPersonInfoList) < 1}">
-                          <td></td>
-                        </th:block>
-                        <td th:if="${#lists.size(internationalCrimeArrest.suspectPersonInfoList) >= 1}">
+                        <td>
+                          <th:block th:if="${#lists.size(internationalCrimeArrest.suspectPersonInfoList) >= 1}">
                             <div th:each="suspectPersonInfo:${internationalCrimeArrest.suspectPersonInfoList}">
                               <th:block th:each="commonCode:${session.commonCode.get('SEX')}">
                                   <th:block th:if="${suspectPersonInfo.sex eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
@@ -212,18 +204,15 @@
                                 <th:block th:text="${suspectPersonInfo.country}"></th:block>
                               </th:block>
                             </div>
+                          </th:block>
                         </td>
                         <td th:text="${#temporals.format(internationalCrimeArrest.crimeAwarenessDt, 'yyyy-MM-dd')}"></td>
                         <td th:text="${#temporals.format(internationalCrimeArrest.caseSentDt, 'yyyy-MM-dd')}"></td>
-                        <th:block th:if="${internationalCrimeArrest.processResult eq null}">
-                          <td></td>
-                        </th:block>
+                        <td>
                           <th:block th:each="commonCode:${session.commonCode.get('PCR')}">
-                          <td th:if="${internationalCrimeArrest.processResult eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
-                        </th:block>
-                        <th:block th:if="${internationalCrimeArrest.processResult ne null && !#strings.contains(internationalCrimeArrest.processResult, 'PCR')}">
-                          <td th:text="${internationalCrimeArrest.processResult}"></td>
+                            <th:block th:if="${internationalCrimeArrest.processResult eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
                           </th:block>
+                        </td>
                       </tr>
                     </th:block>
                     </tbody>

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

@@ -54,10 +54,8 @@
       <div class="col-sm-2">
         <select class="form-select form-select-sm" name="violationType" id="violationType">
           <option value="">선택</option>
-          <th:block th:each="num : ${#numbers.sequence(1,#lists.size(session.commonCode.get('CTH')))}">
-            <th:block th:if="${'CTH'+num == internationalCrimeArrest.crimeType}" th:each="commonCode:${session.commonCode.get('CTH'+num)}">
-              <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${internationalCrimeArrest.violationType eq commonCode.itemCd}"></option>
-            </th:block>
+          <th:block th:each="code:${session.commonCode.get(internationalCrimeArrest.crimeType)}">
+            <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${internationalCrimeArrest.violationType eq code.itemCd}"></option>
           </th:block>
         </select>
       </div>
@@ -305,11 +303,11 @@
     <div class="row mb-1">
       <label class="col-sm-2 col-form-label col-form-label-sm text-center">범죄인지</label>
       <div class="col-sm-2 input-daterange" id="crimeAwarenessDtDiv">
-        <input type="text" class="form-control form-control-sm" name="crimeAwarenessDt" id="crimeAwarenessDt" th:value="${#temporals.format(internationalCrimeArrest.crimeAwarenessDt, 'yyyy-MM-dd HH:mm')}">
+        <input type="text" class="form-control form-control-sm" name="crimeAwarenessDt" id="crimeAwarenessDt" th:value="${#temporals.format(internationalCrimeArrest.crimeAwarenessDt, 'yyyy-MM-dd')}">
       </div>
       <label class="col-sm-2 col-form-label col-form-label-sm text-center">사건송치</label>
       <div class="col-sm-2 input-daterange" id="caseSentDtDiv">
-        <input type="text" class="form-control form-control-sm" name="caseSentDt" id="caseSentDt" th:value="${#temporals.format(internationalCrimeArrest.caseSentDt, 'yyyy-MM-dd HH:mm')}">
+        <input type="text" class="form-control form-control-sm" name="caseSentDt" id="caseSentDt" th:value="${#temporals.format(internationalCrimeArrest.caseSentDt, 'yyyy-MM-dd')}">
       </div>
       <label class="col-sm-2 col-form-label col-form-label-sm text-center">신병처리</label>
       <div class="col-sm-2">

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

@@ -279,11 +279,11 @@
   <div class="row mb-1">
     <label class="col-sm-2 col-form-label col-form-label-sm text-center">범죄인지</label>
     <div class="col-sm-2" id="crimeAwarenessDtDiv">
-      <input type="text" class="form-control form-control-sm" name="crimeAwarenessDt" id="crimeAwarenessDt" th:value="${#temporals.format(internationalCrimeArrest.crimeAwarenessDt, 'yyyy-MM-dd HH:mm')}" readonly>
+      <input type="text" class="form-control form-control-sm" name="crimeAwarenessDt" id="crimeAwarenessDt" th:value="${#temporals.format(internationalCrimeArrest.crimeAwarenessDt, 'yyyy-MM-dd')}" readonly>
     </div>
     <label class="col-sm-2 col-form-label col-form-label-sm text-center">사건송치</label>
     <div class="col-sm-2" id="caseSentDtDiv">
-      <input type="text" class="form-control form-control-sm" name="caseSentDt" id="caseSentDt" th:value="${#temporals.format(internationalCrimeArrest.caseSentDt, 'yyyy-MM-dd HH:mm')}" readonly>
+      <input type="text" class="form-control form-control-sm" name="caseSentDt" id="caseSentDt" th:value="${#temporals.format(internationalCrimeArrest.caseSentDt, 'yyyy-MM-dd')}" readonly>
     </div>
     <label class="col-sm-2 col-form-label col-form-label-sm text-center">신병처리</label>
     <div class="col-sm-2">