From 1a0fe546300aee73e98ff35b4709c8daf499afd5 Mon Sep 17 00:00:00 2001 From: TaehunPark Date: Wed, 4 Jan 2023 17:54:59 +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 | 72 ++++++- .../mapper/CounterIntelligenceMapper.java | 4 + .../model/CounterIntelligenceActivity.java | 18 ++ .../model/ForeignerInfo.java | 42 ++++ .../model/ManageCompanyInfo.java | 41 ++++ .../model/SaftyDemandInfo.java | 10 +- .../repository/ForeignerInfoRepository.java | 13 ++ .../ManageCompanyInfoRepository.java | 13 ++ .../service/CounterIntelligenceService.java | 40 ++++ .../CounterIntelligenceMapper.xml | 52 +++++ .../js/counterIntelligence/ciaForeigner.js | 81 ++++++++ .../counterIntelligence/ciaManageCompany.js | 75 +++++++ .../js/counterIntelligence/ciaSaftyDemand.js | 9 +- .../ciaForeignerEditModal.html | 98 +++++++++ .../counterIntelligence/ciaForeignerList.html | 188 +++++++++++++++++ .../ciaManageCompanyEditModal.html | 141 +++++++++++++ .../ciaManageCompanyList.html | 190 ++++++++++++++++++ .../ciaManageCompanyViewModal.html | 107 ++++++++++ .../ciaSaftyDemandEditModal.html | 17 +- .../ciaSaftyDemandList.html | 6 +- .../ciaSaftyDemandviewModal.html | 30 ++- 21 files changed, 1212 insertions(+), 35 deletions(-) create mode 100644 src/main/java/com/dbnt/faisp/main/counterIntelligence/model/ForeignerInfo.java create mode 100644 src/main/java/com/dbnt/faisp/main/counterIntelligence/model/ManageCompanyInfo.java create mode 100644 src/main/java/com/dbnt/faisp/main/counterIntelligence/repository/ForeignerInfoRepository.java create mode 100644 src/main/java/com/dbnt/faisp/main/counterIntelligence/repository/ManageCompanyInfoRepository.java create mode 100644 src/main/resources/static/js/counterIntelligence/ciaForeigner.js create mode 100644 src/main/resources/static/js/counterIntelligence/ciaManageCompany.js create mode 100644 src/main/resources/templates/counterIntelligence/ciaForeignerEditModal.html create mode 100644 src/main/resources/templates/counterIntelligence/ciaForeignerList.html create mode 100644 src/main/resources/templates/counterIntelligence/ciaManageCompanyEditModal.html create mode 100644 src/main/resources/templates/counterIntelligence/ciaManageCompanyList.html create mode 100644 src/main/resources/templates/counterIntelligence/ciaManageCompanyViewModal.html 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 344b1420..4b4c440f 100644 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java @@ -130,8 +130,6 @@ public class CounterIntelligenceController { cia = ciService.selectSaftyDemandInfo(cia); } - - mav.addObject("cia", cia); return mav; } @@ -150,7 +148,15 @@ public class CounterIntelligenceController { cia.setWrtDt(LocalDateTime.now()); } Integer ciKey = ciService.saveCiActivity(cia, deleteFileSeq); - ciService.saveSaftyDemand(cia); + switch (cia.getCiType()) { + case "SDI": // 공지사항 + ciService.saveSaftyDemand(cia); + break; + case "MCI": // 공용게시판 + ciService.saveManageCompany(cia); + break; + } + return ciKey; } @@ -162,4 +168,64 @@ public class CounterIntelligenceController { mav.addObject("cia", ciService.selectSaftyDemandInfo(cia)); return mav; } + + @GetMapping("/ciaManageCompanyList") + public ModelAndView ciaManageCompanyList(@AuthenticationPrincipal UserInfo loginUser, CounterIntelligenceActivity cia){ + ModelAndView mav = new ModelAndView("counterIntelligence/ciaManageCompanyList"); + + cia.setDownOrganCdList(loginUser.getDownOrganCdList()); + cia.setQueryInfo(); + mav.addObject("mciList", ciService.selectCiaManageCompanyList(cia)); + cia.setContentCnt(ciService.selectCiaManageCompanyListCnt(cia)); + cia.setPaginationInfo(); + mav.addObject("searchParams", cia); + return mav; + } + + @GetMapping("/ciaManageCompanyEditModal") + public ModelAndView ciaManageCompanyEditModal(@AuthenticationPrincipal UserInfo loginUser, CounterIntelligenceActivity cia){ + ModelAndView mav = new ModelAndView("counterIntelligence/ciaManageCompanyEditModal"); + if(cia.getCiKey() != null) { + cia = ciService.selectManageCompanyInfo(cia); + } + + mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); + mav.addObject("cia", cia); + return mav; + } + + @GetMapping("/ciaManageCompanyViewModal") + public ModelAndView ciaManageCompanyViewModal(@AuthenticationPrincipal UserInfo loginUser, CounterIntelligenceActivity cia){ + ModelAndView mav = new ModelAndView("counterIntelligence/ciaManageCompanyViewModal"); + mav.addObject("lineSeparator", '\n'); + mav.addObject("viewUserSeq", loginUser.getUserSeq()); + mav.addObject("cia", ciService.selectManageCompanyInfo(cia)); + return mav; + } + + @GetMapping("/ciaForeignerList") + public ModelAndView ciaForeignerList(@AuthenticationPrincipal UserInfo loginUser, CounterIntelligenceActivity cia){ + ModelAndView mav = new ModelAndView("counterIntelligence/ciaForeignerList"); + + cia.setDownOrganCdList(loginUser.getDownOrganCdList()); + cia.setQueryInfo(); + mav.addObject("mciList", ciService.selectCiaManageCompanyList(cia)); + cia.setContentCnt(ciService.selectCiaManageCompanyListCnt(cia)); + cia.setPaginationInfo(); + mav.addObject("searchParams", cia); + return mav; + } + + @GetMapping("/ciaForeignerEditModal") + public ModelAndView ciaForeignerEditModal(@AuthenticationPrincipal UserInfo loginUser, CounterIntelligenceActivity cia){ + ModelAndView mav = new ModelAndView("counterIntelligence/ciaForeignerEditModal"); + if(cia.getCiKey() != null) { + cia = ciService.selectManageCompanyInfo(cia); + } + + mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); + mav.addObject("cia", 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 2256ee60..dfe232fb 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 @@ -24,4 +24,8 @@ public interface CounterIntelligenceMapper { List selectCiaSaftyDemandList(CounterIntelligenceActivity cia); Integer selectCiaSaftyDemandListCnt(CounterIntelligenceActivity cia); + + List selectCiaManageCompanyList(CounterIntelligenceActivity cia); + + Integer selectCiaManageCompanyListCnt(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 9aa0334e..e2850bbc 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 @@ -53,6 +53,24 @@ public class CounterIntelligenceActivity extends BaseModel { @Transient private SaftyDemandInfo saftyDemandInfo; @Transient + private ManageCompanyInfo manageCompanyInfo; + @Transient + private String mgtOrgan; + @Transient + private String companyNm; + @Transient + private String companyLocation; + @Transient + private String relatedField; + @Transient + private String description; + @Transient + private String cellPhone; + @Transient + private String department; + @Transient + private String name; + @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 new file mode 100644 index 00000000..72232ac5 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/model/ForeignerInfo.java @@ -0,0 +1,42 @@ +package com.dbnt.faisp.main.counterIntelligence.model; + +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 java.time.LocalDate; + +import javax.persistence.*; + + +@Getter +@Setter +@Entity +@NoArgsConstructor +@DynamicInsert +@DynamicUpdate +@Table(name = "foreigner_info") +public class ForeignerInfo { + @Id + @Column(name = "ci_key") + private Integer ciKey; + @Column(name = "manager") + private String manager; + @Column(name = "commu_location") + private String commuLocation; + @Column(name = "commu_national") + private String commuNational; + @Column(name = "commu_address") + private String commuAddress; + @Column(name = "select_reason") + private String selectReason; + @Column(name = "monitoring_info") + private String monitoringInfo; + @Column(name = "fix_date") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate fixDate; + +} diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/model/ManageCompanyInfo.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/model/ManageCompanyInfo.java new file mode 100644 index 00000000..340bc7dd --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/model/ManageCompanyInfo.java @@ -0,0 +1,41 @@ +package com.dbnt.faisp.main.counterIntelligence.model; + + +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 = "manage_company_info") +public class ManageCompanyInfo { + @Id + @Column(name = "ci_key") + private Integer ciKey; + @Column(name = "mgt_organ") + private String mgtOrgan; + @Column(name = "company_nm") + private String companyNm; + @Column(name = "company_location") + private String companyLocation; + @Column(name = "related_field") + private String relatedField; + @Column(name = "description") + private String description; + @Column(name = "cell_phone") + private String cellPhone; + @Column(name = "department") + private String department; + @Column(name = "name") + private String name; + +} diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/model/SaftyDemandInfo.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/model/SaftyDemandInfo.java index 323e4846..362eb077 100644 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/model/SaftyDemandInfo.java +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/model/SaftyDemandInfo.java @@ -1,18 +1,14 @@ package com.dbnt.faisp.main.counterIntelligence.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 org.springframework.web.multipart.MultipartFile; + import javax.persistence.*; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.List; + @Getter @Setter @@ -21,7 +17,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @Table(name = "safty_demand_info") -public class SaftyDemandInfo extends BaseModel { +public class SaftyDemandInfo { @Id @Column(name = "ci_key") private Integer ciKey; diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/repository/ForeignerInfoRepository.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/repository/ForeignerInfoRepository.java new file mode 100644 index 00000000..dd7d5ee5 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/repository/ForeignerInfoRepository.java @@ -0,0 +1,13 @@ +package com.dbnt.faisp.main.counterIntelligence.repository; + +import com.dbnt.faisp.main.counterIntelligence.model.ForeignerInfo; + +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; +import java.util.Optional; + + +public interface ForeignerInfoRepository extends JpaRepository { + +} diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/repository/ManageCompanyInfoRepository.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/repository/ManageCompanyInfoRepository.java new file mode 100644 index 00000000..72b24287 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/repository/ManageCompanyInfoRepository.java @@ -0,0 +1,13 @@ +package com.dbnt.faisp.main.counterIntelligence.repository; + +import com.dbnt.faisp.main.counterIntelligence.model.ManageCompanyInfo; + +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; +import java.util.Optional; + + +public interface ManageCompanyInfoRepository extends JpaRepository { + +} 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 fe8d18a1..6d438551 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 @@ -9,12 +9,15 @@ 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.HashTagLinkCiw; +import com.dbnt.faisp.main.counterIntelligence.model.ManageCompanyInfo; import com.dbnt.faisp.main.counterIntelligence.model.SaftyDemandInfo; import com.dbnt.faisp.main.counterIntelligence.repository.CiaFileRepository; import com.dbnt.faisp.main.counterIntelligence.repository.CiwFileRepository; import com.dbnt.faisp.main.counterIntelligence.repository.CounterIntelligenceActivityRepository; import com.dbnt.faisp.main.counterIntelligence.repository.CounterIntelligenceWorkRepository; +import com.dbnt.faisp.main.counterIntelligence.repository.ForeignerInfoRepository; import com.dbnt.faisp.main.counterIntelligence.repository.HashTagLinkCiwRepository; +import com.dbnt.faisp.main.counterIntelligence.repository.ManageCompanyInfoRepository; import com.dbnt.faisp.main.counterIntelligence.repository.SaftyDemandInfoRepository; import com.dbnt.faisp.main.hashTag.service.HashTagService; import lombok.RequiredArgsConstructor; @@ -36,6 +39,8 @@ public class CounterIntelligenceService extends BaseService { private final CounterIntelligenceActivityRepository counterIntelligenceActivityRepository; private final CiaFileRepository ciaFileRepository; private final SaftyDemandInfoRepository saftyDemandInfoRepository; + private final ManageCompanyInfoRepository manageCompanyInfoRepository; + private final ForeignerInfoRepository foreignerInfoRepository; private final CounterIntelligenceMapper ciMapper; public List selectCounterIntelligenceWorkList(CounterIntelligenceWork ciWork){ @@ -191,12 +196,15 @@ public class CounterIntelligenceService extends BaseService { sdi.setOutlookProblem(cia.getOutlookProblem()); saftyDemandInfoRepository.save(sdi); } + public List selectCiaSaftyDemandList(CounterIntelligenceActivity cia) { return ciMapper.selectCiaSaftyDemandList(cia); } + public Integer selectCiaSaftyDemandListCnt(CounterIntelligenceActivity cia) { return ciMapper.selectCiaSaftyDemandListCnt(cia); } + public CounterIntelligenceActivity selectSaftyDemandInfo(CounterIntelligenceActivity cia) { CounterIntelligenceActivity dbCia = counterIntelligenceActivityRepository.findById(cia.getCiKey()).orElse(null); if(dbCia!=null){ @@ -206,4 +214,36 @@ public class CounterIntelligenceService extends BaseService { return dbCia; } + @Transactional + public void saveManageCompany(CounterIntelligenceActivity cia) { + ManageCompanyInfo mci = new ManageCompanyInfo(); + mci.setCiKey(cia.getCiKey()); + mci.setMgtOrgan(cia.getMgtOrgan()); + mci.setCompanyNm(cia.getCompanyNm()); + mci.setCompanyLocation(cia.getCompanyLocation()); + mci.setRelatedField(cia.getRelatedField()); + mci.setDescription(cia.getDescription()); + mci.setCellPhone(cia.getCellPhone()); + mci.setDepartment(cia.getDepartment()); + mci.setName(cia.getName()); + manageCompanyInfoRepository.save(mci); + } + + public List selectCiaManageCompanyList(CounterIntelligenceActivity cia) { + return ciMapper.selectCiaManageCompanyList(cia); + } + + public Integer selectCiaManageCompanyListCnt(CounterIntelligenceActivity cia) { + return ciMapper.selectCiaManageCompanyListCnt(cia); + } + + public CounterIntelligenceActivity selectManageCompanyInfo(CounterIntelligenceActivity cia) { + CounterIntelligenceActivity dbCia = counterIntelligenceActivityRepository.findById(cia.getCiKey()).orElse(null); + if(dbCia!=null){ + dbCia.setFileList(ciaFileRepository.findByCiKey(cia.getCiKey())); + dbCia.setManageCompanyInfo(manageCompanyInfoRepository.findById(cia.getCiKey()).orElse(null)); + } + return dbCia; + } + } diff --git a/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml b/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml index 239a1fdc..00f0a10e 100644 --- a/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml +++ b/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml @@ -182,5 +182,57 @@ 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 new file mode 100644 index 00000000..c963e127 --- /dev/null +++ b/src/main/resources/static/js/counterIntelligence/ciaForeigner.js @@ -0,0 +1,81 @@ +$(document).on('click', '#addBtn', function (){ + getCiaForeignerEditModal(null); +}) + +function getCiaForeignerEditModal(ciKey){ + $.ajax({ + url: '/counterIntelligence/ciaForeignerEditModal', + data: {ciKey: ciKey}, + type: 'GET', + dataType:"html", + success: function(html){ + $("#ciaForeignerEditModalContent").empty().append(html); + $("#fixDate").datepicker({ + format: "yyyy-mm-dd", + language: "ko", + autoclose: true + }); + setUploadDiv(); + setEditor('editor', '400'); + $("#ciaForeignerEditModal").modal('show'); + }, + error:function(){ + + } + }); +} + +$(document).on('click', '#saveBtn', function (){ + if(confirm("저장하시겠습니까?")){ + const formData = new FormData($("#ciaManageCompanyEditForm")[0]); + for(const file of files) { + if(!file.isDelete) + formData.append('uploadFiles', file, file.name); + } + $(".text-decoration-line-through").each(function (idx, el){ + formData.append('fileSeq', $(el).attr("data-fileseq")); + }) + $.ajax({ + type : 'POST', + data : formData, + url : "/counterIntelligence/saveCiActivity", + processData: false, + contentType: false, + success : function(result) { + alert("저장되었습니다."); + contentFade("out"); + location.reload(); + }, + error : function(xhr, status) { + alert("저장에 실패하였습니다.") + contentFade("out"); + } + }) + + } +}) + +$(document).on('click', '.mciTr', function (){ + getCiaManageCompanyViewModal($(this).find(".ciKey").val()); +}) + +function getCiaManageCompanyViewModal(ciKey){ + $.ajax({ + url: '/counterIntelligence/ciaManageCompanyViewModal', + data: {ciKey: ciKey}, + type: 'GET', + dataType:"html", + success: function(html){ + $("#ciaManageCompanyViewModalBody").empty().append(html) + $("#ciaManageCompanyViewModal").modal('show'); + }, + error:function(){ + + } + }); +} + +$(document).on('click', '#editBtn', function (){ + $("#ciaManageCompanyViewModal").modal('hide'); + getCiaManageCompanyEditModal($(this).attr("data-cikey")); +}) diff --git a/src/main/resources/static/js/counterIntelligence/ciaManageCompany.js b/src/main/resources/static/js/counterIntelligence/ciaManageCompany.js new file mode 100644 index 00000000..2a8d5f78 --- /dev/null +++ b/src/main/resources/static/js/counterIntelligence/ciaManageCompany.js @@ -0,0 +1,75 @@ +$(document).on('click', '#addBtn', function (){ + getCiaManageCompanyEditModal(null); +}) + +function getCiaManageCompanyEditModal(ciKey){ + $.ajax({ + url: '/counterIntelligence/ciaManageCompanyEditModal', + data: {ciKey: ciKey}, + type: 'GET', + dataType:"html", + success: function(html){ + $("#ciaManageCompanyEditModalContent").empty().append(html) + setUploadDiv(); + $("#ciaManageCompanyEditModal").modal('show'); + }, + error:function(){ + + } + }); +} + +$(document).on('click', '#saveBtn', function (){ + if(confirm("저장하시겠습니까?")){ + const formData = new FormData($("#ciaManageCompanyEditForm")[0]); + for(const file of files) { + if(!file.isDelete) + formData.append('uploadFiles', file, file.name); + } + $(".text-decoration-line-through").each(function (idx, el){ + formData.append('fileSeq', $(el).attr("data-fileseq")); + }) + $.ajax({ + type : 'POST', + data : formData, + url : "/counterIntelligence/saveCiActivity", + processData: false, + contentType: false, + success : function(result) { + alert("저장되었습니다."); + contentFade("out"); + location.reload(); + }, + error : function(xhr, status) { + alert("저장에 실패하였습니다.") + contentFade("out"); + } + }) + + } +}) + +$(document).on('click', '.mciTr', function (){ + getCiaManageCompanyViewModal($(this).find(".ciKey").val()); +}) + +function getCiaManageCompanyViewModal(ciKey){ + $.ajax({ + url: '/counterIntelligence/ciaManageCompanyViewModal', + data: {ciKey: ciKey}, + type: 'GET', + dataType:"html", + success: function(html){ + $("#ciaManageCompanyViewModalBody").empty().append(html) + $("#ciaManageCompanyViewModal").modal('show'); + }, + error:function(){ + + } + }); +} + +$(document).on('click', '#editBtn', function (){ + $("#ciaManageCompanyViewModal").modal('hide'); + getCiaManageCompanyEditModal($(this).attr("data-cikey")); +}) diff --git a/src/main/resources/static/js/counterIntelligence/ciaSaftyDemand.js b/src/main/resources/static/js/counterIntelligence/ciaSaftyDemand.js index 87dcc64f..3a54ec5e 100644 --- a/src/main/resources/static/js/counterIntelligence/ciaSaftyDemand.js +++ b/src/main/resources/static/js/counterIntelligence/ciaSaftyDemand.js @@ -60,11 +60,16 @@ function getCiaSaftyDemandViewModal(ciKey){ type: 'GET', dataType:"html", success: function(html){ - $("#ciWorkViewModalBody").empty().append(html) - $("#ciWorkViewModal").modal('show'); + $("#ciaSaftyDemandViewModalBody").empty().append(html) + $("#ciaSaftyDemandViewModal").modal('show'); }, error:function(){ } }); } + +$(document).on('click', '#editBtn', function (){ + $("#ciaSaftyDemandViewModal").modal('hide'); + getCiaSaftyDemandEditModal($(this).attr("data-cikey")); +}) diff --git a/src/main/resources/templates/counterIntelligence/ciaForeignerEditModal.html b/src/main/resources/templates/counterIntelligence/ciaForeignerEditModal.html new file mode 100644 index 00000000..b06cff3f --- /dev/null +++ b/src/main/resources/templates/counterIntelligence/ciaForeignerEditModal.html @@ -0,0 +1,98 @@ + + +
+
+ +
+
+
+ + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ +
+
+ +
+ +
+
+ +
파일을 업로드 해주세요. + + +
+ + 삭제 +
+ +
+ +
+
+
+
+
+
+ +
+
+ + +
+
+ \ No newline at end of file diff --git a/src/main/resources/templates/counterIntelligence/ciaForeignerList.html b/src/main/resources/templates/counterIntelligence/ciaForeignerList.html new file mode 100644 index 00000000..7ade3dca --- /dev/null +++ b/src/main/resources/templates/counterIntelligence/ciaForeignerList.html @@ -0,0 +1,188 @@ + + + + + +
+
+
+
+

외국인 커뮤니티 모니터링 현황

+
+
+

외사방첩관리 > 방첩활동 > 외국인 커뮤니티 모니터링 현황

+
+
+ + +
+
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
관리관서대상커뮤니티선정사유모니터링 사항선정일담당자작성자작성일
소재지국적주소지
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+
+ + + +
+ \ No newline at end of file diff --git a/src/main/resources/templates/counterIntelligence/ciaManageCompanyEditModal.html b/src/main/resources/templates/counterIntelligence/ciaManageCompanyEditModal.html new file mode 100644 index 00000000..cfd0e9c2 --- /dev/null +++ b/src/main/resources/templates/counterIntelligence/ciaManageCompanyEditModal.html @@ -0,0 +1,141 @@ + + +
+
+ +
+
+
+ + + + + + + + + + +
+ +
+ +
+ +
+ +
+
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ + +
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+
+ +
파일을 업로드 해주세요. + + +
+ + 삭제 +
+ +
+ +
+
+
+
+
+
+ +
+
+ + +
+
+ \ No newline at end of file diff --git a/src/main/resources/templates/counterIntelligence/ciaManageCompanyList.html b/src/main/resources/templates/counterIntelligence/ciaManageCompanyList.html new file mode 100644 index 00000000..6e7b5d9f --- /dev/null +++ b/src/main/resources/templates/counterIntelligence/ciaManageCompanyList.html @@ -0,0 +1,190 @@ + + + + + +
+
+
+
+

해양산업보호 관리업체 현황

+
+
+

외사방첩관리 > 방첩활동 > 해양산업보호 관리업체 현황

+
+
+ + +
+
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
문서번호관리관서업체명담당자부서담당자번호담당자명작성자작성일
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+
+ + + +
+ \ No newline at end of file diff --git a/src/main/resources/templates/counterIntelligence/ciaManageCompanyViewModal.html b/src/main/resources/templates/counterIntelligence/ciaManageCompanyViewModal.html new file mode 100644 index 00000000..b97f02e5 --- /dev/null +++ b/src/main/resources/templates/counterIntelligence/ciaManageCompanyViewModal.html @@ -0,0 +1,107 @@ + + +
+
해양산업보호 관리업체 열람
+ +
+
+ +
+
+
+ + + + + + +
+
+
+ + + + +
+
+ + + + + + +
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + +
파일명사이즈
파일이 없습니다.
+ +
+
+
+
+
+
+
+
+ + + + +
+
+ + + +
+
\ No newline at end of file diff --git a/src/main/resources/templates/counterIntelligence/ciaSaftyDemandEditModal.html b/src/main/resources/templates/counterIntelligence/ciaSaftyDemandEditModal.html index 0e513d42..fbad5b39 100644 --- a/src/main/resources/templates/counterIntelligence/ciaSaftyDemandEditModal.html +++ b/src/main/resources/templates/counterIntelligence/ciaSaftyDemandEditModal.html @@ -1,7 +1,7 @@
-
치안수요 등록
+
@@ -9,6 +9,13 @@ + + + + + + +
@@ -16,19 +23,21 @@
- +
- + +
- + +
diff --git a/src/main/resources/templates/counterIntelligence/ciaSaftyDemandList.html b/src/main/resources/templates/counterIntelligence/ciaSaftyDemandList.html index 21426114..651bb2b8 100644 --- a/src/main/resources/templates/counterIntelligence/ciaSaftyDemandList.html +++ b/src/main/resources/templates/counterIntelligence/ciaSaftyDemandList.html @@ -181,9 +181,9 @@
-