diff --git a/src/main/java/go/kr/project/biz/common/controller/CommonContorller.java b/src/main/java/go/kr/project/biz/common/controller/CommonContorller.java index 8be3b61..8bcce53 100644 --- a/src/main/java/go/kr/project/biz/common/controller/CommonContorller.java +++ b/src/main/java/go/kr/project/biz/common/controller/CommonContorller.java @@ -17,7 +17,7 @@ public class CommonContorller { private final CommonService commonService; /** - * 디비에서 관리되는 코드 조회 + * 위반항목, 법정동, 미부과사유 코드 조회 */ @GetMapping("/common/code/find.ajax") public ResponseEntity getCode(@ModelAttribute CommonDto.Request commonDto) { @@ -28,6 +28,7 @@ public class CommonContorller { return ResponseEntity.ok(result); } + /** * 차적조회 */ diff --git a/src/main/java/go/kr/project/biz/common/dto/CommonDto.java b/src/main/java/go/kr/project/biz/common/dto/CommonDto.java index 9891758..55c0099 100644 --- a/src/main/java/go/kr/project/biz/common/dto/CommonDto.java +++ b/src/main/java/go/kr/project/biz/common/dto/CommonDto.java @@ -1,8 +1,7 @@ package go.kr.project.biz.common.dto; -import go.kr.project.domain.entity.CpBdong; -import go.kr.project.domain.entity.CpViolation; import go.kr.project.vo.CpBdongVO; +import go.kr.project.vo.CpCancelAnswerVO; import go.kr.project.vo.CpViolationVO; import lombok.Builder; import lombok.Getter; @@ -37,6 +36,7 @@ public class CommonDto { public static class CodeResult { private List cpViolation; private List cpBdong; + private List cpCancelAnswer; } diff --git a/src/main/java/go/kr/project/biz/common/repository/CommonRepository.java b/src/main/java/go/kr/project/biz/common/repository/CommonRepository.java index 44e4c7a..0bda0ec 100644 --- a/src/main/java/go/kr/project/biz/common/repository/CommonRepository.java +++ b/src/main/java/go/kr/project/biz/common/repository/CommonRepository.java @@ -6,6 +6,7 @@ import go.kr.project.biz.common.dto.CommonDto; import go.kr.project.domain.entity.CpBdong; import go.kr.project.domain.entity.CpViolation; import go.kr.project.vo.CpBdongVO; +import go.kr.project.vo.CpCancelAnswerVO; import go.kr.project.vo.CpViolationVO; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; @@ -13,6 +14,7 @@ import org.springframework.stereotype.Repository; import java.util.List; import static go.kr.project.domain.entity.QCpBdong.cpBdong; +import static go.kr.project.domain.entity.QCpCancelAnswer.cpCancelAnswer; import static go.kr.project.domain.entity.QCpViolation.cpViolation; @Repository @@ -74,6 +76,27 @@ public class CommonRepository { return result; } + public List findCancelAnswerCode(CommonDto.Request commonDto) { + + commonDto.setSggCode("41590"); + + List result = queryFactory + .select( + Projections.fields( + CpCancelAnswerVO.class, + cpCancelAnswer.id.caSggCode, + cpCancelAnswer.id.caCode, + cpCancelAnswer.caId, + cpCancelAnswer.caAnswerText, + cpCancelAnswer.caIsAnswer + ) + ) + .from(cpCancelAnswer) + .where(cpCancelAnswer.id.caSggCode.eq(commonDto.getSggCode())) + .fetch(); + + return result; + } diff --git a/src/main/java/go/kr/project/biz/common/service/CommonService.java b/src/main/java/go/kr/project/biz/common/service/CommonService.java index 1465b60..8b4e0c8 100644 --- a/src/main/java/go/kr/project/biz/common/service/CommonService.java +++ b/src/main/java/go/kr/project/biz/common/service/CommonService.java @@ -7,4 +7,5 @@ import java.util.List; public interface CommonService { CommonDto.Response.CodeResult findCode(CommonDto.Request commonDto); + } diff --git a/src/main/java/go/kr/project/biz/common/service/impl/CommonServiceImpl.java b/src/main/java/go/kr/project/biz/common/service/impl/CommonServiceImpl.java index 016e5f4..6c7af1e 100644 --- a/src/main/java/go/kr/project/biz/common/service/impl/CommonServiceImpl.java +++ b/src/main/java/go/kr/project/biz/common/service/impl/CommonServiceImpl.java @@ -24,11 +24,11 @@ public class CommonServiceImpl implements CommonService { return CommonDto.Response.CodeResult.builder() .cpViolation(commonRepository.findViolationCode(commonDto)) .cpBdong(commonRepository.findBdongCode()) + .cpCancelAnswer(commonRepository.findCancelAnswerCode(commonDto)) .build(); } - } diff --git a/src/main/java/go/kr/project/vo/CpCancelAnswerVO.java b/src/main/java/go/kr/project/vo/CpCancelAnswerVO.java new file mode 100644 index 0000000..6ce7c6a --- /dev/null +++ b/src/main/java/go/kr/project/vo/CpCancelAnswerVO.java @@ -0,0 +1,17 @@ +package go.kr.project.vo; + +import lombok.*; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class CpCancelAnswerVO { + + private String caSggCode; + private String caCode; + private String caId; + private String caIsAnswer; + private String caAnswerText; +} diff --git a/src/main/java/go/kr/project/vo/mapper/EntityVoMapper.java b/src/main/java/go/kr/project/vo/mapper/EntityVoMapper.java index ff9b32e..7df6270 100644 --- a/src/main/java/go/kr/project/vo/mapper/EntityVoMapper.java +++ b/src/main/java/go/kr/project/vo/mapper/EntityVoMapper.java @@ -18,6 +18,8 @@ public interface EntityVoMapper { CpCancelVO toCpCancelVO(CpCancel entity); + CpCancelAnswerVO toCpCancelAnswerVO(CpCancelAnswer entity); + CpGojiPrtVO toCpGojiPrtVO(CpGojiPrt entity); CpGojiSendHistVO toCpGojiSendHistVO(CpGojiSendHist entity); diff --git a/src/main/webapp/WEB-INF/views/biz/dialog/destruction_doc_dialog.jsp b/src/main/webapp/WEB-INF/views/biz/dialog/destruction_doc_dialog.jsp new file mode 100644 index 0000000..17bd4b5 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/biz/dialog/destruction_doc_dialog.jsp @@ -0,0 +1,136 @@ +<%-- + Created by IntelliJ IDEA. + User: kurt + Date: 2025. 11. 28. + Time: 오후 1:46 + To change this template use File | Settings | File Templates. +--%> +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/biz/minwon/init/init_popup.jsp b/src/main/webapp/WEB-INF/views/biz/minwon/init/init_popup.jsp index 424afe2..96b0dc4 100644 --- a/src/main/webapp/WEB-INF/views/biz/minwon/init/init_popup.jsp +++ b/src/main/webapp/WEB-INF/views/biz/minwon/init/init_popup.jsp @@ -26,8 +26,7 @@ <%-- 부모창에서 받아오는 리스크 커서 --%> - <%-- 개별총정보 상태값 --%> - +
0of 0 @@ -154,7 +153,9 @@
법정동
- +
@@ -195,7 +196,7 @@
특기사항
- +
@@ -205,13 +206,13 @@
차량명
- +
차량색상
- +
@@ -221,7 +222,7 @@
연료구분
- +
@@ -232,13 +233,13 @@
소유주
- +
등록구분
- +
@@ -248,13 +249,13 @@
주민번호
- +
우편번호
- +
@@ -264,7 +265,7 @@
주소
- +
@@ -274,13 +275,13 @@
번지
- +
차대번호
- +
@@ -290,7 +291,7 @@
도로코드
- +
@@ -317,12 +318,12 @@
- - - + + + - - + +
@@ -337,9 +338,8 @@ - + + @@ -348,10 +348,7 @@