asf 및 코로나19 관련조치사항 삭제오류수정
parent
8bb6c123fd
commit
72b9da084d
|
|
@ -77,6 +77,7 @@ public class AsfCovController {
|
||||||
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){
|
||||||
|
|
|
||||||
|
|
@ -68,7 +68,7 @@ public class AsfCovService extends BaseService {
|
||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
public void deleteContent(AsfCov asfCov){
|
public void deleteContent(AsfCov asfCov){
|
||||||
asfCov=asfCovRepository.findById(asfCov.getAsfCovKey()).orElse(null);
|
asfCov=asfCovRepository.findTop1ByAsfCovKeyOrderByVersionNoDesc(asfCov.getAsfCovKey()).orElse(null);
|
||||||
asfCov.setContentStatus("DST008");
|
asfCov.setContentStatus("DST008");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -75,13 +75,13 @@ $(function(){
|
||||||
|
|
||||||
|
|
||||||
$(document).on('click', '#deleteMajorBtn', function (){
|
$(document).on('click', '#deleteMajorBtn', function (){
|
||||||
const asfCovKey = $('input[name=asfCovKey]').val();
|
const asfCovKey = $('#processResultEditBody').find(".asfCovKey").val();
|
||||||
console.log(asfCovKey);
|
console.log(asfCovKey);
|
||||||
if(confirm("삭제하시겠습니까?")){
|
if(confirm("삭제하시겠습니까?")){
|
||||||
//contentFade("in");
|
//contentFade("in");
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type : 'POST',
|
type : 'POST',
|
||||||
url : "/ivsgt/deleteContent",
|
url : "/faStatistics/deleteContent",
|
||||||
data : JSON.stringify({asfCovKey:asfCovKey}),
|
data : JSON.stringify({asfCovKey:asfCovKey}),
|
||||||
contentType: 'application/json',
|
contentType: 'application/json',
|
||||||
beforeSend: function (xhr){
|
beforeSend: function (xhr){
|
||||||
|
|
@ -115,7 +115,8 @@ function getEditModal(asfCovKey){
|
||||||
}
|
}
|
||||||
$("#asfCovEditModalContent").empty().append(html);
|
$("#asfCovEditModalContent").empty().append(html);
|
||||||
$("#asfCovEditModal").modal('show');
|
$("#asfCovEditModal").modal('show');
|
||||||
|
$("#editContent").empty().append(html);
|
||||||
|
setUploadDiv();
|
||||||
},
|
},
|
||||||
error:function(e){
|
error:function(e){
|
||||||
ajaxErrorAction(e);
|
ajaxErrorAction(e);
|
||||||
|
|
|
||||||
|
|
@ -19,126 +19,117 @@
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<!-- 내용 -->
|
<!-- 내용 -->
|
||||||
<div class="tab-content" style="overflow-y: auto;">
|
<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="processResultEditBody">
|
<div class="modal-body" id="processResultEditBody">
|
||||||
<form action="#" method="post" id="processResultEditForm">
|
<input type="hidden" class="asfCovKey" th:value="${asfCov.asfCovKey}">
|
||||||
<input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
|
<div class="row mb-1">
|
||||||
<input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
|
<label for="wrtUserNm" class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
|
||||||
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
|
<div class="col-sm-2">
|
||||||
<input type="hidden" name="cdsKey" th:value="${asfCov.cdsKey}">
|
<th:block th:if="${asfCov.wrtUserGrd eq null}">
|
||||||
<input type="hidden" name="wrtOrgan" th:value="${asfCov.wrtOrgan}">
|
<input type="text" class="form-control form-control-sm" id="wrtUserNm" th:value="${asfCov.wrtUserNm}" readonly>
|
||||||
<input type="hidden" name="wrtUserNm" th:value="${asfCov.wrtUserNm}">
|
</th:block>
|
||||||
<input type="hidden" name="wrtDt" th:value="${#temporals.format(asfCov.wrtDt, 'yyyy-MM-dd HH:mm')}">
|
<th:block th:unless="${asfCov.wrtUserGrd eq null}">
|
||||||
<input type="hidden" id="saveYn" name="saveYn">
|
<th:block th:each="code:${session.commonCode.get('JT')}">
|
||||||
<div class="row mb-1">
|
<th:block th:if="${code.itemCd eq asfCov.wrtUserGrd}">
|
||||||
<label for="wrtUserNm" class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
|
<input type="text" class="form-control form-control-sm" id="wrtUserNm" th:value="|${code.itemValue} ${asfCov.wrtUserNm}|" readonly>
|
||||||
<div class="col-sm-2">
|
|
||||||
<th:block th:if="${asfCov.wrtUserGrd eq null}">
|
|
||||||
<input type="text" class="form-control form-control-sm" id="wrtUserNm" th:value="${asfCov.wrtUserNm}" readonly>
|
|
||||||
</th:block>
|
|
||||||
<th:block th:unless="${asfCov.wrtUserGrd eq null}">
|
|
||||||
<th:block th:each="code:${session.commonCode.get('JT')}">
|
|
||||||
<th:block th:if="${code.itemCd eq asfCov.wrtUserGrd}">
|
|
||||||
<input type="text" class="form-control form-control-sm" id="wrtUserNm" th:value="|${code.itemValue} ${asfCov.wrtUserNm}|" readonly>
|
|
||||||
</th:block>
|
|
||||||
</th:block>
|
</th:block>
|
||||||
</th:block>
|
</th:block>
|
||||||
</div>
|
</th:block>
|
||||||
<label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">작성일시</label>
|
</div>
|
||||||
<div class="col-sm-2">
|
<label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">작성일시</label>
|
||||||
<input type="text" class="form-control form-control-sm" id="wrtDt" name="wrtDt" th:value="${#temporals.format(asfCov.wrtDt, 'yyyy-MM-dd HH:mm')}" readonly>
|
<div class="col-sm-2">
|
||||||
|
<input type="text" class="form-control form-control-sm" id="wrtDt" name="wrtDt" th:value="${#temporals.format(asfCov.wrtDt, 'yyyy-MM-dd HH:mm')}" readonly>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row mb-1">
|
||||||
|
<label for="boatNameKr" 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 cdsInfo" id="boatNameKr" name="boatNameKr" th:value="${asfCov.boatNameKr}" disabled>
|
||||||
|
</div>
|
||||||
|
<label for="caseNum" class="col-sm-1 col-form-label col-form-label-sm text-center">사건번호</label>
|
||||||
|
<div class="col-sm-2">
|
||||||
|
<div class="input-group">
|
||||||
|
<input type="text" class="form-control form-control-sm cdsInfo" id="caseNum" name="caseNum" th:value="${asfCov.caseNum}" disabled>
|
||||||
|
<input type="button" class="btn btn-sm btn-outline-primary crackdownStatusInfo w-auto" id="caseNumBtn" value="불러오기">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row mb-1">
|
<label for="caseNum" class="col-sm-2 col-form-label col-form-label-sm text-center">*사건번호로 불러와주세요</label>
|
||||||
<label for="boatNameKr" class="col-sm-1 col-form-label col-form-label-sm text-center">선명</label>
|
</div>
|
||||||
<div class="col-sm-2">
|
<div class="row mb-1">
|
||||||
<input type="text" class="form-control form-control-sm cdsInfo" id="boatNameKr" name="boatNameKr" th:value="${asfCov.boatNameKr}" disabled>
|
<label for="caseAgency" class="col-sm-1 col-form-label col-form-label-sm text-center">사건담당기관</label>
|
||||||
</div>
|
<div class="col-sm-2">
|
||||||
<label for="caseNum" class="col-sm-1 col-form-label col-form-label-sm text-center">사건번호</label>
|
<select class="form-select form-select-sm cdsInfo" id="caseAgency" name="caseAgency" disabled>
|
||||||
<div class="col-sm-2">
|
<option value=""></option>
|
||||||
<div class="input-group">
|
<th:block th:each="commonCode:${session.commonCode.get('ATA')}">
|
||||||
<input type="text" class="form-control form-control-sm cdsInfo" id="caseNum" name="caseNum" th:value="${asfCov.caseNum}" disabled>
|
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq asfCov.caseAgency}"></option>
|
||||||
<input type="button" class="btn btn-sm btn-outline-primary crackdownStatusInfo w-auto" id="caseNumBtn" value="불러오기">
|
</th:block>
|
||||||
</div>
|
</select>
|
||||||
</div>
|
|
||||||
<label for="caseNum" class="col-sm-2 col-form-label col-form-label-sm text-center">*사건번호로 불러와주세요</label>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="row mb-1">
|
<label for="casePoliceOfficer" class="col-sm-1 col-form-label col-form-label-sm text-center fs-13">사건담당경찰관</label>
|
||||||
<label for="caseAgency" 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 cdsInfo" id="casePoliceOfficer" name="casePoliceOfficer" th:value="${asfCov.casePoliceOfficer}" disabled>
|
||||||
<select class="form-select form-select-sm cdsInfo" id="caseAgency" name="caseAgency" disabled>
|
</div>
|
||||||
<option value=""></option>
|
<label for="crackdownPolice" class="col-sm-1 col-form-label col-form-label-sm text-center">단속경찰서</label>
|
||||||
<th:block th:each="commonCode:${session.commonCode.get('ATA')}">
|
<div class="col-sm-2">
|
||||||
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq asfCov.caseAgency}"></option>
|
<select class="form-select form-select-sm cdsInfo" name="crackdownPolice" id="crackdownPolice" disabled>
|
||||||
|
<option value=""></option>
|
||||||
|
<th:block th:each="commonCode:${session.commonCode.get('CPO')}">
|
||||||
|
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq asfCov.crackdownPolice}"></option>
|
||||||
|
</th:block>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<label for="crackdownBoat" class="col-sm-1 col-form-label col-form-label-sm text-center">단속함정</label>
|
||||||
|
<div class="col-sm-2">
|
||||||
|
<select class="form-select form-select-sm cdsInfo" name="crackdownBoat" id="crackdownBoat" disabled>
|
||||||
|
<option value=""></option>
|
||||||
|
<th:block th:each="cpoCode:${session.commonCode.get('CPO')}">
|
||||||
|
<th:block th:each="boatCode:${session.commonCode.get(cpoCode.itemCd)}">
|
||||||
|
<option th:value="${boatCode.itemCd}" th:text="${boatCode.itemValue}"></option>
|
||||||
</th:block>
|
</th:block>
|
||||||
</select>
|
</th:block>
|
||||||
</div>
|
</select>
|
||||||
<label for="casePoliceOfficer" class="col-sm-1 col-form-label col-form-label-sm text-center fs-13">사건담당경찰관</label>
|
|
||||||
<div class="col-sm-2">
|
|
||||||
<input type="text" class="form-control form-control-sm cdsInfo" id="casePoliceOfficer" name="casePoliceOfficer" th:value="${asfCov.casePoliceOfficer}" disabled>
|
|
||||||
</div>
|
|
||||||
<label for="crackdownPolice" class="col-sm-1 col-form-label col-form-label-sm text-center">단속경찰서</label>
|
|
||||||
<div class="col-sm-2">
|
|
||||||
<select class="form-select form-select-sm cdsInfo" name="crackdownPolice" id="crackdownPolice" disabled>
|
|
||||||
<option value=""></option>
|
|
||||||
<th:block th:each="commonCode:${session.commonCode.get('CPO')}">
|
|
||||||
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq asfCov.crackdownPolice}"></option>
|
|
||||||
</th:block>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<label for="crackdownBoat" class="col-sm-1 col-form-label col-form-label-sm text-center">단속함정</label>
|
|
||||||
<div class="col-sm-2">
|
|
||||||
<select class="form-select form-select-sm cdsInfo" name="crackdownBoat" id="crackdownBoat" disabled>
|
|
||||||
<option value=""></option>
|
|
||||||
<th:block th:each="cpoCode:${session.commonCode.get('CPO')}">
|
|
||||||
<th:block th:each="boatCode:${session.commonCode.get(cpoCode.itemCd)}">
|
|
||||||
<option th:value="${boatCode.itemCd}" th:text="${boatCode.itemValue}"></option>
|
|
||||||
</th:block>
|
|
||||||
</th:block>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="row mb-1">
|
</div>
|
||||||
<label for="pressurizedYn" class="col-sm-1 col-form-label col-form-label-sm text-center">전용부두 압송여부</label>
|
<div class="row mb-1">
|
||||||
<div class="col-sm-2">
|
<label for="pressurizedYn" class="col-sm-1 col-form-label col-form-label-sm text-center">전용부두 압송여부</label>
|
||||||
<select class="form-select form-select-sm crackdownStatusInfo" name="pressurizedYn" id="pressurizedYn">
|
<div class="col-sm-2">
|
||||||
<option value="">선택</option>
|
<select class="form-select form-select-sm crackdownStatusInfo" name="pressurizedYn" id="pressurizedYn">
|
||||||
<option value="Y" th:selected="${asfCov.pressurizedYn eq 'Y'}">압송</option>
|
<option value="">선택</option>
|
||||||
<option value="N" th:selected="${asfCov.pressurizedYn eq 'N'}">미압송</option>
|
<option value="Y" th:selected="${asfCov.pressurizedYn eq 'Y'}">압송</option>
|
||||||
</select>
|
<option value="N" th:selected="${asfCov.pressurizedYn eq 'N'}">미압송</option>
|
||||||
</div>
|
</select>
|
||||||
<label for="pressurizedN" class="col-sm-1 col-form-label col-form-label-sm text-center">미압송시</label>
|
|
||||||
<div class="col-sm-2">
|
|
||||||
<select class="form-select form-select-sm crackdownStatusInfo" name="pressurizedN" id="pressurizedN">
|
|
||||||
<option value="">선택</option>
|
|
||||||
<option value="Y" th:selected="${asfCov.pressurizedN eq 'A'}">현장조사</option>
|
|
||||||
<option value="N" th:selected="${asfCov.pressurizedN eq 'O'}">기타</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="row mb-1">
|
<label for="pressurizedN" class="col-sm-1 col-form-label col-form-label-sm text-center">미압송시</label>
|
||||||
<label for="personCnt" class="col-sm-1 col-form-label col-form-label-sm text-center">검사인원</label>
|
<div class="col-sm-2">
|
||||||
<div class="col-sm-2">
|
<select class="form-select form-select-sm crackdownStatusInfo" name="pressurizedN" id="pressurizedN">
|
||||||
<input type="text" class="form-control form-control-sm crackdownStatusInfo" id="personCnt" name="personCnt" th:value="${asfCov.personCnt}">
|
<option value="">선택</option>
|
||||||
</div>
|
<option value="Y" th:selected="${asfCov.pressurizedN eq 'A'}">현장조사</option>
|
||||||
<label for="pressurizedN" class="col-sm-1 col-form-label col-form-label-sm text-center">코로나19 검사결과</label>
|
<option value="N" th:selected="${asfCov.pressurizedN eq 'O'}">기타</option>
|
||||||
<label for="personPositiveCnt" class="col-sm-1 col-form-label col-form-label-sm text-center">양성</label>
|
</select>
|
||||||
<div class="col-sm-1">
|
|
||||||
<input type="text" class="form-control form-control-sm crackdownStatusInfo" id="personPositiveCnt" name="personPositiveCnt" th:value="${asfCov.personPositiveCnt}">
|
|
||||||
</div>
|
|
||||||
<label for="personNegativeCnt" class="col-sm-1 col-form-label col-form-label-sm text-center">음성</label>
|
|
||||||
<div class="col-sm-1">
|
|
||||||
<input type="text" class="form-control form-control-sm crackdownStatusInfo" id="personNegativeCnt" name="personNegativeCnt" th:value="${asfCov.personNegativeCnt}">
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="row mb-1">
|
</div>
|
||||||
<label for="asfcovActionDetail" class="col-sm-1 col-form-label col-form-label-sm text-center">검/방역조치내용</label>
|
<div class="row mb-1">
|
||||||
<div class="col-sm-11">
|
<label for="personCnt" class="col-sm-1 col-form-label col-form-label-sm text-center">검사인원</label>
|
||||||
<textarea class="form-control form-control-sm" rows="5" cols="30" id="asfcovActionDetail" name="asfcovActionDetail" th:value="${asfCov.asfcovActionDetail}"></textarea>
|
<div class="col-sm-2">
|
||||||
</div>
|
<input type="text" class="form-control form-control-sm crackdownStatusInfo" id="personCnt" name="personCnt" th:value="${asfCov.personCnt}">
|
||||||
</div>
|
</div>
|
||||||
</form>
|
<label for="pressurizedN" class="col-sm-1 col-form-label col-form-label-sm text-center">코로나19 검사결과</label>
|
||||||
|
<label for="personPositiveCnt" class="col-sm-1 col-form-label col-form-label-sm text-center">양성</label>
|
||||||
|
<div class="col-sm-1">
|
||||||
|
<input type="text" class="form-control form-control-sm crackdownStatusInfo" id="personPositiveCnt" name="personPositiveCnt" th:value="${asfCov.personPositiveCnt}">
|
||||||
|
</div>
|
||||||
|
<label for="personNegativeCnt" class="col-sm-1 col-form-label col-form-label-sm text-center">음성</label>
|
||||||
|
<div class="col-sm-1">
|
||||||
|
<input type="text" class="form-control form-control-sm crackdownStatusInfo" id="personNegativeCnt" name="personNegativeCnt" th:value="${asfCov.personNegativeCnt}">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row mb-1">
|
||||||
|
<label for="asfcovActionDetail" class="col-sm-1 col-form-label col-form-label-sm text-center">검/방역조치내용</label>
|
||||||
|
<div class="col-sm-11">
|
||||||
|
<textarea class="form-control form-control-sm" rows="5" cols="30" id="asfcovActionDetail" name="asfcovActionDetail" th:value="${asfCov.asfcovActionDetail}"></textarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="tab-pane fade p-2 mx-2" id="history" role="tabpanel" aria-labelledby="history-tab" tabindex="0">
|
<div class="tab-pane fade p-2 mx-2" id="history" role="tabpanel" aria-labelledby="history-tab" tabindex="0">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue