From 76609562a32551cc06c2278fadc245785e0536e5 Mon Sep 17 00:00:00 2001 From: TaehunPark Date: Wed, 2 Nov 2022 15:23:31 +0900 Subject: [PATCH 1/9] =?UTF-8?q?fix:=EB=AF=BC=EA=B0=84=ED=86=B5=EC=97=AD?= =?UTF-8?q?=EC=9D=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/translator/TranslatorController.java | 23 ++++-- .../translator/mapper/TranslatorMapper.java | 2 +- .../main/translator/model/Translator.java | 11 ++- .../repository/TranslatorRepository.java | 5 ++ .../translator/service/TranslatorService.java | 19 +++-- .../mybatisMapper/TranslatorMapper.xml | 7 +- .../static/js/translator/translator.js | 33 ++++---- .../templates/translator/translator.html | 82 +++++++++---------- .../translator/translatorCareerModal.html | 31 ++++--- .../translator/translatorEditModal.html | 65 ++++++++------- .../translator/translatorHistory.html | 8 +- .../translator/translatorStatisticsLang.html | 6 +- 12 files changed, 161 insertions(+), 131 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/translator/TranslatorController.java b/src/main/java/com/dbnt/faisp/main/translator/TranslatorController.java index 693642fc..06ba9d86 100644 --- a/src/main/java/com/dbnt/faisp/main/translator/TranslatorController.java +++ b/src/main/java/com/dbnt/faisp/main/translator/TranslatorController.java @@ -11,6 +11,7 @@ import com.dbnt.faisp.util.Utils; import lombok.RequiredArgsConstructor; import java.io.IOException; +import java.time.LocalDateTime; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -71,8 +72,11 @@ public class TranslatorController { @PostMapping("/insertTranslatorInfo") public String insertTranslatorInfo(@AuthenticationPrincipal UserInfo loginUser,Translator translator) { - translator.setWrtNm(loginUser.getUserId()); + translator.setWrtNm(loginUser.getUserNm()); translator.setWrtOrgan(loginUser.getOgCd()); + translator.setWrtPart(loginUser.getOfcCd()); + translator.setWrtTitle(loginUser.getTitleCd()); + translator.setWrtDt(LocalDateTime.now()); return translatorSevice.insertTranslatorInfo(translator); } @@ -81,17 +85,21 @@ public class TranslatorController { ModelAndView mav = new ModelAndView("translator/translatorEditModal"); //메뉴권한 확인 String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/translator/info").get(0).getAccessAuth(); - mav.addObject("wrtId", translatorSevice.selectTrFristId(translator.getTranslatorKey())); - mav.addObject("userId", loginUser.getUserId()); + mav.addObject("wrtUserSeq", translatorSevice.selectTrFristUserSeq(translator.getTranslatorKey())); + mav.addObject("userSeq", loginUser.getUserSeq()); mav.addObject("trInfo", translatorSevice.selectTranslatorView(translator)); + mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); mav.addObject("accessAuth", accessAuth); return mav; } @PostMapping("/updateTranslatorInfo") public Translator updatetranslatorInfo(@AuthenticationPrincipal UserInfo loginUser,Translator translator) { - translator.setWrtNm(loginUser.getUserId()); + translator.setWrtNm(loginUser.getUserNm()); translator.setWrtOrgan(loginUser.getOgCd()); + translator.setWrtPart(loginUser.getOfcCd()); + translator.setWrtTitle(loginUser.getTitleCd()); + translator.setWrtDt(LocalDateTime.now()); Translator result = translatorSevice.updatetranslatorInfo(translator); return result; } @@ -99,7 +107,7 @@ public class TranslatorController { @GetMapping("/revisionHistory") public ModelAndView revisionHistory(Translator translator){ ModelAndView mav = new ModelAndView("translator/translatorHistory"); - mav.addObject("HistoryList", translatorSevice.selectHistoryList(translator)); + mav.addObject("historyList", translatorSevice.selectHistoryList(translator)); return mav; } @@ -118,8 +126,9 @@ public class TranslatorController { mav.addObject("policeCrr", translatorSevice.selectMaritimePoliceCareer(translatorCrr)); mav.addObject("anotherCrr", translatorSevice.selectAnotherOrganizationCareer(translatorCrr)); mav.addObject("trKey", translatorCrr.getTranslatorKey()); - mav.addObject("wrtId", translatorSevice.selectTrFristId(translatorCrr.getTranslatorKey())); - mav.addObject("userId", loginUser.getUserId()); + mav.addObject("wrtUserSeq", translatorSevice.selectTrFristUserSeq(translatorCrr.getTranslatorKey())); + mav.addObject("userSeq", loginUser.getUserSeq()); + mav.addObject("trName", translatorSevice.selectTrLastName(translatorCrr)); mav.addObject("accessAuth", accessAuth); return mav; } diff --git a/src/main/java/com/dbnt/faisp/main/translator/mapper/TranslatorMapper.java b/src/main/java/com/dbnt/faisp/main/translator/mapper/TranslatorMapper.java index d06a8fb6..1414e4ed 100644 --- a/src/main/java/com/dbnt/faisp/main/translator/mapper/TranslatorMapper.java +++ b/src/main/java/com/dbnt/faisp/main/translator/mapper/TranslatorMapper.java @@ -27,6 +27,6 @@ public interface TranslatorMapper { List selectTranslatorListEx(Translator translator); - String selectTrFristId(int translatorKey); + String selectTrFristUserSeq(int translatorKey); } diff --git a/src/main/java/com/dbnt/faisp/main/translator/model/Translator.java b/src/main/java/com/dbnt/faisp/main/translator/model/Translator.java index 5535e9c0..72de4b9e 100644 --- a/src/main/java/com/dbnt/faisp/main/translator/model/Translator.java +++ b/src/main/java/com/dbnt/faisp/main/translator/model/Translator.java @@ -63,12 +63,19 @@ public class Translator extends BaseModel implements Serializable{ private String dmlYn; @Column(name = "remark") private String remark; + @Column(name = "wrt_organ") + private String wrtOrgan; + @Column(name = "wrt_part") + private String wrtPart; + @Column(name = "wrt_title") + private String wrtTitle; + @Column(name = "wrt_user_seq") + private Integer wrtUserSeq; @Column(name = "wrt_nm") private String wrtNm; @Column(name = "wrt_dt") private LocalDateTime wrtDt; - @Column(name = "wrt_organ") - private String wrtOrgan; + @Transient diff --git a/src/main/java/com/dbnt/faisp/main/translator/repository/TranslatorRepository.java b/src/main/java/com/dbnt/faisp/main/translator/repository/TranslatorRepository.java index dc693e73..455e6d0a 100644 --- a/src/main/java/com/dbnt/faisp/main/translator/repository/TranslatorRepository.java +++ b/src/main/java/com/dbnt/faisp/main/translator/repository/TranslatorRepository.java @@ -2,6 +2,8 @@ package com.dbnt.faisp.main.translator.repository; import com.dbnt.faisp.main.translator.model.Translator; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; @@ -10,6 +12,9 @@ public interface TranslatorRepository extends JpaRepository selectTranslatorList(Translator translator) { @@ -75,8 +73,11 @@ public class TranslatorService { translatorTmp.setDmlYn(translator.getDmlYn()); translatorTmp.setRemark(translator.getRemark()); translatorTmp.setWrtNm(translator.getWrtNm()); - translatorTmp.setWrtDt(LocalDateTime.now()); + translatorTmp.setWrtDt(translator.getWrtDt()); translatorTmp.setWrtOrgan(translator.getWrtOrgan()); + translatorTmp.setWrtPart(translator.getWrtPart()); + translatorTmp.setWrtTitle(translator.getWrtTitle()); + translatorTmp.setWrtUserSeq(translator.getWrtUserSeq()); translatorRepository.save(translatorTmp); return translatorTmp; } @@ -140,8 +141,12 @@ public class TranslatorService { return translatorMapper.selectTranslatorListEx(translator); } - public String selectTrFristId(int translatorKey) { - return translatorMapper.selectTrFristId(translatorKey); + public String selectTrFristUserSeq(int translatorKey) { + return translatorMapper.selectTrFristUserSeq(translatorKey); + } + + public String selectTrLastName(TranslatorCrr translatorCrr) { + return translatorRepository.getTrLastName(translatorCrr.getTranslatorKey()); } } diff --git a/src/main/resources/mybatisMapper/TranslatorMapper.xml b/src/main/resources/mybatisMapper/TranslatorMapper.xml index ed7558ef..59986ce3 100644 --- a/src/main/resources/mybatisMapper/TranslatorMapper.xml +++ b/src/main/resources/mybatisMapper/TranslatorMapper.xml @@ -121,6 +121,9 @@ - + select wrt_user_seq from translator_info where translator_key = #{translatorKey} order by version_no asc diff --git a/src/main/resources/static/js/translator/translator.js b/src/main/resources/static/js/translator/translator.js index 29880898..9f880c73 100644 --- a/src/main/resources/static/js/translator/translator.js +++ b/src/main/resources/static/js/translator/translator.js @@ -45,15 +45,15 @@ $(document).on('click', '#updateBtn', function (){ return false; } - if($('#trLang').val() == ''){ + if($('#eTrLang').val() == ''){ alert("언어를 선택해주세요."); - $('#trLang').focus(); + $('#eTrLang').focus(); return false; } - if($('#trEname').val() == ''){ + if($('#eTrEname').val() == ''){ alert("성명을 입력해주세요."); - $('#trEname').focus(); + $('#eTrEname').focus(); return false; } @@ -227,10 +227,8 @@ $(document).on('change', '#trNny', function (){ $(document).on('click', '#crrAddBtn', function (){ const trKey = (Number($('#tcInsertKey').val())); $('#insertCareer').append( - '
'+ - '
'+ - ''+ - '
'+ + '
'+ + '
'+ ''+ '
'+ ''+ + ''+ '
'+ ''+ '
'+ ''+ '
'+ - ''+ - '
'+ + '
'+ + '
'+ + ''+ + '
'+ ''+ '
'+ - '
' + '
'+ + ''+ + '
'+ + '
'+ + '
' ) $(".tcDt").datepicker({ format: "yyyy-mm-dd", @@ -376,11 +380,6 @@ function deleteCareerBtn(crrSeq,trKey){ } $(document).on('click', '.btn-close', function (){ - trCarrerList.length = 0; - location.reload(); -}) - -$(document).on('click', '#closeModalBtn', function (){ location.reload(); }) diff --git a/src/main/resources/templates/translator/translator.html b/src/main/resources/templates/translator/translator.html index f9f67b75..6f5467c7 100644 --- a/src/main/resources/templates/translator/translator.html +++ b/src/main/resources/templates/translator/translator.html @@ -28,7 +28,7 @@
@@ -52,17 +52,7 @@
- -
- -
-
- -
-
-
-
- @@ -70,19 +60,27 @@
- -
-
- -
+
+
+
+
+ +
+
+ +
+ +
+
@@ -91,7 +89,7 @@
- +
@@ -110,7 +108,7 @@ - + @@ -139,7 +137,10 @@
연번연락처
-
+
+
+ +
-
- - -
+
+ +
@@ -190,7 +190,7 @@
- +
- +
- +
- +
- +
-
- +
- +
- +
- +
- @@ -259,11 +259,11 @@
- +
- +
- +
- +
- +
diff --git a/src/main/resources/templates/translator/translatorCareerModal.html b/src/main/resources/templates/translator/translatorCareerModal.html index 3d99643f..64f37c42 100644 --- a/src/main/resources/templates/translator/translatorCareerModal.html +++ b/src/main/resources/templates/translator/translatorCareerModal.html @@ -6,13 +6,18 @@
-
통역인이름
+
+ +
+ +
+
해양경찰청 이력
- +
@@ -22,20 +27,20 @@ - - - - + + + + - +
연번
ㅇ
타기관 이력
- +
@@ -45,13 +50,13 @@ - - - + + + - +
연번
@@ -60,7 +65,7 @@
- +
diff --git a/src/main/resources/templates/translator/translatorEditModal.html b/src/main/resources/templates/translator/translatorEditModal.html index 85dfdd10..60d870df 100644 --- a/src/main/resources/templates/translator/translatorEditModal.html +++ b/src/main/resources/templates/translator/translatorEditModal.html @@ -1,7 +1,5 @@ -
-
@@ -9,65 +7,67 @@
- +
- +
-
- +
- +
- +
- +
- +
-
- +
- +
- +
-
- +
- +
- +
- @@ -76,27 +76,27 @@
- +
- +
- +
-
- +
- +
- +
- @@ -104,18 +104,17 @@
- +
- +
- - + +
-
-
+ \ No newline at end of file diff --git a/src/main/resources/templates/translator/translatorHistory.html b/src/main/resources/templates/translator/translatorHistory.html index 074c251f..45e4d98e 100644 --- a/src/main/resources/templates/translator/translatorHistory.html +++ b/src/main/resources/templates/translator/translatorHistory.html @@ -1,6 +1,5 @@ -
@@ -22,13 +21,13 @@ - + - - + + @@ -110,5 +109,4 @@
- \ No newline at end of file diff --git a/src/main/resources/templates/translator/translatorStatisticsLang.html b/src/main/resources/templates/translator/translatorStatisticsLang.html index 329d925f..1063dfa9 100644 --- a/src/main/resources/templates/translator/translatorStatisticsLang.html +++ b/src/main/resources/templates/translator/translatorStatisticsLang.html @@ -18,7 +18,7 @@
- +
@@ -50,7 +50,7 @@ - + @@ -67,7 +67,7 @@
- +
From 0489867e6219248ede195076d28ee5a46a73a054 Mon Sep 17 00:00:00 2001 From: TaehunPark Date: Wed, 2 Nov 2022 17:55:03 +0900 Subject: [PATCH 2/9] =?UTF-8?q?fix:=EC=99=B8=EC=82=AC=EB=8C=80=EC=83=81?= =?UTF-8?q?=EB=AA=A9=ED=91=9C=20=ED=99=94=EB=A9=B4=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fipTarget/service/FipTargetService.java | 2 ++ .../templates/fipTarget/ipShipList.html | 20 ++++++----- .../templates/fipTarget/partInfoList.html | 36 +++++++------------ .../fipTarget/partInfoModifyModal.html | 2 +- .../templates/fipTarget/partWorkList.html | 16 +++++---- .../fipTarget/partWorkModifyModal.html | 2 +- .../templates/fipTarget/vulnEditModal.html | 7 ++-- .../templates/fipTarget/vulnerableList.html | 6 ++-- 8 files changed, 43 insertions(+), 48 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java b/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java index b5acbe98..e1cb74b1 100644 --- a/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/service/FipTargetService.java @@ -147,6 +147,7 @@ public class FipTargetService extends BaseService { partTmp.setWrtNm(partInfo.getWrtNm()); partTmp.setWrtPart(partInfo.getWrtPart()); partTmp.setWrtOrgan(partInfo.getWrtOrgan()); + partTmp.setWrtTitle(partInfo.getWrtTitle()); partTmp.setWrtDt(partInfo.getWrtDt()); partInfoRepository.save(partTmp); //업데이트하는 버전 파일조회 @@ -291,6 +292,7 @@ public class FipTargetService extends BaseService { partWork.setWrtNm(dbParkWork.getWrtNm()); partWork.setWrtOrgan(dbParkWork.getWrtOrgan()); partWork.setWrtPart(dbParkWork.getWrtPart()); + partWork.setWrtTitle(dbParkWork.getWrtTitle()); partWork.setWrtUserSeq(dbParkWork.getWrtUserSeq()); partWorkRepository.save(partWork); if(deleteFileSeq!=null && deleteFileSeq.size()>0){ diff --git a/src/main/resources/templates/fipTarget/ipShipList.html b/src/main/resources/templates/fipTarget/ipShipList.html index f290cefc..339a8044 100644 --- a/src/main/resources/templates/fipTarget/ipShipList.html +++ b/src/main/resources/templates/fipTarget/ipShipList.html @@ -12,8 +12,7 @@
-
- +
어권별 구분
+
@@ -46,7 +45,7 @@ - + @@ -73,7 +72,10 @@
항로최종수정일
-
+
+
+ +
-
-
- +
+ -
+
+
diff --git a/src/main/resources/templates/fipTarget/partInfoList.html b/src/main/resources/templates/fipTarget/partInfoList.html index c59f0afa..a3c2881a 100644 --- a/src/main/resources/templates/fipTarget/partInfoList.html +++ b/src/main/resources/templates/fipTarget/partInfoList.html @@ -28,7 +28,7 @@
+
+ +
-
-
-
-
- -
-
- -
-
- -
-
-
-
@@ -85,7 +73,7 @@
- +
@@ -125,7 +113,7 @@ - + @@ -150,7 +138,10 @@
해경서비고
-
+
+
+ +
-
- - -
+
+ +
diff --git a/src/main/resources/templates/fipTarget/partInfoModifyModal.html b/src/main/resources/templates/fipTarget/partInfoModifyModal.html index 352f2c9d..c463ee1f 100644 --- a/src/main/resources/templates/fipTarget/partInfoModifyModal.html +++ b/src/main/resources/templates/fipTarget/partInfoModifyModal.html @@ -146,7 +146,7 @@
- +
\ No newline at end of file diff --git a/src/main/resources/templates/fipTarget/partWorkList.html b/src/main/resources/templates/fipTarget/partWorkList.html index 7cb3fc3f..5f35edd9 100644 --- a/src/main/resources/templates/fipTarget/partWorkList.html +++ b/src/main/resources/templates/fipTarget/partWorkList.html @@ -34,7 +34,7 @@
- +
@@ -54,7 +54,7 @@ - + @@ -100,7 +100,10 @@
외사
터미널명		기타
-
+
+
+ +
-
- - -
+
+ +
diff --git a/src/main/resources/templates/fipTarget/partWorkModifyModal.html b/src/main/resources/templates/fipTarget/partWorkModifyModal.html index 719e29e2..038674fe 100644 --- a/src/main/resources/templates/fipTarget/partWorkModifyModal.html +++ b/src/main/resources/templates/fipTarget/partWorkModifyModal.html @@ -88,7 +88,7 @@ - + \ No newline at end of file diff --git a/src/main/resources/templates/fipTarget/vulnEditModal.html b/src/main/resources/templates/fipTarget/vulnEditModal.html index c896f459..ebc5e286 100644 --- a/src/main/resources/templates/fipTarget/vulnEditModal.html +++ b/src/main/resources/templates/fipTarget/vulnEditModal.html @@ -75,9 +75,8 @@ - - - + +
@@ -88,7 +87,7 @@ - +
diff --git a/src/main/resources/templates/fipTarget/vulnerableList.html b/src/main/resources/templates/fipTarget/vulnerableList.html index f982c1d8..17797ed2 100644 --- a/src/main/resources/templates/fipTarget/vulnerableList.html +++ b/src/main/resources/templates/fipTarget/vulnerableList.html @@ -27,7 +27,7 @@
- +
@@ -40,7 +40,7 @@ - + @@ -52,7 +52,7 @@
구분C급
- +
From aba6c6cbbf1519ee2399c99ff6369d5d30165ec2 Mon Sep 17 00:00:00 2001 From: TaehunPark Date: Wed, 2 Nov 2022 18:02:19 +0900 Subject: [PATCH 3/9] =?UTF-8?q?fix:=EC=99=B8=EC=82=AC=ED=86=B5=EA=B3=84=20?= =?UTF-8?q?=ED=99=94=EB=A9=B4=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../igActivities/fpiMgt/affair/fieldStatistics.html | 8 ++++---- .../igActivities/fpiMgt/affair/ratingStatistics.html | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/fieldStatistics.html b/src/main/resources/templates/igActivities/fpiMgt/affair/fieldStatistics.html index b8b0c82f..b7a5fafc 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/fieldStatistics.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/fieldStatistics.html @@ -9,10 +9,10 @@
- - + +
- @@ -66,7 +66,7 @@ - + diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/ratingStatistics.html b/src/main/resources/templates/igActivities/fpiMgt/affair/ratingStatistics.html index 1c22ad6d..92471c8a 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/ratingStatistics.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/ratingStatistics.html @@ -9,11 +9,10 @@
- - + +
-
+
@@ -42,7 +41,7 @@ - + From fe7da0d84745daa8b90ea0e2a32168ffc8ac8ac4 Mon Sep 17 00:00:00 2001 From: jiHyung Date: Thu, 3 Nov 2022 12:35:59 +0900 Subject: [PATCH 4/9] =?UTF-8?q?select=EB=B0=95=EC=8A=A4=20=EB=8F=99?= =?UTF-8?q?=EC=A0=81=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../faStatistics/internationalCrimeArrest.js | 47 ++++++++++++++----- .../internationalCrimeArrest.html | 21 +++++---- .../internationalCrimeArrestEditModal.html | 23 ++++----- .../internationalCrimeArrestViewModal.html | 22 +++++---- 4 files changed, 73 insertions(+), 40 deletions(-) diff --git a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js index 56fd62e8..00553ccd 100644 --- a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js +++ b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js @@ -28,6 +28,30 @@ $(document).on('click', '.tr', function (){ getIcaViewModal($(this).data('key')); }); +$(document).on('change', 'select[name="organ"]', function (){ + $('select[name="department"]').empty(); + const parent_organ = $(this).val(); + let department = ''; + organConfigList.forEach(function (organConfig) { + if (organConfig.parentOrgan != null && organConfig.organType != 'OGC002' && organConfig.parentOrgan == parent_organ) { + department += ''; + } + }); + + $('select[name="department"]').append('' + department); +}); + +$(document).on('change', 'select[name="crimeType"]', function (){ + $('select[name="violationType"]').empty(); + let violationType = ''; + let code = $(this).val(); + commonCode[code].forEach(function (item) { + violationType += ''; + }); + + $('select[name="violationType"]').append('' + violationType); +}); + $(document).on('change', '#crimeForm', function (){ $('#crimeFormDiv').next().remove(); @@ -125,7 +149,7 @@ $(document).on('change', '#crimeType', function (){ smugglingAmount += ''; }) - if ($(this).val() == 'CTH002') { + if ($(this).val() == 'CTH2') { makeArrestAreaDiv('장소'); $('#smugglingAmountDiv').append( '' @@ -162,7 +186,7 @@ $(document).on('change', '#violationType', function (){ $('.entryVisa').remove(); $('#violationAmountDiv').remove(); - if ($(this).val() == 'VLT001') { + if ($(this).val() == 'CTH101') { makeSpiInfoDiv('피의자 정보'); makeArrestAreaDiv('지역'); makeSeaAreaDiv('밀입국'); @@ -171,7 +195,7 @@ $(document).on('change', '#violationType', function (){ makeDestinationDiv('밀입국 출발지(국가)'); } - if ($(this).val() == 'VLT002') { + if ($(this).val() == 'CTH102') { makeSpiInfoDiv('피의자 정보'); makeArrestAreaDiv('지역'); makeSeaAreaDiv('도외이탈'); @@ -179,7 +203,7 @@ $(document).on('change', '#violationType', function (){ makePurposeDiv('도외이탈'); } - if ($(this).val() == 'VLT003') { + if ($(this).val() == 'CTH103') { makeSpiInfoDiv('피의자 정보'); makeArrestAreaDiv('지역'); makeSeaAreaDiv('밀출국'); @@ -188,7 +212,7 @@ $(document).on('change', '#violationType', function (){ makeDestinationDiv('밀출국 행선지(도착예정지)'); } - if ($(this).val() == 'VLT004') { + if ($(this).val() == 'CTH104') { makeSpiInfoDiv('피의자 정보'); makeArrestAreaDiv('지역'); makeSeaAreaDiv('밀항'); @@ -197,15 +221,18 @@ $(document).on('change', '#violationType', function (){ makeDestinationDiv('밀항 행선지(도착예정지)'); } - if ($(this).val() == 'VLT005') { + if ($(this).val() == 'CTH105') { makeSpiInfoDiv('불법체류 및 취업'); makeEntryVisaDiv(); } - if ($(this).val() == 'VLT301') { + if ($(this).val() == 'CTH401') { makeViolationAmountDiv(); } + if ($(this).val() == 'CTH201' || $(this).val() == 'CTH202' || $(this).val() == 'CTH203' || $(this).val() == 'CTH204') { + makeArrestAreaDiv('장소'); + } }); $(document).on('change', '#smugglingAmount', function (){ @@ -321,7 +348,7 @@ function makeArrestAreaDiv(name) { function makeMeansDiv(name, code) { let means = ''; - if (code == 'VLT001') { + if (code == 'CTH101') { commonCode.MS1.forEach(function (item){ means += ''; }) @@ -500,10 +527,6 @@ function saveInternationalCrimeArrest(contentState){ function contentCheck(){ let flag = true; - if(!$('select[name="organ"]').val()){ - alert("지방청을 선택해주세요.") - flag = false; - } return flag; } diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html index d54e5004..74df0917 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html @@ -7,6 +7,7 @@ @@ -44,7 +45,7 @@ -
+
- + + + + +
@@ -138,12 +141,14 @@
+ + + + + - - - diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html index 3c40c5d9..f9912f12 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html @@ -33,14 +33,14 @@ -
- + + + + + +
@@ -65,9 +65,10 @@
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html index 259a6a56..cdaf35b0 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html @@ -33,11 +33,14 @@
- - -
+
@@ -52,7 +55,7 @@
- - - + + + + +
From afc7d21f0c48d437f455b91b8e459bea45208036 Mon Sep 17 00:00:00 2001 From: jiHyung Date: Thu, 3 Nov 2022 12:40:09 +0900 Subject: [PATCH 5/9] =?UTF-8?q?select=EB=B0=95=EC=8A=A4=20=EB=8F=99?= =?UTF-8?q?=EC=A0=81=20=EC=B2=98=EB=A6=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../internationalCrimeArrestEditModal.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html index f9912f12..66e08252 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html @@ -37,7 +37,7 @@ -
-
+
+
-
-
+
+
-
-
+
+ +
+
+ +
+
+ +
-
-
-
- -
-
- -
- -
+
+ +
+
@@ -186,13 +187,15 @@
+
+
- -
- @@ -201,56 +204,56 @@
- -
-
- -
+ +
- -
+ +
- -
-
- -
+ +
- -
-
- -
+ +
- -
- @@ -259,41 +262,41 @@
- -
+ +
- -
-
- -
+ +
-
- -
-
-
-
- -
- + +
+
+ +
@@ -333,7 +336,7 @@
-
+
diff --git a/src/main/resources/templates/translator/translatorCareerInsert.html b/src/main/resources/templates/translator/translatorCareerInsert.html index c8b31214..d0bed886 100644 --- a/src/main/resources/templates/translator/translatorCareerInsert.html +++ b/src/main/resources/templates/translator/translatorCareerInsert.html @@ -1,6 +1,5 @@ -
@@ -27,5 +26,4 @@
- \ No newline at end of file diff --git a/src/main/resources/templates/translator/translatorEditModal.html b/src/main/resources/templates/translator/translatorEditModal.html index 60d870df..48dbebb8 100644 --- a/src/main/resources/templates/translator/translatorEditModal.html +++ b/src/main/resources/templates/translator/translatorEditModal.html @@ -5,11 +5,12 @@ +
+
-
- +
- @@ -20,7 +21,7 @@
- @@ -28,18 +29,18 @@
-
+
- +
- @@ -47,14 +48,14 @@
-
+
- +
- @@ -66,8 +67,8 @@
-
- @@ -76,13 +77,13 @@
- +
- @@ -90,26 +91,24 @@
-
+
- +
+
- - - + +
- -
- -
- + +
+
- -
+
diff --git a/src/main/resources/templates/translator/translatorHistory.html b/src/main/resources/templates/translator/translatorHistory.html index 45e4d98e..e3798317 100644 --- a/src/main/resources/templates/translator/translatorHistory.html +++ b/src/main/resources/templates/translator/translatorHistory.html @@ -36,7 +36,7 @@
-
+
@@ -56,21 +56,21 @@
-
+
-
+
-
+
-
+
@@ -84,11 +84,11 @@
-
+
-
+
@@ -97,13 +97,11 @@
-
-
- -
- + +
+
-
+
diff --git a/src/main/resources/templates/translator/translatorStatisticsLang.html b/src/main/resources/templates/translator/translatorStatisticsLang.html index 1063dfa9..59eb4134 100644 --- a/src/main/resources/templates/translator/translatorStatisticsLang.html +++ b/src/main/resources/templates/translator/translatorStatisticsLang.html @@ -17,6 +17,11 @@
+
+
+ +
+
구분
@@ -64,13 +69,6 @@
-
-
-
- -
-
-
From f767cda7fc3621917d2bb84089cc88e362376d5a Mon Sep 17 00:00:00 2001 From: TaehunPark Date: Thu, 3 Nov 2022 14:24:10 +0900 Subject: [PATCH 7/9] =?UTF-8?q?fix:=ED=91=B8=ED=84=B0=EA=B3=A0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/layout/layout.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/layout/layout.html b/src/main/resources/templates/layout/layout.html index 4897eca5..dc2e4b5a 100644 --- a/src/main/resources/templates/layout/layout.html +++ b/src/main/resources/templates/layout/layout.html @@ -56,7 +56,7 @@
-
+
From 783792ecbaaf996a124c42e55c2bb0dc547d2f35 Mon Sep 17 00:00:00 2001 From: jiHyung Date: Thu, 3 Nov 2022 14:25:44 +0900 Subject: [PATCH 8/9] =?UTF-8?q?=EB=8F=99=EC=A0=81=EC=98=B5=EC=85=98=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=20=EA=B3=B5=ED=86=B5=ED=95=A8=EC=88=98=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/js/common.js | 24 +++++++++++++++++++ .../faStatistics/internationalCrimeArrest.js | 20 ++-------------- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/src/main/resources/static/js/common.js b/src/main/resources/static/js/common.js index 6154c7c3..023b650d 100644 --- a/src/main/resources/static/js/common.js +++ b/src/main/resources/static/js/common.js @@ -186,4 +186,28 @@ function fileCheck(flag, files){ flag = false; } return flag; +} + +function dynamicOption(targetTagName, code) { + $(targetTagName).empty(); + let option = ''; + + if (code) { + commonCode[code].forEach(function (item) { + option += ''; + }); + } + + $(targetTagName).append('' + option); +} + +function departmentDynamicOption(targetTagName, code, defaultOptionName='') { + $(targetTagName).empty(); + let option = ''; + organConfigList.forEach(function (organConfig) { + if (organConfig.parentOrgan != null && organConfig.organType != 'OGC002' && organConfig.parentOrgan == code) { + option += ''; + } + }); + $(targetTagName).append('' + option); } \ No newline at end of file diff --git a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js index 00553ccd..023de1ce 100644 --- a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js +++ b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js @@ -29,27 +29,11 @@ $(document).on('click', '.tr', function (){ }); $(document).on('change', 'select[name="organ"]', function (){ - $('select[name="department"]').empty(); - const parent_organ = $(this).val(); - let department = ''; - organConfigList.forEach(function (organConfig) { - if (organConfig.parentOrgan != null && organConfig.organType != 'OGC002' && organConfig.parentOrgan == parent_organ) { - department += ''; - } - }); - - $('select[name="department"]').append('' + department); + departmentDynamicOption('select[name="department"]', $(this).val()); }); $(document).on('change', 'select[name="crimeType"]', function (){ - $('select[name="violationType"]').empty(); - let violationType = ''; - let code = $(this).val(); - commonCode[code].forEach(function (item) { - violationType += ''; - }); - - $('select[name="violationType"]').append('' + violationType); + dynamicOption('select[name="violationType"]', $(this).val()); }); From c63e56dd6968b133ec8a3c4c6a1aa4ff74ae3916 Mon Sep 17 00:00:00 2001 From: TaehunPark Date: Thu, 3 Nov 2022 17:47:47 +0900 Subject: [PATCH 9/9] =?UTF-8?q?fix:=EC=99=B8=EC=82=AC=EB=8C=80=EC=83=81?= =?UTF-8?q?=EB=AA=A9=ED=91=9C=20=ED=99=94=EB=A9=B4=EC=88=98=EC=A0=95,?= =?UTF-8?q?=EC=BF=BC=EB=A6=AC=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/fipTarget/FipTargetController.java | 2 +- .../resources/mybatisMapper/FipTarget.xml | 1 + src/main/resources/static/css/common.css | 3 + .../templates/fipTarget/ipShipEditModal.html | 40 +++++++----- .../templates/fipTarget/ipShipList.html | 2 +- .../templates/fipTarget/ipShipViewModal.html | 28 ++++++--- .../fipTarget/partInfoEditModal.html | 11 ++-- .../templates/fipTarget/partInfoHistory.html | 63 ++++++++++--------- .../templates/fipTarget/partInfoList.html | 14 +++-- .../fipTarget/partInfoModifyModal.html | 12 ++-- .../fipTarget/partWorkEditModal.html | 8 ++- .../templates/fipTarget/partWorkList.html | 4 +- .../fipTarget/partWorkModifyModal.html | 4 +- .../templates/fipTarget/vulnEditModal.html | 13 ++-- .../templates/fipTarget/vulnerableList.html | 6 +- 15 files changed, 128 insertions(+), 83 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java b/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java index 85487bb1..fcc4ff10 100644 --- a/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java @@ -287,7 +287,7 @@ public class FipTargetController { mav.addObject("partWorkList", fipTargetService.selectPartWorkList(partWork)); partWork.setContentCnt(fipTargetService.selectPartWorkListCnt(partWork)); partWork.setPaginationInfo(); - mav.addObject("uesrId", loginUser.getUserId()); + mav.addObject("uesrSeq", loginUser.getUserSeq()); mav.addObject("searchParams", partWork); return mav; } diff --git a/src/main/resources/mybatisMapper/FipTarget.xml b/src/main/resources/mybatisMapper/FipTarget.xml index 1d2dbe7e..8788aa6d 100644 --- a/src/main/resources/mybatisMapper/FipTarget.xml +++ b/src/main/resources/mybatisMapper/FipTarget.xml @@ -330,6 +330,7 @@ pi.terminal_nm, (select item_value from code_mgt where item_cd = pw.wrt_title) as wrt_title, pw.wrt_nm, + pw.wrt_user_seq, pw.work_dt, pw.save_yn, work_type, diff --git a/src/main/resources/static/css/common.css b/src/main/resources/static/css/common.css index 0fadeb44..1b428011 100644 --- a/src/main/resources/static/css/common.css +++ b/src/main/resources/static/css/common.css @@ -83,4 +83,7 @@ } .pl-15{ padding-left: 15%; +} +.display-none{ + display:none } \ No newline at end of file diff --git a/src/main/resources/templates/fipTarget/ipShipEditModal.html b/src/main/resources/templates/fipTarget/ipShipEditModal.html index 960970c6..459baff4 100644 --- a/src/main/resources/templates/fipTarget/ipShipEditModal.html +++ b/src/main/resources/templates/fipTarget/ipShipEditModal.html @@ -34,36 +34,40 @@

-
+
-
+
-
- -
+
+
+
+ +


-
+
-
+
-
+
-
- -
- -
+
+
+ +
+ +
+
-
+
+
+
+ +
+
+
-
diff --git a/src/main/resources/templates/fipTarget/ipShipList.html b/src/main/resources/templates/fipTarget/ipShipList.html index 339a8044..8de9ec19 100644 --- a/src/main/resources/templates/fipTarget/ipShipList.html +++ b/src/main/resources/templates/fipTarget/ipShipList.html @@ -11,7 +11,7 @@
-
+
-
+
@@ -43,7 +43,7 @@ th:value="${partInfo.versionNo}"> + th:text="${#temporals.format(partInfo.wrtDt, 'yyyy-MM-dd HH:mm')}"> @@ -51,69 +51,76 @@
-
+
+
- -
+ +
- -
+
+
+ +
- -
+ +
- -
+ +

-
해경
+
해경
- -
+ +
- -
+
+
+ +
- -
+ +
-
육경
+
육경
- -
+ +
- -
+
+
+ +
- -
+ +

- +
@@ -122,7 +129,7 @@
- +
@@ -133,7 +140,7 @@
-
+
diff --git a/src/main/resources/templates/fipTarget/partInfoList.html b/src/main/resources/templates/fipTarget/partInfoList.html index a3c2881a..381d4b56 100644 --- a/src/main/resources/templates/fipTarget/partInfoList.html +++ b/src/main/resources/templates/fipTarget/partInfoList.html @@ -16,14 +16,15 @@
-
-
+
+
+
@@ -46,7 +47,7 @@ -
+
+
- +
+
+ +
+
diff --git a/src/main/resources/templates/fipTarget/partInfoModifyModal.html b/src/main/resources/templates/fipTarget/partInfoModifyModal.html index c463ee1f..5a460f00 100644 --- a/src/main/resources/templates/fipTarget/partInfoModifyModal.html +++ b/src/main/resources/templates/fipTarget/partInfoModifyModal.html @@ -19,6 +19,7 @@ +
@@ -49,12 +50,12 @@
-
+


-
해경
+
해경
@@ -74,7 +75,8 @@
-
육경
+
+
육경
@@ -144,8 +146,10 @@
- + +
+
diff --git a/src/main/resources/templates/fipTarget/partWorkEditModal.html b/src/main/resources/templates/fipTarget/partWorkEditModal.html index 6e877a1e..e1746712 100644 --- a/src/main/resources/templates/fipTarget/partWorkEditModal.html +++ b/src/main/resources/templates/fipTarget/partWorkEditModal.html @@ -76,9 +76,13 @@
-
+
+
- +
+
+ +
\ No newline at end of file diff --git a/src/main/resources/templates/fipTarget/partWorkList.html b/src/main/resources/templates/fipTarget/partWorkList.html index 5f35edd9..fc1229ac 100644 --- a/src/main/resources/templates/fipTarget/partWorkList.html +++ b/src/main/resources/templates/fipTarget/partWorkList.html @@ -24,7 +24,7 @@
- +
@@ -56,7 +56,7 @@ - + diff --git a/src/main/resources/templates/fipTarget/partWorkModifyModal.html b/src/main/resources/templates/fipTarget/partWorkModifyModal.html index 038674fe..1bd525a7 100644 --- a/src/main/resources/templates/fipTarget/partWorkModifyModal.html +++ b/src/main/resources/templates/fipTarget/partWorkModifyModal.html @@ -82,11 +82,13 @@
-
+
+
+
diff --git a/src/main/resources/templates/fipTarget/vulnEditModal.html b/src/main/resources/templates/fipTarget/vulnEditModal.html index ebc5e286..e0819535 100644 --- a/src/main/resources/templates/fipTarget/vulnEditModal.html +++ b/src/main/resources/templates/fipTarget/vulnEditModal.html @@ -22,7 +22,7 @@
-
+
-
+
@@ -79,13 +79,14 @@
+
+ +
- - diff --git a/src/main/resources/templates/fipTarget/vulnerableList.html b/src/main/resources/templates/fipTarget/vulnerableList.html index 17797ed2..b7dff6f3 100644 --- a/src/main/resources/templates/fipTarget/vulnerableList.html +++ b/src/main/resources/templates/fipTarget/vulnerableList.html @@ -11,7 +11,7 @@
-
+
@@ -24,7 +24,6 @@
-
@@ -52,12 +51,11 @@
- +
-