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

# Conflicts:
#	src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/mapper/InternationalCrimeArrestMapper.java
#	src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java

src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/CrackdownStatusController.java

@@ -0,0 +1,72 @@
+package com.dbnt.faisp.faStatistics.crackdownStatus;
+
+import com.dbnt.faisp.authMgt.service.AuthMgtService;
+import com.dbnt.faisp.faStatistics.crackdownStatus.model.CrackdownStatus;
+import com.dbnt.faisp.faStatistics.crackdownStatus.model.FishingBoat;
+import com.dbnt.faisp.faStatistics.crackdownStatus.model.ProcessResult;
+import com.dbnt.faisp.faStatistics.crackdownStatus.service.CrackdownStatusService;
+import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest;
+import com.dbnt.faisp.userInfo.model.UserInfo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/faStatistics")
+public class CrackdownStatusController {
+
+    private final AuthMgtService authMgtService;
+    private final CrackdownStatusService crackdownStatusService;
+
+    @RequestMapping("/crackdownStatus")
+    public ModelAndView crackdownStatus(@AuthenticationPrincipal UserInfo loginUser, CrackdownStatus crackdownStatus) {
+        ModelAndView mav = new ModelAndView("faStatistics/crackdownStatus/crackdownStatus");
+
+        //메뉴권한 확인
+        String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faStatistics/crackdownStatus").get(0).getAccessAuth();
+
+        mav.addObject("accessAuth", accessAuth);
+
+        crackdownStatus.setQueryInfo();
+        List<CrackdownStatus> crackdownStatusList = crackdownStatusService.selectCrackdownStatusList(crackdownStatus);
+
+        mav.addObject("crackdownStatusList", crackdownStatusList);
+        crackdownStatus.setContentCnt(crackdownStatusService.selectCrackdownStatusListCnt(crackdownStatus));
+        crackdownStatus.setPaginationInfo();
+        mav.addObject("searchParams", crackdownStatus);
+        return mav;
+    }
+
+    @GetMapping("/crackdownStatus/crackdownStatusEditModal")
+    public ModelAndView crackdownStatusEditModal(@AuthenticationPrincipal UserInfo loginUser, CrackdownStatus crackdownStatus){
+        ModelAndView mav = new ModelAndView("faStatistics/crackdownStatus/crackdownStatusEditModal");
+        if(crackdownStatus.getCdsKey()!=null){
+            crackdownStatus = crackdownStatusService.selectCrackdownStatus(crackdownStatus.getCdsKey());
+        }else{
+            crackdownStatus.setWrtOrgan(loginUser.getOgCd());
+            crackdownStatus.setWrtNm(loginUser.getUserNm());
+            crackdownStatus.setWrtDt(LocalDateTime.now());
+        }
+        mav.addObject("crackdownStatus", crackdownStatus);
+        return mav;
+    }
+
+    @PostMapping("/crackdownStatus/saveCrackdownStatus")
+    public Integer saveCrackdownStatus(@AuthenticationPrincipal UserInfo loginUser,
+                                       CrackdownStatus crackdownStatus,
+                                       FishingBoat fishingBoat,
+                                       ProcessResult processResult){
+        crackdownStatus.setWrtUserSeq(loginUser.getUserSeq());
+        crackdownStatus.setFishingBoat(fishingBoat);
+        crackdownStatus.setProcessResult(processResult);
+        return crackdownStatusService.saveCrackdownStatus(crackdownStatus);
+    }
+}

src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/mapper/CrackdownStatusMapper.java

@@ -0,0 +1,14 @@
+package com.dbnt.faisp.faStatistics.crackdownStatus.mapper;
+
+import com.dbnt.faisp.faStatistics.crackdownStatus.model.CrackdownStatus;
+import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest;
+import com.dbnt.faisp.util.ParamMap;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface CrackdownStatusMapper {
+    List<CrackdownStatus> selectCrackdownStatusList(CrackdownStatus crackdownStatus);
+    Integer selectCrackdownStatusListCnt(CrackdownStatus crackdownStatus);
+}

src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/CaptinPhotoFile.java

@@ -0,0 +1,53 @@
+package com.dbnt.faisp.faStatistics.crackdownStatus.model;
+
+import com.dbnt.faisp.config.FileInfo;
+import lombok.*;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Getter
+@Setter
+@Entity
+@NoArgsConstructor
+@DynamicInsert
+@DynamicUpdate
+@IdClass(CaptinPhotoFile.CaptinPhotoFileId.class)
+@Table(name = "captin_photo_file")
+public class CaptinPhotoFile extends FileInfo {
+    @Id
+    @Column(name = "sailor_key")
+    private Integer sailorKey;
+
+    @Id
+    @Column(name = "file_seq")
+    private Integer fileSeq;
+
+    @Column(name = "orig_nm")
+    private String origNm;
+
+    @Column(name = "conv_nm")
+    private String convNm;
+
+    @Column(name = "file_extn")
+    private String fileExtn;
+
+    @Column(name = "file_size")
+    private String fileSize;
+
+    @Column(name = "save_path")
+    private String savePath;
+
+
+    @Embeddable
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class CaptinPhotoFileId implements Serializable {
+        private Integer sailorKey;
+        private Integer fileSeq;
+    }
+
+}

src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/CrackdownStatus.java

@@ -0,0 +1,140 @@
+package com.dbnt.faisp.faStatistics.crackdownStatus.model;
+
+import com.dbnt.faisp.config.BaseModel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+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 = "crackdown_status")
+public class CrackdownStatus extends BaseModel {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "cds_key")
+    private Integer cdsKey;
+
+    @Column(name = "case_num")
+    private String caseNum;
+
+    @Column(name = "napo_dt")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    private LocalDateTime napoDt;
+
+    @Column(name = "napo_sea_point_lon")
+    private String napoSeaPointLon;
+
+    @Column(name = "napo_sea_point_lat")
+    private String napoSeaPointLat;
+
+    @Column(name = "napo_sea_point_detail")
+    private String napoSeaPointDetail;
+
+    @Column(name = "invasion_type")
+    private String invasionType;
+
+    @Column(name = "nll")
+    private String nll;
+
+    @Column(name = "case_agency")
+    private String caseAgency;
+
+    @Column(name = "case_police_officer")
+    private String casePoliceOfficer;
+
+    @Column(name = "crackdown_boat")
+    private String crackdownBoat;
+
+    @Column(name = "crackdown_police")
+    private String crackdownPolice;
+
+    @Column(name = "mmsi")
+    private String mmsi;
+
+    @Column(name = "field_ivsgt")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    private LocalDateTime fieldIvsgt;
+
+    @Column(name = "obstr_exspd_cnt")
+    private Integer obstrExspdCnt;
+
+    @Column(name = "person_damage_cnt")
+    private Integer personDamageCnt;
+
+    @Column(name = "person_damage_amount")
+    private Integer personDamageAmount;
+
+    @Column(name = "person_damage_detail")
+    private String personDamageDetail;
+
+    @Column(name = "material_damage_cnt")
+    private Integer materialDamageCnt;
+
+    @Column(name = "material_damage_amount")
+    private Integer materialDamageAmount;
+
+    @Column(name = "material_damage_detail")
+    private String materialDamageDetail;
+
+    @Column(name = "field_ivsgt_napo_dt")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    private LocalDateTime fieldIvsgtNapoDt;
+
+    @Column(name = "field_ivsgt_release_dt")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    private LocalDateTime fieldIvsgtReleaseDt;
+
+    @Column(name = "field_ivsgt_time_taken")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    private LocalDateTime fieldIvsgtTimeTaken;
+
+    @Column(name = "pressurized_start_dt")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    private LocalDateTime pressurizedStartDt;
+
+    @Column(name = "pressurized_end_dt")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    private LocalDateTime pressurizedEndDt;
+
+    @Column(name = "distance")
+    private String distance;
+
+    @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;
+
+    @Transient
+    private List<Violation> violationList;
+    @Transient
+    private FishingBoat fishingBoat;
+    @Transient
+    private ProcessResult processResult;
+    @Transient
+    private List<Sailor> sailorList;
+
+    @Transient
+    private String crackdownPoliceEtc;
+    @Transient
+    private String crackdownBoatEtc;
+}

src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/FishingBoat.java

@@ -0,0 +1,134 @@
+package com.dbnt.faisp.faStatistics.crackdownStatus.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.LocalDateTime;
+
+@Getter
+@Setter
+@Entity
+@NoArgsConstructor
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "fishing_boat")
+@IdClass(FishingBoat.FishingBoatId.class)
+public class FishingBoat extends BaseModel {
+
+    @Id
+    @Column(name = "fb_key")
+    private Integer fbKey;
+
+    @Id
+    @Column(name = "cds_key")
+    private Integer cdsKey;
+
+    @Column(name = "boat_name_kr")
+    private String boatNameKr;
+
+    @Column(name = "boat_name_cn")
+    private String boatNameCn;
+
+    @Column(name = "permit_num")
+    private String permitNum;
+
+    @Column(name = "nationality")
+    private String nationality;
+
+    @Column(name = "ton_cnt")
+    private Integer tonCnt;
+
+    @Column(name = "fishery_type")
+    private String fisheryType;
+
+    @Column(name = "boat_material")
+    private String boatMaterial;
+
+    @Column(name = "boat_nny_sung")
+    private String boatNnySung;
+
+    @Column(name = "boat_nny_si")
+    private String boatNnySi;
+
+    @Column(name = "offense_type")
+    private String offenseType;
+
+    @Column(name = "offense_quantity")
+    private Integer offenseQuantity;
+
+    @Column(name = "offense_amount")
+    private Integer offenseAmount;
+
+    @Column(name = "offense_illegal_waste_quantity")
+    private Integer offenseIllegalWasteQuantity;
+
+    @Column(name = "dambo_unpaid_amount")
+    private Integer damboUnpaidAmount;
+
+    @Column(name = "dambo_payment")
+    private Integer damboPayment;
+
+    @Column(name = "payment_payment_dt")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    private LocalDateTime paymentPaymentDt;
+
+    @Column(name = "confiscation_frame")
+    private String confiscationFrame;
+
+    @Column(name = "confiscation_width")
+    private String confiscationWidth;
+
+    @Column(name = "confiscation_jo")
+    private String confiscationJo;
+
+    @Column(name = "confiscation_gae")
+    private String confiscationGae;
+
+    @Column(name = "confiscation_etc")
+    private String confiscationEtc;
+
+    @Column(name = "catch_fish_species")
+    private String catchFishSpecies;
+
+    @Column(name = "catch_cnt")
+    private Integer catchCnt;
+
+    @Column(name = "offense_fish_species")
+    private String offenseFishSpecies;
+
+    @Column(name = "offense_catch_cnt")
+    private Integer offenseCatchCnt;
+
+    @Column(name = "save_yn")
+    private String saveYn;
+
+    @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;
+
+    @Transient
+    private String boatMaterialEtc;
+
+    @Embeddable
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class FishingBoatId implements Serializable {
+        private Integer fbKey;
+        private Integer cdsKey;
+    }
+}

src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/ProcessResult.java

@@ -0,0 +1,143 @@
+package com.dbnt.faisp.faStatistics.crackdownStatus.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.LocalDateTime;
+
+@Getter
+@Setter
+@Entity
+@NoArgsConstructor
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "process_result")
+@IdClass(ProcessResult.ProcessResultId.class)
+public class ProcessResult extends BaseModel {
+
+    @Id
+    @Column(name = "pr_key")
+    private Integer prKey;
+
+    @Id
+    @Column(name = "cds_key")
+    private Integer cdsKey;
+
+    @Column(name = "process_status")
+    private String processStatus;
+
+    @Column(name = "pressurized_time_taken")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    private LocalDateTime pressurizedTimeTaken;
+
+    @Column(name = "warrant_req_take_time")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    private LocalDateTime warrantReqTakeTime;
+
+    @Column(name = "is_ivsgt_stop")
+    private String isIvsgtStop;
+
+    @Column(name = "eviction_dt")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    private String evictionDt;
+
+    @Column(name = "direct_handover_dt")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    private LocalDateTime directHandoverDt;
+
+    @Column(name = "handover_sea_point_lon")
+    private String handoverSeaPointLon;
+
+    @Column(name = "handover_sea_point_lat")
+    private String handoverSeaPointLat;
+
+    @Column(name = "handover_sea_point_detail")
+    private String handoverSeaPointDetail;
+
+    @Column(name = "handover_boat")
+    private String handoverBoat;
+
+    @Column(name = "middle_takeover_boat")
+    private String middleTakeoverBoat;
+
+    @Column(name = "consignment_start_dt")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    private LocalDateTime consignmentStartDt;
+
+    @Column(name = "consignment_end_dt")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    private LocalDateTime consignmentEndDt;
+
+    @Column(name = "confiscation_dt")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    private LocalDateTime confiscationDt;
+
+    @Column(name = "boat_disposal_dt")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    private LocalDateTime boatDisposalDt;
+
+    @Column(name = "boat_disposal_type")
+    private String boatDisposalType;
+
+    @Column(name = "return_dt")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    private LocalDateTime returnDt;
+
+    @Column(name = "exile_cnt")
+    private Integer exileCnt;
+
+    @Column(name = "exile_dt")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    private LocalDateTime exileDt;
+
+    @Column(name = "flight")
+    private String flight;
+
+    @Column(name = "immigration_office_name")
+    private String immigrationOfficeName;
+
+    @Column(name = "immigration_office_officer_name")
+    private String immigrationOfficeOfficerName;
+
+    @Column(name = "immigration_office_officer_contact")
+    private String immigrationOfficeOfficerContact;
+
+    @Column(name = "sentencing_court")
+    private String sentencingCourt;
+
+    @Column(name = "sentencing_detail")
+    private String sentencingDetail;
+
+    @Column(name = "execution_detail")
+    private String executionDetail;
+
+    @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;
+
+    @Transient
+    private String processStatusEtc;
+
+    @Embeddable
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class ProcessResultId implements Serializable {
+        private Integer prKey;
+        private Integer cdsKey;
+    }
+}

src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/Sailor.java

@@ -0,0 +1,100 @@
+package com.dbnt.faisp.faStatistics.crackdownStatus.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.LocalDateTime;
+
+@Getter
+@Setter
+@Entity
+@NoArgsConstructor
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "sailor")
+@IdClass(Sailor.SailorId.class)
+public class Sailor extends BaseModel {
+
+    @Id
+    @Column(name = "sailor_key")
+    private Integer sailorKey;
+
+    @Id
+    @Column(name = "fb_key")
+    private Integer fbKey;
+
+    @Column(name = "sailor_name_kr")
+    private String sailorNameKr;
+
+    @Column(name = "sailor_name_cn")
+    private String sailorNameCn;
+
+    @Column(name = "sailor_name_pinyin")
+    private String sailorNamePinyin;
+
+    @Column(name = "sailor_contact")
+    private String sailorContact;
+
+    @Column(name = "birthdate")
+    private String birthdate;
+
+    @Column(name = "residence")
+    private String residence;
+
+    @Column(name = "education")
+    private String education;
+
+    @Column(name = "position")
+    private String position;
+
+    @Column(name = "career")
+    private String career;
+
+    @Column(name = "similar_criminal_history")
+    private Integer similarCriminalHistory;
+
+    @Column(name = "heterogeneous_criminal_history")
+    private Integer heterogeneousCriminalHistory;
+
+    @Column(name = "arrest_history")
+    private Integer arrestHistory;
+
+    @Column(name = "criminal_history_detail")
+    private String criminalHistoryDetail;
+
+    @Column(name = "monthly_wages")
+    private String monthlyWages;
+
+    @Column(name = "is_restriction")
+    private String isRestriction;
+
+    @Column(name = "note")
+    private String note;
+
+    @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;
+
+    @Embeddable
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class SailorId implements Serializable {
+        private Integer sailorKey;
+        private Integer fbKey;
+    }
+}

src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/Violation.java

@@ -0,0 +1,31 @@
+package com.dbnt.faisp.faStatistics.crackdownStatus.model;
+
+import com.dbnt.faisp.config.BaseModel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+@Getter
+@Setter
+@Entity
+@NoArgsConstructor
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "violation")
+public class Violation extends BaseModel {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "violation_key")
+    private Integer violationKey;
+    @Column(name = "fb_key")
+    private Integer fbKey;
+    @Column(name = "violation")
+    private String violation;
+
+    @Transient
+    private String violationEtc;
+}

src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/CaptionPhotoFileRepository.java

@@ -0,0 +1,8 @@
+package com.dbnt.faisp.faStatistics.crackdownStatus.repository;
+
+import com.dbnt.faisp.faStatistics.crackdownStatus.model.CaptinPhotoFile;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface CaptionPhotoFileRepository extends JpaRepository<CaptinPhotoFile, CaptinPhotoFile.CaptinPhotoFileId> {
+
+}

src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/CrackdownStatusRepository.java

@@ -0,0 +1,8 @@
+package com.dbnt.faisp.faStatistics.crackdownStatus.repository;
+
+import com.dbnt.faisp.faStatistics.crackdownStatus.model.CrackdownStatus;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface CrackdownStatusRepository extends JpaRepository<CrackdownStatus, Integer> {
+
+}

src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/FishingBoatRepository.java

@@ -0,0 +1,8 @@
+package com.dbnt.faisp.faStatistics.crackdownStatus.repository;
+
+import com.dbnt.faisp.faStatistics.crackdownStatus.model.FishingBoat;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface FishingBoatRepository extends JpaRepository<FishingBoat, FishingBoat.FishingBoatId> {
+
+}

src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/ProcessResultRepository.java

@@ -0,0 +1,8 @@
+package com.dbnt.faisp.faStatistics.crackdownStatus.repository;
+
+import com.dbnt.faisp.faStatistics.crackdownStatus.model.ProcessResult;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface ProcessResultRepository extends JpaRepository<ProcessResult, ProcessResult.ProcessResultId> {
+
+}

src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/SailorRepository.java

@@ -0,0 +1,8 @@
+package com.dbnt.faisp.faStatistics.crackdownStatus.repository;
+
+import com.dbnt.faisp.faStatistics.crackdownStatus.model.Sailor;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface SailorRepository extends JpaRepository<Sailor, Sailor.SailorId> {
+
+}

src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/ViolationRepository.java

@@ -0,0 +1,8 @@
+package com.dbnt.faisp.faStatistics.crackdownStatus.repository;
+
+import com.dbnt.faisp.faStatistics.crackdownStatus.model.Violation;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface ViolationRepository extends JpaRepository<Violation, Integer> {
+
+}

src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/service/CrackdownStatusService.java

@@ -0,0 +1,97 @@
+package com.dbnt.faisp.faStatistics.crackdownStatus.service;
+
+
+import com.dbnt.faisp.config.BaseService;
+import com.dbnt.faisp.faStatistics.crackdownStatus.mapper.CrackdownStatusMapper;
+import com.dbnt.faisp.faStatistics.crackdownStatus.model.CrackdownStatus;
+import com.dbnt.faisp.faStatistics.crackdownStatus.model.ProcessResult;
+import com.dbnt.faisp.faStatistics.crackdownStatus.model.Sailor;
+import com.dbnt.faisp.faStatistics.crackdownStatus.model.Violation;
+import com.dbnt.faisp.faStatistics.crackdownStatus.repository.*;
+import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest;
+import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.SuspectPersonInfo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class CrackdownStatusService extends BaseService {
+
+    private final CrackdownStatusMapper crackdownStatusMapper;
+    private final CrackdownStatusRepository crackdownStatusRepository;
+    private final FishingBoatRepository fishingBoatRepository;
+    private final ViolationRepository violationRepository;
+    private final ProcessResultRepository processResultRepository;
+    private final SailorRepository sailorRepository;
+
+    public List<CrackdownStatus> selectCrackdownStatusList(CrackdownStatus crackdownStatus) {
+        return crackdownStatusMapper.selectCrackdownStatusList(crackdownStatus);
+    };
+
+    public Integer selectCrackdownStatusListCnt(CrackdownStatus crackdownStatus) {
+        return crackdownStatusMapper.selectCrackdownStatusListCnt(crackdownStatus);
+    }
+
+    public CrackdownStatus selectCrackdownStatus(Integer cdsKey) {
+        CrackdownStatus savedCrackdownStatus = crackdownStatusRepository.findById(cdsKey).orElse(null);
+        if (savedCrackdownStatus != null) {
+
+        }
+        return savedCrackdownStatus;
+    }
+
+    @Transactional
+    public Integer saveCrackdownStatus(CrackdownStatus crackdownStatus) {
+        if (crackdownStatus.getCrackdownBoatEtc() != null) {
+            crackdownStatus.setCrackdownBoat(crackdownStatus.getCrackdownBoatEtc());
+        }
+        if (crackdownStatus.getCrackdownPoliceEtc() != null) {
+            crackdownStatus.setCrackdownPolice(crackdownStatus.getCrackdownPoliceEtc());
+        }
+
+        Integer cdsKey = crackdownStatusRepository.save(crackdownStatus).getCdsKey();
+        if (crackdownStatus.getFishingBoat() != null) {
+            if (crackdownStatus.getFishingBoat().getBoatMaterialEtc() != null) {
+                crackdownStatus.getFishingBoat().setBoatMaterial(crackdownStatus.getFishingBoat().getBoatMaterialEtc());
+            }
+            crackdownStatus.getFishingBoat().setCdsKey(cdsKey);
+            Integer fbKey = fishingBoatRepository.save(crackdownStatus.getFishingBoat()).getFbKey();
+            crackdownStatus.getFishingBoat().setFbKey(fbKey);
+        }
+
+        if (crackdownStatus.getProcessResult() != null) {
+            if (crackdownStatus.getProcessResult().getProcessStatusEtc() != null) {
+                crackdownStatus.getProcessResult().setProcessStatus(crackdownStatus.getProcessResult().getProcessStatusEtc());
+            }
+            crackdownStatus.getProcessResult().setCdsKey(cdsKey);
+            Integer prKey = processResultRepository.save(crackdownStatus.getProcessResult()).getPrKey();
+            crackdownStatus.getProcessResult().setPrKey(prKey);
+        }
+
+        /*if (internationalCrimeArrest.getDeleteSpiKeyList() != null) {
+            suspectPersonInfoRepository.deleteAllByIdInQuery(internationalCrimeArrest.getDeleteSpiKeyList());
+        }*/
+
+        if (crackdownStatus.getViolationList() != null) {
+            for(Violation violation: crackdownStatus.getViolationList()){
+                if (violation.getViolationEtc() != null) {
+                    violation.setViolation(violation.getViolationEtc());
+                }
+                violation.setFbKey(crackdownStatus.getFishingBoat().getFbKey());
+            }
+            violationRepository.saveAll(crackdownStatus.getViolationList());
+        }
+
+        if (crackdownStatus.getSailorList() != null) {
+            for(Sailor sailor: crackdownStatus.getSailorList()){
+                sailor.setFbKey(crackdownStatus.getFishingBoat().getFbKey());
+            }
+            sailorRepository.saveAll(crackdownStatus.getSailorList());
+        }
+
+        return cdsKey;
+    }
+}

src/main/java/com/dbnt/faisp/fipTarget/model/ShipInfo.java

@@ -0,0 +1,130 @@
+package com.dbnt.faisp.fipTarget.model;
+
+import com.dbnt.faisp.config.BaseModel;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.persistence.*;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+
+@Getter
+@Setter
+@Entity
+@NoArgsConstructor
+@DynamicInsert
+@DynamicUpdate
+@IdClass(ShipInfo.ShipInfoId.class)
+@Table(name = "ship_info")
+public class ShipInfo extends BaseModel implements Serializable{
+  @Id
+  @Column(name = "si_seq")
+  private Integer siSeq;
+  @Id
+  @Column(name = "si_type")
+  private String siType;
+  @Id
+  @Column(name = "version_no")
+  private Integer versionNo;
+  @Column(name = "start_point")
+  private String startPoint;
+  @Column(name = "end_point")
+  private Integer endPoint;
+  @Column(name = "distance_nm")
+  private String distanceNm;
+  @Column(name = "distance_km")
+  private String distanceKm;
+  @Column(name = "owner_nm")
+  private String ownerNm;
+  @Column(name = "ship_nm")
+  private String shipNm;
+  @Column(name = "operation_cnt")
+  private String operationCnt;
+  @Column(name = "ship_weight")
+  private Integer shipWeight;
+  @Column(name = "passenger_cnt")
+  private Integer passengerCnt;
+  @Column(name = "freight_cnt")
+  private Integer freightCnt;
+  @Column(name = "close_yn")
+  private String closeYn;
+  @Column(name = "description")
+  private String description;
+  @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_title")
+  private String wrtTitle;
+  @Column(name = "wrt_nm")
+  private String wrtNm;
+  @Column(name = "wrt_dt")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+  private LocalDateTime wrtDt;
+ 
+  @Transient
+  private String excel;
+
+
+@Override
+public String toString() {
+	return "ShipInfo [siSeq=" + siSeq + ", siType=" + siType + ", versionNo=" + versionNo + ", startPoint=" + startPoint
+			+ ", endPoint=" + endPoint + ", distanceNm=" + distanceNm + ", distanceKm=" + distanceKm + ", ownerNm="
+			+ ownerNm + ", shipNm=" + shipNm + ", operationCnt=" + operationCnt + ", shipWeight=" + shipWeight
+			+ ", passengerCnt=" + passengerCnt + ", freightCnt=" + freightCnt + ", description=" + description
+			+ ", wrtOrgan=" + wrtOrgan + ", wrtPart=" + wrtPart + ", wrtUserSeq=" + wrtUserSeq + ", wrtTitle="
+			+ wrtTitle + ", wrtNm=" + wrtNm + ", wrtDt=" + wrtDt + ", excel=" + excel + "]";
+}
+
+
+
+
+@Embeddable
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public static class ShipInfoId implements Serializable { 	
+  private Integer siSeq;
+  private String siType;
+  private Integer versionNo;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/mapper/InternationalCrimeArrestMapper.java

@@ -1,6 +1,8 @@
 package com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.mapper;
 
+
 import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest;
+
 import com.dbnt.faisp.util.ParamMap;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -11,6 +13,5 @@ public interface InternationalCrimeArrestMapper{
     List<InternationalCrimeArrest> selectInternationalCrimeArrestList(InternationalCrimeArrest internationalCrimeArrest);
     Integer selectInternationalCrimeArrestListCnt(InternationalCrimeArrest internationalCrimeArrest);
     List<ParamMap> selectInternationalCrimeArrestParamList(InternationalCrimeArrest internationalCrimeArrest);
-    List<ParamMap> selectSuspectPersonInfoParamList(int icaKey);
     Integer icaDuplicateCount(InternationalCrimeArrest internationalCrimeArrest);
 }

src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java

@@ -1,6 +1,7 @@
 package com.dbnt.faisp.main.fipTarget;
 
 
+import com.dbnt.faisp.fipTarget.model.ShipInfo;
 import com.dbnt.faisp.main.authMgt.service.AuthMgtService;
 import com.dbnt.faisp.main.fipTarget.model.PartInfo;
 import com.dbnt.faisp.main.fipTarget.model.PartInfoFile;
@@ -12,6 +13,7 @@ import com.dbnt.faisp.main.fipTarget.service.FipTargetService;
 import com.dbnt.faisp.main.organMgt.service.OrganConfigService;
 import com.dbnt.faisp.main.userInfo.model.UserInfo;
 import com.dbnt.faisp.main.userInfo.service.UserInfoService;
+
 import com.dbnt.faisp.util.ParamMap;
 import com.dbnt.faisp.util.Utils;
 
@@ -466,8 +468,33 @@ public class FipTargetController {
   public void deleteVulnerable(@RequestBody Vulnerable vulnerable) {
 	  fipTargetService.deleteVulnerable(vulnerable);
   }
-//외사취약지 끝 
+  //외사취약지 끝 
+  //국제여객선 시작
+  @GetMapping("/ipShipList")
+  public ModelAndView ipShipList(@AuthenticationPrincipal UserInfo loginUser, ShipInfo shipInfo, HttpServletResponse response) {
+    ModelAndView mav = new ModelAndView("fipTarget/ipShipList");
+    shipInfo.setDownOrganCdList(loginUser.getDownOrganCdList());
+    //메뉴권한 확인
+    String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/target/ipShipList?siType="+shipInfo.getSiType()).get(0).getAccessAuth();
+    mav.addObject("accessAuth", accessAuth);
+    shipInfo.setQueryInfo();
+    
+    shipInfo.setPaginationInfo();  
+    mav.addObject("uesrId", loginUser.getUserId());
+    mav.addObject("searchParams", shipInfo);
+    return mav;
+  }
   
+  @GetMapping("/ipShipEditModal")
+  public ModelAndView ipShipEditModal(@AuthenticationPrincipal UserInfo loginUser,ShipInfo shipInfo) {
+    ModelAndView mav = new ModelAndView("fipTarget/ipShipEditModal");
+  //메뉴권한 확인
+    String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/target/partWorkList").get(0).getAccessAuth();
+    mav.addObject("accessAuth", accessAuth);
+
+   
+    return mav;
+  }
   
  
   

src/main/java/com/dbnt/faisp/main/fpiMgt/affair/AffairController.java

@@ -258,10 +258,18 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관
 	    totalList.add(total);
     }
     mav.addObject("totalList", totalList);
-    type1List = addTotalRow(typeStatistics.getCategory1(), type1List);
+    if(typeStatistics.getCategory1() != null) {
-    type2List = addTotalRow(typeStatistics.getCategory2(), type2List);
+    	type1List = addTotalRow(typeStatistics.getCategory1(), type1List);
-    type3List = addTotalRow(typeStatistics.getCategory3(), type3List);
+    }
-    type4List = addTotalRow(typeStatistics.getCategory4(), type4List);
+	if(typeStatistics.getCategory2() != null) {
+		type2List = addTotalRow(typeStatistics.getCategory2(), type2List);
+	}
+	if(typeStatistics.getCategory3() != null) {
+		type3List = addTotalRow(typeStatistics.getCategory3(), type3List);
+	}
+	if(typeStatistics.getCategory4() != null) {
+		type4List = addTotalRow(typeStatistics.getCategory4(), type4List);
+	}
     mav.addObject("type1List", type1List);
     mav.addObject("type2List", type2List);
     mav.addObject("type3List", type3List);
@@ -286,8 +294,12 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관
 	    }
 	    totalList.add(total);
     }
-    sangboCntList = addTotalRow(typeStatistics.getSangbo(), sangboCntList);
+    if(typeStatistics.getSangbo() != null) {
-    arrCntList = addTotalRow(typeStatistics.getRating(), arrCntList);
+    	sangboCntList = addTotalRow(typeStatistics.getSangbo(), sangboCntList);
+    }
+    if(typeStatistics.getRating() != null) {
+    	arrCntList = addTotalRow(typeStatistics.getRating(), arrCntList);
+    }
     mav.addObject("totalList", totalList);
     mav.addObject("sangboList", sangboCntList);
     mav.addObject("arrCntList", arrCntList);

src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/service/BoardInvestigationService.java

@@ -89,7 +89,7 @@ public class BoardInvestigationService extends BaseService {
     int fileSeq = lastFileInfo==null?1:(lastFileInfo.getFileSeq()+1);
     for(MultipartFile file : multipartFileList){
       String saveName = UUID.randomUUID().toString();
-      String path = locationPath+ File.separator+"monthPlan"+File.separator;
+      String path = locationPath+ File.separator+"ivsgt"+File.separator;
       saveFile(file, new File(path+File.separator+saveName));
 
       String originalFilename = file.getOriginalFilename();

src/main/resources/mybatisMapper/AffairMapper.xml

@@ -126,21 +126,21 @@
         and wrt_dt <= #{endDate}::date+1
       </if>
       <if test='rating != null and rating != "" or sangbo != null and sangbo != ""'>
-		and affair_key in (
+		and ab.affair_key in (
 			select affair_key
-			from affair_rating aa
+			from affair_rating ar2
-				inner join organ_config ab 
+				inner join organ_config oc2 
-					on aa.rating_organ = ab.organ_cd
+					on ar2.rating_organ = oc2.organ_cd
 				<where>
 				<if test='rating != null and rating != ""'>
-				and aa.affair_rate in
+				and ar2.affair_rate in
 				<foreach collection="rating" item="item" index="index" separator="," open="(" close=")">
 		        #{item}
 		        </foreach>
 				</if>
 				<if test='sangbo != null and sangbo != ""'>
-				and aa.organ_up = 'T'
+				and ar2.organ_up = 'T'
-				and ab.organ_type in
+				and oc2.organ_type in
 				<foreach collection="sangbo" item="item" index="index" separator="," open="(" close=")">
 		        #{item}
 		        </foreach>
@@ -230,40 +230,42 @@
 		order by item_cd asc) a left outer join
 		(select wrt_organ,
 		   count(*) as cnt
-		from affair_board
+		from affair_board ab,
-		<trim prefix="WHERE" prefixOverrides="AND |OR ">
+	     	 affair_rating ar
-			<if test='userNm != null and userNm != ""'>
+	    where ab.affair_key = ar.affair_key
-        		and wrt_user_nm like '%'||#{userNm}||'%'
+		and (ar.organ_up != 'T' or ar.organ_up is null)
-      		</if>
+		  <if test='userNm != null and userNm != ""'>
-			<if test='startDate != null and startDate != ""'>
+	        and wrt_user_nm like '%'||#{userNm}||'%'
-	          and wrt_dt >= #{startDate}::date
+	      </if>
-		    </if>
+	  	  <if test='startDate != null and startDate != ""'>
-		    <if test='endDate != null and endDate != ""'>
+	        and wrt_dt >= #{startDate}::date
-		      and wrt_dt &lt;= #{endDate}::date+1
+	      </if>
-		    </if>
+	      <if test='endDate != null and endDate != ""'>
-			<if test='rating != null and rating != "" or sangbo != null and sangbo != ""'>
+	        and wrt_dt &lt;= #{endDate}::date+1
-			and affair_key in (
+	      </if>
-			select affair_key
+	      <if test='rating != null and rating != "" or sangbo != null and sangbo != ""'>
-			from affair_rating aa
+			and ab.affair_key in (
-				inner join organ_config ab 
+				select affair_key
-					on aa.rating_organ = ab.organ_cd
+				from affair_rating ar2
-				<where>
+					inner join organ_config oc2 
-				<if test='rating != null and rating != ""'>
+						on ar2.rating_organ = oc2.organ_cd
-				and aa.affair_rate in
+					<where>
-				<foreach collection="rating" item="item" index="index" separator="," open="(" close=")">
+					<if test='rating != null and rating != ""'>
-		        #{item}
+					and ar2.affair_rate in
-		        </foreach>
+					<foreach collection="rating" item="item" index="index" separator="," open="(" close=")">
-				</if>
+			        #{item}
-				<if test='sangbo != null and sangbo != ""'>
+			        </foreach>
-				and aa.organ_up = 'T'
+					</if>
-				and ab.organ_type in
+					<if test='sangbo != null and sangbo != ""'>
-				<foreach collection="sangbo" item="item" index="index" separator="," open="(" close=")">
+					and ar2.organ_up = 'T'
-		        #{item}
+					and oc2.organ_type in
-		        </foreach>
+					<foreach collection="sangbo" item="item" index="index" separator="," open="(" close=")">
-				</if>
+			        #{item}
-				</where>
+			        </foreach>
-		)
+					</if>
-		</if>
+					</where>
+			)
+			</if>
 		<if test='category1 != null and category1 != ""'>
 			and affair_type1 in
 			<foreach collection="category1" item="item" index="index" separator="," open="(" close=")">
@@ -288,7 +290,6 @@
 	        #{item}
 	        </foreach>
 		</if>
-		</trim>
 		group by wrt_organ)b on 
 		a.item_cd = b.wrt_organ
 		order by wrt_organ asc
@@ -322,10 +323,11 @@
 		(select wrt_organ,
 			   affair_type1 as affair_type,
 			   count(*) as cnt
-		from affair_board
+		from affair_board ab,
-		<where>
+		     affair_rating ar
+		where ab.affair_key = ar.affair_key
+		and (ar.organ_up != 'T' or ar.organ_up is null)
 		<include refid="searchStatistics"></include>
-		</where>
 		group by wrt_organ,affair_type1) c 
 		on a.item_cd = c.affair_type and b.item_cd = c.wrt_organ
 	order by wrt_organ,affair_type asc
@@ -359,10 +361,11 @@
 		(select wrt_organ,
 			   affair_type2 as affair_type,
 			   count(*) as cnt
-		from affair_board
+		from affair_board ab,
-		<where>
+		     affair_rating ar
+		where ab.affair_key = ar.affair_key
+		and (ar.organ_up != 'T' or ar.organ_up is null)
 		<include refid="searchStatistics"></include>
-		</where>
 		group by wrt_organ,affair_type2) c 
 		on a.item_cd = c.affair_type and b.item_cd = c.wrt_organ
 	order by wrt_organ,affair_type asc
@@ -396,10 +399,11 @@
 		(select wrt_organ,
 			   affair_type3 as affair_type,
 			   count(*) as cnt
-		from affair_board
+		from affair_board ab,
-		<where>
+		     affair_rating ar
+		where ab.affair_key = ar.affair_key
+		and (ar.organ_up != 'T' or ar.organ_up is null)
 		<include refid="searchStatistics"></include>
-		</where>
 		group by wrt_organ,affair_type3) c 
 		on a.item_cd = c.affair_type and b.item_cd = c.wrt_organ
 	order by wrt_organ,affair_type asc
@@ -433,84 +437,74 @@
 		(select wrt_organ,
 			   affair_type4 as affair_type,
 			   count(*) as cnt
-		from affair_board
+		from affair_board ab,
-		<where>
+		     affair_rating ar
+		where ab.affair_key = ar.affair_key
+		and (ar.organ_up != 'T' or ar.organ_up is null)
 		<include refid="searchStatistics"></include>
-		</where>
 		group by wrt_organ,affair_type4) c 
 		on a.item_cd = c.affair_type and b.item_cd = c.wrt_organ
 	order by wrt_organ,affair_type asc
   </select>
   
   <sql id="raitingSearch">
-  		<choose>
+  		<if test='userNm != null and userNm != ""'>
-		<when test='sangbo != null and sangbo != ""'>
+       		and wrt_user_nm like '%'||#{userNm}||'%'
-		and ar.organ_up = 'T'
+     	</if>
-		and oc.organ_type in
+		<if test='startDate != null and startDate != ""'>
-		<foreach collection="sangbo" item="item" index="index" separator="," open="(" close=")">
+          and wrt_dt >= #{startDate}::date
-	    #{item}
+	    </if>
-	    </foreach>
+	    <if test='endDate != null and endDate != ""'>
-		</when>
+	      and wrt_dt &lt;= #{endDate}::date+1
-		<otherwise>
+	    </if>    
-		and oc.organ_type not in ('OGC002','OGC003')
+	    <if test='rating != null and rating != "" or sangbo != null and sangbo != ""'>
-		</otherwise>
+		and ab.affair_key in (
-	</choose>
+			select affair_key
-	<choose>
+			from affair_rating ar2
-		<when test='category1 != null and category1 != ""'>
+				inner join organ_config oc2 
-		and affair_type1 in
+					on ar2.rating_organ = oc2.organ_cd
-		<foreach collection="category1" item="item" index="index" separator="," open="(" close=")">
+				<where>
-	       #{item}
+				<if test='rating != null and rating != ""'>
-	    </foreach>
+				and ar2.affair_rate in
-		</when>
+				<foreach collection="rating" item="item" index="index" separator="," open="(" close=")">
-		<otherwise>
+		        #{item}
-		and affair_type1 not in (select item_cd from code_mgt where category_cd = 'DC01')
+		        </foreach>
-		</otherwise>
+				</if>
-	</choose>
+				<if test='sangbo != null and sangbo != ""'>
-	<choose>
+				and ar2.organ_up = 'T'
-		<when test='category2 != null and category2 != ""'>
+				and oc2.organ_type in
-		and affair_type2 in
+				<foreach collection="sangbo" item="item" index="index" separator="," open="(" close=")">
-		<foreach collection="category2" item="item" index="index" separator="," open="(" close=")">
+		        #{item}
-	       #{item}
+		        </foreach>
-	    </foreach>
+				</if>
-		</when>
+				</where>
-		<otherwise>
+		)
-		and affair_type2 not in (select item_cd from code_mgt where category_cd = 'DC02')
+		</if>
-		</otherwise>
+		<if test='category1 != null and category1 != ""'>
-	</choose>
+			and affair_type1 in
-	<choose>
+			<foreach collection="category1" item="item" index="index" separator="," open="(" close=")">
-		<when test='category3 != null and category3 != ""'>
-		and affair_type3 in
-		<foreach collection="category3" item="item" index="index" separator="," open="(" close=")">
-	       #{item}
-	    </foreach>
-		</when>
-		<otherwise>
-		and affair_type3 not in (select item_cd from code_mgt where category_cd = 'DC03')
-		</otherwise>
-	</choose>
-	<choose>
-		<when test='category4 != null and category4 != ""'>
-		and affair_type4 in
-		<foreach collection="category4" item="item" index="index" separator="," open="(" close=")">
-	       #{item}
-	    </foreach>
-		</when>
-		<otherwise>
-		and affair_type4 not in (select item_cd from code_mgt where category_cd = 'DC04')
-		</otherwise>
-	</choose>
-	<choose>
-		<when test='rating != null and rating != ""'>
-		and affair_rate in
-			<foreach collection="rating" item="item" index="index" separator="," open="(" close=")">
 	        #{item}
 	        </foreach>
-		</when>
+		</if>
-		<otherwise>
+		<if test='category2 != null and category2 != ""'>
-		and affair_rate not in (select item_cd from code_mgt where category_cd = 'AAR')
+			and affair_type2 in
-		</otherwise>
+			<foreach collection="category2" item="item" index="index" separator="," open="(" close=")">
-	</choose>
+	        #{item}
-  </sql>
+	        </foreach>
+		</if>
+		<if test='category3 != null and category3 != ""'>
+			and affair_type3 in
+			<foreach collection="category3" item="item" index="index" separator="," open="(" close=")">
+	        #{item}
+	        </foreach>
+		</if>
+		<if test='category4 != null and category4 != ""'>
+			and affair_type4 in
+			<foreach collection="category4" item="item" index="index" separator="," open="(" close=")">
+	        #{item}
+	        </foreach>
+		</if>
+	</sql>
   
   <select id="selectRatingStatusTotal" resultType="TypeStatistics" parameterType="TypeStatistics">
   	select item_cd as wrt_organ,
@@ -521,18 +515,28 @@
 		   item_value
 	from code_mgt
 	where category_cd = 'OG'
-	and use_chk = 'T') a
+	and use_chk = 'T'
+	<choose>
+		<when test='organList != null and organList != ""'>
+		and item_cd in
+		<foreach collection="organList" item="item" index="index" separator="," open="(" close=")">
+        #{item}
+        </foreach>
+		</when>
+		<otherwise>
+		and item_cd not in (select item_cd from code_mgt where category_cd = 'OG' and use_chk = 'T')
+		</otherwise>
+	</choose>
+	) a
 	left outer join
 	(select ab.wrt_organ,
-		   oc.organ_type,
 		   count(*) as cnt 
 	from affair_board ab,
-	     affair_rating ar,
+	     affair_rating ar
-	     organ_config oc
 	where ab.affair_key = ar.affair_key
-	and ar.rating_organ = oc.organ_cd
+	and (ar.organ_up != 'T' or ar.organ_up is null)
 	<include refid="raitingSearch"></include>
-	group by ab.wrt_organ,oc.organ_type) c
+	group by ab.wrt_organ) c
 	on a.item_cd = c.wrt_organ 
 	order by item_cd asc
   </select>
@@ -573,6 +577,7 @@
 	     organ_config oc
 	where ab.affair_key = ar.affair_key
 	and ar.rating_organ = oc.organ_cd
+	and (ar.organ_up != 'T' or ar.organ_up is null)
 	<include refid="raitingSearch"></include>
 	group by ab.wrt_organ,oc.organ_type) c
 	on a.item_cd = c.wrt_organ and b.organ_type = c.organ_type
@@ -609,12 +614,9 @@
 			   ar.affair_rate,
 			   count(*) as cnt 
 		from affair_board ab,
-		     affair_rating ar,
+		     affair_rating ar
-		     organ_config oc
 		where ab.affair_key = ar.affair_key
-		and ar.rating_organ = oc.organ_cd
+		and (ar.organ_up != 'T' or ar.organ_up is null)
-		and ar.affair_rate is not null
-		and ar.affair_rate != ''
 		<include refid="raitingSearch"></include>
 		group by ab.wrt_organ,ar.affair_rate) c 
 		on c.wrt_organ = a.item_cd and c.affair_rate = b.item_cd

src/main/resources/mybatisMapper/CrackdownStatustMapper.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.dbnt.faisp.faStatistics.crackdownStatus.mapper.CrackdownStatusMapper">
+    <sql id="selectCrackdownStatusListWhere">
+        <where>
+
+        </where>
+    </sql>
+
+    <select id="selectCrackdownStatusList" resultType="CrackdownStatus" parameterType="CrackdownStatus">
+    SELECT
+        c.cds_key
+        , c.case_num
+        , c.napo_dt
+        , c.napo_sea_point_lon
+        , c.napo_sea_point_lat
+        , c.napo_sea_point_detail
+        , c.invasion_type
+        , c.nll
+        , c.case_agency
+        , c.case_police_officer
+        , c.crackdown_boat
+        , c.crackdown_police
+        , c.mmsi
+        , c.field_ivsgt
+        , c.obstr_exspd_cnt
+        , c.person_damage_cnt
+        , c.person_damage_amount
+        , c.person_damage_detail
+        , c.material_damage_cnt
+        , c.material_damage_amount
+        , c.material_damage_detail
+        , c.field_ivsgt_napo_dt
+        , c.field_ivsgt_release_dt
+        , c.field_ivsgt_time_taken
+        , c.pressurized_start_dt
+        , c.pressurized_end_dt
+        , c.distance
+        , c.wrt_organ
+        , c.wrt_user_seq
+        , c.wrt_nm
+        , c.wrt_dt
+    FROM crackdown_status c
+    <include refid="selectCrackdownStatusListWhere"></include>
+    ORDER BY c.cds_key DESC
+    LIMIT #{rowCnt} OFFSET #{firstIndex}
+    </select>
+
+    <select id="selectCrackdownStatusListCnt" resultType="int" parameterType="CrackdownStatus">
+    SELECT count(*)
+    FROM crackdown_status
+    <include refid="selectCrackdownStatusListWhere"></include>
+    </select>
+</mapper>

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

@@ -0,0 +1,305 @@
+$(document).on('click', '#crackdownStatusAddBtn', function () {
+    getCrackdownStatusEditModal(null);
+});
+
+$(document).on('click', '#crackdownStatusEditBtn', function () {
+    $("#crackdownStatusViewModal").modal('hide');
+    getCrackdownStatusEditModal(Number($("#icaViewBody").find("[name='cdsKey']").val()));
+});
+
+
+$(document).on('click', '#saveCrackdownStatusBtn', function (){
+    saveCrackdownStatus('N')
+});
+
+$(document).on('click', '#saveTempBtn', function (){
+    saveCrackdownStatus('Y')
+});
+
+$(document).on('click', '.tr', function (){
+    getCrackdownStatusViewModal($(this).data('key'));
+});
+
+$(document).on('click', '#sailorAddBtn', function (){
+    $('#sailorDiv').append(
+        '<div class="row">'
+        + '<label class="col-sm-1 col-form-label text-center">선원이름</label>'
+        + '<div class="col-sm-2">'
+        + '<input class="form-control" name="sailorNameKr">'
+        + '</div>'
+        + '<div class="col-sm-2">'
+        + '<select class="form-select form-select-sm" name="sailor">'
+        + '<option value="">선택</option>'
+        + '<option value="Y">구속</option>'
+        + '<option value="N">불구속</option>'
+        + '</select>'
+        + '</div>'
+        + '<button type="button" class="btn btn-primary col-auto" id="sailorRemoveBtn">-</button>'
+        + '</div>'
+    )
+});
+
+
+$(document).on('click', '#violationAddBtn', function (){
+    let violation = '';
+    commonCode.VT.forEach(function (item){
+        violation += '<option value="'+ item.itemCd +'">' + item.itemValue +'</option>';
+    })
+
+    $('#violationDiv').append(
+        '<div>'
+        + '<select class="form-select form-select-sm" name="violation">'
+        + '<option value="">선택</option>'
+        + violation
+        + '<option value="etc">직접입력</option>'
+        + '</select>'
+        + '<button type="button" class="btn btn-primary col-auto" id="violationRemoveBtn">-</button>'
+        + '</div>'
+    )
+});
+
+
+$(document).on('click', '#sailorRemoveBtn', function (){
+    $(this).parent().remove();
+});
+
+$(document).on('click', '#violationRemoveBtn', function (){
+    $(this).parent().remove();
+});
+
+$(document).on('change', '.violation', function (){
+    if ($(this).val() == 'etc') {
+        $(this).after(
+            '<div class="col-auto">'
+            + '<input type="text" class="form-control" name="violationEtc">'
+            + '</div>'
+        );
+    } else {
+        $(this).next().remove();
+    }
+});
+
+$(document).on('change', '#crackdownPolice', function (){
+    if ($(this).val() == 'etc') {
+        $(this).after(
+            '<div class="col-auto">'
+            + '<input type="text" class="form-control" name="crackdownPoliceEtc">'
+            + '</div>'
+        );
+    } else {
+        $(this).next().remove();
+    }
+});
+
+$(document).on('change', '#crackdownBoat', function (){
+    if ($(this).val() == 'etc') {
+        $(this).after(
+            '<div class="col-auto">'
+            + '<input type="text" class="form-control" name="crackdownBoatEtc">'
+            + '</div>'
+        );
+    } else {
+        $(this).next().remove();
+    }
+});
+
+$(document).on('change', '#boatMaterial', function (){
+    if ($(this).val() == 'etc') {
+        $(this).after(
+            '<div class="col-auto">'
+            + '<input type="text" class="form-control" name="boatMaterialEtc">'
+            + '</div>'
+        );
+    } else {
+        $(this).next().remove();
+    }
+});
+
+$(document).on('change', '#processStatus', function (){
+    if ($(this).val() == 'etc') {
+        $(this).after(
+            '<div class="col-auto">'
+            + '<input type="text" class="form-control" name="processStatusEtc">'
+            + '</div>'
+        );
+    } else {
+        $(this).next().remove();
+    }
+});
+
+function getCrackdownStatusEditModal(cdsKey){
+    $.ajax({
+        url: '/faStatistics/crackdownStatus/crackdownStatusEditModal',
+        data: {
+            cdsKey: cdsKey
+        },
+        type: 'GET',
+        dataType:"html",
+        success: function(html){
+            $("#crackdownStatusViewBody").empty();
+            $("#crackdownStatusEditModalContent").empty().append(html);
+            $("#crackdownStatusEditModal").modal('show');
+
+            $("#napoDt").datepicker({
+                format: "yyyy-mm-dd",
+                language: "ko"
+            });
+            $("#birthdate").datepicker({
+                format: "yyyy-mm-dd",
+                language: "ko"
+            });
+            $("#paymentPaymentDt").datepicker({
+                format: "yyyy-mm-dd",
+                language: "ko"
+            });
+            $("#consignmentStartDt").datepicker({
+                format: "yyyy-mm-dd",
+                language: "ko"
+            });
+            $("#consignmentEndDt").datepicker({
+                format: "yyyy-mm-dd",
+                language: "ko"
+            });
+            $("#evictionDt").datepicker({
+                format: "yyyy-mm-dd",
+                language: "ko"
+            });
+            $("#returnDt").datepicker({
+                format: "yyyy-mm-dd",
+                language: "ko"
+            });
+            $("#confiscationDt").datepicker({
+                format: "yyyy-mm-dd",
+                language: "ko"
+            });
+            $("#boatDisposalDt").datepicker({
+                format: "yyyy-mm-dd",
+                language: "ko"
+            });
+            $("#directHandoverDt").datepicker({
+                format: "yyyy-mm-dd",
+                language: "ko"
+            });
+            $("#fieldIvsgtNapoDt").datepicker({
+                format: "yyyy-mm-dd",
+                language: "ko"
+            });
+            $("#fieldIvsgtReleaseDt").datepicker({
+                format: "yyyy-mm-dd",
+                language: "ko"
+            });
+            $("#pressurizedStartDt").datepicker({
+                format: "yyyy-mm-dd",
+                language: "ko"
+            });
+            $("#pressurizedEndDt").datepicker({
+                format: "yyyy-mm-dd",
+                language: "ko"
+            });
+
+        },
+        error:function(){
+
+        }
+    });
+}
+
+function saveCrackdownStatus(saveYn){
+    if(contentCheck()){
+        if(confirm("저장하시겠습니까?")){
+            $("#saveYn").val(saveYn);
+            contentFade("in");
+            const formData = new FormData($("#cdsEditForm")[0]);
+
+            let violationList = [];
+            let sailorList = [];
+
+            sailorList.push(
+                { position: 'POS001', sailorNameKr: null, isRestriction: $("#cdsEditForm").find('select[name="captin"]').val() != '' ? $("#cdsEditForm").find('select[name="captin"]').val() : null },
+                { position: 'POS002', sailorNameKr: null, isRestriction: $("#cdsEditForm").find('select[name="mate"]').val()  != '' ? $("#cdsEditForm").find('select[name="mate"]').val() : null },
+                { position: 'POS003', sailorNameKr: null, isRestriction: $("#cdsEditForm").find('select[name="warden"]').val()  != '' ? $("#cdsEditForm").find('select[name="warden"]').val() : null }
+            );
+
+            $(".sailor-list").each(function (){
+                sailorList.push({
+                    sailorKey: $(this).parent().parent().find('input[name="sailorKey"]').val() != undefined ? Number($(this).find('input[name="sailorKey"]').val()) : null,
+                    sailorNameKr: $(this).parent().parent().find('input[name="sailorNameKr"]').val(),
+                    position: 'POS006',
+                    isRestriction: $(this).val() != undefined ? $(this).val() : null
+                });
+            });
+
+            for (let i=0; i < sailorList.length; i++) {
+                if (sailorList[i].spiKey != null) {
+                    formData.append(`sailorList[${i}].sailorKey`, sailorList[i].sailorKey);
+                }
+                if (sailorList[i].sailorNameKr != null) {
+                    formData.append(`sailorList[${i}].sailorNameKr`, sailorList[i].sailorNameKr);
+                }
+                formData.append(`sailorList[${i}].position`, sailorList[i].position);
+                if (sailorList[i].isRestriction != null) {
+                    formData.append(`sailorList[${i}].isRestriction`, sailorList[i].isRestriction);
+                }
+            }
+
+            $(".violation").each(function (){
+                violationList.push({
+                    violationKey: $(this).parent().find('input[name="violationKey"]').val() != undefined ? Number($(this).find('input[name="violationKey"]').val()) : null,
+                    fbKey: $("#cdsEditForm").find('input[name="fbKey"]').val() != undefined ? Number($(this).find('input[name="fbKey"]').val()) : null,
+                    violation: $(this).val() != '' ? $(this).val() : null,
+                    violationEtc: $(this).parent().find('input[name="violationEtc"]').val() != undefined ? $(this).find('input[name="violationEtc"]').val() : null
+                });
+            });
+
+            for (let i=0; i < violationList.length; i++) {
+                if (violationList[i].violationKey != null) {
+                    formData.append(`violationList[${i}].violationKey`, violationList[i].violationKey);
+                }
+                if (violationList[i].fbKey != null) {
+                    formData.append(`violationList[${i}].fbKey`, violationList[i].fbKey);
+                }
+                if (violationList[i].violation != null) {
+                    formData.append(`violationList[${i}].violation`, violationList[i].violation);
+                }
+                if (violationList[i].violationEtc != null) {
+                    formData.append(`violationList[${i}].violationEtc`, violationList[i].violationEtc);
+                }
+            }
+
+            $.ajax({
+                type : 'POST',
+                data : formData,
+                url : "/faStatistics/crackdownStatus/saveCrackdownStatus",
+                processData: false,
+                contentType: false,
+                success : function(result) {
+                    alert("저장되었습니다.");
+                    contentFade("out");
+                    $("#crackdownStatusEditModal").modal('hide');
+                },
+                error : function(xhr, status) {
+                    alert("저장에 실패하였습니다.")
+                    contentFade("out");
+                }
+            })
+        }
+    }
+}
+
+function contentCheck(){
+    let flag = true;
+
+    if(!$('input[name="boatNameKr"]').val()) {
+        alert('선명을 입력해주세요.');
+        $('input[name="boatNameKr"]').focus();
+        return false;
+    }
+
+    if(!$('select[name="processStatus"]').val()) {
+        alert('처리현황을 선택해주세요.');
+        $('select[name="processStatus"]').focus();
+        return false;
+    }
+
+    return flag;
+}

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

@@ -489,7 +489,6 @@ function saveInternationalCrimeArrest(contentState){
                     alert("저장되었습니다.");
                     contentFade("out");
                     $("#icaEditModal").modal('hide');
-                    // getIcaViewModal(result);
                 },
                 error : function(xhr, status) {
                     alert("저장에 실패하였습니다.")

src/main/resources/static/js/fipTarget/shipInfo.js

@@ -0,0 +1,25 @@
+$(document).on('click', '#krcnTab', function (){
+	location.href="/target/ipShipList?siType=KRCN";
+})
+
+$(document).on('click', '#krjpruTab', function (){
+	location.href="/target/ipShipList?siType=KRJPRU";
+})
+
+$(document).on('click', '#addKRCN', function (){
+	const siType = 'KRCN';
+	$.ajax({
+    url: '/target/ipShipEditModal',
+     data: {siType: siType},
+    type: 'GET',
+    dataType:"html",
+    success: function(html){
+      $("#ipShipModalContent").empty().append(html);
+      $("#ipShipModal").modal('show');
+
+    },
+    error:function(){
+
+    }
+  });
+})

src/main/resources/static/js/igActivities/fpiMgt/affair/statistics.js

@@ -5,11 +5,29 @@ $(function(){
   });
 })
 
-$(document).on('click', '#downExcel', function (){
+$(document).on('click', '#fieldDownExcel', function (){
-  exportExcel();
+  exportExcel('분야별');
 })
 
-function exportExcel(){ 
+$(document).on('click', '#ratingDownExcel', function (){
+  exportExcel('평가별');
+})
+
+function exportExcel(name){ 	
+	var excelHandler = {
+	    getExcelFileName : function(){
+	        return '견문통계'+'_'+name+'_'+getToday()+'.xlsx';	//파일명
+	    },
+	    getSheetName : function(){
+	        return '견문통계'+'_'+name;
+	    },
+	    getExcelData : function(){
+	        return document.getElementById('tableData'); 	//TABLE id
+	    },
+	    getWorksheet : function(){
+	        return XLSX.utils.table_to_sheet(this.getExcelData());
+	    }
+	}	
   // step 1. workbook 생성
   var wb = XLSX.utils.book_new();
 
@@ -26,21 +44,6 @@ function exportExcel(){
   saveAs(new Blob([s2ab(wbout)],{type:"application/octet-stream"}), excelHandler.getExcelFileName());
 }
 
-var excelHandler = {
-    getExcelFileName : function(){
-        return '견문통계'+'_'+getToday()+'.xlsx';	//파일명
-    },
-    getSheetName : function(){
-        return 'Table Test Sheet';	//시트명
-    },
-    getExcelData : function(){
-        return document.getElementById('tableData'); 	//TABLE id
-    },
-    getWorksheet : function(){
-        return XLSX.utils.table_to_sheet(this.getExcelData());
-    }
-}
-
 function s2ab(s) { 
   var buf = new ArrayBuffer(s.length); //convert s to arrayBuffer
   var view = new Uint8Array(buf);  //create uint8array as viewer
@@ -89,9 +92,17 @@ function goFieldStatistics(){
 }
 
 $(document).on('click', '#ratingSearch', function (){
+	if($('input:checkbox[name=rating]:checked').length < 1){
+		alert("평가항목을 선택해주세요");
+		return false;
+	}
 	goRatingStatistics();
 })
 $(document).on('click', '#ratingTab', function (){
+	if($('input:checkbox[name=rating]:checked').length < 1){
+		alert("평가항목을 선택해주세요");
+		return false;
+	}
 	goRatingStatistics();
 })
 

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

@@ -0,0 +1,265 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org"
+      xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity5"
+      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/faStatistics/crackdownStatus.js}"></script>
+</th:block>
+<div layout:fragment="content">
+    <main class="pt-3">
+        <h4>불법조업 외국어선 단속현황</h4>
+        <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
+        <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
+        <div class="row mx-0">
+            <div class="col-12 card">
+                <div class="card-body">
+                    <form method="get" th:action="@{/faStatistics/crackdownStatus}" id="icaSearchForm">
+                        <input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
+                        <div class="row justify-content-between pe-3 py-1">
+                            <div class="col-auto">
+                                <select class="form-select" name="rowCnt" id="rowCnt">
+                                    <th:block th:each="num : ${#numbers.sequence(1,5)}">
+                                        <option th:value="${num*10}" th:text="${num*10}" th:selected="${searchParams.rowCnt eq num*10}"></option>
+                                    </th:block>
+                                </select>
+                            </div>
+                            <div class="col-auto">
+                                <div class="row justify-content-end">
+                                    <!--<div class="col-auto">
+                                        <input type="text" class="form-control form-control-sm" placeholder="사건번호" name="caseNum" th:value="${searchParams.caseNum}">
+                                    </div>-->
+                                    <input type="submit" class="btn btn-sm btn-primary col-auto" id="searchBtn" value="검색">
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                    <div class="row justify-content-start" style="overflow: hidden; overflow-x: scroll">
+                        <table class="table table-striped">
+                            <thead>
+                            <tr>
+                                <th rowspan="4">연번</th>
+                                <th rowspan="4">나포일시</th>
+                                <th rowspan="4">위반장소</th>
+                                <th rowspan="4">위반내용</th>
+                                <th colspan="4">침범유형</th>
+                                <th rowspan="3">NLL</th>
+                                <th colspan="7">특수공무집행방해</th>
+                                <th rowspan="4">사건담당경찰서</th>
+                                <th colspan="2">검거기관</th>
+                                <th rowspan="4">MMSI.NO(AIS)</th>
+                                <th colspan="6">선박제원</th>
+                                <th rowspan="3" colspan="2">선장(출생년도)</th>
+                                <th rowspan="4">선종</th>
+                                <th rowspan="3" colspan="2">어획물 축소기재</th>
+                                <th colspan="5">범칙물</th>
+                                <th colspan="2">처리현황</th>
+                                <th colspan="3">담보금납부(만원)</th>
+                                <th colspan="2">담보금미납(만원)</th>
+                                <th colspan="10">선박처리</th>
+                                <th colspan="4">직접인계</th>
+                                <th colspan="6">구속</th>
+                                <th colspan="6">불구속</th>
+                                <th rowspan="3" colspan="4">현장조사</th>
+                                <th rowspan="3" colspan="2">압송</th>
+                                <th rowspan="4">영장청구 소요시간</th>
+                                <th colspan="5">압수어구</th>
+                            </tr>
+                            <tr>
+                                <th rowspan="2">무허가 조업</th>
+                                <th rowspan="2">
+                                    <div>특정금지</div>
+                                    <div>(무허가, 정선명령위반)</div>
+                                </th>
+                                <th rowspan="2">
+                                    <div>EEZ</div>
+                                    <div>제한조건</div>
+                                </th>
+                                <th rowspan="2">영해침범</th>
+                                <th rowspan="2">발생건수</th>
+                                <th colspan="3">인적피해</th>
+                                <th colspan="3">물적피해</th>
+                                <th rowspan="2" colspan="2">구분</th>
+                                <th rowspan="3">선명</th>
+                                <th rowspan="3">톤수(톤)</th>
+                                <th rowspan="3">선원(명)</th>
+                                <th rowspan="3">선질</th>
+                                <th rowspan="2" colspan="2">선적</th>
+                                <th rowspan="3">어종</th>
+                                <th rowspan="2">어획량(kg)</th>
+                                <th rowspan="2">폐기량(kg)</th>
+                                <th rowspan="2">위판량(kg)</th>
+                                <th rowspan="2">위판금액(원)</th>
+                                <th rowspan="2">조사중</th>
+                                <th rowspan="2">완료</th>
+                                <th rowspan="2">척수</th>
+                                <th rowspan="2">납부액</th>
+                                <th rowspan="3">납부일시</th>
+                                <th rowspan="2">미납</th>
+                                <th rowspan="2">미납금액</th>
+                                <th rowspan="2">위탁관리</th>
+                                <th rowspan="3">위탁시작일</th>
+                                <th rowspan="3">위탁종료일</th>
+                                <th rowspan="2">퇴거</th>
+                                <th rowspan="2">직접인계</th>
+                                <th rowspan="2">공매</th>
+                                <th colspan="2">폐선</th>
+                                <th rowspan="2">침몰</th>
+                                <th rowspan="2">환부</th>
+                                <th colspan="3">일시</th>
+                                <th rowspan="3">해점</th>
+                                <th rowspan="3">인계함정</th>
+                                <th rowspan="3">중측인수함정</th>
+                                <th rowspan="2">계</th>
+                                <th rowspan="2">선장</th>
+                                <th rowspan="2">향해장</th>
+                                <th rowspan="2">기관장</th>
+                                <th rowspan="2">선원</th>
+                                <th rowspan="2">구속척수(몰수판결)</th>
+                                <th rowspan="2">계</th>
+                                <th rowspan="2">선장</th>
+                                <th rowspan="2">향해장</th>
+                                <th rowspan="2">기관장</th>
+                                <th rowspan="2">선원</th>
+                                <th rowspan="2">불구속척수</th>
+                                <th rowspan="2">틀(타망)</th>
+                                <th rowspan="2">폭(유망)</th>
+                                <th rowspan="2">조(형망)</th>
+                                <th rowspan="2">개(통발)</th>
+                                <th rowspan="2">기타</th>
+                            </tr>
+                            <tr>
+                                <th>피해인원</th>
+                                <th>피해액(만원)</th>
+                                <th rowspan="2">상세내용</th>
+                                <th>발생건수</th>
+                                <th>피해액(만원)</th>
+                                <th rowspan="2">상세내용</th>
+                                <th>단순폐선</th>
+                                <th>폐선조건부공매</th>
+                            </tr>
+                            <tr>
+                                <th>3</th>
+                                <th>4</th>
+                                <th>2</th>
+                                <th>1</th>
+                                <th>4</th>
+                                <th>3</th>
+                                <th>4</th>
+                                <th>9000,000</th>
+                                <th>4</th>
+                                <th>9099,099</th>
+                                <th>단속경찰서</th>
+                                <th>단속함정</th>
+                                <th>성</th>
+                                <th>시</th>
+                                <th>이름</th>
+                                <th>출생년도</th>
+                                <th>어종</th>
+                                <th>수량</th>
+                                <th>100</th>
+                                <th>100</th>
+                                <th>100</th>
+                                <th>8888700</th>
+                                <th>10</th>
+                                <th>8</th>
+                                <th>400</th>
+                                <th>4000</th>
+                                <th>10</th>
+                                <th>80000</th>
+                                <th>11</th>
+                                <th>10</th>
+                                <th>11</th>
+                                <th>12</th>
+                                <th>8</th>
+                                <th>2</th>
+                                <th>7</th>
+                                <th>6</th>
+                                <th>20</th>
+                                <th>10</th>
+                                <th>10</th>
+                                <th>10</th>
+                                <th>10</th>
+                                <th>10</th>
+                                <th>20</th>
+                                <th>10</th>
+                                <th>10</th>
+                                <th>2</th>
+                                <th>11</th>
+                                <th>10</th>
+                                <th>10</th>
+                                <th>나포일시</th>
+                                <th>석방일시</th>
+                                <th>소요시간</th>
+                                <th>소요시간</th>
+                                <th>거리(해리)</th>
+                                <th>7</th>
+                                <th>8</th>
+                                <th>10</th>
+                                <th>11</th>
+                                <th>12</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+
+                            </tbody>
+                        </table>
+                    </div>
+                    <div class="row justify-content">
+                        <button class="btn btn-sm btn-primary col-auto" id="">관리자마감</button>
+                        <button class="btn btn-sm btn-primary col-auto" id="crackdownStatusExcelDownBtn">엑셀 다운로드</button>
+                        <button class="btn btn-sm btn-primary col-auto" id="crackdownStatusAddBtn">등록</button>
+                    </div>
+
+                    <!-- 페이징 -->
+                    <div class="row justify-content-center">
+                        <div class="col-auto">
+                            <nav aria-label="Page navigation">
+                                <ul class="pagination">
+                                    <th:block th:if="${searchParams.pageIndex>3}">
+                                        <li class="page-item" th:data-pageindex="${(searchParams.pageIndex)-3}">
+                                            <a class="page-link" href="#" aria-label="Previous">
+                                                <span aria-hidden="true">&laquo;</span>
+                                            </a>
+                                        </li>
+                                    </th:block>
+                                    <th:block th:each="num : ${#numbers.sequence(searchParams.startNum, searchParams.endNum)}">
+                                        <li class="page-item" th:data-pageindex="${num}" th:classappend="${searchParams.pageIndex eq num?'active':''}">
+                                            <a class="page-link" href="#" th:text="${num}"></a>
+                                        </li>
+                                    </th:block>
+                                    <th:block th:if="${searchParams.maxNum>searchParams.endNum+2}">
+                                        <li class="page-item" th:data-pageindex="${(searchParams.pageIndex)+3}">
+                                            <a class="page-link" href="#" aria-label="Next">
+                                                <span aria-hidden="true">&raquo;</span>
+                                            </a>
+                                        </li>
+                                    </th:block>
+                                </ul>
+                            </nav>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="modal fade" id="crackdownStatusEditModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="crackdownStatusEditModalLabel" aria-hidden="true">
+            <div class="modal-dialog modal-xl modal-dialog-scrollable">
+                <div class="modal-content" id="crackdownStatusEditModalContent">
+
+                </div>
+            </div>
+        </div>
+        <div class="modal fade" id="crackdownStatusViewModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="crackdownStatusViewModalLabel" aria-hidden="true">
+            <div class="modal-dialog modal-xl modal-dialog-scrollable">
+                <div class="modal-content" id="crackdownStatusViewBody">
+
+                </div>
+            </div>
+        </div>
+    </main>
+</div>
+</html>

src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusEditModal.html

@@ -0,0 +1,457 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org">
+<div class="modal-header">
+  <h5 class="modal-title" id="crackdownStatusEditModalLabel" th:text="${crackdownStatus.cdsKey eq null ? '불법조업 외국어선 단속등록' : '불법조업 외국어선 단속수정'}">></h5>
+  <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+</div>
+<div class="modal-body" id="cdsEditBody">
+  <form action="#" method="post" id="cdsEditForm">
+    <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
+    <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
+    <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
+    <input type="hidden" name="cdsKey" th:value="${crackdownStatus.cdsKey}">
+    <th:block th:if="${crackdownStatus.fishingBoat ne null}">
+      <input type="hidden" name="fbKey" th:value="${crackdownStatus.fishingBoat.fbKey}">
+    </th:block>
+    <th:block th:if="${crackdownStatus.processResult ne null}">
+      <input type="hidden" name="prKey" th:value="${crackdownStatus.processResult.prKey}">
+    </th:block>
+    <input type="hidden" name="wrtOrgan" th:value="${crackdownStatus.wrtOrgan}">
+    <input type="hidden" name="wrtNm" th:value="${crackdownStatus.wrtNm}">
+    <input type="hidden" name="wrtDt" th:value="${#temporals.format(crackdownStatus.wrtDt, 'yyyy-MM-dd HH:mm')}">
+    <input type="hidden" id="saveYn" name="saveYn">
+    <div class="mb-3 row">
+      나포정보
+    </div>
+    <div class="mb-3 row">
+      <div class="col-sm-1">
+        <label class="col-auto col-form-label text-center">나포일시</label>
+        <label class="col-auto col-form-label text-center">NLL</label>
+      </div>
+      <div class="col-sm-2">
+        <input class="form-control" name="napoDt" id="napoDt">
+        <select class="form-select form-select-sm" name="nll">
+          <option value="Y">O</option>
+          <option value="N">X</option>
+        </select>
+      </div>
+      <label class="col-sm-1 col-form-label text-center">위반장소</label>
+      <div class="col-sm-2">
+        <input class="form-control" placeholder="위도" name="napoSeaPointLat">
+        <input class="form-control" placeholder="경도" name="napoSeaPointLon">
+        <input class="form-control" placeholder="상세내용" name="napoSeaPointDetail">
+      </div>
+      <div class="col-sm-1">
+        <label class="col-form-label text-center">위반내용</label>
+        <button type="button" class="btn btn-primary col-auto" id="violationAddBtn">+</button>
+      </div>
+      <div class="col-sm-2" id="violationDiv">
+        <th:block th:if="${#lists.isEmpty(crackdownStatus.violationList)}">
+          <select class="form-select form-select-sm violation" name="violation">
+            <option value="">선택</option>
+            <th:block th:each="commonCode:${session.commonCode.get('VT')}">
+              <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"></option>
+            </th:block>
+            <option value="etc">직접입력</option>
+          </select>
+        </th:block>
+        <th:block th:if="${!#lists.isEmpty(crackdownStatus.violationList)}">
+          <th:block th:each="violation : ${crackdownStatus.violationList}">
+            <th:block th:each="commonCode:${session.commonCode.get('VT')}">
+              <input type="hidden" name="violationKey" th:value="${violation.violationKey}">
+              <select class="form-select form-select-sm violation" name="violation">
+                <option value="">선택</option>
+                <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
+                        th:selected="${crackdownStatus.violationList != null and commonCode.itemCd eq crackdownStatus.violationList.violation}"></option>
+                <option value="etc">직접입력</option>
+              </select>
+            </th:block>
+          </th:block>
+        </th:block>
+      </div>
+      <label class="col-sm-1 col-form-label text-center">침범유형</label>
+      <div class="col-sm-2">
+        <select class="form-select form-select-sm" name="invasionType">
+          <option value="">선택</option>
+          <th:block th:each="commonCode:${session.commonCode.get('IST')}">
+            <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
+                    th:selected="${commonCode.itemCd eq crackdownStatus.invasionType}"></option>
+          </th:block>
+        </select>
+      </div>
+    </div>
+    <div class="mb-3 row">
+      특수공무집행방해
+    </div>
+    <div class="mb-3 row">
+      <label class="col-sm-1 col-form-label text-center">발생건수</label>
+      <div class="col-sm-2">
+        <input type="number" min="0" class="form-control" name="obstrExspdCnt">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">피해인원</label>
+      <div class="col-sm-2">
+        <input type="number" min="0" class="form-control" name="personDamageCnt">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">피해액</label>
+      <div class="col-sm-2">
+        <input type="number" min="0" class="form-control" name="personDamageAmount">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">상세내용</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="personDamageDetail">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">발생건수</label>
+      <div class="col-sm-2">
+        <input type="number" min="0" class="form-control" name="materialDamageCnt">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">피해액</label>
+      <div class="col-sm-2">
+        <input type="number" min="0" class="form-control" name="materialDamageAmount">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">상세내용</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="materialDamageDetail">
+      </div>
+    </div>
+    <div class="mb-3 row">
+      검거기관
+    </div>
+    <div class="mb-3 row">
+      <label class="col-sm-1 col-form-label text-center">사건담당 기관</label>
+      <div class="col-sm-2">
+        <select class="form-select form-select-sm" name="caseAgency">
+          <option value="">선택</option>
+          <th:block th:each="commonCode:${session.commonCode.get('ATA')}">
+            <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
+                    th:selected="${commonCode.itemCd eq crackdownStatus.caseAgency}"></option>
+          </th:block>
+        </select>
+      </div>
+      <label class="col-sm-1 col-form-label text-center">단속<br>경찰서</label>
+      <div class="col-sm-2">
+        <select class="form-select form-select-sm" name="crackdownPolice" id="crackdownPolice">
+          <option value="">선택</option>
+          <th:block th:each="commonCode:${session.commonCode.get('CPO')}">
+            <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
+                    th:selected="${commonCode.itemCd eq crackdownStatus.crackdownPolice}"></option>
+          </th:block>
+          <option value="etc">직접입력</option>
+        </select>
+      </div>
+      <label class="col-sm-1 col-form-label text-center">단속함정</label>
+      <div class="col-sm-2">
+        <select class="form-select form-select-sm" name="crackdownBoat" id="crackdownBoat">
+          <option value="">선택</option>
+          <th:block th:each="commonCode:${session.commonCode.get('CDB')}">
+            <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
+                    th:selected="${commonCode.itemCd eq crackdownStatus.crackdownPolice}"></option>
+          </th:block>
+          <option value="etc">직접입력</option>
+        </select>
+      </div>
+      <label class="col-sm-1 col-form-label text-center">MMSI.NO</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="mmsi">
+      </div>
+    </div>
+    <div class="mb-3 row">
+      선박제원
+    </div>
+    <div class="mb-3 row">
+      <label class="col-sm-1 col-form-label text-center">선명</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="boatNameKr">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">톤수</label>
+      <div class="col-sm-2">
+        <input type="number" min="0" class="form-control" name="tonCnt">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">선질</label>
+      <div class="col-sm-2">
+        <select class="form-select form-select-sm" name="boatMaterial" id="boatMaterial">
+          <option value="">선택</option>
+          <th:block th:each="commonCode:${session.commonCode.get('BM')}">
+            <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
+                    th:selected="${crackdownStatus.fishingBoat ne null && commonCode.itemCd eq crackdownStatus.fishingBoat.boatMaterial}"></option>
+          </th:block>
+          <option value="etc">직접입력</option>
+        </select>
+      </div>
+      <label class="col-sm-1 col-form-label text-center">선적 성</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="boatNnySung">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">선적 시</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="boatNnyAi">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">선장명</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="sailorNameKr">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">출생년도</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="birthdate" id="birthdate">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">선종</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="fisheryType">
+      </div>
+    </div>
+    <div class="mb-3 row">
+      어획물 축소기재
+    </div>
+    <div class="mb-3 row">
+      <label class="col-sm-1 col-form-label text-center">어종</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="catchFishSpecies">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">수량</label>
+      <div class="col-sm-2">
+        <input type="number" min="0" class="form-control" name="catchCnt">
+      </div>
+    </div>
+    <div class="mb-3 row">
+      범칙물
+    </div>
+    <div class="mb-3 row">
+      <label class="col-sm-1 col-form-label text-center">어종</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="offenseFishSpecies">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">어획량</label>
+      <div class="col-sm-2">
+        <input type="number" min="0" class="form-control" name="offenseCatchCnt">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">폐기량</label>
+      <div class="col-sm-2">
+        <input type="number" min="0" class="form-control" name="offenseIllegalWasteQuantity">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">위판량</label>
+      <div class="col-sm-2">
+        <input type="number" min="0" class="form-control" name="offenseQuantity">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">위판금액</label>
+      <div class="col-sm-2">
+        <input type="number" min="0" class="form-control" name="offenseAmount">
+      </div>
+    </div>
+    <div class="mb-3 row">
+      처리결과
+    </div>
+    <div class="mb-3 row">
+      <label class="col-sm-1 col-form-label text-center">처리현황</label>
+      <div class="col-sm-2">
+        <select class="form-select form-select-sm" name="processStatus" id="processStatus">
+          <option value="">선택</option>
+          <th:block th:each="commonCode:${session.commonCode.get('PR')}">
+            <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
+                    th:selected="${crackdownStatus.processResult ne null && commonCode.itemCd eq crackdownStatus.processResult.processStatus}"></option>
+          </th:block>
+          <option value="etc">직접입력</option>
+        </select>
+      </div>
+    </div>
+    <div class="mb-3 row">
+      담보금 납부
+    </div>
+    <div class="mb-3 row">
+      <label class="col-sm-1 col-form-label text-center">납부액</label>
+      <div class="col-sm-2">
+        <input type="number" min="0" class="form-control" name="damboPayment">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">납부일시</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="paymentPaymentDt" id="paymentPaymentDt">
+      </div>
+    </div>
+    <div class="mb-3 row">
+      담보금 미납
+    </div>
+    <div class="mb-3 row">
+      <label class="col-sm-1 col-form-label text-center">미납액</label>
+      <div class="col-sm-2">
+        <input type="number" min="0" class="form-control" name="damboUnpaidAmount">
+      </div>
+    </div>
+    <div class="mb-3 row">
+      선박처리
+    </div>
+    <div class="mb-3 row">
+      <label class="col-sm-1 col-form-label text-center">위탁시작일</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="consignmentStartDt" id="consignmentStartDt">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">위탁종료일</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="consignmentEndDt" id="consignmentEndDt">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">퇴거일</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="evictionDt" id="evictionDt">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">환부일</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="returnDt" id="returnDt">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">몰수확정일</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="confiscationDt" id="confiscationDt">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">폐선일</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="boatDisposalDt" id="boatDisposalDt">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">폐선종류</label>
+      <div class="col-sm-2">
+        <select class="form-select form-select-sm" name="boatDisposalType">
+          <option value="">선택</option>
+          <th:block th:each="commonCode:${session.commonCode.get('BDT')}">
+            <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
+                    th:selected="${crackdownStatus.processResult ne null && commonCode.itemCd eq crackdownStatus.processResult.boatDisposalType}"></option>
+          </th:block>
+        </select>
+      </div>
+    </div>
+    <div class="mb-3 row">
+      직접인계
+    </div>
+    <div class="mb-3 row">
+      <label class="col-sm-1 col-form-label text-center">직접인계일</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="directHandoverDt" id="directHandoverDt">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">해점</label>
+      <div class="col-sm-2">
+        <input class="form-control" placeholder="경도" name="handoverSeaPointLon">
+        <input class="form-control" placeholder="위도" name="handoverSeaPointLat">
+        <input class="form-control" placeholder="상세내용" name="handoverSeaPointDetail">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">인계함정</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="handoverBoat">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">중측</br>인수함정</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="middleTakeoverBoat">
+      </div>
+    </div>
+    <div class="mb-3 row">
+      구속/ 불구속
+    </div>
+    <div class="mb-3 row">
+      <label class="col-sm-1 col-form-label text-center">선장</label>
+      <div class="col-sm-2">
+        <select class="form-select form-select-sm" name="captin">
+          <option value="">선택</option>
+          <option value="Y">구속</option>
+          <option value="N">불구속</option>
+        </select>
+      </div>
+      <label class="col-sm-1 col-form-label text-center">향해장</label>
+      <div class="col-sm-2">
+        <select class="form-select form-select-sm" name="mate">
+          <option value="">선택</option>
+          <option value="Y">구속</option>
+          <option value="N">불구속</option>
+        </select>
+      </div>
+      <label class="col-sm-1 col-form-label text-center">기관장</label>
+      <div class="col-sm-2">
+        <select class="form-select form-select-sm" name="warden">
+          <option value="">선택</option>
+          <option value="Y">구속</option>
+          <option value="N">불구속</option>
+        </select>
+      </div>
+      <button type="button" class="btn btn-primary col-auto" id="sailorAddBtn">선원 추가</button>
+    </div>
+    <div class="mb-3 row" id="sailorDiv">
+      <!--
+      <div class="row">
+        <label class="col-sm-1 col-form-label text-center">선원 이름</label>
+        <div class="col-sm-2">
+          <input class="form-control" name="sailorNameKr">
+        </div>
+        <div class="col-sm-2">
+          <select class="form-select form-select-sm sailor-list" name="sailor">
+            <option value="">선택</option>
+            <option value="Y">구속</option>
+            <option value="N">불구속</option>
+          </select>
+        </div>
+        <button type="button" class="btn btn-primary col-auto" id="sailorRemoveBtn">-</button>
+      </div>
+      -->
+    </div>
+    <div class="mb-3 row">
+      현장조사
+    </div>
+    <div class="mb-3 row">
+      <label class="col-sm-1 col-form-label text-center">나포일시</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="fieldIvsgtNapoDt" id="fieldIvsgtNapoDt">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">석방일시</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="fieldIvsgtReleaseDt" id="fieldIvsgtReleaseDt">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">소요시간</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="fieldIvsgtTimeTaken">
+      </div>
+    </div>
+    <div class="mb-3 row">
+      압송
+    </div>
+    <div class="mb-3 row">
+      <label class="col-sm-1 col-form-label text-center">압송시작</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="pressurizedStartDt" id="pressurizedStartDt">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">압송종료</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="pressurizedEndDt" id="pressurizedEndDt">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">영장청구<br>소요시간</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="warrantReqTakeTime" readonly>
+      </div>
+      <label class="col-sm-1 col-form-label text-center">거리</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="distance">
+      </div>
+    </div>
+    <div class="mb-3 row">
+      압수어구
+    </div>
+    <div class="mb-3 row">
+      <label class="col-sm-1 col-form-label text-center">틀</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="confiscationFrame">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">폭</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="confiscationWidth">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">조</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="confiscationJo">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">개</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="confiscationGae">
+      </div>
+      <label class="col-sm-1 col-form-label text-center">기타</label>
+      <div class="col-sm-2">
+        <input class="form-control" name="confiscationEtc">
+      </div>
+    </div>
+  </form>
+</div>
+<div class="modal-footer">
+  <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+  <button type="button" class="btn btn-warning" id="saveTempBtn">임시저장</button>
+  <button type="button" class="btn btn-primary" id="saveCrackdownStatusBtn">저장</button>
+</div>
+</html>

src/main/resources/templates/fipTarget/ipShipEditModal.html

@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org">
+
+<div class="modal-header">
+  <h5 class="modal-title" id="menuEditModalLabel">국제여객선 등록</h5>
+  <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+</div>
+<div class="modal-body">
+  <form id="partInfoSave" method="post">
+        <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
+   		<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
+   		<h5 class="text-center">항로</h5>
+          <div class="mb-2 row">
+            <label for="startPoint" class="col-sm-2 col-form-label text-center">출발</label>        
+            <div class="col-sm-3">
+               <input type="text" class="form-control" id="startPoint" name="startPoint" placeholder="직접입력">
+            </div>
+           <label for="endPoint" class="col-sm-2 col-form-label text-center">도착</label>
+            <div class="col-sm-3">
+              <input type="text" class="form-control" id="endPoint" name="endPoint" placeholder="직접입력">
+            </div> 
+          </div>
+          <div class="mb-2 row">
+            <label for="distanceNm" class="col-sm-2 col-form-label text-center">거리(해리)</label>        
+            <div class="col-sm-3">
+               <input type="text" class="form-control" id="distanceNm" name="distanceNm" placeholder="직접입력">
+            </div>
+            <label for="distanceKm" class="col-sm-2 col-form-label text-center">거리(KM)</label>        
+            <div class="col-sm-3">
+               <input type="text" class="form-control" id="distanceKm" name="distanceKm" placeholder="직접입력">
+            </div>
+          </div>
+          <br><br>
+          <div class="mb-3 row">
+            <label for="shipWeight" class="col-sm-2 col-form-label text-center">국제총톤 수</label>
+            <div class="col-sm-4">
+                  <input type="text" class="form-control" id="shipWeight" name="shipWeight" placeholder="직접입력">
+            </div>
+            <label for="passengerCnt" class="col-sm-2 col-form-label text-center">여객</label>
+            <div class="col-sm-4">
+                  <input type="text" class="form-control" id="passengerCnt" name="passengerCnt" placeholder="직접입력">
+            </div>
+            <label for="freightCnt" class="col-sm-2 col-form-label text-center">화물</label>
+            <div class="col-sm-4">
+                  <input type="text" class="form-control" id="freightCnt" name="freightCnt" placeholder="직접입력">
+            </div>
+          </div>
+          <br><br>
+          <div class="mb-4 row">
+            <label for="ownerNm" class="col-sm-2 col-form-label text-center">사업자</label>
+            <div class="col-sm-4">
+                  <input type="text" class="form-control" id="ownerNm" name="ownerNm" placeholder="직접입력">
+            </div>
+            <label for="shipNm" class="col-sm-2 col-form-label text-center">선명</label>
+            <div class="col-sm-4">
+                  <input type="text" class="form-control" id="shipNm" name="shipNm" placeholder="직접입력">
+            </div>
+            <label for="operationCnt" class="col-sm-2 col-form-label text-center">운항횟수</label>
+            <div class="col-sm-4">
+                  <input type="text" class="form-control" id="operationCnt" name="operationCnt" placeholder="직접입력">
+            </div>
+          </div>
+          <div class="mb-1 row">
+            <label for="closeYn" class="col-sm-2 col-form-label text-center">휴항</label>
+            <div class="col-sm-4">
+                  <input type="text" class="form-control" id="closeYn" name="closeYn" placeholder="직접입력">
+            </div>
+          </div>
+          <div class="mb-1 row">
+            <label for="description" class="col-sm-2 col-form-label text-center">비고</label>
+            <div class="col-sm-4">
+                  <textarea id="description" name="description" rows="4" cols="50"></textarea>
+            </div>
+          </div>
+      </form>
+</div>
+<div class="modal-footer justify-content-between">
+  <div class="col-auto">
+    <button type="button" id="btn-close" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+    <button type="button" class="btn btn-primary" id="savePartInfo">저장</button>
+  </div>
+</div>
+</html>

src/main/resources/templates/fipTarget/ipShipList.html

@@ -0,0 +1,117 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorate="~{layout/layout}">
+<th:block layout:fragment="script">
+  <script type="text/javascript" th:src="@{/js/fipTarget/shipInfo.js}"></script>
+</th:block>
+<div layout:fragment="content">
+  <main class="pt-3">
+    <h4>국제여객선 목록</h4>
+    <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
+    <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
+    <div class="row mx-0">
+      <div class="col-12 card text-center">
+        <div class="card-body">
+        <ul class="nav nav-tabs" id="userTab" role="tablist">
+            <li class="nav-item" role="presentation">
+              <button class="nav-link" th:classappend="${searchParams.siType eq 'KRCN'?' active':''}" id="krcnTab" data-bs-toggle="tab" type="button" role="tab">한-중 국제여객선 현황</button>
+            </li>
+            <li class="nav-item" role="presentation">
+              <button class="nav-link" th:classappend="${searchParams.siType eq 'KRJPRU'?' active':''}" id="krjpruTab" data-bs-toggle="tab" type="button" role="tab">한-일,러 국제여객선 현황</button>
+            </li>
+          </ul>
+          <form method="get" th:action="@{/equip/List}">
+            <input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
+            <div class="row justify-content-between pe-3 py-1">
+              <div class="col-auto">
+                <select class="form-select" name="rowCnt" id="rowCnt">
+                  <th:block th:each="num : ${#numbers.sequence(1,5)}">
+                    <option th:value="${num*10}" th:text="${num*10}" th:selected="${searchParams.rowCnt==num*10}"></option>
+                  </th:block>
+                </select>
+              </div>
+              <div class="col-auto">
+                <div class="row justify-content-end">
+                  <div class="col-auto">
+                    <input type="text" class="form-control form-control-sm">
+                  </div>
+                  <input type="submit" class="btn btn-sm btn-primary col-auto" id="searchBtn" value="검색">
+                </div>
+              </div>
+            </div>
+          </form>
+          <div class="row justify-content-start">
+            <div class="col-12">
+              <div class="card">
+                <div class="card-body">
+                  <div class="row">
+                    <table class="table table-striped">
+                      <thead>
+                      <tr>
+                        <th>항로</th>
+                        <th>사업자<br>(한국대리점)</th>
+                        <th>선명</th>
+                        <th>국제<br>총톤수</th>
+                        <th>수송능력</th>
+                        <th>운항횟수</th>
+                        <th>휴항</th>
+                        <th>최종수정일</th>
+                      </tr>
+                      </thead>
+                      <tbody>
+                      <tr>
+
+                      </tr>
+                      </tbody>
+                    </table>
+                  </div>                 
+                   <div class="row justify-content-center">
+                    <div class="col-auto">
+                      <nav aria-label="Page navigation">
+                        <ul class="pagination">
+                          <th:block th:if="${searchParams.pageIndex>3}">
+                            <li class="page-item" th:data-pageindex="${(searchParams.pageIndex)-3}">
+                              <a class="page-link" href="#" aria-label="Previous">
+                                <span aria-hidden="true">&laquo;</span>
+                              </a>
+                            </li>
+                          </th:block>
+                          <th:block th:each="num : ${#numbers.sequence(searchParams.startNum, searchParams.endNum)}">
+                            <li class="page-item" th:data-pageindex="${num}" th:classappend="${searchParams.pageIndex==num?'active':''}">
+                              <a class="page-link" href="#" th:text="${num}"></a>
+                            </li>
+                          </th:block>
+                          <th:block th:if="${searchParams.maxNum>searchParams.endNum+2}">
+                            <li class="page-item" th:data-pageindex="${(searchParams.pageIndex)+3}">
+                              <a class="page-link" href="#" aria-label="Next">
+                                <span aria-hidden="true">&raquo;</span>
+                              </a>
+                            </li>
+                          </th:block>
+                        </ul>
+                      </nav>
+                    </div>
+                  </div>
+                  <div class="col-auto">                     
+                      <input type="button" class="btn btn-primary" value="등록" id="addKRCN" th:if="${accessAuth != 'ACC001'} and ${searchParams.siType eq 'KRCN'}">
+                      <input type="button" class="btn btn-primary" value="등록" id="addKRJPRU" th:if="${accessAuth != 'ACC001'} and ${searchParams.siType eq 'KRJPRU'}">
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </main>
+
+	<div class="modal fade" id="ipShipModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="userEditModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg modal-dialog-scrollable">
+      <div class="modal-content" id="ipShipModalContent">
+      </div>
+    </div>
+  </div>
+
+</div>
+</html>

src/main/resources/templates/igActivities/fpiMgt/affair/affairStatistics.html

@@ -92,8 +92,8 @@
 						</ul>
                     </div>
                     <div class="col-auto">
-                    <input id="category11" name="sangbo" type="checkbox" value="OGC003" checked>경찰서상보<br>
+                    <input id="category11" name="sangbo" type="checkbox" value="OGC003">경찰서상보<br>
-                    <input id="category11" name="sangbo" type="checkbox" value="OGC002" checked>지방청상보
+                    <input id="category11" name="sangbo" type="checkbox" value="OGC002">지방청상보
                     </div>
                 <div class="col-1 d-grid gap-2">
                   <button type="button" id="fieldSearch" class="btn btn-lg btn-primary col-auto">분야별 검색</button>

src/main/resources/templates/igActivities/fpiMgt/affair/fieldStatistics.html

@@ -10,7 +10,7 @@
 </ul>
 <div class="card-body">
 	<button id="showMenu">검색조건열기</button>
-	<button id="downExcel">엑셀다운</button>
+	<button id="fieldDownExcel">엑셀다운</button>
 	<div class="row" id="statisticsDiv">
 		<table class="table table-hover table-bordered border-dark"
 			id="tableData">

src/main/resources/templates/igActivities/fpiMgt/affair/ratingStatistics.html

@@ -10,7 +10,7 @@
 </ul>
 <div class="card-body">
 	<button id="showMenu">검색조건열기</button>
-	<button id="downExcel">엑셀다운</button>
+	<button id="ratingDownExcel">엑셀다운</button>
 	<div class="row" id="statisticsDiv">
 		<table class="table table-hover table-bordered border-dark"
 			id="tableData">