diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/ActivityCaseController.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/ActivityCaseController.java index aa99738a..639fe9d1 100644 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/ActivityCaseController.java +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/ActivityCaseController.java @@ -84,6 +84,7 @@ public class ActivityCaseController { @GetMapping("/activityCaseSummaryModal") public ModelAndView activityCaseSummaryModal(@AuthenticationPrincipal UserInfo loginUser, ActivityCaseSummary activityCase){ ModelAndView mav = new ModelAndView("counterIntelligence/activityCase/activityCaseSummaryModal"); + mav.addObject("modalType", activityCase.getModalType()); List activityCaseList = activityCaseService.selectActivityCaseInfoList(activityCase.getReceiptKey()); mav.addObject("viewUserSeq", loginUser.getUserSeq()); mav.addObject("wrtUserSeq", activityCaseList.get(activityCaseList.size()-1).getWrtUserSeq()); @@ -97,6 +98,7 @@ public class ActivityCaseController { @GetMapping("/activityCaseViewModal") public ModelAndView activityCaseViewModal(@AuthenticationPrincipal UserInfo loginUser, ActivityCase activityCase, ActivityCaseInfo activityCaseInfo){ ModelAndView mav = new ModelAndView("counterIntelligence/activityCase/activityCaseViewModal"); + mav.addObject("modalType", activityCase.getModalType()); activityCase = activityCaseService.selectActivityCase(activityCase.getReceiptKey()); activityCaseInfo = activityCaseService.selectActivityCaseInfo(activityCaseInfo.getCaseKey()); mav.addObject("viewUserSeq", loginUser.getUserSeq()); diff --git a/src/main/resources/mybatisMapper/ActivityCaseMapper.xml b/src/main/resources/mybatisMapper/ActivityCaseMapper.xml index 9a62b796..b7a11837 100644 --- a/src/main/resources/mybatisMapper/ActivityCaseMapper.xml +++ b/src/main/resources/mybatisMapper/ActivityCaseMapper.xml @@ -191,11 +191,77 @@ + + and c.case_type = #{caseType} + + + and a.receipt_num like '%'||#{receiptNum}||'%' + + + and e.name like '%'||#{suspectNm}||'%' + + + and e.address like '%'||#{suspectAddress}||'%' + + + and c.activity_result = #{activityResult} + + + and a.wrt_user_nm like '%'||#{wrtUserNm}||'%' + + + and f.user_nm like '%'||#{apprvUserNm}||'%' + + + + and c.report_date >= #{startDate}::date + + + and c.report_date <= #{endDate}::date+1 + + + + + and d.report_date >= #{startDate}::date + + + and d.report_date <= #{endDate}::date+1 + + + + + and c.report_date >= #{startDate}::date + + + and c.report_date <= #{endDate}::date+1 + + + and c.case_type = 'ACR003' + + + + and a.wrt_organ = #{wrtOrgan} + + and (a.wrt_user_seq = #{wrtUserSeq} + or a.receipt_key in (select a.receipt_key + from activity_case_info a + inner join activity_case_apprv b + on a.case_key = b.case_key + where b.user_seq = #{wrtUserSeq})) + + + + and a.wrt_organ in + + #{organCd} + + \ No newline at end of file diff --git a/src/main/resources/static/js/counterIntelligence/activityCase.js b/src/main/resources/static/js/counterIntelligence/activityCase.js index 9f8012db..ef4bac9c 100644 --- a/src/main/resources/static/js/counterIntelligence/activityCase.js +++ b/src/main/resources/static/js/counterIntelligence/activityCase.js @@ -54,11 +54,11 @@ $(document).on('click', '.addInfoBtn', function (){ }) $(document).on('click', '.activityCaseTr', function (){ - getActivityCaseSummaryModal($(this).find(".receiptKey").val()); + getActivityCaseSummaryModal($(this).attr("data-receiptkey"), $(this).attr("data-modaltype")); }) $(document).on('click', '.summaryTr', function (){ - getActivityCaseViewModal($(this).find(".receiptKey").val(), $(this).find(".caseKey").val()); + getActivityCaseViewModal($(this).attr("data-receiptkey"), $(this).attr("data-casekey"), $(this).attr("data-modaltype")); }) $(document).on('click', '#editInfoBtn', function (){ @@ -137,10 +137,10 @@ function getApprvDiv(apprvList){ }); } -function getActivityCaseSummaryModal(receiptKey){ +function getActivityCaseSummaryModal(receiptKey, modalType){ $.ajax({ url: '/counterIntelligence/activityCaseSummaryModal', - data: {receiptKey: receiptKey}, + data: {receiptKey: receiptKey, modalType: modalType}, type: 'GET', dataType:"html", success: function(html){ @@ -153,10 +153,10 @@ function getActivityCaseSummaryModal(receiptKey){ }); } -function getActivityCaseViewModal(receiptKey, caseKey){ +function getActivityCaseViewModal(receiptKey, caseKey, modalType){ $.ajax({ url: '/counterIntelligence/activityCaseViewModal', - data: {receiptKey: receiptKey, caseKey: caseKey}, + data: {receiptKey: receiptKey, caseKey: caseKey, modalType: modalType}, type: 'GET', dataType:"html", success: function(html){ diff --git a/src/main/resources/templates/counterIntelligence/activityCase/activityCaseBoard.html b/src/main/resources/templates/counterIntelligence/activityCase/activityCaseBoard.html index 9bed1bc8..5ad6640e 100644 --- a/src/main/resources/templates/counterIntelligence/activityCase/activityCaseBoard.html +++ b/src/main/resources/templates/counterIntelligence/activityCase/activityCaseBoard.html @@ -127,31 +127,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/templates/counterIntelligence/activityCase/activityCaseMgt.html b/src/main/resources/templates/counterIntelligence/activityCase/activityCaseMgt.html index 9a3aeebc..2559acdf 100644 --- a/src/main/resources/templates/counterIntelligence/activityCase/activityCaseMgt.html +++ b/src/main/resources/templates/counterIntelligence/activityCase/activityCaseMgt.html @@ -55,7 +55,7 @@
- @@ -128,7 +128,7 @@ - + @@ -147,7 +147,7 @@ - + @@ -200,5 +200,21 @@
+ + + + \ No newline at end of file diff --git a/src/main/resources/templates/counterIntelligence/activityCase/activityCaseSummaryModal.html b/src/main/resources/templates/counterIntelligence/activityCase/activityCaseSummaryModal.html index 05c8f3eb..b7834feb 100644 --- a/src/main/resources/templates/counterIntelligence/activityCase/activityCaseSummaryModal.html +++ b/src/main/resources/templates/counterIntelligence/activityCase/activityCaseSummaryModal.html @@ -20,31 +20,33 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/main/resources/templates/counterIntelligence/activityCase/activityCaseViewModal.html b/src/main/resources/templates/counterIntelligence/activityCase/activityCaseViewModal.html index 1ffcfb39..bd755ea5 100644 --- a/src/main/resources/templates/counterIntelligence/activityCase/activityCaseViewModal.html +++ b/src/main/resources/templates/counterIntelligence/activityCase/activityCaseViewModal.html @@ -191,7 +191,9 @@ + \ No newline at end of file + + \ No newline at end of file