From 6cce9dd75707794bf1d7c1acd88fa8e8d0bc30bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=84=B1=EC=98=81?= Date: Thu, 23 Oct 2025 12:08:07 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=ED=96=89=20=EB=8C=80=EC=83=81?= =?UTF-8?q?=EC=9E=90=20=EC=A1=B0=ED=9A=8C=20=EB=A1=9C=EC=A7=81=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EB=B0=8F=20=EA=B4=80=EB=A0=A8=20=EC=BB=AC=EB=9F=BC?= =?UTF-8?q?/=EC=BD=94=EB=93=9C=20=EB=B3=80=EA=B2=BD,=20Levy=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=EB=AA=A8=EB=8D=B8=20=EB=B0=8F=20=EC=84=9C=EB=B9=84?= =?UTF-8?q?=EC=8A=A4=20=EC=97=B0=EA=B2=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../levy/levy/controller/LevyController.java | 14 +++++----- .../levy/model/LevyNotiImpltTrprInfoVO.java | 2 ++ .../mapper/levy/levy/LevyMapper_maria.xml | 27 +++++++++---------- .../webapp/WEB-INF/views/levy/levy/list.jsp | 19 +++---------- 4 files changed, 26 insertions(+), 36 deletions(-) diff --git a/src/main/java/go/kr/project/levy/levy/controller/LevyController.java b/src/main/java/go/kr/project/levy/levy/controller/LevyController.java index ae6a8f8..0101d3f 100644 --- a/src/main/java/go/kr/project/levy/levy/controller/LevyController.java +++ b/src/main/java/go/kr/project/levy/levy/controller/LevyController.java @@ -4,9 +4,11 @@ import egovframework.constant.TilesConstants; import egovframework.util.ApiResponseUtil; import go.kr.project.common.model.CmmnCodeSearchVO; import go.kr.project.common.service.CommonCodeService; +import go.kr.project.levy.levy.model.LevyNotiImpltInfoVO; +import go.kr.project.levy.levy.model.LevyNotiImpltTrprInfoVO; +import go.kr.project.levy.levy.service.LevyService; import go.kr.project.noti.model.NotiImpltInfoVO; import go.kr.project.noti.model.NotiImpltTrprInfoVO; -import go.kr.project.noti.service.NotiService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; @@ -45,7 +47,7 @@ import java.util.List; public class LevyController { /** 이행정보 서비스 */ - private final NotiService service; + private final LevyService service; /** 코드 서비스 */ private final CommonCodeService commonCodeService; @@ -80,7 +82,7 @@ public class LevyController { @ApiResponse(description = "오류로 인한 실패") }) @PostMapping("/levyImpltInfolist.ajax") - public ResponseEntity levyImpltInfolistAjax(@ModelAttribute NotiImpltInfoVO paramVO) { + public ResponseEntity levyImpltInfolistAjax(@ModelAttribute LevyNotiImpltInfoVO paramVO) { // 총 이행정보 수 조회 int totalCount = service.selectImpltInfoListTotalCount(paramVO); @@ -90,7 +92,7 @@ public class LevyController { paramVO.setPagingYn("Y"); // 페이징 처리된 이행정보 목록 조회 - List list = service.selectImpltInfoList(paramVO); + List list = service.selectImpltInfoList(paramVO); return ApiResponseUtil.successWithGrid(list, paramVO); } @@ -108,9 +110,9 @@ public class LevyController { @ApiResponse(description = "오류로 인한 실패") }) @PostMapping("/levyImpltTrprInfolist.ajax") - public ResponseEntity levyImpltInfolistAjax(@ModelAttribute NotiImpltTrprInfoVO paramVO) { + public ResponseEntity levyImpltInfolistAjax(@ModelAttribute LevyNotiImpltTrprInfoVO paramVO) { - List result = service.selectImpltTrprInfoList(paramVO); + List result = service.selectImpltTrprInfoList(paramVO); return ApiResponseUtil.successWithGrid(result, paramVO); diff --git a/src/main/java/go/kr/project/levy/levy/model/LevyNotiImpltTrprInfoVO.java b/src/main/java/go/kr/project/levy/levy/model/LevyNotiImpltTrprInfoVO.java index 10e4453..bcd9120 100644 --- a/src/main/java/go/kr/project/levy/levy/model/LevyNotiImpltTrprInfoVO.java +++ b/src/main/java/go/kr/project/levy/levy/model/LevyNotiImpltTrprInfoVO.java @@ -19,6 +19,8 @@ import java.time.LocalDateTime; * ----------------------------------------------------------- * 2025-10-14 김동규 최초 생성 */ + +@EqualsAndHashCode(callSuper=true) @Data @Builder @AllArgsConstructor diff --git a/src/main/resources/mybatis/mapper/levy/levy/LevyMapper_maria.xml b/src/main/resources/mybatis/mapper/levy/levy/LevyMapper_maria.xml index dbbedbf..175d8ae 100644 --- a/src/main/resources/mybatis/mapper/levy/levy/LevyMapper_maria.xml +++ b/src/main/resources/mybatis/mapper/levy/levy/LevyMapper_maria.xml @@ -43,12 +43,15 @@ LEFT JOIN tb_cd_detail rgnSeCd ON rgnSeCd.CD_GROUP_ID = 'RGN_SE_CD' AND rgnSeCd.CD_ID = c.RGN_SE_CD LEFT JOIN tb_user ru ON ii.RGTR = ru.USER_ID LEFT JOIN tb_user mu ON ii.MDFR = mu.USER_ID - WHERE ii.CRDN_YR = #{schCrdnYr} - AND ii.DEL_YN = 'N' - AND ii.IMPLT_BGNG_YMD BETWEEN #{schImpltBgngYmd1} AND #{schImpltBgngYmd2} + WHERE ii.CRDN_YR = #{schCrdnYr} + AND ii.DEL_YN = 'N' + AND ii.IMPLT_BGNG_YMD BETWEEN #{schImpltBgngYmd1} AND #{schImpltBgngYmd2} AND ii.IMPLT_TASK_SE_CD = #{schImpltTaskSeCd} + + AND ii.IMPLT_TASK_SE_CD IN ('4', '5', '6') + ORDER BY CRDN_NO ASC @@ -64,6 +67,9 @@ AND ii.IMPLT_TASK_SE_CD = #{schImpltTaskSeCd} + + AND ii.IMPLT_TASK_SE_CD IN ('4', '5', '6') + @@ -72,8 +78,8 @@ diff --git a/src/main/webapp/WEB-INF/views/levy/levy/list.jsp b/src/main/webapp/WEB-INF/views/levy/levy/list.jsp index ecdeb3a..2afc3be 100644 --- a/src/main/webapp/WEB-INF/views/levy/levy/list.jsp +++ b/src/main/webapp/WEB-INF/views/levy/levy/list.jsp @@ -19,7 +19,8 @@
  • 단속 년도
  • - +
  • 진행단계
  • @@ -433,19 +434,7 @@ */ getGridColumns : function() { var self = this; - return [ - { - header : '행위번호', - name : 'actNo', - align : 'center', - width : 60 - }, - { - header : '행위구분', - name : 'actTypeCdNm', - align : 'center', - width : 140 - }, + return [ { header : '소유자,행위자 구분', name : 'impltTrprSeCdNm', @@ -487,7 +476,7 @@ return { api : { readData : { - url : '', + url : '', method : 'POST', contentType : 'application/x-www-form-urlencoded', processData : true