From 227f5ec5a2f49c7e835135e3dcb721e7eb3cca51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Thu, 6 Oct 2022 18:43:36 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B2=AD=EC=82=B0=EB=B3=B4=EA=B3=A0=20?= =?UTF-8?q?=EC=9E=91=EC=97=85=EC=A4=91.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dbnt/faisp/config/SecurityConfig.java | 6 +- .../fpiMgt/affairResult/ResultController.java | 5 +- .../resources/mybatisMapper/ResultMapper.xml | 25 +-- .../igActivities/fpiMgt/result/resultMgt.js | 86 ++++----- .../fpiMgt/affairPlan/planMgt.html | 9 +- .../fpiMgt/affairResult/resultEditModal.html | 168 ++++++++++-------- .../fpiMgt/affairResult/resultMgt.html | 31 ++-- 7 files changed, 170 insertions(+), 160 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/config/SecurityConfig.java b/src/main/java/com/dbnt/faisp/config/SecurityConfig.java index 80bf4808..03c9894a 100644 --- a/src/main/java/com/dbnt/faisp/config/SecurityConfig.java +++ b/src/main/java/com/dbnt/faisp/config/SecurityConfig.java @@ -84,7 +84,11 @@ public class SecurityConfig{ "/refreshSession", "/publicBoard/**", "/affairPlan/**", - "/affair/**" + "/affair/**", + "/affairResult/**", + "/equip/**", + "/target/**", + "/translator/**" ).hasRole(Role.USER.name()) // USER 접근 허용 .antMatchers( "/authMgt/**", diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/ResultController.java b/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/ResultController.java index 33163b51..99b9d012 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/ResultController.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/ResultController.java @@ -43,8 +43,9 @@ public class ResultController { // 첩보수집활동 > 외사경찰 견문관 mav.addObject("accessAuth", accessAuth); mav.addObject("apprvAuth", apprvAuth); resultBoard.setQueryInfo(); - mav.addObject("resultList", resultService.selectResultBoardList(resultBoard)); - resultBoard.setContentCnt(resultService.selectResultBoardListCnt(resultBoard)); +// mav.addObject("resultList", resultService.selectResultBoardList(resultBoard)); +// resultBoard.setContentCnt(resultService.selectResultBoardListCnt(resultBoard)); + resultBoard.setContentCnt(0); resultBoard.setPaginationInfo(); mav.addObject("searchParams", resultBoard); return mav; diff --git a/src/main/resources/mybatisMapper/ResultMapper.xml b/src/main/resources/mybatisMapper/ResultMapper.xml index 8c803b40..04fa7e8f 100644 --- a/src/main/resources/mybatisMapper/ResultMapper.xml +++ b/src/main/resources/mybatisMapper/ResultMapper.xml @@ -15,27 +15,20 @@ and a.wrt_organ = #{wrtOrgan} - - and a.content_title like '%'||#{contentTitle}||'%' + + and a.clear_title like '%'||#{clearTitle}||'%' + + + and a.result_title like '%'||#{resultTitle}||'%' and a.result_state = #{resultState} - - - and a.result_dt >= #{startDate}::date - - - and a.result_dt <= #{endDate}::date+1 - + + and a.wrt_dt >= #{startDate}::date - - - and a.wrt_dt >= #{startDate}::date - - - and a.wrt_dt <= #{endDate}::date+1 - + + and a.wrt_dt <= #{endDate}::date+1 and a.wrt_organ in diff --git a/src/main/resources/static/js/igActivities/fpiMgt/result/resultMgt.js b/src/main/resources/static/js/igActivities/fpiMgt/result/resultMgt.js index ae2e8054..eb260a36 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/result/resultMgt.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/result/resultMgt.js @@ -7,32 +7,32 @@ $(function(){ }); }) -$(document).on('click', '#planTab', function (){ - location.href = "/affairPlan/planMgt"; +$(document).on('click', '#resultTab', function (){ + location.href = "/affairResult/resultMgt"; }) $(document).on('click', '#stayTab', function (){ - location.href = "/affairPlan/stayPage"; + location.href = "/affairResult/stayPage"; }) $(document).on('click', '#commitTab', function (){ - location.href = "/affairPlan/commitPage"; + location.href = "/affairResult/commitPage"; }) -$(document).on('click', '#addPlanBtn', function (){ - getPlanEditModal(null) +$(document).on('click', '#addResultBtn', function (){ + getResultEditModal(null) }) -$(document).on('click', '#editPlanBtn', function (){ - $("#planViewModal").modal('hide'); - getPlanEditModal(Number($("#planViewBody").find("[name='planKey']").val())); +$(document).on('click', '#editResultBtn', function (){ + $("#resultViewModal").modal('hide'); + getResultEditModal(Number($("#resultViewBody").find("[name='resultKey']").val())); }) -$(document).on('click', '#planAddBtn', function (){ - $("#planDiv").append("") +$(document).on('click', '#resultAddBtn', function (){ + $("#resultDiv").append("") }) -$(document).on('click', '#detailPlanAddBtn', function (){ - const detailPlanDiv = $("#detailPlanDiv"); - detailPlanDiv.append(""); - const lastAppendTextarea = detailPlanDiv.children()[detailPlanDiv.children().length-1]; +$(document).on('click', '#detailResultAddBtn', function (){ + const detailResultDiv = $("#detailResultDiv"); + detailResultDiv.append(""); + const lastAppendTextarea = detailResultDiv.children()[detailResultDiv.children().length-1]; $(lastAppendTextarea).summernote({ lang:'ko-KR', height: 120, @@ -47,30 +47,30 @@ $(document).on('click', '#detailPlanAddBtn', function (){ }); }) -$(document).on('click', '#savePlanBtn', function (){ - savePlan('DST002') +$(document).on('click', '#saveResultBtn', function (){ + saveResult('DST002') }) $(document).on('click', '#saveTempBtn', function (){ - savePlan('DST001') + saveResult('DST001') }) -$(document).on('click', '.planTr', function (){ +$(document).on('click', '.resultTr', function (){ $(".trChkBox").prop("checked", false); $(this).find(".trChkBox").prop("checked", true); - getPlanViewModal(Number($(this).find(".planKey").val())); + getResultViewModal(Number($(this).find(".resultKey").val())); }) $(document).on('click', '.apprvBtn', function (){ - $("#apprvFormPlanKey").val($("#viewModalPlanKey").val()); - $("#viewModalApprvValue").val($(this).attr("data-planstate")); + $("#apprvFormResultKey").val($("#viewModalResultKey").val()); + $("#viewModalApprvValue").val($(this).attr("data-resultstate")); if(confirm($(this).val()+"하시겠습니까?")){ const formData = new FormData($("#apprvForm")[0]); contentFade("in") $.ajax({ type : 'POST', data : formData, - url : "/affairPlan/planStateChange", + url : "/affairResult/resultStateChange", processData: false, contentType: false, beforeSend: function (xhr){ @@ -78,7 +78,7 @@ $(document).on('click', '.apprvBtn', function (){ }, success : function(result) { alert("저장되었습니다") - getPlanViewModal(result); + getResultViewModal(result); contentFade("out"); }, error : function(xhr, status) { @@ -89,15 +89,15 @@ $(document).on('click', '.apprvBtn', function (){ } }) -function getPlanViewModal(planKey){ +function getResultViewModal(resultKey){ $.ajax({ - url: '/affairPlan/planViewModal', - data: {planKey: planKey}, + url: '/affairResult/resultViewModal', + data: {resultKey: resultKey}, type: 'GET', dataType:"html", success: function(html){ - $("#planViewBody").empty().append(html) - $("#planViewModal").modal('show'); + $("#resultViewBody").empty().append(html) + $("#resultViewModal").modal('show'); }, error:function(){ @@ -105,20 +105,20 @@ function getPlanViewModal(planKey){ }); } -function getPlanEditModal(planKey){ +function getResultEditModal(resultKey){ $.ajax({ - url: '/affairPlan/planEditModal', - data: {planKey: planKey}, + url: '/affairResult/resultEditModal', + data: {resultKey: resultKey}, type: 'GET', dataType:"html", success: function(html){ - $("#planEditModalContent").empty().append(html) - $("#planEditModal").modal('show'); - $("#planDt").datepicker({ + $("#resultEditModalContent").empty().append(html) + $("#resultEditModal").modal('show'); + $("#resultDt").datepicker({ format: "yyyy-mm-dd", language: "ko" }); - $("[name='detailPlanInfos']").summernote({ + $("[name='detailResultInfos']").summernote({ lang:'ko-KR', height: 120, disableDragAndDrop: true, @@ -137,12 +137,12 @@ function getPlanEditModal(planKey){ } }); } -function savePlan(planState){ +function saveResult(resultState){ if(contentCheck()){ if(confirm("저장하시겠습니까?")){ - $("#planState").val(planState); + $("#resultState").val(resultState); contentFade("in"); - const formData = new FormData($("#planEditForm")[0]); + const formData = new FormData($("#resultEditForm")[0]); for(const file of files) { if(!file.isDelete) formData.append('uploadFiles', file, file.name); @@ -153,14 +153,14 @@ function savePlan(planState){ $.ajax({ type : 'POST', data : formData, - url : "/affairPlan/savePlan", + url : "/affairResult/saveResult", processData: false, contentType: false, success : function(result) { alert("저장되었습니다."); contentFade("out"); - $("#planEditModal").modal('hide'); - getPlanViewModal(result); + $("#resultEditModal").modal('hide'); + getResultViewModal(result); }, error : function(xhr, status) { alert("저장에 실패하였습니다.") @@ -178,7 +178,7 @@ function contentCheck(){ alert("제목을 입력해주세요.") flag = false; } - if(!$("#planDt").val()){ + if(!$("#resultDt").val()){ alert("시행일자를 입력해주세요.") flag = false; } diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html index 72355dbf..3f09ec2a 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html @@ -112,12 +112,9 @@ - 임시저장 - 결재대기 - 계장반려 - 계장결재 - 부장반려 - 부장결재 + + + diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultEditModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultEditModal.html index b198307a..a67c5233 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultEditModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultEditModal.html @@ -1,91 +1,111 @@
- +
-
-
+
+ - - - - - -
- -
- -
- -
- -
- -
- -
-
-
- -
- -
-
-
- -
- - - - - - - - -
-
- -
-
-
- -
- - - - - - - - -
-
- -
-
-
- -
-
- -
파일을 업로드 해주세요. - - -
- - 삭제 + + + + + + +
+
+
+ +
+ +
+ +
+ +
+ +
+
+ +
- +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+ +
+ +
+ +
+ +
+
+
+ +
+ + + +
+
+ +
+
+
+ +
+
+ +
파일을 업로드 해주세요. + + +
+ + 삭제 +
+ +
+
+
- +
+ +
+
+ +
- +
\ No newline at end of file diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html index 72355dbf..03b8f0bd 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html @@ -3,12 +3,12 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout/layout}"> - +
-

첩보수집활동 > 외사경찰 견문관리 > 계획수립

-

계획수립

+

첩보수집활동 > 외사경찰 견문관리 > 청산보고서

+

청산보고서

@@ -49,26 +49,21 @@
- +
- - +
-
@@ -98,7 +93,7 @@ - +
@@ -150,7 +145,7 @@
- +
@@ -163,16 +158,16 @@
-