From 41f4de08fec8757963d2f483a3b1d6bc08249be6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9C=A0=EC=A7=80=EC=9D=B8?= Date: Mon, 9 Feb 2026 14:15:06 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B8=B0=EC=97=85=EC=82=AC=EC=9A=A9=EC=9E=90?= =?UTF-8?q?=20>=20=EC=8B=9C=EC=B6=94=EC=A0=95=EB=B3=B4=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D=20:=20=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=EC=97=90=20'=EB=B0=B0=EC=A0=95=20=EB=B0=9C?= =?UTF-8?q?=EC=A3=BC=EA=B8=B0=EA=B4=80'=20=ED=91=9C=EC=8B=9C=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../egovframework/sqlmap/mapper/regi/regi.xml | 20 ++++++++++++++----- src/main/webapp/WEB-INF/views/web/index.jsp | 1 + 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/regi.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/regi.xml index 4d796730..b23bdcd9 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/regi.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/regi/regi.xml @@ -35,16 +35,26 @@ ST.MODIFY_ITEM, tcsi.CID, tcsi.CRT_USERID, - tcsi.CONST_USERID + tcsi.CONST_USERID, + tgld.GL_DISTRICT, + tgmd.GM_DISTRICT, + tgsd.GS_DISTRICT, + COALESCE(tgsd.GS_DISTRICT, tgmd.GM_DISTRICT, tgld.GL_DISTRICT) AS last_district -- 우선순위: GS -> GM -> GL 순으로 NULL이 아닌 값을 선택 FROM TEMP_PROJECT_INFO A LEFT JOIN (SELECT * FROM (SELECT L.* ,ROW_NUMBER() OVER (PARTITION BY PROJECT_CODE ORDER BY REG_DATE DESC) AS RN FROM TEMP_SMS_LOG L) - WHERE RN = 1) B ON A.PROJECT_CODE = B.PROJECT_CODE - LEFT JOIN TEMP_MANAGE_STATE ST ON ST.PROJECT_CODE = A.PROJECT_CODE - AND ST.STATE = '5' - LEFT JOIN TEMP_CONSTRUCT_SITE_INFO tcsi ON tcsi.PROJECT_CODE = A.PROJECT_CODE + WHERE RN = 1) B ON A.PROJECT_CODE = B.PROJECT_CODE + LEFT JOIN TEMP_MANAGE_STATE ST ON ST.PROJECT_CODE = A.PROJECT_CODE + AND ST.STATE = '5' + LEFT JOIN TEMP_CONSTRUCT_SITE_INFO tcsi ON tcsi.PROJECT_CODE = A.PROJECT_CODE + LEFT JOIN TBL_GL_DISTRICT tgld ON tcsi.MASTER_COMPANY_O_CODE = tgld.GL_CODE + LEFT JOIN TBL_GM_DISTRICT tgmd ON tcsi.MASTER_COMPANY_O_CODE = tgmd.GL_CODE + AND tcsi.MASTER_COMPANY_TW_CODE = tgmd.GM_CODE + LEFT JOIN TBL_GS_DISTRICT tgsd ON tcsi.MASTER_COMPANY_O_CODE = tgsd.GL_CODE + AND tcsi.MASTER_COMPANY_TW_CODE = tgsd.GM_CODE + AND tcsi.MASTER_COMPANY_TH_CODE = tgsd.GS_CODE WHERE NVL(A.USE_YN,' ') <> 'N' AND A.USERID = #{userId} ]]> diff --git a/src/main/webapp/WEB-INF/views/web/index.jsp b/src/main/webapp/WEB-INF/views/web/index.jsp index 689b3bbc..4df06ad2 100644 --- a/src/main/webapp/WEB-INF/views/web/index.jsp +++ b/src/main/webapp/WEB-INF/views/web/index.jsp @@ -166,6 +166,7 @@ function kendoGrid() { dataSource : gridData, columns: [ { field: "rowNumber", width: 50, title: "순번", template: "" }, + {field: "reqCompany", width: 180, title: "배정 발주기관", template: function (data) { return data.lastDistrict || data.gsDistrict || data.gmDistrict || data.glDistrict || ""; }, attributes: { style: "text-align: left" }}, { field: "projectName", title: "프로젝트명",