fix : 외사첩보망 견문관리 운용계획 운용시작일추가 및 뷰페이지 텍스트에어리어 줄바꿈적용
parent
d9d7e0685c
commit
8b7a9d19b1
|
|
@ -142,6 +142,7 @@ public class IntelligenceNetworkController { // 첩보수집활동 > 해양외
|
||||||
//메뉴권한 확인
|
//메뉴권한 확인
|
||||||
mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/operationPlanList/all").get(0).getAccessAuth());
|
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());
|
mav.addObject("apprvAuth", authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/operationPlanList/all").get(0).getApprovalAuth());
|
||||||
|
mav.addObject("lineSeparator", '\n');
|
||||||
return mav;
|
return mav;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -286,6 +287,7 @@ public class IntelligenceNetworkController { // 첩보수집활동 > 해양외
|
||||||
//메뉴권한 확인
|
//메뉴권한 확인
|
||||||
mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/intelligenceAnalyzeList/all").get(0).getAccessAuth());
|
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());
|
mav.addObject("apprvAuth", authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/intelligenceAnalyzeList/all").get(0).getApprovalAuth());
|
||||||
|
mav.addObject("lineSeparator", '\n');
|
||||||
return mav;
|
return mav;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -46,6 +46,9 @@ public class OperationPlan extends BaseModel {
|
||||||
private String opRank;
|
private String opRank;
|
||||||
@Column(name = "op_etc")
|
@Column(name = "op_etc")
|
||||||
private String opEtc;
|
private String opEtc;
|
||||||
|
@Column(name = "op_sdate")
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||||
|
private LocalDate opSdate;
|
||||||
@Column(name = "target_location")
|
@Column(name = "target_location")
|
||||||
private String targetLocation;
|
private String targetLocation;
|
||||||
@Column(name = "vulnerability_analyze")
|
@Column(name = "vulnerability_analyze")
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@ function getOerationPlanEditModal(opKey){
|
||||||
dataType:"html",
|
dataType:"html",
|
||||||
success: function(html){
|
success: function(html){
|
||||||
$("#operationPlanEditModalContent").empty().append(html)
|
$("#operationPlanEditModalContent").empty().append(html)
|
||||||
$("#opBirth").datepicker({
|
$("#opBirth,#opSdate").datepicker({
|
||||||
format: "yyyy-mm-dd",
|
format: "yyyy-mm-dd",
|
||||||
language: "ko",
|
language: "ko",
|
||||||
autoclose: true
|
autoclose: true
|
||||||
|
|
@ -48,6 +48,11 @@ $(document).on('click', '#editBtn', function (){
|
||||||
})
|
})
|
||||||
|
|
||||||
$(document).on('click', '#saveBtn', function (){
|
$(document).on('click', '#saveBtn', function (){
|
||||||
|
if(!$("#opSdate").val()){
|
||||||
|
alert("운용시작일을 입력해주세요.");
|
||||||
|
$('#opSdate').focus();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
if(!$("#opName").val()){
|
if(!$("#opName").val()){
|
||||||
alert("성명을 입력해주세요.");
|
alert("성명을 입력해주세요.");
|
||||||
$('#opName').focus();
|
$('#opName').focus();
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,10 @@
|
||||||
<input type="hidden" name="wrtUserNm" th:value="${op.wrtUserNm}">
|
<input type="hidden" name="wrtUserNm" th:value="${op.wrtUserNm}">
|
||||||
<input type="hidden" name="wrtDt" id="wrtDt" th:value="${#temporals.format(op.wrtDt, 'yyyy-MM-dd HH:mm')}">
|
<input type="hidden" name="wrtDt" id="wrtDt" th:value="${#temporals.format(op.wrtDt, 'yyyy-MM-dd HH:mm')}">
|
||||||
<div class="row mb-1">
|
<div class="row mb-1">
|
||||||
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center">*운용시작일</label>
|
||||||
|
<div class="col-sm-2">
|
||||||
|
<input type="text" class="form-control form-control-sm" id="opSdate" name="opSdate" th:value="${op.opSdate}" readonly>
|
||||||
|
</div>
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
|
||||||
<div class="col-sm-2">
|
<div class="col-sm-2">
|
||||||
<input type="text" class="form-control form-control-sm" placeholder="작성자 자동입력" readonly>
|
<input type="text" class="form-control form-control-sm" placeholder="작성자 자동입력" readonly>
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,8 @@
|
||||||
<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 p-2 show active" id="boardTabPanel" role="tabpanel" tabindex="0">
|
<div class="tab-pane fade p-2 show active" id="boardTabPanel" role="tabpanel" tabindex="0">
|
||||||
<div class="row mb-1">
|
<div class="row mb-1">
|
||||||
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center">운용시작일</label>
|
||||||
|
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${op.opSdate}"></label>
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
|
||||||
<th:block th:each="commonCode:${session.commonCode.get('JT')}">
|
<th:block th:each="commonCode:${session.commonCode.get('JT')}">
|
||||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:if="${commonCode.itemCd eq op.wrtUserGrd}" th:text="|${commonCode.itemValue} ${op.wrtUserNm}|"></label>
|
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:if="${commonCode.itemCd eq op.wrtUserGrd}" th:text="|${commonCode.itemValue} ${op.wrtUserNm}|"></label>
|
||||||
|
|
@ -65,28 +67,28 @@
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">대상목표<br>및<br>위지</label>
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center">대상목표<br>및<br>위지</label>
|
||||||
<div class="col-sm-11 form-control-sm" id="contentDiv">
|
<div class="col-sm-11 form-control-sm" id="contentDiv">
|
||||||
<div th:utext="${op.targetLocation}"></div>
|
<div th:utext="${#strings.replace(op.targetLocation, lineSeparator, '<br>')}"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<hr>
|
<hr>
|
||||||
<div class="row mb-1">
|
<div class="row mb-1">
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">취약성 분석</label>
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center">취약성 분석</label>
|
||||||
<div class="col-sm-11 form-control-sm" id="contentDiv">
|
<div class="col-sm-11 form-control-sm" id="contentDiv">
|
||||||
<div th:utext="${op.vulnerabilityAnalyze}"></div>
|
<div th:utext="${#strings.replace(op.vulnerabilityAnalyze, lineSeparator, '<br>')}"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<hr>
|
<hr>
|
||||||
<div class="row mb-1">
|
<div class="row mb-1">
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">적격성 분석</label>
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center">적격성 분석</label>
|
||||||
<div class="col-sm-11 form-control-sm" id="contentDiv">
|
<div class="col-sm-11 form-control-sm" id="contentDiv">
|
||||||
<div th:utext="${op.eligibilityAnalyze}"></div>
|
<div th:utext="${#strings.replace(op.eligibilityAnalyze, lineSeparator, '<br>')}"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<hr>
|
<hr>
|
||||||
<div class="row mb-1">
|
<div class="row mb-1">
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center">중점 수집사항</label>
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center">중점 수집사항</label>
|
||||||
<div class="col-sm-11 form-control-sm" id="contentDiv">
|
<div class="col-sm-11 form-control-sm" id="contentDiv">
|
||||||
<div th:utext="${op.focusCollection}"></div>
|
<div th:utext="${#strings.replace(op.focusCollection, lineSeparator, '<br>')}"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue