diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registration/controller/CarFfnlgTrgtController.java b/src/main/java/go/kr/project/carInspectionPenalty/registration/controller/CarFfnlgTrgtController.java index ad0c9c4..ae00b51 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registration/controller/CarFfnlgTrgtController.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registration/controller/CarFfnlgTrgtController.java @@ -67,6 +67,15 @@ public class CarFfnlgTrgtController { .sortAscending(true) .build(); model.addAttribute("taskPrcsSttsCdList", commonCodeService.selectCodeDetailList(taskPrcsSttsCdSearchVO)); + + // 과태료 대상 구분 코드 조회 (공통코드) + CmmnCodeSearchVO ffnlgTrgtSeCdSearchVO = CmmnCodeSearchVO.builder() + .searchCdGroupId("FFNLG_TRGT_SE_CD") + .searchUseYn("Y") + .sortColumn("SORT_ORDR") + .sortAscending(true) + .build(); + model.addAttribute("ffnlgTrgtSeCdList", commonCodeService.selectCodeDetailList(ffnlgTrgtSeCdSearchVO)); return "carInspectionPenalty/registration/list" + TilesConstants.BASE; } diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registration/model/CarFfnlgTrgtExcelVO.java b/src/main/java/go/kr/project/carInspectionPenalty/registration/model/CarFfnlgTrgtExcelVO.java index 02a86b1..1c48303 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registration/model/CarFfnlgTrgtExcelVO.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registration/model/CarFfnlgTrgtExcelVO.java @@ -18,6 +18,10 @@ import lombok.*; @ExcelSheet(name = "과태료대상목록") public class CarFfnlgTrgtExcelVO { + /** 대상구분 */ + @ExcelColumn(headerName = "대상구분", headerWidth = 15, align = ExcelColumn.Align.CENTER) + private String ffnlgTrgtSeCdNm; + /** 접수일자 */ @ExcelColumn(headerName = "접수일자", headerWidth = 15, align = ExcelColumn.Align.CENTER) private String rcptYmd; diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registration/model/CarFfnlgTrgtVO.java b/src/main/java/go/kr/project/carInspectionPenalty/registration/model/CarFfnlgTrgtVO.java index c1db3ea..2edb51b 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registration/model/CarFfnlgTrgtVO.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registration/model/CarFfnlgTrgtVO.java @@ -65,6 +65,7 @@ public class CarFfnlgTrgtVO extends PagingVO { private String dltr; // 삭제자 // 조회용 필드 + private String ffnlgTrgtSeCdNm; // 대상구분 코드명 private String taskPrcsSttsCdNm; // 업무 처리 상태 코드명 private String rgtrNm; // 등록자명 @@ -76,4 +77,5 @@ public class CarFfnlgTrgtVO extends PagingVO { private List schTaskPrcsSttsCd; // 검색 업무 처리 상태 코드 (다중 선택 가능) private String schInspYmdStart; // 검색 시작 검사 일자 private String schInspYmdEnd; // 검색 종료 검사 일자 + private String schFfnlgTrgtSeCd; // 검색 과태료 대상 구분 코드 } diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/CarFfnlgTrgtServiceImpl.java b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/CarFfnlgTrgtServiceImpl.java index 5af8f6d..3692d22 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/CarFfnlgTrgtServiceImpl.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/CarFfnlgTrgtServiceImpl.java @@ -192,6 +192,8 @@ public class CarFfnlgTrgtServiceImpl extends EgovAbstractServiceImpl implements } // 업무 처리 상태 및 등록자 설정 + // TODO : txt upload 시 1 지연 코드 하드코딩 + vo.setFfnlgTrgtSeCd("1"); // 지연 vo.setTaskPrcsSttsCd(TaskPrcsSttsConstants.TASK_PRCS_STTS_CD_01_RCPT); // 01=접수 vo.setTaskPrcsYmd(LocalDate.now().format(DATE_FORMATTER)); vo.setRcptYmd(LocalDate.now().format(DATE_FORMATTER)); // 접수일자는 현재 날짜 diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/ComparisonServiceImpl.java b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/ComparisonServiceImpl.java index 4fe4444..b8abf9c 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/ComparisonServiceImpl.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/ComparisonServiceImpl.java @@ -2,7 +2,7 @@ package go.kr.project.carInspectionPenalty.registration.service.impl; import go.kr.project.carInspectionPenalty.registration.model.CarFfnlgTrgtVO; import go.kr.project.carInspectionPenalty.registration.service.ComparisonService; -import go.kr.project.carInspectionPenalty.registration.service.impl.checker.*; +import go.kr.project.carInspectionPenalty.registration.service.impl.delay_checker.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl; diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/checker/AbstractComparisonChecker.java b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/AbstractComparisonChecker.java similarity index 99% rename from src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/checker/AbstractComparisonChecker.java rename to src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/AbstractComparisonChecker.java index 7889d81..800c346 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/checker/AbstractComparisonChecker.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/AbstractComparisonChecker.java @@ -1,4 +1,4 @@ -package go.kr.project.carInspectionPenalty.registration.service.impl.checker; +package go.kr.project.carInspectionPenalty.registration.service.impl.delay_checker; import go.kr.project.api.model.request.NewBasicRequest; import go.kr.project.api.model.request.NewLedgerRequest; diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/checker/ComparisonChecker.java b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ComparisonChecker.java similarity index 96% rename from src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/checker/ComparisonChecker.java rename to src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ComparisonChecker.java index 4e84cbc..790f99e 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/checker/ComparisonChecker.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ComparisonChecker.java @@ -1,4 +1,4 @@ -package go.kr.project.carInspectionPenalty.registration.service.impl.checker; +package go.kr.project.carInspectionPenalty.registration.service.impl.delay_checker; import go.kr.project.carInspectionPenalty.registration.model.CarFfnlgTrgtVO; diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/checker/OwnerCloseWithin31Checker.java b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/OwnerCloseWithin31Checker.java similarity index 99% rename from src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/checker/OwnerCloseWithin31Checker.java rename to src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/OwnerCloseWithin31Checker.java index 93df5ce..930632a 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/checker/OwnerCloseWithin31Checker.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/OwnerCloseWithin31Checker.java @@ -1,4 +1,4 @@ -package go.kr.project.carInspectionPenalty.registration.service.impl.checker; +package go.kr.project.carInspectionPenalty.registration.service.impl.delay_checker; import egovframework.constant.TaskPrcsSttsConstants; import egovframework.exception.MessageException; diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/checker/OwnerLevyOver31Checker.java b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/OwnerLevyOver31Checker.java similarity index 99% rename from src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/checker/OwnerLevyOver31Checker.java rename to src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/OwnerLevyOver31Checker.java index d6c201b..3790325 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/checker/OwnerLevyOver31Checker.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/OwnerLevyOver31Checker.java @@ -1,4 +1,4 @@ -package go.kr.project.carInspectionPenalty.registration.service.impl.checker; +package go.kr.project.carInspectionPenalty.registration.service.impl.delay_checker; import egovframework.constant.TaskPrcsSttsConstants; import egovframework.exception.MessageException; diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/checker/ProductCloseWithin31Checker.java b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductCloseWithin31Checker.java similarity index 99% rename from src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/checker/ProductCloseWithin31Checker.java rename to src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductCloseWithin31Checker.java index df49fa5..6d1da84 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/checker/ProductCloseWithin31Checker.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductCloseWithin31Checker.java @@ -1,4 +1,4 @@ -package go.kr.project.carInspectionPenalty.registration.service.impl.checker; +package go.kr.project.carInspectionPenalty.registration.service.impl.delay_checker; import egovframework.constant.TaskPrcsSttsConstants; import egovframework.exception.MessageException; diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/checker/ProductLevyOver31Checker.java b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductLevyOver31Checker.java similarity index 99% rename from src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/checker/ProductLevyOver31Checker.java rename to src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductLevyOver31Checker.java index fde6f33..0c84277 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/checker/ProductLevyOver31Checker.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductLevyOver31Checker.java @@ -1,4 +1,4 @@ -package go.kr.project.carInspectionPenalty.registration.service.impl.checker; +package go.kr.project.carInspectionPenalty.registration.service.impl.delay_checker; import egovframework.constant.TaskPrcsSttsConstants; import egovframework.exception.MessageException; diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/checker/ProductUseChecker.java b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductUseChecker.java similarity index 99% rename from src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/checker/ProductUseChecker.java rename to src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductUseChecker.java index 621cb84..60284d5 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/checker/ProductUseChecker.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductUseChecker.java @@ -1,4 +1,4 @@ -package go.kr.project.carInspectionPenalty.registration.service.impl.checker; +package go.kr.project.carInspectionPenalty.registration.service.impl.delay_checker; import egovframework.constant.TaskPrcsSttsConstants; import egovframework.exception.MessageException; diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/checker/ProductUseChnageChecker.java b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductUseChnageChecker.java similarity index 99% rename from src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/checker/ProductUseChnageChecker.java rename to src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductUseChnageChecker.java index 8bcf947..02127fa 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/checker/ProductUseChnageChecker.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/ProductUseChnageChecker.java @@ -1,4 +1,4 @@ -package go.kr.project.carInspectionPenalty.registration.service.impl.checker; +package go.kr.project.carInspectionPenalty.registration.service.impl.delay_checker; import egovframework.constant.TaskPrcsSttsConstants; import egovframework.exception.MessageException; diff --git a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/checker/TransferCase115DayChecker.java b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/TransferCase115DayChecker.java similarity index 99% rename from src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/checker/TransferCase115DayChecker.java rename to src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/TransferCase115DayChecker.java index 1182504..97dc9fc 100644 --- a/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/checker/TransferCase115DayChecker.java +++ b/src/main/java/go/kr/project/carInspectionPenalty/registration/service/impl/delay_checker/TransferCase115DayChecker.java @@ -1,4 +1,4 @@ -package go.kr.project.carInspectionPenalty.registration.service.impl.checker; +package go.kr.project.carInspectionPenalty.registration.service.impl.delay_checker; import egovframework.constant.TaskPrcsSttsConstants; import egovframework.exception.MessageException; diff --git a/src/main/resources/mybatis/mapper/carInspectionPenalty/registration/CarFfnlgTrgtMapper_maria.xml b/src/main/resources/mybatis/mapper/carInspectionPenalty/registration/CarFfnlgTrgtMapper_maria.xml index cb2e5c7..04df771 100644 --- a/src/main/resources/mybatis/mapper/carInspectionPenalty/registration/CarFfnlgTrgtMapper_maria.xml +++ b/src/main/resources/mybatis/mapper/carInspectionPenalty/registration/CarFfnlgTrgtMapper_maria.xml @@ -18,6 +18,9 @@ AND t.OWNR_NM LIKE CONCAT('%', #{schOwnrNm}, '%') + + AND t.FFNLG_TRGT_SE_CD = #{schFfnlgTrgtSeCd} + AND t.TASK_PRCS_STTS_CD IN @@ -43,6 +46,12 @@ WHERE CD_GROUP_ID = 'TASK_PRCS_STTS_CD' AND USE_YN = 'Y' ) cd ON t.TASK_PRCS_STTS_CD = cd.CD_ID + LEFT JOIN ( + SELECT CD_ID, CD_NM + FROM tb_cd_detail + WHERE CD_GROUP_ID = 'FFNLG_TRGT_SE_CD' + AND USE_YN = 'Y' + ) cd2 ON t.FFNLG_TRGT_SE_CD = cd2.CD_ID WHERE t.DEL_DT IS NULL @@ -53,6 +62,7 @@ t.CAR_FFNLG_TRGT_ID AS carFfnlgTrgtId, t.RCPT_YMD AS rcptYmd, t.FFNLG_TRGT_SE_CD AS ffnlgTrgtSeCd, + cd2.CD_NM as ffnlgTrgtSeCdNm, t.INSPSTN_CD AS inspstnCd, t.INSP_YMD AS inspYmd, t.VHCLNO AS vhclno, @@ -95,6 +105,12 @@ WHERE CD_GROUP_ID = 'TASK_PRCS_STTS_CD' AND USE_YN = 'Y' ) cd ON t.TASK_PRCS_STTS_CD = cd.CD_ID + LEFT JOIN ( + SELECT CD_ID, CD_NM + FROM tb_cd_detail + WHERE CD_GROUP_ID = 'FFNLG_TRGT_SE_CD' + AND USE_YN = 'Y' + ) cd2 ON t.FFNLG_TRGT_SE_CD = cd2.CD_ID WHERE t.DEL_DT IS NULL ORDER BY t.CAR_FFNLG_TRGT_ID ASC @@ -109,6 +125,7 @@ t.CAR_FFNLG_TRGT_ID AS carFfnlgTrgtId, t.RCPT_YMD AS rcptYmd, t.FFNLG_TRGT_SE_CD AS ffnlgTrgtSeCd, + cd2.CD_NM as ffnlgTrgtSeCdNm, t.INSPSTN_CD AS inspstnCd, t.INSP_YMD AS inspYmd, t.VHCLNO AS vhclno, @@ -151,6 +168,12 @@ WHERE CD_GROUP_ID = 'TASK_PRCS_STTS_CD' AND USE_YN = 'Y' ) cd ON t.TASK_PRCS_STTS_CD = cd.CD_ID + LEFT JOIN ( + SELECT CD_ID, CD_NM + FROM tb_cd_detail + WHERE CD_GROUP_ID = 'FFNLG_TRGT_SE_CD' + AND USE_YN = 'Y' + ) cd2 ON t.FFNLG_TRGT_SE_CD = cd2.CD_ID WHERE t.CAR_FFNLG_TRGT_ID = #{carFfnlgTrgtId} AND t.DEL_DT IS NULL @@ -159,6 +182,7 @@ + +
    +
  • +
  • +
+
    +
  • 대상구분
  • +
  • + +
  • 처리상태
  • @@ -51,10 +66,7 @@
-
    -
  • -
  • -
+
@@ -128,6 +140,7 @@ var schInspYmdEnd = $.trim(nvl($("#schInspYmdEnd").val(), "")); var schVhclno = $.trim(nvl($("#schVhclno").val(), "")); var schOwnrNm = $.trim(nvl($("#schOwnrNm").val(), "")); + var schFfnlgTrgtSeCd = $.trim(nvl($("#schFfnlgTrgtSeCd").val(), "")); // 체크박스에서 선택된 값들을 배열로 수집 var schTaskPrcsSttsCd = []; @@ -141,6 +154,7 @@ SEARCH_COND.schInspYmdEnd = schInspYmdEnd.replace(/-/g, ''); SEARCH_COND.schVhclno = schVhclno; SEARCH_COND.schOwnrNm = schOwnrNm; + SEARCH_COND.schFfnlgTrgtSeCd = schFfnlgTrgtSeCd; SEARCH_COND.schTaskPrcsSttsCd = schTaskPrcsSttsCd; }; @@ -155,6 +169,7 @@ if (SEARCH_COND.schInspYmdEnd) params.push('schInspYmdEnd=' + encodeURIComponent(SEARCH_COND.schInspYmdEnd)); if (SEARCH_COND.schVhclno) params.push('schVhclno=' + encodeURIComponent(SEARCH_COND.schVhclno)); if (SEARCH_COND.schOwnrNm) params.push('schOwnrNm=' + encodeURIComponent(SEARCH_COND.schOwnrNm)); + if (SEARCH_COND.schFfnlgTrgtSeCd) params.push('schFfnlgTrgtSeCd=' + encodeURIComponent(SEARCH_COND.schFfnlgTrgtSeCd)); // 배열로 전달 if (SEARCH_COND.schTaskPrcsSttsCd && SEARCH_COND.schTaskPrcsSttsCd.length > 0) { SEARCH_COND.schTaskPrcsSttsCd.forEach(function(val) { @@ -183,6 +198,7 @@ schInspYmdEnd: '검사일자 종료', schVhclno: '차량번호', schOwnrNm: '소유자명', + schFfnlgTrgtSeCd: '대상구분', schTaskPrcsSttsCd: '처리상태' }; @@ -224,7 +240,7 @@ // 달라진 조건 찾기 var differences = []; var searchFields = ['schRcptYmdStart', 'schRcptYmdEnd', 'schInspYmdStart', 'schInspYmdEnd', - 'schVhclno', 'schOwnrNm', 'schTaskPrcsSttsCd']; + 'schVhclno', 'schOwnrNm', 'schFfnlgTrgtSeCd', 'schTaskPrcsSttsCd']; searchFields.forEach(function(field) { var currentValue = SEARCH_COND[field]; @@ -357,12 +373,13 @@ return totalCount - (page - 1) * perPage - rowIndex; } }, + { header: '과태료대상구분코드', name: 'ffnlgTrgtSeCd', align: 'center', width: 120, hidden: true }, + { header: '대상구분', name: 'ffnlgTrgtSeCdNm', align: 'center', width: 120 }, { header: '접수일자', name: 'rcptYmd', align: 'center', width: 100, formatter: function(e) { return e.value ? moment(e.value, 'YYYYMMDD').format('YYYY-MM-DD') : ''; } }, - { header: '과태료대상구분코드', name: 'ffnlgTrgtSeCd', align: 'center', width: 120, hidden: true }, { header: '검사소코드', name: 'inspstnCd', align: 'center', width: 100 }, { header: '검사일자', name: 'inspYmd', align: 'center', width: 100, formatter: function(e) { @@ -691,6 +708,7 @@ $("#schInspYmdEnd").val(""); $("#schVhclno").val(""); $("#schOwnrNm").val(""); + $("#schFfnlgTrgtSeCd").val(""); // 체크박스 모두 해제 $("input[name='schTaskPrcsSttsCd']").prop('checked', false); self.grid.reload();