diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java index f07d0086..487c9fc5 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java @@ -45,8 +45,8 @@ public class InternationalCrimeArrest extends BaseModel { @Column(name = "suspect_table") private String suspectTable; @Column(name = "crime_awareness_dt") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDate crimeAwarenessDt; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") + private LocalDateTime crimeAwarenessDt; @Column(name = "case_sent_dt") @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate caseSentDt; diff --git a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js index e00427cb..88f8ce60 100644 --- a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js +++ b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js @@ -90,6 +90,12 @@ $(document).on('click', '.spiRemoveBtn', function (){ spiRemoveBtnControl() }) +$(document).on('change', '.crimeAwarenessDt', function (){ + $("#crimeAwarenessDt").val( + $("#crimeAwarenessDate").val()+ + " "+$("#crimeAwarenessTime").val() + ) +}) $(document).on('change', '.etcSelfInput', function (){ const selfInput = $("#"+this.id+"_self") if(this.value === "etc"){ @@ -196,6 +202,7 @@ function saveInternationalCrimeArrest(status){ formData.append("suspectInfoList["+idx+"].processResult", spi.find('.processResult').val()); }); formData.append("caseOverview", CrossEditor.GetBodyValue()); + debugger $.ajax({ type : 'POST', data : formData, diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaEditModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaEditModal.html index 1498333d..27249ea3 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaEditModal.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaEditModal.html @@ -41,7 +41,7 @@
- +
@@ -415,7 +415,6 @@ -
@@ -460,7 +459,6 @@ - @@ -481,9 +479,13 @@
- +
- +
+ + + +
@@ -526,7 +528,6 @@ -
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaList.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaList.html index c3148425..99be1c9d 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaList.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaList.html @@ -98,6 +98,18 @@
+
+ +
+
+
+
+ + +
+
+
+
@@ -169,7 +181,7 @@ 검거원표 피의자원표 피의자 인적사항 - 범죄인지 + 검거일시 사건송치 작성자 작성일시 diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaViewModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaViewModal.html index 3f466d19..07dfd268 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaViewModal.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaViewModal.html @@ -285,7 +285,7 @@
- +