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

국제범죄 검거현황 열람모달 양식 수정. 

공지사항 수정시 하위관서 노출 오류 수정.
master
강석 최 2023-05-19 11:14:46 +09:00
parent cf549d0917
commit c4ea7e3640
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/dbnt/faisp/main/publicBoard/service/PublicBoardService.java
View File

@ -9,6 +9,7 @@ import com.dbnt.faisp.main.publicBoard.model.PublicFile;
import com.dbnt.faisp.main.publicBoard.repository.PublicBoardRepository; import com.dbnt.faisp.main.publicBoard.repository.PublicBoardRepository;
import com.dbnt.faisp.main.publicBoard.repository.PublicCommentRepository; import com.dbnt.faisp.main.publicBoard.repository.PublicCommentRepository;
import com.dbnt.faisp.main.publicBoard.repository.PublicFileRepository; import com.dbnt.faisp.main.publicBoard.repository.PublicFileRepository;
import com.dbnt.faisp.util.Utils;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -48,6 +49,9 @@ public class PublicBoardService extends BaseService {
@Transactional @Transactional
public Integer saveContent(PublicBoard publicBoard, List<Integer> deleteFileSeq) { public Integer saveContent(PublicBoard publicBoard, List<Integer> deleteFileSeq) {
if(Utils.isEmpty(publicBoard.getOrganChk())){
publicBoard.setOrganChk("F");
}
Integer publicKey = publicBoardRepository.save(publicBoard).getPublicKey(); Integer publicKey = publicBoardRepository.save(publicBoard).getPublicKey();
if(deleteFileSeq!=null && deleteFileSeq.size()>0){ if(deleteFileSeq!=null && deleteFileSeq.size()>0){
deletePublicFile(publicKey, deleteFileSeq); deletePublicFile(publicKey, deleteFileSeq);

10
src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html
View File

@ -7,12 +7,6 @@
<div class="modal-body"> <div class="modal-body">
<input type="hidden" name="icaKey" id="viewModalKey" th:value="${ica.icaKey}"> <input type="hidden" name="icaKey" id="viewModalKey" th:value="${ica.icaKey}">
<input type="hidden" name="icaKey" id="viewModalViolationType" th:value="${ica.violationType}"> <input type="hidden" name="icaKey" id="viewModalViolationType" th:value="${ica.violationType}">
<div class="row mb-1 justify-content-end">
<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="${ica.caseOfficer}"></label>
<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="${#temporals.format(ica.wrtDt, 'yyyy-MM-dd HH:mm')}"></label>
</div>
<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>
<label class="col-sm-2 col-form-label col-form-label-sm text-start"> <label class="col-sm-2 col-form-label col-form-label-sm text-start">
@ -28,6 +22,8 @@
</label> </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>
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${ica.caseOfficer}"></label> <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${ica.caseOfficer}"></label>
<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="${ica.caseOfficer}"></label>
</div> </div>
<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>
@ -44,6 +40,8 @@
</label> </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>
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${ica.crimeName}"></label> <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${ica.crimeName}"></label>
<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="${#temporals.format(ica.wrtDt, 'yyyy-MM-dd HH:mm')}"></label>
</div> </div>
<!--위반유형별 양식 시작--> <!--위반유형별 양식 시작-->
<!--직접밀입국, 제주무사증 도외이탈, 밀출국 공통양식 시작--> <!--직접밀입국, 제주무사증 도외이탈, 밀출국 공통양식 시작-->