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

asf 및 코로나19 관련조치사항 완료

master
DESKTOP-QGC5RJO\DBNT 2023-01-13 17:59:11 +09:00
parent 851a1a10a7
commit 4df78ab1d4
8 changed files with 82 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/AsfCovController.java
View File

@ -38,7 +38,7 @@ public class AsfCovController {
mav.addObject("searchParams", asfCov);
asfCov.setQueryInfo();
mav.addObject("asfCov", asfCov);
// mav.addObject("asfCov", asfCov);
mav.addObject("asfCovList", asfCovService.selectAsfCovList(asfCov));
asfCov.setPaginationInfo();
return mav;

6
src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/asfCov/AsfCov.java
View File

@ -36,7 +36,7 @@ public class AsfCov extends BaseModel {
private Integer cdsKey;
@Column(name ="person_cnt")
private Integer personCnt;
private Integer personCnt=0;
@Column(name ="pressurized_yn")
private String pressurizedYn;
@ -45,10 +45,10 @@ public class AsfCov extends BaseModel {
private String pressurizedN;
@Column(name ="person_negative_cnt")
private Integer personNegativeCnt;
private Integer personNegativeCnt=0;
@Column(name ="person_positive_cnt")
private Integer personPositiveCnt;
private Integer personPositiveCnt=0;
@Column(name ="asfcov_action_detail")
private String asfcovActionDetail;

36
src/main/resources/static/js/faStatistics/asfCov.js
View File

@ -222,29 +222,25 @@ $(document).on('change', '#searchFormPolice', function (){
}
})
// $(document).on('click', '#history-tab', function (){
// const asfCovKey = $('#asfCovEditModalContent').find('.asfCovKey').val();
// getHistoryViewModal(asfCovKey);
// $(function(){
// const searchFormBoat = $("#pressurizedN")
// if(searchFormBoat.val()!==""){
// searchFormBoat.find("."+$("#pressurizedYn").val()).show();
// searchFormBoat.removeAttr("disabled");
// }
//
// });
//
// function getHistoryViewModal(asfCovKey){
// $.ajax({
// url: '/faStatistics/asfCovHistoryViewModal',
// data: {
// asfCovKey: asfCovKey,
// cdsKey : cdsKey,
// },
// type: 'GET',
// dataType:"html",
// success: function(html){
// $("#asfCovViewModalContent").empty().append(html)
// $("#asfCovViewModal").modal('show');
// },
// error:function(e){
// ajaxErrorAction(e);
// }
// });
// $(document).on('change', '#pressurizedYn', function (){
// const searchFormBoat = $("#pressurizedN")
// searchFormBoat.find("option").hide()
// if(this.value !== ""){
// searchFormBoat.removeAttr("disabled")
// searchFormBoat.find("."+this.value).show();
// }else{
// searchFormBoat.attr("disabled", "disabled")
// }
// })
$(document).on('click', '.versionInfoTr', function (){
$(this).find(".versionNo").prop('checked', true);

11
src/main/resources/templates/faStatistics/asfCov/asfCov.html
View File

@ -112,8 +112,9 @@
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th th:text="${#aggregates.sum(asfCovList.![personCnt])}"></th>
<th th:text="${#aggregates.sum(asfCovList.![personPositiveCnt])}"></th>
<th th:text="${#aggregates.sum(asfCovList.![personNegativeCnt])}"></th>
</tr>
</thead>
<tbody class="table-group-divider align-middle">
@ -134,9 +135,9 @@
<td th:if="${asfcov.crackdownBoat eq code.itemCd}" th:text="${code.itemValue}"></td>
</th:block>
</th:block>
<td th:text="${asfCov.pressurizedYn eq 'Y'}">O</td>
<td></td>
<td></td>
<td th:text="${asfcov.pressurizedYn eq 'Y'?'O':''}"></td>
<td th:text="${asfcov.pressurizedN eq 'A'?'O':''}"></td>
<td th:text="${asfcov.pressurizedN eq 'M'?'O':''}"></td>
<td th:text="${asfcov.personCnt}"></td>
<td th:text="${asfcov.personPositiveCnt}"></td>
<td th:text="${asfcov.personNegativeCnt}"></td>

10
src/main/resources/templates/faStatistics/asfCov/asfCovEditModal.html
View File

@ -97,24 +97,24 @@
<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>
<option value="A" th:selected="${asfCov.pressurizedN eq 'A'}">현장조사</option>
<option value="M" th:selected="${asfCov.pressurizedN eq 'M'}">기타</option>
</select>
</div>
</div>
<div class="row mb-1">
<label for="personCnt" 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 crackdownStatusInfo" id="personCnt" name="personCnt" th:value="${asfCov.personCnt}">
<input type="number" class="form-control form-control-sm crackdownStatusInfo" id="personCnt" name="personCnt" min="0" value="0" th:value="${asfCov.personCnt}">
</div>
<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}">
<input type="number" class="form-control form-control-sm crackdownStatusInfo" id="personPositiveCnt" name="personPositiveCnt" min="0" value="0" 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}">
<input type="number" class="form-control form-control-sm crackdownStatusInfo" id="personNegativeCnt" name="personNegativeCnt" min="0" value="0" th:value="${asfCov.personNegativeCnt}">
</div>
</div>
<div class="row mb-1">

4
src/main/resources/templates/faStatistics/asfCov/asfCovHistoryDetail.html
View File

@ -53,7 +53,7 @@
<div class="row mb-1">
<label for="pressurizedYn" class="col-sm-2 col-form-label col-form-label-sm text-center">전용부두 압송여부</label>
<div class="col-sm-4">
<select class="form-select form-select-sm crackdownStatusInfo" name="pressurizedYn" id="pressurizedYn">
<select class="form-select form-select-sm crackdownStatusInfo" name="pressurizedYn" id="pressurizedYn" DISABLED>
<option value="">선택</option>
<option value="O" th:selected="${asfCov.pressurizedYn eq 'Y'}">압송</option>
<option value="" th:selected="${asfCov.pressurizedYn eq 'N'}">미압송</option>
@ -61,7 +61,7 @@
</div>
<label for="pressurizedN" class="col-sm-2 col-form-label col-form-label-sm text-center">미압송시</label>
<div class="col-sm-4">
<select class="form-select form-select-sm crackdownStatusInfo" name="pressurizedN" id="pressurizedN">
<select class="form-select form-select-sm crackdownStatusInfo" name="pressurizedN" id="pressurizedN" DISABLED>
<option value="">선택</option>
<option value="Y" th:selected="${asfCov.pressurizedN eq 'A'}">현장조사</option>
<option value="N" th:selected="${asfCov.pressurizedN eq 'O'}">기타</option>

132
src/main/resources/templates/faStatistics/asfCov/asfCovViewModal.html
View File

@ -24,112 +24,60 @@
<div class="modal-body" id="asfCovEditModalContent">
<input type="hidden" class="asfCovKey" th:value="${asfCov.asfCovKey}">
<div class="row mb-1">
<label for="wrtUserNm" class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
<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>
</div>
<label for="wrtDt" 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="wrtDt" name="wrtDt" th:value="${#temporals.format(asfCov.wrtDt, 'yyyy-MM-dd HH:mm')}" readonly>
</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-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-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-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 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>
<label for="caseNum" class="col-sm-2 col-form-label col-form-label-sm text-center">*사건번호로 불러와주세요</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.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 for="caseAgency" 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" id="caseAgency" name="caseAgency" disabled>
<option value=""></option>
<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')}">
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq asfCov.caseAgency}"></option>
<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>
</select>
</div>
<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>
<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')}">
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq asfCov.crackdownPolice}"></option>
<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>
</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>
<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 for="pressurizedYn" 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="pressurizedYn" id="pressurizedYn">
<option value="">선택</option>
<option value="Y" th:selected="${asfCov.pressurizedYn eq 'Y'}">압송</option>
<option value="N" th:selected="${asfCov.pressurizedYn eq 'N'}">미압송</option>
</select>
</div>
<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>
<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 for="personCnt" 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 crackdownStatusInfo" id="personCnt" name="personCnt" th:value="${asfCov.personCnt}">
</div>
<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>
<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 class="tab-pane fade" id="history" role="tabpanel" aria-labelledby="history-tab">

1
src/main/resources/templates/faStatistics/processResult/processResultViewModal.html
View File

@ -157,7 +157,6 @@
</div>
</div>
</div>
</div>
<div class="modal-footer bg-light">
<th:block th:if="${userSeq eq processResult.wrtUserSeq or accessAuth eq 'ACC003'}"><!--작성자일 경우 수정 허용--><!--관리자일 경우 수정 허용-->
<button type="button" class="btn btn-warning" id="processResultEditBtn">수정</button>