From 341d7b60bb5d1facf358343d0d69a43cb747d591 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Mon, 17 Apr 2023 18:28:51 +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=EC=88=98=EC=A0=95=EC=A4=91.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InternationalCrimeArrestController.java | 16 +- .../model/IcaSubInfo.java | 52 +++ .../model/IcaSuspectInfo.java | 44 ++ .../model/InternationalCrimeArrest.java | 128 +++--- .../model/SuspectPersonInfo.java | 47 --- ...ository.java => IcaSubInfoRepository.java} | 12 +- .../repository/IcaSuspectInfoRepository.java | 14 + .../InternationalCrimeArrestRepository.java | 4 +- .../InternationalCrimeArrestService.java | 55 +-- .../faStatistics/internationalCrimeArrest.js | 367 +--------------- .../intelligenceNetwork/operationPlan.js | 145 +++---- .../internationalCrimeArrest.html | 4 +- .../internationalCrimeArrestEditModal.html | 392 ++++++++++++------ .../internationalCrimeArrestViewModal.html | 11 +- .../operationPlanList.html | 12 +- 15 files changed, 531 insertions(+), 772 deletions(-) create mode 100644 src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/IcaSubInfo.java create mode 100644 src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/IcaSuspectInfo.java delete mode 100644 src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/SuspectPersonInfo.java rename src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/repository/{SuspectPersonInfoRepository.java => IcaSubInfoRepository.java} (55%) create mode 100644 src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/repository/IcaSuspectInfoRepository.java diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java index d226d0c1..74f2dba1 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java @@ -1,13 +1,10 @@ package com.dbnt.faisp.main.faStatistics.internationalCrimeArrest; import com.dbnt.faisp.main.authMgt.service.AuthMgtService; -import com.dbnt.faisp.main.codeMgt.model.CodeMgt; -import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest; -import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.repository.SuspectPersonInfoRepository; +import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.repository.IcaSuspectInfoRepository; import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.service.InternationalCrimeArrestService; import com.dbnt.faisp.main.menuMgt.service.MenuMgtService; -import com.dbnt.faisp.main.organMgt.model.OrganConfig; import com.dbnt.faisp.main.organMgt.service.OrganConfigService; import com.dbnt.faisp.main.userInfo.model.UserInfo; import com.dbnt.faisp.util.Excel; @@ -31,7 +28,7 @@ public class InternationalCrimeArrestController { private final AuthMgtService authMgtService; private final InternationalCrimeArrestService internationalCrimeArrestService; private final OrganConfigService organConfigService; - private final SuspectPersonInfoRepository suspectPersonInfoRepository; + private final IcaSuspectInfoRepository suspectPersonInfoRepository; private final MenuMgtService menuMgtService; @GetMapping("/internationalCrimeArrest") @@ -49,7 +46,7 @@ public class InternationalCrimeArrestController { List internationalCrimeArrestList = internationalCrimeArrestService.selectInternationalCrimeArrestList(internationalCrimeArrest); for (InternationalCrimeArrest ica:internationalCrimeArrestList) { - ica.setSuspectPersonInfoList(suspectPersonInfoRepository.findByIcaKey(ica.getIcaKey())); + ica.setSuspectInfoList(suspectPersonInfoRepository.findByIcaKey(ica.getIcaKey())); } mav.addObject("internationalCrimeArrestList", internationalCrimeArrestList); @@ -68,9 +65,12 @@ public class InternationalCrimeArrestController { internationalCrimeArrest = internationalCrimeArrestService.selectInternationalCrimeArrest(internationalCrimeArrest.getIcaKey()); }else{ internationalCrimeArrest.setWrtOrgan(loginUser.getOgCd()); - internationalCrimeArrest.setWrtNm(loginUser.getUserNm()); + internationalCrimeArrest.setWrtPart(loginUser.getOfcCd()); + internationalCrimeArrest.setWrtUserSeq(loginUser.getUserSeq()); + internationalCrimeArrest.setWrtUserGrd(loginUser.getTitleCd()); + internationalCrimeArrest.setWrtUserNm(loginUser.getUserNm()); internationalCrimeArrest.setWrtDt(LocalDateTime.now()); - internationalCrimeArrest.setSuspectPersonInfoList(suspectPersonInfoRepository.findByIcaKey(internationalCrimeArrest.getIcaKey())); + internationalCrimeArrest.setSuspectInfoList(suspectPersonInfoRepository.findByIcaKey(internationalCrimeArrest.getIcaKey())); } mav.addObject("organConfigList", organConfigService.selectOrganList()); mav.addObject("internationalCrimeArrest", internationalCrimeArrest); diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/IcaSubInfo.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/IcaSubInfo.java new file mode 100644 index 00000000..bf16a1d0 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/IcaSubInfo.java @@ -0,0 +1,52 @@ +package com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model; + +import com.dbnt.faisp.config.BaseModel; +import lombok.*; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.persistence.*; +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; + +@Getter +@Setter +@Entity +@NoArgsConstructor +@DynamicInsert +@DynamicUpdate +@Table(name = "ica_sub_info") +public class IcaSubInfo extends BaseModel { + @Id + @Column(name = "ica_key") + private Integer icaKey; + @Column(name = "stay_qualification") + private String stayQualification; + @Column(name = "stay_period_expired_dt") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate stayPeriodExpiredDt; + @Column(name = "entry_visa") + private String entryVisa; + @Column(name = "sea_area") + private String seaArea; + @Column(name = "arrest_area") + private String arrestArea; + @Column(name = "destination") + private String destination; + @Column(name = "means") + private String means; + @Column(name = "purpose") + private String purpose; + @Column(name = "smuggled_goods") + private String smuggledGoods; + @Column(name = "crackdown_area") + private String crackdownArea; + @Column(name = "police_cnt") + private Integer poloceCnt; + @Column(name = "violation_amount") + private String violationAmount; + +} diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/IcaSuspectInfo.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/IcaSuspectInfo.java new file mode 100644 index 00000000..eefe71fc --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/IcaSuspectInfo.java @@ -0,0 +1,44 @@ +package com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model; + +import com.dbnt.faisp.config.BaseModel; +import lombok.*; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +@Getter +@Setter +@Entity +@NoArgsConstructor +@DynamicInsert +@DynamicUpdate +@Table(name = "ica_suspect_info") +@IdClass(IcaSuspectInfo.IcaSuspectInfoId.class) +public class IcaSuspectInfo extends BaseModel { + @Id + @Column(name = "ica_key") + private Integer icaKey; + @Id + @Column(name = "spi_key") + private Integer spiKey; + @Column(name = "sex") + private String sex; + @Column(name = "age") + private String age; + @Column(name = "country") + private String country; + @Column(name = "process_result") + private String processResult; + + @Embeddable + @Data + @NoArgsConstructor + @AllArgsConstructor + public static class IcaSuspectInfoId implements Serializable { + private Integer icaKey; + private Integer spiKey; + } +} 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 9ef39c3d..b25b0f5f 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 @@ -21,82 +21,56 @@ import java.util.List; @DynamicUpdate @Table(name = "international_crime_arrest") public class InternationalCrimeArrest extends BaseModel { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "ica_key") - private Integer icaKey; - @Column(name = "organ") - private String organ; - @Column(name = "department") - private String department; - @Column(name = "crime_type") - private String crimeType; - @Column(name = "violation_type") - private String violationType; - @Column(name = "crime_name") - private String crimeName; - @Column(name = "smuggling_amount") - private String smugglingAmount; - @Column(name = "occur_table") - private String occurTable; - @Column(name = "arrest_table") - private String arrestTable; - @Column(name = "suspect_table") - private String suspectTable; - @Column(name = "crime_awareness_dt") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDate crimeAwarenessDt; - @Column(name = "case_sent_dt") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDate caseSentDt; - @Column(name = "process_result") - private String processResult; - @Column(name = "other_crime") - private String otherCrime; - @Column(name = "case_num") - private String caseNum; - @Column(name = "case_overview") - private String caseOverview; - @Column(name = "sea_area") - private String seaArea; - @Column(name = "arrest_area") - private String arrestArea; - @Column(name = "means") - private String means; - @Column(name = "purpose") - private String purpose; - @Column(name = "smuggled_goods") - private String smuggledGoods; - @Column(name = "crackdown_personel") - private Integer crackdownPersonel; - @Column(name = "violation_amount") - private String violationAmount; - @Column(name = "destination") - 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") - private Integer wrtUserSeq; - @Column(name = "wrt_nm") - private String wrtNm; - @Column(name = "wrt_dt") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") - private LocalDateTime wrtDt; + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "ica_key") + private Integer icaKey; + @Column(name = "organ") + private String organ; + @Column(name = "department") + private String department; + @Column(name = "crime_type") + private String crimeType; + @Column(name = "violation_type") + private String violationType; + @Column(name = "crime_name") + private String crimeName; + @Column(name = "occur_table") + private String occurTable; + @Column(name = "arrest_table") + private String arrestTable; + @Column(name = "suspect_table") + private String suspectTable; + @Column(name = "crime_awareness_dt") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate crimeAwarenessDt; + @Column(name = "case_sent_dt") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate caseSentDt; + @Column(name = "case_num") + private String caseNum; + @Column(name = "case_overview") + private String caseOverview; + @Column(name = "crime_form") + private String crimeForm; + @Column(name = "status") + private String status; + @Column(name = "wrt_organ") + private String wrtOrgan; + @Column(name = "wrt_part") + private String wrtPart; + @Column(name = "wrt_user_seq") + private Integer wrtUserSeq; + @Column(name = "wrt_user_grd") + private String wrtUserGrd; + @Column(name = "wrt_user_nm") + private String wrtUserNm; + @Column(name = "wrt_dt") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") + private LocalDateTime wrtDt; - @Transient - private List suspectPersonInfoList; - @Transient - private List deleteSpiKeyList; - @Transient - private String processResultEtc; - @Transient - private String smuggledGoodsEtc; - @Transient - private String meansEtc; - @Transient - private String purposesEtc; + @Transient + private List suspectInfoList; + @Transient + private IcaSubInfo icaSubInfo; } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/SuspectPersonInfo.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/SuspectPersonInfo.java deleted file mode 100644 index 7a53a95f..00000000 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/SuspectPersonInfo.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model; - -import com.dbnt.faisp.config.BaseModel; -import lombok.*; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; -import org.springframework.format.annotation.DateTimeFormat; - -import javax.persistence.*; -import java.time.LocalDateTime; -import java.util.List; - -@Getter -@Setter -@Entity -@NoArgsConstructor -@DynamicInsert -@DynamicUpdate -@Table(name = "suspect_person_info") -public class SuspectPersonInfo extends BaseModel { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "spi_key") - private Integer spiKey; - @Column(name = "ica_key") - private Integer icaKey; - @Column(name = "sex") - private String sex; - @Column(name = "age") - private String age; - @Column(name = "country") - private String country; - @Column(name = "stay_qualification") - private String stayQualification; - @Column(name = "stay_period_expired_dt") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDateTime stayPeriodExpiredDt; - @Column(name = "entry_visa") - private String entryVisa; - - @Transient - private List icaKeyList; - @Transient - private List spiKeyList; - @Transient - private String countryEtc; -} diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/repository/SuspectPersonInfoRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/repository/IcaSubInfoRepository.java similarity index 55% rename from src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/repository/SuspectPersonInfoRepository.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/repository/IcaSubInfoRepository.java index dc1da914..f8118d47 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/repository/SuspectPersonInfoRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/repository/IcaSubInfoRepository.java @@ -1,7 +1,7 @@ package com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.repository; -import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model.SuspectPersonInfo; - +import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model.IcaSubInfo; +import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model.IcaSuspectInfo; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; @@ -11,10 +11,6 @@ import org.springframework.transaction.annotation.Transactional; import java.util.List; -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); +public interface IcaSubInfoRepository extends JpaRepository { + } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/repository/IcaSuspectInfoRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/repository/IcaSuspectInfoRepository.java new file mode 100644 index 00000000..b9325928 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/repository/IcaSuspectInfoRepository.java @@ -0,0 +1,14 @@ +package com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.repository; + +import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model.IcaSuspectInfo; + +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; + + +public interface IcaSuspectInfoRepository extends JpaRepository { + List findByIcaKey(Integer icaKey); + + void deleteByIcaKey(Integer icaKey); +} diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/repository/InternationalCrimeArrestRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/repository/InternationalCrimeArrestRepository.java index 225e5e3d..f45773fb 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/repository/InternationalCrimeArrestRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/repository/InternationalCrimeArrestRepository.java @@ -9,6 +9,6 @@ public interface InternationalCrimeArrestRepository extends JpaRepository selectInternationalCrimeArrestList(InternationalCrimeArrest InternationalCrimeArrest) { return internationalCrimeArrestMapper.selectInternationalCrimeArrestList(InternationalCrimeArrest); @@ -38,50 +40,31 @@ public class InternationalCrimeArrestService extends BaseService { } public InternationalCrimeArrest selectInternationalCrimeArrest(Integer icaKey) { - InternationalCrimeArrest savedInternationalCrimeArrest = internationalCrimeArrestRepository.findById(icaKey).orElse(null); - if (savedInternationalCrimeArrest != null) { - savedInternationalCrimeArrest.setSuspectPersonInfoList(suspectPersonInfoRepository.findByIcaKey(icaKey)); + InternationalCrimeArrest savedICA = internationalCrimeArrestRepository.findById(icaKey).orElse(null); + if (savedICA != null) { + savedICA.setSuspectInfoList(icaSuspectInfoRepository.findByIcaKey(icaKey)); } - return savedInternationalCrimeArrest; + return savedICA; } @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()); - } + public Integer savedInternationalCrimeArrest(InternationalCrimeArrest ica) { - Integer icaKey = internationalCrimeArrestRepository.save(internationalCrimeArrest).getIcaKey(); - - if (internationalCrimeArrest.getDeleteSpiKeyList() != null) { - suspectPersonInfoRepository.deleteAllByIdInQuery(internationalCrimeArrest.getDeleteSpiKeyList()); + Integer icaKey = internationalCrimeArrestRepository.save(ica).getIcaKey(); + icaSuspectInfoRepository.deleteByIcaKey(icaKey); + Integer i=1; + for(IcaSuspectInfo suspectInfo: ica.getSuspectInfoList()){ + suspectInfo.setIcaKey(icaKey); + suspectInfo.setSpiKey(i++); } - - if (internationalCrimeArrest.getSuspectPersonInfoList() != null) { - for(SuspectPersonInfo info: internationalCrimeArrest.getSuspectPersonInfoList()){ - if (info.getCountryEtc() != null) { - info.setCountry(info.getCountryEtc()); - } - info.setIcaKey(icaKey); - } - suspectPersonInfoRepository.saveAll(internationalCrimeArrest.getSuspectPersonInfoList()); - } - + icaSuspectInfoRepository.saveAll(ica.getSuspectInfoList()); + icaSubInfoRepository.save(ica.getIcaSubInfo()); return icaKey; } @Transactional public void deleteInternationalCrimeArrest(InternationalCrimeArrest internationalCrimeArrest) { - internationalCrimeArrestRepository.bulkModifyingByIcaKeyToContentStatus(internationalCrimeArrest.getIcaKey(), "D"); + internationalCrimeArrestRepository.bulkModifyingByIcaKeyToStatus(internationalCrimeArrest.getIcaKey(), "D"); } } diff --git a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js index 33c20246..148facf0 100644 --- a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js +++ b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js @@ -20,6 +20,7 @@ $(document).on('click', '#icaEditBtn', function () { $("#icaViewModal").modal('hide'); getIcaEditModal(Number($("#icaViewBody").find("[name='icaKey']").val())); }); + $(document).on('click', '#icaDeleteBtn', function (){ $.ajax({ type : 'POST', @@ -65,372 +66,6 @@ $(document).on('change', '#searchCrimeType', function (){ dynamicOption('#searchViolationType', $(this).val(), '위반유형'); }); - -$(document).on('change', '#crimeForm', function (){ - if ($(this).val() !== 'CMF001') { - $("#spiAddBtn").show(); - } else { - $("#spiAddBtn").hide(); - $.each($('.dynamic').children("input[name='spiKey']"), function (idx, item){ - let deleteKey = item.value; - $("#icaEditForm").append(''); - }); - $("#spiDiv").children('.dynamic').remove(); - } -}); - -$(document).on('click', '#spiAddBtn', function (){ - - let sex = ''; - commonCode.SEX.forEach(function (item){ - sex += ''; - }); - - let age = ''; - commonCode.AGE.forEach(function (item){ - age += ''; - }) - - let country = ''; - commonCode.NNY.forEach(function (item){ - country += ''; - }) - - $("#spiDiv").append( - '
' - + '' - + '
' - + '' - + '
' - + '' - + '
' - + '' - + '
' - + '' - + '
' - + '' - + '
' - + '' - + '
' - ); -}); - -$(document).on('change', '.country', function (){ - if ($(this).val() == 'etc') { - $(this).parent().after( - '
' - + '' - + '
' - ); - } else { - $(this).parent().next().remove(); - } -}); - -$(document).on('change', '#processResult', function (){ - if ($(this).val() === 'etc') { - $("[name=\"processResultEtc\"]").val('') - $("#processResultEtcDiv").show(); - } else { - $("#processResultEtcDiv").hide(); - } -}); - -$(document).on('click', '.spiCancelBtn', function (){ - const deleteKey = $(this).parent().children("input[name='spiKey']").val(); - if(deleteKey !== undefined){ - $("#icaEditForm").append(''); - } - $(this).parent().remove(); -}); - -$(document).on('change', '#crimeType', function (){ - $('#smugglingAmountDiv').children().remove(); - $('#crimeNameDiv').children().remove(); - $('#arrestAreaDiv').remove(); - - let smugglingAmount = ''; - commonCode.SG.forEach(function (item){ - if(item.useChk === 'T'){ - smugglingAmount += ''; - } - }) - - if ($(this).val() == 'CTH2') { - makeArrestAreaDiv('장소'); - $('#smugglingAmountDiv').append( - '' - + '
' - + '' - + '
' - + '' - + '
' - + '' - + '
' - + '' - + '
' - + '' - + '
' - ); - } else { - $("#crimeNameDiv").append( - '
\n' + - ' \n' + - '
\n' + - ' \n' + - '
\n' + - '
' - ); - } -}); - -$(document).on('change', '#violationType', function (){ - $('#spiInfoDiv').remove(); - $('#arrestAreaDiv').remove(); - $('#meansDiv').remove(); - $('.entryVisa').remove(); - $('#violationAmountDiv').remove(); - - if ($(this).val() == 'CTH101') { - makeSpiInfoDiv('피의자 정보'); - makeArrestAreaDiv('지역'); - makeSeaAreaDiv('밀입국'); - makeMeansDiv('밀입국'); - makePurposeDiv('밀입국'); - makeDestinationDiv('밀입국 출발지(국가)'); - } - - if ($(this).val() == 'CTH102') { - makeSpiInfoDiv('피의자 정보'); - makeArrestAreaDiv('지역'); - makeSeaAreaDiv('도외이탈'); - makeMeansDiv('도외이탈'); - makePurposeDiv('도외이탈'); - } - - if ($(this).val() == 'CTH103') { - makeSpiInfoDiv('피의자 정보'); - makeArrestAreaDiv('지역'); - makeSeaAreaDiv('밀출국'); - makeMeansDiv('밀출국'); - makePurposeDiv('밀출국'); - makeDestinationDiv('밀출국 행선지(도착예정지)'); - } - - if ($(this).val() == 'CTH104') { - makeSpiInfoDiv('피의자 정보'); - makeArrestAreaDiv('지역'); - makeSeaAreaDiv('밀항'); - makeMeansDiv('밀항'); - makePurposeDiv('밀항'); - makeDestinationDiv('밀항 행선지(도착예정지)'); - } - - if ($(this).val() == 'CTH105') { - makeSpiInfoDiv('불법체류 및 취업'); - makeEntryVisaDiv(); - } - - if ($(this).val() == 'CTH401') { - makeViolationAmountDiv(); - } - - if ($(this).val() == 'CTH201' || $(this).val() == 'CTH202' || $(this).val() == 'CTH203' || $(this).val() == 'CTH204') { - makeArrestAreaDiv('장소'); - } -}); - -$(document).on('change', '#smugglingAmount', function (){ - if ($(this).val() == 'etc') { - $(this).parent().append( - '
' - + '' - + '
' - ); - } else { - $(this).next().remove(); - } -}); - -$(document).on('change', '#means', function (){ - if ($(this).val() == 'etc') { - $(this).parent().append( - '
' - + '' - + '
' - ); - } else { - $(this).next().remove(); - } -}); - -$(document).on('change', '#purpose', function (){ - if ($(this).val() == 'etc') { - $(this).parent().append( - '
' - + '' - + '
' - ); - } else { - $(this).next().remove(); - } -}); - -$(function(){ - $("#datePickerDiv").datepicker({ - format: "yyyy-mm-dd", - language: "ko", - autoclose: true - }); -}); - -function makeEntryVisaDiv() { - $('#spiWrapper').prepend( - '' - + '
' - + '' - + '
' - ); -} - -function makeSpiInfoDiv(name) { - $('#spiParentDiv').after( - '
' - + '' - + '
' - + '
' - + '
' - + '' - + '
' - + '' - + '
' - + '' - + '
' - + '' - + '
' - + '
' - + '
' - + '
' - + '
' - ); - $("#stayQualificationDiv").datepicker({ - format: "yyyy-mm-dd", - language: "ko", - autoclose: true - }); -} - -function makeSeaAreaDiv(name) { - - let seaArea = ''; - commonCode.SAA.forEach(function (item){ - seaArea += ''; - }) - - $('#arrestAreaDiv').append( - '' - + '
' - + '' - + '
' - ); -} - -function makeArrestAreaDiv(name) { - - let arrestArea = ''; - commonCode.SAA.forEach(function (item){ - arrestArea += ''; - }) - - $('#spiParentDiv').after( - '
' - + '' - + '
' - + '' - + '
' - + '
' - ); -} - -function makeMeansDiv(name, code) { - let means = ''; - if (code == 'CTH101') { - commonCode.MS1.forEach(function (item){ - means += ''; - }) - } else { - commonCode.MS2.forEach(function (item){ - means += ''; - }) - } - - $('#spiParentDiv').after( - '
' - + '' - + '
' - + '' - + '
' - + '
' - ); -} - -function makePurposeDiv(name) { - - let purpose = ""; - commonCode.PPS.forEach(function (item){ - purpose += ''; - }) - - $('#meansDiv').append( - '' - + '
' - + '' - + '
' - ); -} - -function makeDestinationDiv(name) { - $('#meansDiv').append( - '' - + '
' - + '' - + '
' - ); -} - -function makeViolationAmountDiv() { - $('#spiParentDiv').after( - '
' - + '' - + '
' - + '' - + '
' - + '
' - ); -} - function getIcaViewModal(icaKey){ $.ajax({ url: '/faStatistics/internationalCrimeArrestViewModal', diff --git a/src/main/resources/static/js/igActivities/intelligenceNetwork/operationPlan.js b/src/main/resources/static/js/igActivities/intelligenceNetwork/operationPlan.js index 42f50081..17d0c6f9 100644 --- a/src/main/resources/static/js/igActivities/intelligenceNetwork/operationPlan.js +++ b/src/main/resources/static/js/igActivities/intelligenceNetwork/operationPlan.js @@ -5,22 +5,15 @@ $(function(){ autoclose: true }); }) - -$(document).on('click', '#allTab', function (){ - location.href = "/intelligenceNetwork/operationPlanList/all"; -}) -$(document).on('click', '#stayTab', function (){ - location.href = "/intelligenceNetwork/operationPlanList/stay"; -}) -$(document).on('click', '#commitTab', function (){ - location.href = "/intelligenceNetwork/operationPlanList/commit"; +$(document).on('click', '.pageTab', function (){ + location.href = "/intelligenceNetwork/operationPlanList/"+$(this).attr("data-tabtype"); }) $(document).on('click', '#addBtn', function (){ - getOerationPlanEditModal(null); + getOperationPlanEditModal(null); }) -function getOerationPlanEditModal(opKey){ +function getOperationPlanEditModal(opKey){ $.ajax({ url: '/intelligenceNetwork/operationPlanEditModal', data: {opKey: opKey}, @@ -43,83 +36,83 @@ function getOerationPlanEditModal(opKey){ } $(document).on('click', '#editBtn', function (){ - $("#operationPlanViewModal").modal('hide'); - getOerationPlanEditModal($(this).attr("data-opkey")); + $("#operationPlanViewModal").modal('hide'); + getOperationPlanEditModal($(this).attr("data-opkey")); }) $(document).on('click', '#saveBtn', function (){ - if(!$("#opSdate").val()){ - alert("운용시작일을 입력해주세요."); - $('#opSdate').focus(); - return false; - } - if(!$("#opName").val()){ - alert("성명을 입력해주세요."); - $('#opName').focus(); - return false; - } - if(!$("#opBirth").val()){ - alert("생년월일을 입력해주세요."); - $('#opBirth').focus(); - return false; - } - if(!$("#opPosition").val()){ - alert("근무처를 입력해주세요."); - $('#opPosition').focus(); - return false; - } - if(!$("#opPhone").val()){ - alert("연락처를 입력해주세요."); - $('#opPhone').focus(); - return false; - } - if(!$("#opRank").val()){ - alert("등급을 입력해주세요."); - $('#opRank').focus(); - return false; - } - if(confirm("저장하시겠습니까?")){ - saveOperationPlan('DST002'); - } + if(!$("#opSdate").val()){ + alert("운용시작일을 입력해주세요."); + $('#opSdate').focus(); + return false; + } + if(!$("#opName").val()){ + alert("성명을 입력해주세요."); + $('#opName').focus(); + return false; + } + if(!$("#opBirth").val()){ + alert("생년월일을 입력해주세요."); + $('#opBirth').focus(); + return false; + } + if(!$("#opPosition").val()){ + alert("근무처를 입력해주세요."); + $('#opPosition').focus(); + return false; + } + if(!$("#opPhone").val()){ + alert("연락처를 입력해주세요."); + $('#opPhone').focus(); + return false; + } + if(!$("#opRank").val()){ + alert("등급을 입력해주세요."); + $('#opRank').focus(); + return false; + } + if(confirm("저장하시겠습니까?")){ + saveOperationPlan('DST002'); + } }) $(document).on('click', '#saveTempBtn', function (){ - if(confirm("임시저장 하시겠습니까?")){ - saveOperationPlan('DST001'); - } + if(confirm("임시저장 하시겠습니까?")){ + saveOperationPlan('DST001'); + } }) function saveOperationPlan(opState){ - contentFade("in"); - const formData = new FormData($("#operationPlanEditForm")[0]); - for(const file of files) { - if(!file.isDelete) - formData.append('uploadFiles', file, file.name); - } - $(".text-decoration-line-through").each(function (idx, el){ - formData.append('fileSeq', $(el).attr("data-fileseq")); - }) - formData.append('opState', opState); - $.ajax({ - type : 'POST', - data : formData, - url : "/intelligenceNetwork/saveOperationPlan", - processData: false, - contentType: false, - success : function(result) { - alert("저장되었습니다."); - contentFade("out"); - location.reload(); - }, - error : function(xhr, status) { - alert("저장에 실패하였습니다.") - contentFade("out"); - } - }) + contentFade("in"); + const formData = new FormData($("#operationPlanEditForm")[0]); + for(const file of files) { + if(!file.isDelete) + formData.append('uploadFiles', file, file.name); + } + $(".text-decoration-line-through").each(function (idx, el){ + formData.append('fileSeq', $(el).attr("data-fileseq")); + }) + formData.append('opState', opState); + $.ajax({ + type : 'POST', + data : formData, + url : "/intelligenceNetwork/saveOperationPlan", + processData: false, + contentType: false, + success : function(result) { + alert("저장되었습니다."); + contentFade("out"); + location.reload(); + }, + error : function(xhr, status) { + alert("저장에 실패하였습니다.") + contentFade("out"); + } + }) } $(document).on('click', '.operationPlanTr', function (){ - getOperationPlanViewModal(Number($(this).find(".opKey").val())); + getOperationPlanViewModal(Number($(this).find(".opKey").val())); }) function getOperationPlanViewModal(opKey){ diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html index a4b7f29c..114319cc 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html @@ -100,10 +100,10 @@
- +
- +
- +
- +
-
- +
- +
-
-
- -
- + +
+ +
+
+ + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+ + +
+ +
+ +
+ +
+ +
+ +
+ +
+
+ + +
+ +
+ +
+ +
+ +
+
+ + +
+ +
+ +
+ +
+ +
+ +
+ +
+
+ + +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+
+ + +
+ +
+ +
+ +
+ +
+ +
+ +
+
+ + +
+ +
+ +
+ +
+ +
+ +
+ +
+
+ + +
- +
- +
- +
- +
- +
+ + +
-
- -
-
+ +
+
@@ -248,6 +367,23 @@
+ +
+ +
+
@@ -298,37 +434,19 @@
-
- +
- +
- -
- -
-
-
- -
+ +
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html index 09906647..aea90f40 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html @@ -38,21 +38,21 @@ - +
- +
- +
@@ -181,7 +181,7 @@
- +
@@ -317,6 +317,5 @@ -
\ No newline at end of file diff --git a/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanList.html b/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanList.html index 08b48607..36983e6a 100644 --- a/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanList.html +++ b/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanList.html @@ -22,13 +22,13 @@
@@ -105,19 +105,17 @@ + - 운영중 - - - +