DBNT
/
FAISP
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

첩보수집활동 결재기능 오류 수정.

master
강석 최 2023-05-11 14:18:33 +09:00
parent 617fbfd212
commit f0b541057c
12 changed files with 365 additions and 328 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/PlanController.java
View File

@ -181,6 +181,7 @@ public class PlanController { // 첩보수집활동 > 외사경찰 견문관리
planBoard = planService.selectPlanBoard(planBoard.getPlanKey());
mav.addObject("plan", planBoard);
mav.addObject("userSeq",loginUser.getUserSeq());
mav.addObject("viewOrgan",loginUser.getOgCd());
mav.addObject("lineSeparator", '\n');
//메뉴권한 확인
mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/affairPlan/planMgt").get(0).getAccessAuth());

1
src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java
View File

@ -222,6 +222,7 @@ public class ResultController { // 첩보수집활동 > 외사경찰 견문관
resultBoard = resultService.selectResultBoard(resultBoard.getResultKey());
mav.addObject("result", resultBoard);
mav.addObject("userSeq",loginUser.getUserSeq());
mav.addObject("viewOrgan",loginUser.getOgCd());
//메뉴권한 확인
mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/affairResult/resultMgt").get(0).getAccessAuth());
mav.addObject("apprvAuth", authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/affairResult/resultMgt").get(0).getApprovalAuth());

3
src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/IntelligenceNetworkController.java
View File

@ -141,6 +141,7 @@ public class IntelligenceNetworkController {
op = intelligenceNetworkService.selectOperationPlan(op.getOpKey());
mav.addObject("op", op);
mav.addObject("userSeq",loginUser.getUserSeq());
mav.addObject("viewOrgan",loginUser.getOgCd());
//메뉴권한 확인
mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/operationPlanList/all").get(0).getAccessAuth());
mav.addObject("apprvAuth", authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/operationPlanList/all").get(0).getApprovalAuth());
@ -292,6 +293,7 @@ public class IntelligenceNetworkController {
ia.setApprvList(intelligenceNetworkService.selectIntelligenceAnalyzeApprv(ia));
mav.addObject("ia", ia);
mav.addObject("userSeq",loginUser.getUserSeq());
mav.addObject("viewOrgan",loginUser.getOgCd());
//메뉴권한 확인
mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/intelligenceAnalyzeList/all").get(0).getAccessAuth());
mav.addObject("apprvAuth", authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/intelligenceAnalyzeList/all").get(0).getApprovalAuth());
@ -444,6 +446,7 @@ public class IntelligenceNetworkController {
fer = intelligenceNetworkService.selectFireExtensionReportInfo(fer);
mav.addObject("fer", fer);
mav.addObject("userSeq",loginUser.getUserSeq());
mav.addObject("viewOrgan",loginUser.getOgCd());
//메뉴권한 확인
mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/fireExtensionReportList/all").get(0).getAccessAuth());
mav.addObject("apprvAuth", authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/fireExtensionReportList/all").get(0).getApprovalAuth());

2
src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/MonitoringController.java
View File

@ -146,6 +146,7 @@ public class MonitoringController { // 첩보수집활동 > 해양외사모니
md = monitoringService.selectDesignation(md.getMdKey());
mav.addObject("md", md);
mav.addObject("userSeq",loginUser.getUserSeq());
mav.addObject("viewOrgan",loginUser.getOgCd());
//메뉴권한 확인
mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/monitoring/designationList/all").get(0).getAccessAuth());
mav.addObject("apprvAuth", authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/monitoring/designationList/all").get(0).getApprovalAuth());
@ -295,6 +296,7 @@ public class MonitoringController { // 첩보수집활동 > 해양외사모니
mr = monitoringService.selectResult(mr.getMrKey());
mav.addObject("mr", mr);
mav.addObject("userSeq",loginUser.getUserSeq());
mav.addObject("viewOrgan",loginUser.getOgCd());
//메뉴권한 확인
mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/monitoring/resultList/all").get(0).getAccessAuth());
mav.addObject("apprvAuth", authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/monitoring/resultList/all").get(0).getApprovalAuth());

32
src/main/resources/mybatisMapper/AffairMapper.xml
View File

@ -295,7 +295,9 @@
a.content_title as title,
a.wrt_dt
from plan_board a
where (
where
a.wrt_organ = #{ogCd}
and (
a.wrt_user_seq = #{userSeq}
or (
a.plan_state = 'DST002' and
@ -342,7 +344,9 @@
a.clear_title as title,
a.wrt_dt
from result_board a
where (
where
a.wrt_organ = #{ogCd}
and (
a.wrt_user_seq = #{userSeq} or (
a.result_state = 'DST002' and
( select ab.approval_auth ~ 'APC003' or ab.approval_auth ~ 'APC004'
@ -363,7 +367,9 @@
a.op_sdate||' '||a.op_name||' 운영 계획' as title,
a.wrt_dt
from operation_plan a
where (
where
a.wrt_organ = #{ogCd}
and (
a.wrt_user_seq = #{userSeq}
or (
a.op_state = 'DST002' and
@ -409,7 +415,9 @@
a.ia_sdate||'~'||a.ia_edate||' 운영 실적 분석' as title,
a.wrt_dt
from intelligence_analyze a
where (
where
a.wrt_organ = #{ogCd}
and (
a.wrt_user_seq = #{userSeq}
or (
a.ia_state = 'DST002' and
@ -432,7 +440,9 @@
a.wrt_dt
from fire_extension_report a
inner join operation_plan b on a.op_key = b.op_key
where (
where
a.wrt_organ = #{ogCd}
and (
a.wrt_user_seq = #{userSeq}
or (
a.fer_state = 'DST002' and
@ -454,7 +464,9 @@
a.md_title as title,
a.wrt_dt
from monitoring_designation a
where (
where
a.wrt_organ = #{ogCd}
and (
a.wrt_user_seq = #{userSeq}
or (
a.md_state = 'DST002' and
@ -476,7 +488,9 @@
a.mr_title as title,
a.wrt_dt
from monitoring_result a
where (
where
a.wrt_organ = #{ogCd}
and (
a.wrt_user_seq = #{userSeq}
or (
a.mr_state = 'DST002' and
@ -499,7 +513,9 @@
b.wrt_dt
from activity_case a
inner join activity_case_info b on a.receipt_key = b.receipt_key
where (
where
a.wrt_organ = #{ogCd}
and (
a.wrt_user_seq = #{userSeq}
or b.case_key in (
select case_key

2
src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html
View File

@ -137,6 +137,7 @@
</div>
<div class="col-12" th:unless="${apprvAuth eq null}">
<th:block th:if="${viewOrgan eq plan.wrtOrgan}">
<th:block th:if="${(#strings.contains(apprvAuth, 'APC003') or #strings.contains(apprvAuth, 'APC004')) and plan.planState eq 'DST002'
or (#strings.contains(apprvAuth, 'APC001') or #strings.contains(apprvAuth, 'APC002')) and plan.planState eq 'DST004'}">
<form action="#" method="post" id="apprvForm">
@ -160,6 +161,7 @@
</div>
</form>
</th:block>
</th:block>
</div>
</div>
</div>

2
src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html
View File

@ -270,6 +270,7 @@
</th:block>
</th:block>
<div class="col-12 mt-2" th:if="${apprvAuth ne null}">
<th:block th:if="${viewOrgan eq result.wrtOrgan}">
<th:block th:if="${result.resultState eq 'DST002' and (#strings.contains(apprvAuth, 'APC003') or #strings.contains(apprvAuth, 'APC004'))
or result.resultState eq 'DST004' and (#strings.contains(apprvAuth, 'APC002') or #strings.contains(apprvAuth, 'APC001'))}">
<form action="#" method="post" id="apprvForm">
@ -293,6 +294,7 @@
</div>
</form>
</th:block>
</th:block>
</div>
</div>
</div>

2
src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportViewModal.html
View File

@ -131,10 +131,12 @@
</th:block>
</div>
<div class="col-auto">
<th:block th:if="${fer.wrtOrgan eq viewOrgan}">
<th:block th:if="${(apprvAuth eq 'APC001' or apprvAuth eq 'APC002') and fer.ferState eq 'DST002'}">
<button type="button" class="btn btn-danger apprvBtn" th:data-planstate="${apprvAuth eq 'APC004'||apprvAuth eq 'APC003'?'DST003':'DST005'}" th:value="반려">반려</button>
<button type="button" class="btn btn-success apprvBtn" th:data-planstate="${apprvAuth eq 'APC004'||apprvAuth eq 'APC003'?'DST004':'DST006'}" th:value="승인">승인</button>
</th:block>
</th:block>
<th:block th:unless="${fer.ferState eq 'DST004' or fer.ferState eq 'DST006'}"><!--승인 상태일때는 수정 불가 -->
<th:block th:if="${userSeq eq fer.wrtUserSeq or accessAuth eq 'ACC003'}"><!--작성자일 경우 수정 허용--><!--관리자일 경우 수정 허용-->
<button type="button" class="btn btn-warning" th:data-ferkey="${fer.ferKey}" id="editBtn">수정</button>

10
src/main/resources/templates/igActivities/intelligenceNetwork/intelligenceAnalyzeViewModal.html
View File

@ -196,13 +196,11 @@
</th:block>
</div>
<div class="col-auto">
<th:block th:if="${ia.wrtOrgan eq viewOrgan}">
<th:block th:if="${(apprvAuth eq 'APC001' or apprvAuth eq 'APC002') and ia.iaState eq 'DST002'}">
<button type="button" class="btn btn-danger apprvBtn"
th:data-planstate="${apprvAuth eq 'APC004'||apprvAuth eq 'APC003'?'DST003':'DST005'}" th:value="반려">반려
</button>
<button type="button" class="btn btn-success apprvBtn"
th:data-planstate="${apprvAuth eq 'APC004'||apprvAuth eq 'APC003'?'DST004':'DST006'}" th:value="승인">승인
</button>
<button type="button" class="btn btn-danger apprvBtn" th:data-planstate="${apprvAuth eq 'APC004'||apprvAuth eq 'APC003'?'DST003':'DST005'}" th:value="반려">반려</button>
<button type="button" class="btn btn-success apprvBtn" th:data-planstate="${apprvAuth eq 'APC004'||apprvAuth eq 'APC003'?'DST004':'DST006'}" th:value="승인">승인</button>
</th:block>
</th:block>
<th:block th:unless="${ia.iaState eq 'DST004' or ia.iaState eq 'DST006'}"><!--승인 상태일때는 수정 불가 -->
<th:block th:if="${userSeq eq ia.wrtUserSeq or accessAuth eq 'ACC003'}"><!--작성자일 경우 수정 허용--><!--관리자일 경우 수정 허용-->

2
src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanViewModal.html
View File

@ -153,10 +153,12 @@
</th:block>
</div>
<div class="col-auto">
<th:block th:if="${op.wrtOrgan eq viewOrgan}">
<th:block th:if="${(apprvAuth eq 'APC001' or apprvAuth eq 'APC002') and op.opState eq 'DST002'}">
<button type="button" class="btn btn-danger apprvBtn" th:data-planstate="${apprvAuth eq 'APC004'||apprvAuth eq 'APC003'?'DST003':'DST005'}" th:value="반려">반려</button>
<button type="button" class="btn btn-success apprvBtn" th:data-planstate="${apprvAuth eq 'APC004'||apprvAuth eq 'APC003'?'DST004':'DST006'}" th:value="승인">승인</button>
</th:block>
</th:block>
<th:block th:unless="${op.opState eq 'DST004' or op.opState eq 'DST006'}"><!--승인 상태일때는 수정 불가 -->
<th:block th:if="${userSeq eq op.wrtUserSeq or accessAuth eq 'ACC003'}"><!--작성자일 경우 수정 허용--><!--관리자일 경우 수정 허용-->
<button type="button" class="btn btn-warning" th:data-opkey="${op.opKey}" id="editBtn">수정</button>

14
src/main/resources/templates/igActivities/monitoring/designationViewModal.html
View File

@ -123,8 +123,10 @@
</th:block>
</div>
</div>
<div class="col-12" th:if="${(apprvAuth eq 'APC003' or apprvAuth eq 'APC004') and md.mdState eq 'DST002'
<th:block th:if="${md.wrtOrgan eq viewOrgan}">
<th:block th:if="${(apprvAuth eq 'APC003' or apprvAuth eq 'APC004') and md.mdState eq 'DST002'
or (apprvAuth eq 'APC001' or apprvAuth eq 'APC002') and md.mdState eq 'DST004'}">
<div class="col-12">
<form action="#" method="post" id="apprvForm">
<div class="row">
<div class="col-10">
@ -142,22 +144,24 @@
</div>
</form>
</div>
</th:block>
</th:block>
</div>
</div>
<div class="modal-footer justify-content-between bg-light">
<div class="col-auto">
<div class="col-auto">
<th:block th:unless="${md.mdState eq 'DST004' or md.mdState eq 'DST006'}">
<th:block th:if="${userSeq eq md.wrtUserSeq or accessAuth eq 'ACC003'}">
<button type="button" class="btn btn-danger" th:data-mdkey="${md.mdKey}" id="deleteBtn">삭제</button>
</th:block>
</th:block>
</div>
<div class="col-auto">
</div>
<div class="col-auto">
<th:block th:unless="${md.mdState eq 'DST004' or md.mdState eq 'DST006'}"><!--승인 상태일때는 수정 불가 -->
<th:block th:if="${userSeq eq md.wrtUserSeq or accessAuth eq 'ACC003'}"><!--작성자일 경우 수정 허용--><!--관리자일 경우 수정 허용-->
<button type="button" class="btn btn-warning" th:data-mdkey="${md.mdKey}" id="editBtn">수정</button>
</th:block>
</th:block>
</div>
</div>
</div>

14
src/main/resources/templates/igActivities/monitoring/resultViewModal.html
View File

@ -248,8 +248,10 @@
</th:block>
</div>
</div>
<div class="col-12" th:if="${(apprvAuth eq 'APC003' or apprvAuth eq 'APC004') and mr.mrState eq 'DST002'
<th:block th:if="${mr.wrtOrgan eq viewOrgan}">
<th:block th:if="${(apprvAuth eq 'APC003' or apprvAuth eq 'APC004') and mr.mrState eq 'DST002'
or (apprvAuth eq 'APC001' or apprvAuth eq 'APC002') and mr.mrState eq 'DST004'}">
<div class="col-12">
<form action="#" method="post" id="apprvForm">
<hr>
<div class="row">
@ -268,22 +270,24 @@
</div>
</form>
</div>
</th:block>
</th:block>
</div>
</div>
<div class="modal-footer justify-content-between bg-light">
<div class="col-auto">
<div class="col-auto">
<th:block th:unless="${mr.mrState eq 'DST004' or mr.mrState eq 'DST006'}">
<th:block th:if="${userSeq eq mr.wrtUserSeq or accessAuth eq 'ACC003'}">
<button type="button" class="btn btn-danger" th:data-mrkey="${mr.mrKey}" id="deleteBtn">삭제</button>
</th:block>
</th:block>
</div>
<div class="col-auto">
</div>
<div class="col-auto">
<th:block th:unless="${mr.mrState eq 'DST004' or mr.mrState eq 'DST006'}"><!--승인 상태일때는 수정 불가 -->
<th:block th:if="${userSeq eq mr.wrtUserSeq or accessAuth eq 'ACC003'}"><!--작성자일 경우 수정 허용--><!--관리자일 경우 수정 허용-->
<button type="button" class="btn btn-warning" th:data-mrkey="${mr.mrKey}" id="editBtn">수정</button>
</th:block>
</th:block>
</div>
</div>
</div>