From 5352d1b1efe7879ebe4d01ff16051345d9d0d3a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Tue, 1 Jul 2025 10:13:20 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EB=B0=B0=ED=8F=AC=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/main/resources/application.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/front/src/main/resources/application.yml b/front/src/main/resources/application.yml index 6b611ef3..e020e3c5 100644 --- a/front/src/main/resources/application.yml +++ b/front/src/main/resources/application.yml @@ -5,7 +5,6 @@ spring: messages: basename: messages/exception,messages/validation,messages/uri,messages/operation encoding: UTF-8 - # gzip compression 설정 compression: enabled: true From c3c8859a28e5ef50311531fd500761eb69814f34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Tue, 1 Jul 2025 10:43:09 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[1=EC=B0=A8][BO]=20=EC=9E=84=EC=97=85?= =?UTF-8?q?=EB=85=B8=EB=8F=99=20=ED=88=AC=EC=9E=85=EC=9D=98=20=EC=9E=91?= =?UTF-8?q?=EC=97=85=20=EB=A9=B4=EC=A0=81=20=EC=A7=81=EC=A0=91=20=EC=9E=85?= =?UTF-8?q?=EB=A0=A5=20=EB=8B=A8=EC=9C=84=20=EB=AF=B8=EB=85=B8=EC=B6=9C=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 --- .../mappers/household/GetDailyRecordStatusDetailMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml b/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml index c0b3e8ea..49015667 100644 --- a/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml +++ b/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml @@ -59,7 +59,7 @@ dw.work_name, /* 작업명*/ dw.work_land_area, /* 작업 면적 */ CASE - WHEN dw.area_unit_code = 'code.record.unit.self' + WHEN dw.area_unit_code = 'code.record.area.self' THEN dw.area_unit_self ELSE ui_area.code_text END AS areaUnitText, /* 작업면적 단위 텍스트 */ @@ -83,7 +83,7 @@ dw.updated_at /* 최종수정날짜 */ FROM daily_work dw LEFT JOIN uicode ui_area - ON ui_area.parent_id = 'code.record.unit' + ON ui_area.parent_id = 'code.record.area' AND ui_area.id = dw.area_unit_code LEFT JOIN uicode ui_harvest ON ui_harvest.parent_id = 'code.record.unit'