Merge branch 'bugfix_kim' into bo_daily

This commit is contained in:
김현주
2025-07-01 10:43:27 +09:00
2 changed files with 2 additions and 3 deletions

View File

@@ -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'