외사 통계 하위 페이지 접근 권한별 등록, 수정 버튼 동작 추가.
parent
e4befe8898
commit
2107603416
|
|
@ -2,6 +2,7 @@ package com.dbnt.faisp.main.faStatistics.crackdownsStatus;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
import com.dbnt.faisp.main.authMgt.service.AuthMgtService;
|
||||||
import com.dbnt.faisp.main.codeMgt.service.CodeMgtService;
|
import com.dbnt.faisp.main.codeMgt.service.CodeMgtService;
|
||||||
import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.asfCov.AsfCov;
|
import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.asfCov.AsfCov;
|
||||||
import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatus;
|
import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatus;
|
||||||
|
|
@ -27,51 +28,59 @@ import java.util.List;
|
||||||
@RequestMapping("/faStatistics")
|
@RequestMapping("/faStatistics")
|
||||||
public class AsfCovController {
|
public class AsfCovController {
|
||||||
|
|
||||||
private final AsfCovService asfCovService;
|
private final AsfCovService asfCovService;
|
||||||
private final CodeMgtService codeMgtService;
|
private final CodeMgtService codeMgtService;
|
||||||
|
private final AuthMgtService authMgtService;
|
||||||
|
|
||||||
@GetMapping("/asfCov")
|
@GetMapping("/asfCov")
|
||||||
public ModelAndView asfCove(@AuthenticationPrincipal UserInfo loginUser, AsfCov asfCov) {
|
public ModelAndView asfCove(@AuthenticationPrincipal UserInfo loginUser, AsfCov asfCov) {
|
||||||
ModelAndView mav = new ModelAndView("faStatistics/asfCov/asfCov");
|
ModelAndView mav = new ModelAndView("faStatistics/asfCov/asfCov");
|
||||||
|
//메뉴권한 확인
|
||||||
|
String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faStatistics/asfCov").get(0).getAccessAuth();
|
||||||
|
mav.addObject("accessAuth", accessAuth);
|
||||||
|
mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
|
||||||
|
mav.addObject("searchParams", asfCov);
|
||||||
|
|
||||||
mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
|
asfCov.setQueryInfo();
|
||||||
mav.addObject("searchParams", asfCov);
|
// mav.addObject("asfCov", asfCov);
|
||||||
|
mav.addObject("asfCovList", asfCovService.selectAsfCovList(asfCov));
|
||||||
|
asfCov.setPaginationInfo();
|
||||||
|
return mav;
|
||||||
|
}
|
||||||
|
|
||||||
asfCov.setQueryInfo();
|
@GetMapping("/asfCovEditModal")
|
||||||
// mav.addObject("asfCov", asfCov);
|
public ModelAndView asfCovEditModal(@AuthenticationPrincipal UserInfo loginUser, AsfCov asfCov) {
|
||||||
mav.addObject("asfCovList", asfCovService.selectAsfCovList(asfCov));
|
ModelAndView mav = new ModelAndView("faStatistics/asfCov/asfCovEditModal");
|
||||||
asfCov.setPaginationInfo();
|
if (asfCov.getAsfCovKey() != null) {
|
||||||
return mav;
|
asfCov = asfCovService.selectAsfCov(asfCov.getAsfCovKey());
|
||||||
|
} else {
|
||||||
|
asfCov.setWrtOrgan(loginUser.getOgCd());
|
||||||
|
asfCov.setWrtPart(loginUser.getOfcCd());
|
||||||
|
asfCov.setWrtUserSeq(loginUser.getUserSeq());
|
||||||
|
asfCov.setWrtUserGrd(loginUser.getTitleCd());
|
||||||
|
asfCov.setWrtUserNm(loginUser.getUserNm());
|
||||||
|
asfCov.setWrtDt(LocalDateTime.now());
|
||||||
}
|
}
|
||||||
|
mav.addObject("asfCov", asfCov);
|
||||||
|
mav.addObject("userSeq", loginUser.getUserSeq());
|
||||||
|
|
||||||
@GetMapping("/asfCovEditModal")
|
return mav;
|
||||||
public ModelAndView asfCovEditModal(@AuthenticationPrincipal UserInfo loginUser, AsfCov asfCov) {
|
}
|
||||||
ModelAndView mav = new ModelAndView("faStatistics/asfCov/asfCovEditModal");
|
|
||||||
if (asfCov.getAsfCovKey() != null) {
|
|
||||||
asfCov = asfCovService.selectAsfCov(asfCov.getAsfCovKey());
|
|
||||||
} else {
|
|
||||||
asfCov.setWrtOrgan(loginUser.getOgCd());
|
|
||||||
asfCov.setWrtPart(loginUser.getOfcCd());
|
|
||||||
asfCov.setWrtUserSeq(loginUser.getUserSeq());
|
|
||||||
asfCov.setWrtUserGrd(loginUser.getTitleCd());
|
|
||||||
asfCov.setWrtUserNm(loginUser.getUserNm());
|
|
||||||
asfCov.setWrtDt(LocalDateTime.now());
|
|
||||||
}
|
|
||||||
mav.addObject("asfCov", asfCov);
|
|
||||||
mav.addObject("userSeq", loginUser.getUserSeq());
|
|
||||||
|
|
||||||
return mav;
|
@GetMapping("/asfCovViewModal")
|
||||||
}
|
public ModelAndView asfCovViewModal(@AuthenticationPrincipal UserInfo loginUser, AsfCov asfCov){
|
||||||
|
ModelAndView mav= new ModelAndView("faStatistics/asfCov/asfCovViewModal");
|
||||||
|
|
||||||
@GetMapping("/asfCovViewModal")
|
//메뉴권한 확인
|
||||||
public ModelAndView asfCovViewModal(@AuthenticationPrincipal UserInfo loginUser, AsfCov asfCov){
|
String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faStatistics/asfCov").get(0).getAccessAuth();
|
||||||
ModelAndView mav= new ModelAndView("faStatistics/asfCov/asfCovViewModal");
|
mav.addObject("accessAuth", accessAuth);
|
||||||
|
mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
|
||||||
|
|
||||||
mav.addObject("userSeq",loginUser.getUserSeq());
|
mav.addObject("userSeq",loginUser.getUserSeq());
|
||||||
mav.addObject("asfCov", asfCovService.selectAsfCov(asfCov.getAsfCovKey()));
|
mav.addObject("asfCov", asfCovService.selectAsfCov(asfCov.getAsfCovKey()));
|
||||||
mav.addObject("asfCovHistory", asfCovService.selectAsfCovHistory(asfCov.getAsfCovKey()));
|
mav.addObject("asfCovHistory", asfCovService.selectAsfCovHistory(asfCov.getAsfCovKey()));
|
||||||
return mav;
|
return mav;
|
||||||
}
|
}
|
||||||
|
|
||||||
// @GetMapping("/asfCovHistoryViewModal")
|
// @GetMapping("/asfCovHistoryViewModal")
|
||||||
// public ModelAndView asfCovHistoryViewModal(@AuthenticationPrincipal UserInfo loginUser, AsfCov asfCov){
|
// public ModelAndView asfCovHistoryViewModal(@AuthenticationPrincipal UserInfo loginUser, AsfCov asfCov){
|
||||||
|
|
@ -82,27 +91,27 @@ public class AsfCovController {
|
||||||
// return mav;
|
// return mav;
|
||||||
// }
|
// }
|
||||||
|
|
||||||
@GetMapping("/asfCovHistoryDetail")
|
@GetMapping("/asfCovHistoryDetail")
|
||||||
public ModelAndView asfCovHistoryDetail(@AuthenticationPrincipal UserInfo loginUser, AsfCov asfCov){
|
public ModelAndView asfCovHistoryDetail(@AuthenticationPrincipal UserInfo loginUser, AsfCov asfCov){
|
||||||
ModelAndView mav = new ModelAndView("faStatistics/asfCov/asfCovHistoryDetail");
|
ModelAndView mav = new ModelAndView("faStatistics/asfCov/asfCovHistoryDetail");
|
||||||
asfCov = asfCovService.selectAsfCov(asfCov.getAsfCovKey());
|
asfCov = asfCovService.selectAsfCov(asfCov.getAsfCovKey());
|
||||||
mav.addObject("userSeq",loginUser.getUserSeq());
|
mav.addObject("userSeq",loginUser.getUserSeq());
|
||||||
mav.addObject("asfCovHistory", asfCovService.selectAsfCovHistory(asfCov.getAsfCovKey()));
|
mav.addObject("asfCovHistory", asfCovService.selectAsfCovHistory(asfCov.getAsfCovKey()));
|
||||||
mav.addObject("asfCov", asfCov);
|
mav.addObject("asfCov", asfCov);
|
||||||
return mav;
|
return mav;
|
||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping("/saveContent")
|
@PostMapping("/saveContent")
|
||||||
public Integer saveContent (AsfCov asfCov){
|
public Integer saveContent (AsfCov asfCov){
|
||||||
return asfCovService.saveContent(asfCov);
|
return asfCovService.saveContent(asfCov);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@PostMapping("/deleteContent")
|
@PostMapping("/deleteContent")
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public void deleteContent(@RequestBody AsfCov asfCov){
|
public void deleteContent(@RequestBody AsfCov asfCov){
|
||||||
asfCovService.deleteContent(asfCov);
|
asfCovService.deleteContent(asfCov);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@ public class FishingBoatController {
|
||||||
//메뉴권한 확인
|
//메뉴권한 확인
|
||||||
String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faStatistics/fishingBoat").get(0).getAccessAuth();
|
String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faStatistics/fishingBoat").get(0).getAccessAuth();
|
||||||
mav.addObject("accessAuth", accessAuth);
|
mav.addObject("accessAuth", accessAuth);
|
||||||
|
mav.addObject("loginUserOrgan", loginUser.getOgCd());
|
||||||
params.setQueryInfo();
|
params.setQueryInfo();
|
||||||
if(params.getYear()==null){
|
if(params.getYear()==null){
|
||||||
params.setYear(LocalDateTime.now().getYear());
|
params.setYear(LocalDateTime.now().getYear());
|
||||||
|
|
@ -101,6 +101,7 @@ public class FishingBoatController {
|
||||||
mav.addObject("bdtList", codeMgtService.selectCodeMgtList("BDT"));
|
mav.addObject("bdtList", codeMgtService.selectCodeMgtList("BDT"));
|
||||||
mav.addObject("boatList", codeMgtService.selectCodeMgtList(crackdownStatus.getCrackdownPolice()));
|
mav.addObject("boatList", codeMgtService.selectCodeMgtList(crackdownStatus.getCrackdownPolice()));
|
||||||
mav.addObject("userSeq", loginUser.getUserSeq());
|
mav.addObject("userSeq", loginUser.getUserSeq());
|
||||||
|
mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
|
||||||
return mav;
|
return mav;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -64,6 +64,7 @@ public class SailorController {
|
||||||
mav.addObject("userSeq",loginUser.getUserSeq());
|
mav.addObject("userSeq",loginUser.getUserSeq());
|
||||||
//메뉴권한 확인
|
//메뉴권한 확인
|
||||||
mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faStatistics/sailor").get(0).getAccessAuth());
|
mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faStatistics/sailor").get(0).getAccessAuth());
|
||||||
|
mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
|
||||||
return mav;
|
return mav;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -166,7 +166,9 @@
|
||||||
<button class="btn btn-success" id="asfCovDownExcel">엑셀 다운로드</button>
|
<button class="btn btn-success" id="asfCovDownExcel">엑셀 다운로드</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-auto">
|
<div class="col-auto">
|
||||||
<button class="btn btn-primary" id="addAsfCovBtn" >등록</button>
|
<th:block th:if="${accessAuth ne 'ACC001'}">
|
||||||
|
<button class="btn btn-primary" id="addAsfCovBtn" >등록</button>
|
||||||
|
</th:block>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -1,135 +1,137 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="ko" xmlns:th="http://www.thymeleaf.org">
|
<html lang="ko" xmlns:th="http://www.thymeleaf.org">
|
||||||
<div class="modal-header bg-dark">
|
<div class="modal-header bg-dark">
|
||||||
<h5 class="modal-title text-white" id="asfCovEditModalLabel">ASF 및 코로나19 관련 조치현황 상세</h5>
|
<h5 class="modal-title text-white" id="asfCovEditModalLabel">ASF 및 코로나19 관련 조치현황 상세</h5>
|
||||||
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
|
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
<!-- 탭 메뉴 -->
|
<!-- 탭 메뉴 -->
|
||||||
<ul class="nav nav-tabs" role="tablist">
|
<ul class="nav nav-tabs" role="tablist">
|
||||||
<li class="nav-item" role="presentation">
|
<li class="nav-item" role="presentation">
|
||||||
<button class="nav-link processResultTab active" id="processResult-tab" data-bs-toggle="tab"
|
<button class="nav-link processResultTab active" id="processResult-tab" data-bs-toggle="tab"
|
||||||
data-bs-target="#processResult" type="button" role="tab" aria-controls="processResult" data-processResult-type="processResult"
|
data-bs-target="#processResult" type="button" role="tab" aria-controls="processResult" data-processResult-type="processResult"
|
||||||
aria-selected="true">상세</button>
|
aria-selected="true">상세</button>
|
||||||
</li>
|
</li>
|
||||||
<li class="nav-item" role="presentation">
|
<li class="nav-item" role="presentation">
|
||||||
<button class="nav-link processResultTab" id="history-tab" data-bs-toggle="tab"
|
<button class="nav-link processResultTab" id="history-tab" data-bs-toggle="tab"
|
||||||
data-bs-target="#history" type="button" role="tab" data-history-type="history"
|
data-bs-target="#history" type="button" role="tab" data-history-type="history"
|
||||||
aria-controls="history">수정이력</button>
|
aria-controls="history">수정이력</button>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<!-- 내용 -->
|
<!-- 내용 -->
|
||||||
<div class="tab-content bg-white border border-top-0 p-2">
|
<div class="tab-content bg-white border border-top-0 p-2">
|
||||||
<div class="tab-pane fade show active" id="processResult" role="tabpanel" aria-labelledby="processResult-tab">
|
<div class="tab-pane fade show active" id="processResult" role="tabpanel" aria-labelledby="processResult-tab">
|
||||||
<div class="modal-body" id="asfCovEditModalContent">
|
<div class="modal-body" id="asfCovEditModalContent">
|
||||||
<input type="hidden" class="asfCovKey" th:value="${asfCov.asfCovKey}">
|
<input type="hidden" class="asfCovKey" th:value="${asfCov.asfCovKey}">
|
||||||
<div class="row mb-1">
|
<div class="row mb-1">
|
||||||
<div class="col-sm-9"></div>
|
<div class="col-sm-9"></div>
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">작성일시</label>
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">작성일시</label>
|
||||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(asfCov.wrtDt, 'yyyy-MM-dd HH:mm')}"></label>
|
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(asfCov.wrtDt, 'yyyy-MM-dd HH:mm')}"></label>
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">사건번호</label>
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">사건번호</label>
|
||||||
<label class="col-sm-8 col-form-label col-form-label-sm text-start" th:text="${asfCov.caseNum}"></label>
|
<label class="col-sm-8 col-form-label col-form-label-sm text-start" th:text="${asfCov.caseNum}"></label>
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">작성자</label>
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">작성자</label>
|
||||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.wrtUserNm}"></label>
|
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.wrtUserNm}"></label>
|
||||||
</div>
|
|
||||||
<hr class="my-1">
|
|
||||||
<div class="row mb-1">
|
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">선명</label>
|
|
||||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.boatNameKr}"></label>
|
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">단속함정</label>
|
|
||||||
<th:block th:unless="${#strings.isEmpty(asfCov.crackdownBoat)}">
|
|
||||||
<th:block th:each="code:${session.commonCode.get(asfCov.crackdownPolice)}">
|
|
||||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:if="${asfCov.crackdownBoat eq code.itemCd}" th:text="${code.itemValue}"></td>
|
|
||||||
</th:block>
|
|
||||||
</th:block>
|
|
||||||
</div>
|
|
||||||
<hr class="my-1">
|
|
||||||
<div class="row mb-1">
|
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">사건담당경찰서</label>
|
|
||||||
<th:block th:each="commonCode:${session.commonCode.get('ATA')}">
|
|
||||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:if="${asfCov.caseAgency eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></label>
|
|
||||||
</th:block>
|
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">사건담당경찰관</label>
|
|
||||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.casePoliceOfficer}"></label>
|
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">단속경찰서</label>
|
|
||||||
<th:block th:each="commonCode:${session.commonCode.get('CPO')}">
|
|
||||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:if="${asfCov.crackdownPolice eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></label>
|
|
||||||
</th:block>
|
|
||||||
</div>
|
|
||||||
<hr class="my-1">
|
|
||||||
<div class="row mb-1">
|
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">전용부두 압송여부</label>
|
|
||||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.pressurizedYn}"></label>
|
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">미압송시</label>
|
|
||||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.pressurizedN}"></label>
|
|
||||||
</div>
|
|
||||||
<div class="row mb-1">
|
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">검사인원</label>
|
|
||||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.personCnt}"></label>
|
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">양성</label>
|
|
||||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.personPositiveCnt}"></label>
|
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">음성</label>
|
|
||||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.personNegativeCnt}"></label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<hr class="my-1">
|
|
||||||
<div class="row mb-1">
|
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">검/방역조치 내용</label>
|
|
||||||
<div class="col-sm-11 form-control-sm" th:utext="${asfCov.asfcovActionDetail}"></div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="tab-pane fade" id="history" role="tabpanel" aria-labelledby="history-tab">
|
<hr class="my-1">
|
||||||
<div class="row">
|
<div class="row mb-1">
|
||||||
<div class="col-4">
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">선명</label>
|
||||||
<table class="table table-hover">
|
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.boatNameKr}"></label>
|
||||||
<thead>
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">단속함정</label>
|
||||||
<tr>
|
<th:block th:unless="${#strings.isEmpty(asfCov.crackdownBoat)}">
|
||||||
<td></td>
|
<th:block th:each="code:${session.commonCode.get(asfCov.crackdownPolice)}">
|
||||||
<td>수정자</td>
|
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:if="${asfCov.crackdownBoat eq code.itemCd}" th:text="${code.itemValue}"></td>
|
||||||
<td>수정일</td>
|
</th:block>
|
||||||
</tr>
|
</th:block>
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
<tr class="versionInfoTr" th:each="asfcov:${asfCovHistory}">
|
|
||||||
<input type="hidden" class="asfCovKey" th:value="${asfcov.asfCovKey}">
|
|
||||||
<input type="hidden" class="versionNo" th:value="${asfcov.versionNo}">
|
|
||||||
<td><input type="checkbox" class="versionInfoChkbox"></td>
|
|
||||||
<td>
|
|
||||||
<th:block th:each="commonCode:${session.commonCode.get('OG')}">
|
|
||||||
<th:block th:if="${asfcov.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
|
|
||||||
</th:block>
|
|
||||||
<th:block th:each="commonCode:${session.commonCode.get(asfcov.wrtOrgan)}">
|
|
||||||
<th:block th:if="${asfcov.wrtPart eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
|
|
||||||
</th:block>
|
|
||||||
<br>
|
|
||||||
<th:block th:each="commonCode:${session.commonCode.get('JT')}">
|
|
||||||
<th:block th:if="${asfcov.wrtUserGrd eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
|
|
||||||
</th:block>
|
|
||||||
<th:block th:text="${asfcov.wrtUserNm}"></th:block>
|
|
||||||
</td>
|
|
||||||
<td th:text="${#temporals.format(asfcov.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
<div class="col-8" id="asfcovVersionInfoDiv">
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
<hr class="my-1">
|
||||||
|
<div class="row mb-1">
|
||||||
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">사건담당경찰서</label>
|
||||||
|
<th:block th:each="commonCode:${session.commonCode.get('ATA')}">
|
||||||
|
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:if="${asfCov.caseAgency eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></label>
|
||||||
|
</th:block>
|
||||||
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">사건담당경찰관</label>
|
||||||
|
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.casePoliceOfficer}"></label>
|
||||||
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">단속경찰서</label>
|
||||||
|
<th:block th:each="commonCode:${session.commonCode.get('CPO')}">
|
||||||
|
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:if="${asfCov.crackdownPolice eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></label>
|
||||||
|
</th:block>
|
||||||
|
</div>
|
||||||
|
<hr class="my-1">
|
||||||
|
<div class="row mb-1">
|
||||||
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">전용부두 압송여부</label>
|
||||||
|
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.pressurizedYn}"></label>
|
||||||
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">미압송시</label>
|
||||||
|
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.pressurizedN}"></label>
|
||||||
|
</div>
|
||||||
|
<div class="row mb-1">
|
||||||
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">검사인원</label>
|
||||||
|
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.personCnt}"></label>
|
||||||
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">양성</label>
|
||||||
|
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.personPositiveCnt}"></label>
|
||||||
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">음성</label>
|
||||||
|
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.personNegativeCnt}"></label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<hr class="my-1">
|
||||||
|
<div class="row mb-1">
|
||||||
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">검/방역조치 내용</label>
|
||||||
|
<div class="col-sm-11 form-control-sm" th:utext="${asfCov.asfcovActionDetail}"></div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="tab-pane fade" id="history" role="tabpanel" aria-labelledby="history-tab">
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-4">
|
||||||
|
<table class="table table-hover">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<td></td>
|
||||||
|
<td>수정자</td>
|
||||||
|
<td>수정일</td>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<tr class="versionInfoTr" th:each="asfcov:${asfCovHistory}">
|
||||||
|
<input type="hidden" class="asfCovKey" th:value="${asfcov.asfCovKey}">
|
||||||
|
<input type="hidden" class="versionNo" th:value="${asfcov.versionNo}">
|
||||||
|
<td><input type="checkbox" class="versionInfoChkbox"></td>
|
||||||
|
<td>
|
||||||
|
<th:block th:each="commonCode:${session.commonCode.get('OG')}">
|
||||||
|
<th:block th:if="${asfcov.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
|
||||||
|
</th:block>
|
||||||
|
<th:block th:each="commonCode:${session.commonCode.get(asfcov.wrtOrgan)}">
|
||||||
|
<th:block th:if="${asfcov.wrtPart eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
|
||||||
|
</th:block>
|
||||||
|
<br>
|
||||||
|
<th:block th:each="commonCode:${session.commonCode.get('JT')}">
|
||||||
|
<th:block th:if="${asfcov.wrtUserGrd eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
|
||||||
|
</th:block>
|
||||||
|
<th:block th:text="${asfcov.wrtUserNm}"></th:block>
|
||||||
|
</td>
|
||||||
|
<td th:text="${#temporals.format(asfcov.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
<div class="col-8" id="asfcovVersionInfoDiv">
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer row justify-content-between bg-light">
|
<th:block th:if="${userSeq eq asfCov.wrtUserSeq
|
||||||
|
or (accessAuth eq 'ACC003' and #lists.contains(mgtOrganList, asfCov.wrtOrgan))}">
|
||||||
|
<!--작성자, 관리자일 경우 수정, 삭제 허용-->
|
||||||
|
<div class="modal-footer row justify-content-between bg-light">
|
||||||
<div class="col-auto">
|
<div class="col-auto">
|
||||||
<button type="button" class="btn btn-danger" id="deleteMajorBtn">삭제</button>
|
<button type="button" class="btn btn-danger" id="deleteMajorBtn">삭제</button>
|
||||||
<!-- <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->
|
<!-- <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->
|
||||||
</div>
|
</div>
|
||||||
<div class="col-auto">
|
<div class="col-auto">
|
||||||
<th:block th:if="${userSeq eq asfCov.wrtUserSeq}"><!--작성자일 경우 수정 허용-->
|
<button type="button" class="btn btn-warning" id="editBtn" th:data-asfCovkey="${asfCov.asfCovKey}">수정</button>
|
||||||
<button type="button" class="btn btn-warning" id="editBtn" th:data-asfCovkey="${asfCov.asfCovKey}">수정</button>
|
|
||||||
</th:block>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</th:block>
|
||||||
</html>
|
</html>
|
||||||
|
|
@ -246,7 +246,9 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="row justify-content-between">
|
<div class="row justify-content-between">
|
||||||
<div class="col-auto">
|
<div class="col-auto">
|
||||||
<button class="btn btn-warning" id="deadlineBtn" data-menukey="51" th:data-deadlinechk="${deadlineState}" th:if="${accessAuth eq 'ACC003'}" th:text="${deadlineState eq 'F'?'마감':'등록허용'}"></button>
|
<th:block th:if="${accessAuth eq 'ACC003' and loginUserOrgan eq 'OG001'}">
|
||||||
|
<button class="btn btn-warning" id="deadlineBtn" data-menukey="51" th:data-deadlinechk="${deadlineState}" th:text="${deadlineState eq 'F'?'마감':'등록허용'}"></button>
|
||||||
|
</th:block>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-auto">
|
<div class="col-auto">
|
||||||
<nav aria-label="Page navigation">
|
<nav aria-label="Page navigation">
|
||||||
|
|
@ -274,7 +276,9 @@
|
||||||
</nav>
|
</nav>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-auto">
|
<div class="col-auto">
|
||||||
<input type="button" class="btn btn-success" value="등록" id="getFishingBoatEditModalBtn" th:disabled="${deadlineState eq 'T'}">
|
<th:block th:if="${accessAuth ne 'ACC001'}">
|
||||||
|
<input type="button" class="btn btn-success" value="등록" id="getFishingBoatEditModalBtn" th:disabled="${deadlineState eq 'T'}">
|
||||||
|
</th:block>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -590,7 +590,9 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer bg-light">
|
<div class="modal-footer bg-light">
|
||||||
<th:block th:if="${userSeq eq crackdownStatus.fishingBoat.wrtUserSeq or accessAuth eq 'ACC003'}"><!--작성자일 경우 수정 허용--><!--관리자일 경우 수정 허용-->
|
<th:block th:if="${userSeq eq crackdownStatus.fishingBoat.wrtUserSeq
|
||||||
|
or (accessAuth eq 'ACC003' and #lists.contains(mgtOrganList, crackdownStatus.fishingBoat.wrtOrgan))}">
|
||||||
|
<!--작성자, 관리자일 경우 수정 허용-->
|
||||||
<button type="button" class="btn btn-warning" id="editFishingBoatBtn">수정</button>
|
<button type="button" class="btn btn-warning" id="editFishingBoatBtn">수정</button>
|
||||||
</th:block>
|
</th:block>
|
||||||
<!-- <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->
|
<!-- <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->
|
||||||
|
|
|
||||||
|
|
@ -333,7 +333,9 @@
|
||||||
<button class="btn btn-success" id="sailorDownExcel">엑셀 다운로드</button>
|
<button class="btn btn-success" id="sailorDownExcel">엑셀 다운로드</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-auto">
|
<div class="col-auto">
|
||||||
<button class="btn btn-primary" id="sailorAddBtn">등록</button>
|
<th:block th:if="${accessAuth ne 'ACC001'}">
|
||||||
|
<button class="btn btn-primary" id="sailorAddBtn">등록</button>
|
||||||
|
</th:block>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -219,7 +219,9 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer bg-light">
|
<div class="modal-footer bg-light">
|
||||||
<th:block th:if="${userSeq eq sailor.wrtUserSeq or accessAuth eq 'ACC003'}"><!--작성자일 경우 수정 허용--><!--관리자일 경우 수정 허용-->
|
<th:block th:if="${userSeq eq sailor.wrtUserSeq
|
||||||
|
or (accessAuth eq 'ACC003' and #lists.contains(mgtOrganList, sailor.wrtOrgan))}">
|
||||||
|
<!--작성자일 경우 수정 허용--><!--관리자일 경우 수정 허용-->
|
||||||
<button type="button" class="btn btn-warning" id="sailorEditBtn">수정</button>
|
<button type="button" class="btn btn-warning" id="sailorEditBtn">수정</button>
|
||||||
</th:block>
|
</th:block>
|
||||||
<!-- <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->
|
<!-- <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue