From 55a318dd69611de30248565068630dcc3126dd02 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Tue, 14 Nov 2023 17:51:24 +0900 Subject: [PATCH] =?UTF-8?q?=ED=86=B5=ED=95=A9=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/fims/sprt/web/Sprt01Controller.java | 4 +- .../fims/sprt/integrationSearch-mapper.xml | 42 +++++++++---------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java index bf72aa78..21b94fb2 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java @@ -107,8 +107,8 @@ public class Sprt01Controller extends ApplicationController { List list = null; list = sprt01Service.getIntegrationDataList(query); - List upList = list.stream().filter(item -> item.string("RCVMT_YN").equals("N")).toList(); - List downList = list.stream().filter(item -> item.string("RCVMT_YN").equals("Y")).toList(); + List upList = list.stream().filter(item -> item.string("RCVMT_ETC_YN").equals("N")).toList(); + List downList = list.stream().filter(item -> item.string("RCVMT_ETC_YN").equals("Y")).toList(); mav.addObject("upList", upList); mav.addObject("downList", downList); diff --git a/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml b/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml index f3bb899e..4d3fa6e6 100644 --- a/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml @@ -105,38 +105,38 @@ , L.SZR_RMV_YMD /* 압류 해제 일자 */ , VI.TXITM_NM /* 세목 명 */ , (CASE - WHEN R.RCVMT_ID IS NULL - THEN 'N' - ELSE 'Y' - END) AS RCVMT_YN /* 수납 여부 */ + WHEN (R.RCVMT_ID IS NOT NULL) OR (C.CRDN_STTS_CD IN ('81','82','83','84','85','86','87','88')) + THEN 'Y' + ELSE 'N' + END) AS RCVMT_ETC_YN /* 수납,기타 여부 */ , (CASE - WHEN R.RCVMT_ID IS NULL + WHEN (R.RCVMT_ID IS NOT NULL) OR (C.CRDN_STTS_CD IN ('81','82','83','84','85','86','87','88')) THEN CASE - WHEN '상태' = '압류' + WHEN C.CRDN_STTS_CD IN ('88') + THEN '법원이송' + WHEN C.CRDN_STTS_CD IN ('71','72','73','74','75') + THEN '수납' + WHEN C.CRDN_STTS_CD IN ('76','77') + THEN '결손' + ELSE '기타' + END + ELSE + CASE + WHEN C.CRDN_STTS_CD IN ('55') THEN '압류' - WHEN '상태' = '압류예정' + WHEN C.CRDN_STTS_CD IN ('53','54') THEN '압류예정' - WHEN '상태' = '독촉' + WHEN C.CRDN_STTS_CD IN ('52') THEN '독촉' - WHEN '상태' = '부과' + WHEN C.CRDN_STTS_CD IN ('51','61') THEN '부과' - WHEN '상태' = '자납부과' + WHEN C.CRDN_STTS_CD IN ('41','42','43') THEN '자납부과' - WHEN '상태' = '의견진술접수' + WHEN C.CRDN_STTS_CD IN ('31') THEN '의견진술접수' ELSE '단속' END - ELSE - CASE - WHEN '상태' = '수납' - THEN '수납' - WHEN '상태' = '결손' - THEN '결손' - WHEN '상태' = '법원이송' - THEN '법원이송' - ELSE '기타' - END END) AS TAB_GROUP /* 탭 그룹 */ , C.DEL_YN /* 삭제 여부 */ , C.REG_DT /* 등록 일시 */