From b218a81ebb76c8ad681fe1933ee1ef58fbb593e5 Mon Sep 17 00:00:00 2001 From: TaehunPark Date: Thu, 5 Jan 2023 11:42:12 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=EB=B0=A9=EC=B2=A9=ED=99=9C=EB=8F=99?= =?UTF-8?q?=20=EC=A4=91=EA=B0=84=EC=A0=80=EC=9E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CounterIntelligenceController.java | 11 +++-- .../mapper/CounterIntelligenceMapper.java | 6 +++ .../model/CounterIntelligenceActivity.java | 17 +++++++ .../model/ForeignerInfo.java | 2 + .../service/CounterIntelligenceService.java | 24 ++++++++++ .../CounterIntelligenceMapper.xml | 46 +++++++++++++++++++ .../js/counterIntelligence/ciaForeigner.js | 3 +- .../ciaForeignerEditModal.html | 20 ++++---- .../counterIntelligence/ciaForeignerList.html | 17 +++++-- 9 files changed, 129 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java index 667e2a63..cb385d84 100644 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java @@ -149,12 +149,15 @@ public class CounterIntelligenceController { } Integer ciKey = ciService.saveCiActivity(cia, deleteFileSeq); switch (cia.getCiType()) { - case "SDI": // 공지사항 + case "SDI": // 치안수요분석 ciService.saveSaftyDemand(cia); break; - case "MCI": // 공용게시판 + case "MCI": // 해양산업보호관리업체 ciService.saveManageCompany(cia); break; + case "FI": // 외국인커뮤니티모니터링 + ciService.saveForeigner(cia); + break; } return ciKey; @@ -209,8 +212,8 @@ public class CounterIntelligenceController { cia.setDownOrganCdList(loginUser.getDownOrganCdList()); cia.setQueryInfo(); - mav.addObject("mciList", ciService.selectCiaManageCompanyList(cia)); - cia.setContentCnt(ciService.selectCiaManageCompanyListCnt(cia)); + mav.addObject("fiList", ciService.selectCiaForeignerList(cia)); + cia.setContentCnt(ciService.selectCiaForeignerListCnt(cia)); cia.setPaginationInfo(); mav.addObject("searchParams", cia); return mav; diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/mapper/CounterIntelligenceMapper.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/mapper/CounterIntelligenceMapper.java index dfe232fb..99fa1f70 100644 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/mapper/CounterIntelligenceMapper.java +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/mapper/CounterIntelligenceMapper.java @@ -3,6 +3,8 @@ package com.dbnt.faisp.main.counterIntelligence.mapper; import com.dbnt.faisp.main.counterIntelligence.model.CiWorkStatistics; import com.dbnt.faisp.main.counterIntelligence.model.CounterIntelligenceActivity; import com.dbnt.faisp.main.counterIntelligence.model.CounterIntelligenceWork; +import com.dbnt.faisp.main.counterIntelligence.model.ForeignerInfo; + import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -28,4 +30,8 @@ public interface CounterIntelligenceMapper { List selectCiaManageCompanyList(CounterIntelligenceActivity cia); Integer selectCiaManageCompanyListCnt(CounterIntelligenceActivity cia); + + List selectCiaForeignerList(CounterIntelligenceActivity cia); + + Integer selectCiaForeignerListCnt(CounterIntelligenceActivity cia); } diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/model/CounterIntelligenceActivity.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/model/CounterIntelligenceActivity.java index e2850bbc..53f62dac 100644 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/model/CounterIntelligenceActivity.java +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/model/CounterIntelligenceActivity.java @@ -55,6 +55,8 @@ public class CounterIntelligenceActivity extends BaseModel { @Transient private ManageCompanyInfo manageCompanyInfo; @Transient + private ForeignerInfo foreignerInfo; + @Transient private String mgtOrgan; @Transient private String companyNm; @@ -71,6 +73,21 @@ public class CounterIntelligenceActivity extends BaseModel { @Transient private String name; @Transient + private String manager; + @Transient + private String commuLocation; + @Transient + private String commuNational; + @Transient + private String commuAddress; + @Transient + private String selectReason; + @Transient + private String monitoringInfo; + @Transient + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate fixDate; + @Transient private List fileList; @Transient private List multipartFileList; diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/model/ForeignerInfo.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/model/ForeignerInfo.java index 72232ac5..7115a05b 100644 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/model/ForeignerInfo.java +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/model/ForeignerInfo.java @@ -23,6 +23,8 @@ public class ForeignerInfo { @Id @Column(name = "ci_key") private Integer ciKey; + @Column(name = "mgt_organ") + private String mgtOrgan; @Column(name = "manager") private String manager; @Column(name = "commu_location") diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/service/CounterIntelligenceService.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/service/CounterIntelligenceService.java index 6d438551..b3b1e61a 100644 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/service/CounterIntelligenceService.java +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/service/CounterIntelligenceService.java @@ -8,6 +8,7 @@ import com.dbnt.faisp.main.counterIntelligence.model.CiaFile; import com.dbnt.faisp.main.counterIntelligence.model.CiwFile; import com.dbnt.faisp.main.counterIntelligence.model.CounterIntelligenceActivity; import com.dbnt.faisp.main.counterIntelligence.model.CounterIntelligenceWork; +import com.dbnt.faisp.main.counterIntelligence.model.ForeignerInfo; import com.dbnt.faisp.main.counterIntelligence.model.HashTagLinkCiw; import com.dbnt.faisp.main.counterIntelligence.model.ManageCompanyInfo; import com.dbnt.faisp.main.counterIntelligence.model.SaftyDemandInfo; @@ -246,4 +247,27 @@ public class CounterIntelligenceService extends BaseService { return dbCia; } + @Transactional + public void saveForeigner(CounterIntelligenceActivity cia) { + ForeignerInfo fi = new ForeignerInfo(); + fi.setCiKey(cia.getCiKey()); + fi.setMgtOrgan(cia.getMgtOrgan()); + fi.setManager(cia.getManager()); + fi.setCommuLocation(cia.getCommuLocation()); + fi.setCommuNational(cia.getCommuNational()); + fi.setCommuAddress(cia.getCommuAddress()); + fi.setSelectReason(cia.getSelectReason()); + fi.setMonitoringInfo(cia.getMonitoringInfo()); + fi.setFixDate(cia.getFixDate()); + foreignerInfoRepository.save(fi); + } + + public List selectCiaForeignerList(CounterIntelligenceActivity cia) { + return ciMapper.selectCiaForeignerList(cia); + } + + public Integer selectCiaForeignerListCnt(CounterIntelligenceActivity cia) { + return ciMapper.selectCiaForeignerListCnt(cia); + } + } diff --git a/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml b/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml index 00f0a10e..86aa5ba6 100644 --- a/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml +++ b/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml @@ -234,5 +234,51 @@ ORDER BY cia.ci_key DESC )a + + + + \ No newline at end of file diff --git a/src/main/resources/static/js/counterIntelligence/ciaForeigner.js b/src/main/resources/static/js/counterIntelligence/ciaForeigner.js index c963e127..577fa271 100644 --- a/src/main/resources/static/js/counterIntelligence/ciaForeigner.js +++ b/src/main/resources/static/js/counterIntelligence/ciaForeigner.js @@ -27,7 +27,7 @@ function getCiaForeignerEditModal(ciKey){ $(document).on('click', '#saveBtn', function (){ if(confirm("저장하시겠습니까?")){ - const formData = new FormData($("#ciaManageCompanyEditForm")[0]); + const formData = new FormData($("#ciaForeignerEditForm")[0]); for(const file of files) { if(!file.isDelete) formData.append('uploadFiles', file, file.name); @@ -35,6 +35,7 @@ $(document).on('click', '#saveBtn', function (){ $(".text-decoration-line-through").each(function (idx, el){ formData.append('fileSeq', $(el).attr("data-fileseq")); }) + formData.append('monitoringInfo', CrossEditor.GetBodyValue()); $.ajax({ type : 'POST', data : formData, diff --git a/src/main/resources/templates/counterIntelligence/ciaForeignerEditModal.html b/src/main/resources/templates/counterIntelligence/ciaForeignerEditModal.html index b06cff3f..6ef535c0 100644 --- a/src/main/resources/templates/counterIntelligence/ciaForeignerEditModal.html +++ b/src/main/resources/templates/counterIntelligence/ciaForeignerEditModal.html @@ -5,10 +5,10 @@
-
+ - +