From bb116154f020d793c3af20b14b10b528bcbd2182 Mon Sep 17 00:00:00 2001 From: jiHyung Date: Wed, 19 Oct 2022 18:01:15 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B5=AD=EC=A0=9C=EB=B2=94=EC=A3=84=EA=B2=80?= =?UTF-8?q?=EA=B1=B0=ED=98=84=ED=99=A9=20=ED=99=94=EB=A9=B4=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InternationalCrimeArrestController.java | 21 +- .../InternationalCrimeArrestMapper.java | 2 - .../model/InternationalCrimeArrest.java | 13 +- .../model/SuspectPersonInfo.java | 8 +- .../InternationalCrimeArrestRepository.java | 13 +- .../SuspectPersonInfoRepository.java | 10 +- .../InternationalCrimeArrestService.java | 33 +- .../InternationalCrimeArrestMapper.xml | 58 +-- .../faStatistics/internationalCrimeArrest.js | 76 ++-- src/main/resources/static/js/ivsgt/ivsgt.js | 1 + .../internationalCrimeArrest.html | 133 ++++--- .../internationalCrimeArrestEditModal.html | 246 ++++++++++--- .../internationalCrimeArrestViewModal.html | 329 ++++++++++++++++++ 13 files changed, 749 insertions(+), 194 deletions(-) create mode 100644 src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html diff --git a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java b/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java index 53433855..80a8f023 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java +++ b/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java @@ -4,20 +4,14 @@ import com.dbnt.faisp.authMgt.service.AuthMgtService; import com.dbnt.faisp.codeMgt.model.CodeMgt; import com.dbnt.faisp.codeMgt.service.CodeMgtService; import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest; -import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.SuspectPersonInfo; import com.dbnt.faisp.faStatistics.internationalCrimeArrest.repository.SuspectPersonInfoRepository; import com.dbnt.faisp.faStatistics.internationalCrimeArrest.service.InternationalCrimeArrestService; -import com.dbnt.faisp.ivsgtMgt.boardInvestigation.model.ArrestType; -import com.dbnt.faisp.ivsgtMgt.boardInvestigation.model.BoardInvestigation; -import com.dbnt.faisp.ivsgtMgt.boardInvestigation.model.RelatedReports; -import com.dbnt.faisp.ivsgtMgt.boardInvestigation.service.BoardInvestigationService; import com.dbnt.faisp.organMgt.model.OrganConfig; import com.dbnt.faisp.organMgt.service.OrganConfigService; import com.dbnt.faisp.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import java.time.LocalDateTime; @@ -35,7 +29,7 @@ public class InternationalCrimeArrestController { private final SuspectPersonInfoRepository suspectPersonInfoRepository; @GetMapping("/internationalCrimeArrest") - public ModelAndView arrest(@AuthenticationPrincipal UserInfo loginUser,InternationalCrimeArrest internationalCrimeArrest) { + public ModelAndView internationalCrimeArrest(@AuthenticationPrincipal UserInfo loginUser,InternationalCrimeArrest internationalCrimeArrest) { ModelAndView mav = new ModelAndView("faStatistics/internationalCrimeArrest/internationalCrimeArrest"); //메뉴권한 확인 @@ -45,7 +39,13 @@ public class InternationalCrimeArrestController { mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); internationalCrimeArrest.setQueryInfo(); - mav.addObject("internationalCrimeArrestList", internationalCrimeArrestService.selectInternationalCrimeArrestList(internationalCrimeArrest)); + List internationalCrimeArrestList = internationalCrimeArrestService.selectInternationalCrimeArrestList(internationalCrimeArrest); + + for (InternationalCrimeArrest ica:internationalCrimeArrestList) { + ica.setSuspectPersonInfoList(suspectPersonInfoRepository.findByIcaKey(ica.getIcaKey())); + } + + mav.addObject("internationalCrimeArrestList", internationalCrimeArrestList); internationalCrimeArrest.setContentCnt(internationalCrimeArrestService.selectInternationalCrimeArrestListCnt(internationalCrimeArrest)); internationalCrimeArrest.setPaginationInfo(); mav.addObject("searchParams", internationalCrimeArrest); @@ -53,7 +53,7 @@ public class InternationalCrimeArrestController { } @GetMapping("/internationalCrimeArrest/internationalCrimeArrestEditModal") - public ModelAndView ivsgtEditModal(@AuthenticationPrincipal UserInfo loginUser, InternationalCrimeArrest internationalCrimeArrest){ + public ModelAndView internationalCrimeArrestEditModal(@AuthenticationPrincipal UserInfo loginUser, InternationalCrimeArrest internationalCrimeArrest){ ModelAndView mav = new ModelAndView("faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal"); if(internationalCrimeArrest.getIcaKey()!=null){ internationalCrimeArrest = internationalCrimeArrestService.selectInternationalCrimeArrest(internationalCrimeArrest.getIcaKey()); @@ -69,11 +69,12 @@ public class InternationalCrimeArrestController { } @GetMapping("/internationalCrimeArrest/internationalCrimeArrestViewModal") - public ModelAndView ivsgtViewModal(@AuthenticationPrincipal UserInfo loginUser, InternationalCrimeArrest internationalCrimeArrest){ + public ModelAndView internationalCrimeArrestViewModal(@AuthenticationPrincipal UserInfo loginUser, InternationalCrimeArrest internationalCrimeArrest){ ModelAndView mav = new ModelAndView("faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal"); internationalCrimeArrest = internationalCrimeArrestService.selectInternationalCrimeArrest(internationalCrimeArrest.getIcaKey()); mav.addObject("internationalCrimeArrest", internationalCrimeArrest); mav.addObject("userSeq",loginUser.getUserSeq()); + mav.addObject("organConfigList", selectOrganList()); //메뉴권한 확인 mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faStatistics/internationalCrimeArrest").get(0).getAccessAuth()); return mav; diff --git a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/mapper/InternationalCrimeArrestMapper.java b/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/mapper/InternationalCrimeArrestMapper.java index 394eb3ed..11686f6c 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/mapper/InternationalCrimeArrestMapper.java +++ b/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/mapper/InternationalCrimeArrestMapper.java @@ -1,7 +1,6 @@ package com.dbnt.faisp.faStatistics.internationalCrimeArrest.mapper; import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest; -import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.SuspectPersonInfo; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -10,5 +9,4 @@ import java.util.List; public interface InternationalCrimeArrestMapper{ List selectInternationalCrimeArrestList(InternationalCrimeArrest internationalCrimeArrest); Integer selectInternationalCrimeArrestListCnt(InternationalCrimeArrest internationalCrimeArrest); - List selectSuspectPersonInfoList(Integer icaKey); } diff --git a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java b/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java index 9c47de3f..1e35b1b3 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java +++ b/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java @@ -7,7 +7,6 @@ import lombok.Setter; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; -import org.springframework.web.bind.annotation.RequestParam; import javax.persistence.*; import java.time.LocalDate; @@ -76,6 +75,8 @@ public class InternationalCrimeArrest extends BaseModel { private String destination; @Column(name = "content_status") private String contentStatus; + @Column(name = "crime_form") + private String crimeForm; @Column(name = "wrt_organ") private String wrtOrgan; @Column(name = "wrt_user_seq") @@ -89,5 +90,13 @@ public class InternationalCrimeArrest extends BaseModel { @Transient private List suspectPersonInfoList; @Transient - private List deleteSpikeyList; + private List deleteSpiKeyList; + @Transient + private String processResultEtc; + @Transient + private String smuggledGoodsEtc; + @Transient + private String meansEtc; + @Transient + private String purposesEtc; } diff --git a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/model/SuspectPersonInfo.java b/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/model/SuspectPersonInfo.java index 20a4a282..c70258f1 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/model/SuspectPersonInfo.java +++ b/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/model/SuspectPersonInfo.java @@ -1,9 +1,7 @@ package com.dbnt.faisp.faStatistics.internationalCrimeArrest.model; import com.dbnt.faisp.config.BaseModel; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; +import lombok.*; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; @@ -39,11 +37,11 @@ public class SuspectPersonInfo extends BaseModel { private LocalDateTime stayPeriodExpiredDt; @Column(name = "entry_visa") private String entryVisa; - @Column(name = "crime_form") - private String crimeForm; @Transient private List icaKeyList; @Transient private List spiKeyList; + @Transient + private String countryEtc; } diff --git a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/repository/InternationalCrimeArrestRepository.java b/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/repository/InternationalCrimeArrestRepository.java index 1e7d65bb..6d1d9770 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/repository/InternationalCrimeArrestRepository.java +++ b/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/repository/InternationalCrimeArrestRepository.java @@ -1,19 +1,8 @@ package com.dbnt.faisp.faStatistics.internationalCrimeArrest.repository; import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest; - import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - public interface InternationalCrimeArrestRepository extends JpaRepository { - @Transactional - @Modifying - @Query("delete from SuspectPersonInfo s where s.spiKey in :idList") - void deleteAllByIdInQuery(@Param("idList") List deleteSpikeyList); + } diff --git a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/repository/SuspectPersonInfoRepository.java b/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/repository/SuspectPersonInfoRepository.java index 114dc61c..f4ad9db6 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/repository/SuspectPersonInfoRepository.java +++ b/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/repository/SuspectPersonInfoRepository.java @@ -3,10 +3,18 @@ package com.dbnt.faisp.faStatistics.internationalCrimeArrest.repository; import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.SuspectPersonInfo; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.transaction.annotation.Transactional; import java.util.List; -public interface SuspectPersonInfoRepository extends JpaRepository { +public interface SuspectPersonInfoRepository extends JpaRepository { List findByIcaKey(Integer icaKey); + @Transactional + @Modifying + @Query("delete from SuspectPersonInfo s where s.spiKey in :idList") + void deleteAllByIdInQuery(@Param("idList") List deleteKeyList); } diff --git a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java b/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java index 5a8824d4..85fc39a7 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java +++ b/src/main/java/com/dbnt/faisp/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java @@ -2,26 +2,16 @@ package com.dbnt.faisp.faStatistics.internationalCrimeArrest.service; import com.dbnt.faisp.config.BaseService; -import com.dbnt.faisp.config.FileInfo; import com.dbnt.faisp.faStatistics.internationalCrimeArrest.mapper.InternationalCrimeArrestMapper; import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest; import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.SuspectPersonInfo; import com.dbnt.faisp.faStatistics.internationalCrimeArrest.repository.InternationalCrimeArrestRepository; import com.dbnt.faisp.faStatistics.internationalCrimeArrest.repository.SuspectPersonInfoRepository; -import com.dbnt.faisp.fpiMgt.affair.model.HashTag; -import com.dbnt.faisp.fpiMgt.affair.repository.HashTagRepository; -import com.dbnt.faisp.ivsgtMgt.boardInvestigation.mapper.BoardInvestigationMapper; -import com.dbnt.faisp.ivsgtMgt.boardInvestigation.model.*; -import com.dbnt.faisp.ivsgtMgt.boardInvestigation.repository.*; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.multipart.MultipartFile; -import java.io.File; -import java.util.ArrayList; import java.util.List; -import java.util.UUID; @Service @RequiredArgsConstructor @@ -48,13 +38,32 @@ public class InternationalCrimeArrestService extends BaseService { @Transactional public Integer savedInternationalCrimeArrest(InternationalCrimeArrest internationalCrimeArrest) { + if (internationalCrimeArrest.getMeansEtc() != null) { + internationalCrimeArrest.setMeans(internationalCrimeArrest.getMeansEtc()); + } + if (internationalCrimeArrest.getPurposesEtc() != null) { + internationalCrimeArrest.setPurpose(internationalCrimeArrest.getPurposesEtc()); + } + if (internationalCrimeArrest.getSmuggledGoodsEtc() != null) { + internationalCrimeArrest.setSmuggledGoods(internationalCrimeArrest.getSmuggledGoodsEtc()); + } + if (internationalCrimeArrest.getProcessResultEtc() != null) { + internationalCrimeArrest.setProcessResult(internationalCrimeArrest.getProcessResultEtc()); + } + Integer icaKey = internationalCrimeArrestRepository.save(internationalCrimeArrest).getIcaKey(); - if (internationalCrimeArrest.getDeleteSpikeyList() != null) { - internationalCrimeArrestRepository.deleteAllByIdInQuery(internationalCrimeArrest.getDeleteSpikeyList()); + if (internationalCrimeArrest.getDeleteSpiKeyList() != null) { + suspectPersonInfoRepository.deleteAllByIdInQuery(internationalCrimeArrest.getDeleteSpiKeyList()); } if (internationalCrimeArrest.getSuspectPersonInfoList() != null) { + for(SuspectPersonInfo info: internationalCrimeArrest.getSuspectPersonInfoList()){ + if (info.getCountryEtc() != null) { + info.setCountry(info.getCountryEtc()); + } + info.setIcaKey(icaKey); + } suspectPersonInfoRepository.saveAll(internationalCrimeArrest.getSuspectPersonInfoList()); } diff --git a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml index 0fa39c4b..269abab7 100644 --- a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml +++ b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml @@ -23,33 +23,34 @@ '); + }); $("#spiDiv").children('.dynamic').remove(); } }); @@ -65,7 +81,7 @@ $(document).on('click', '#spiAddBtn', function (){ $(document).on('change', '.country', function (){ if ($(this).val() == 'etc') { $(this).parent().after( - '
' + '
' + '' + '
' ); @@ -76,17 +92,19 @@ $(document).on('change', '.country', function (){ $(document).on('change', '#processResult', function (){ if ($(this).val() == 'etc') { - $(this).parent().after( - '
' + $(this).after( + '
' + '' + '
' ); } else { - $(this).parent().next().remove(); + $(this).next().remove(); } }); -$(document).on('click', '#spiCancelBtn', function (){ +$(document).on('click', '.spiCancelBtn', function (){ + let deleteKey = $(this).parent().children("input[name='spiKey']").val(); + $("#icaEditForm").append(''); $(this).parent().remove(); }); @@ -106,7 +124,7 @@ $(document).on('change', '#crimeType', function (){ '' + '
' + '' @@ -187,7 +205,7 @@ $(document).on('change', '#smugglingAmount', function (){ if ($(this).val() == 'etc') { $(this).parent().append( '
' - + '' + + '' + '
' ); } else { @@ -269,8 +287,8 @@ function makeSeaAreaDiv(name) { $('#arrestAreaDiv').append( '' + '
' - + '' + + '' + seaArea + '' + '
' @@ -311,7 +329,7 @@ function makeMeansDiv(name, code) { + '' + '
' + '' @@ -331,7 +349,7 @@ function makePurposeDiv(name) { '' + '
' + '' @@ -359,15 +377,15 @@ function makeViolationAmountDiv() { ); } -function getIcaViewModal(ivsgtKey){ +function getIcaViewModal(icaKey){ $.ajax({ url: '/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal', - data: {ivsgtKey: ivsgtKey}, + data: {icaKey: icaKey}, type: 'GET', dataType:"html", success: function(html){ - $("#ivsgtViewBody").empty().append(html) - $("#ivsgtViewModal").modal('show'); + $("#icaViewBody").empty().append(html) + $("#icaViewModal").modal('show'); }, error:function(){ @@ -384,7 +402,8 @@ function getIcaEditModal(icaKey){ type: 'GET', dataType:"html", success: function(html){ - $("#icaEditModalContent").empty().append(html) + $("#icaViewBody").empty(); + $("#icaEditModalContent").empty().append(html); $("#icaEditModal").modal('show'); $("#crimeAwarenessDtDiv").datepicker({ format: "yyyy-mm-dd", @@ -424,23 +443,34 @@ function saveInternationalCrimeArrest(contentState){ $(".spi-list").each(function (){ spiList.push({ + spiKey: $(this).find('input[name="spiKey"]').val() != undefined ? Number($(this).find('input[name="spiKey"]').val()) : null, sex: $(this).find('select[name="sex"]').val(), age: $(this).find('select[name="age"]').val(), - country: $(this).find('select[name="country"]').val() + country: $(this).find('select[name="country"]').val(), + stayQualification: $(this).find('input[name="stayQualification"]').val() != undefined ? $(this).find('input[name="stayQualification"]').val() : null, + stayPeriodExpiredDt: $(this).find('input[name="stayPeriodExpiredDt"]').val() != undefined ? $(this).find('input[name="stayPeriodExpiredDt"]').val() : null, + countryEtc: $(this).find('input[name="countryEtc"]').val() != undefined ? $(this).find('input[name="countryEtc"]').val() : null }); }); for (let i=0; i < spiList.length; i++) { + if (spiList[i].spiKey != null) { + formData.append(`suspectPersonInfoList[${i}].spiKey`, spiList[i].spiKey); + } formData.append(`suspectPersonInfoList[${i}].sex`, spiList[i].sex); formData.append(`suspectPersonInfoList[${i}].age`, spiList[i].age); formData.append(`suspectPersonInfoList[${i}].country`, spiList[i].country); + if (spiList[i].stayQualification != null) { + formData.append(`suspectPersonInfoList[${i}].stayQualification`, spiList[i].stayQualification); + } + if (spiList[i].stayPeriodExpiredDt != null) { + formData.append(`suspectPersonInfoList[${i}].stayPeriodExpiredDt`, spiList[i].stayPeriodExpiredDt); + } + if (spiList[i].countryEtc != null) { + formData.append(`suspectPersonInfoList[${i}].countryEtc`, spiList[i].countryEtc); + } } - /* - // formData 출력 - for (const [key,value] of formData.entries()) { - console.log(`${key}: ${value}`); - } - */ + $.ajax({ type : 'POST', data : formData, diff --git a/src/main/resources/static/js/ivsgt/ivsgt.js b/src/main/resources/static/js/ivsgt/ivsgt.js index f6951bbf..d1145d0b 100644 --- a/src/main/resources/static/js/ivsgt/ivsgt.js +++ b/src/main/resources/static/js/ivsgt/ivsgt.js @@ -90,6 +90,7 @@ function getIvsgtEditModal(ivsgtKey, ivsgtType){ type: 'GET', dataType:"html", success: function(html){ + $("#ivsgtViewBody").empty(); $("#ivsgtEditModalContent").empty().append(html) $("#ivsgtEditModal").modal('show'); $("[name='contentInfo']").summernote({ diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html index 3fb4fb8c..b885c97d 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html @@ -22,49 +22,102 @@ aria-labelledby="arrest-tab"> - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - -
지방청경찰서 -
범죄테마
-
(대분류)
- 		-
위반유형
-
(중분류)
- 		-
죄명
-
(소분류)
- 		발생원표검거원표피의자원표피의자 인적사항범죄인지사건송치신병처리
지방청경찰서 +
범죄테마
+
(대분류)
+ 		+
위반유형
+
(중분류)
+ 		+
죄명
+
(소분류)
+ 		발생원표검거원표피의자원표피의자 인적사항범죄인지사건송치신병처리
성별나이국적
+ + + + + + + + + + + + + + + +
+
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html index 114ee6ca..b0cfa871 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html @@ -1,11 +1,12 @@
- +
+ @@ -14,13 +15,13 @@
- +
@@ -28,10 +29,10 @@
@@ -47,7 +48,7 @@
- +
-
- + + +
+ + +
+ +
+ +
+ +
+ +
+ +
+ +
+
@@ -89,22 +113,24 @@
+ + +
-
- + +
@@ -112,8 +138,7 @@
@@ -121,72 +146,177 @@
- - - +
+ + + +
+ - - - - - +
+ +
- - - - - +
+ +
- - - - +
+ +
+ +
+ +
+ + + +
+ + +
+
+
+ + + +
+
+ + +
+ +
+ + +
+ +
+ +
+ +
+
+
+ + +
+ +
+ + +
+ +
+ + +
+ + +
+ +
+ +
+ +
+ + +
+ +
-
+
+ +
+ +
+ +
+ +
+
+ + +
+ +
+ +
+
+
-
- +
+
-
- +
+
+ +
+ +
+
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html new file mode 100644 index 00000000..0fae71ae --- /dev/null +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html @@ -0,0 +1,329 @@ + + +
+ + +
+
+ + + + + + + + +
+ +
+ +
+ +
+ + +
+ + +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+ +
+
+ + +
+ + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+ + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ + +
+
+
+ + + +
+
+ + +
+ +
+ + +
+ +
+ +
+ +
+
+
+ + +
+ +
+ + +
+ +
+ + +
+ + +
+ +
+ +
+ +
+ + +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+
+ + + +
+ +
+ +
+
+ +
+ +
+ +
+ +
+ +
+ +
+ + +
+ +
+ +
+
+
+ +
+
+
+
+ +
+
+ + + + +
+ \ No newline at end of file