From d9a372a3ab233c9f1879bc79594c6141012918b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Mon, 28 Jul 2025 09:36:43 +0900 Subject: [PATCH 1/9] =?UTF-8?q?=EB=92=A4=EB=A1=9C=20=EA=B0=80=EA=B8=B0=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EC=B6=94=EA=B0=80=20=EC=9A=94=EC=B2=AD=20?= =?UTF-8?q?=EC=82=AC=ED=95=AD,,,?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/templates/guide/index.html | 31 +++++++++++++++---- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/front/src/main/resources/templates/guide/index.html b/front/src/main/resources/templates/guide/index.html index 97830fb9..78766500 100644 --- a/front/src/main/resources/templates/guide/index.html +++ b/front/src/main/resources/templates/guide/index.html @@ -82,26 +82,45 @@
From d7299d4f5bbbf0941be06be5f5998b59c0417eb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Mon, 28 Jul 2025 09:38:13 +0900 Subject: [PATCH 2/9] =?UTF-8?q?=EB=92=A4=EB=A1=9C=20=EA=B0=80=EA=B8=B0=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EC=B6=94=EA=B0=80=20=EC=9A=94=EC=B2=AD=20?= =?UTF-8?q?=EC=82=AC=ED=95=AD,,,?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/main/resources/templates/guide/index.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/front/src/main/resources/templates/guide/index.html b/front/src/main/resources/templates/guide/index.html index 78766500..3e8860cf 100644 --- a/front/src/main/resources/templates/guide/index.html +++ b/front/src/main/resources/templates/guide/index.html @@ -69,17 +69,18 @@ + +
+ + - - -
From 4e8bfcc2159a78afb5d463b21252a081425f52f7 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Mon, 28 Jul 2025 17:52:17 +0900 Subject: [PATCH 5/9] =?UTF-8?q?[BO=5F=EC=B6=94=EA=B0=80=EC=9A=94=EC=B2=AD?= =?UTF-8?q?=EC=82=AC=ED=95=AD]=20=EC=9E=84=EA=B0=80=ED=98=84=ED=99=A9=20-?= =?UTF-8?q?=20=EC=9E=84=EA=B0=80=EB=B2=88=ED=98=B8=20=EA=B2=80=EC=83=89=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80,=20=EC=97=91=EC=85=80=EB=8B=A4=EC=9A=B4?= =?UTF-8?q?=EB=A1=9C=EB=93=9C=20=EC=B9=BC=EB=9F=BC=EB=AA=85=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/GetHouseholdsExcelController.java | 7 +++++-- .../web/model/GetHouseholdsExcelReqVO.java | 2 ++ .../ports/application/domain/GetDailyWork.java | 1 + .../web/GetHouseholdsStatusController.java | 1 + .../web/model/GetHouseholdsStatusReqVO.java | 2 ++ .../domain/GetHouseholdsStatusCmd.java | 2 ++ .../adapters/web/model/GetHouseholdsUIReqVO.java | 1 + .../household/GetHouseholdsStatusMapper.xml | 5 +++++ .../excelDownload/GetHouseholdsExcelMapper.xml | 1 + .../templates/households/households.html | 16 ++++++++++++++++ 10 files changed, 36 insertions(+), 2 deletions(-) diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/GetHouseholdsExcelController.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/GetHouseholdsExcelController.java index aa4c6ede..d4f6279e 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/GetHouseholdsExcelController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/GetHouseholdsExcelController.java @@ -56,6 +56,7 @@ class GetHouseholdsExcelController { getHouseholdsStatusPortIn.operate(pageable, new GetHouseholdsStatusCmd( reqVO.getRecordMonth(), + reqVO.getHouseholdNum(), reqVO.getOwnerField(), reqVO.getOwnerValue(), reqVO.getRegionMainCode(), @@ -154,7 +155,7 @@ class GetHouseholdsExcelController { StringUtils.defaultString(item.getIndustryDetail()), StringUtils.defaultString(item.getResearcherName()), StringUtils.defaultString(item.getResearcherPhone()), - StringUtils.defaultString(item.getCompletionRate()) + "%", + StringUtils.defaultString(item.getCompletionRate()), StringUtils.defaultString(item.getFirstVisitDate()), StringUtils.defaultString(item.getSecondVisitDate()), StringUtils.defaultString(item.getGiftSend()), @@ -180,7 +181,7 @@ class GetHouseholdsExcelController { "규모/세부품목", "조사원", "조사원 연락처", - "당월 일계부 현황", + "당월 일계부 현황(%)", "당월 1차 임가방문", "당월 2차 임가방문", "답례품 전달", @@ -496,6 +497,7 @@ class GetHouseholdsExcelController { StringUtils.defaultString(item.getWorkName()), StringUtils.defaultString(item.getWorkMark()), StringUtils.defaultString(item.getWorkLandArea()), + StringUtils.defaultString(item.getAreaMark()), StringUtils.defaultString(item.getAreaUnitName()), StringUtils.defaultString(item.getHarvestQuantity()), StringUtils.defaultString(item.getHarvestUnitName()), @@ -523,6 +525,7 @@ class GetHouseholdsExcelController { "작업명", "작업 부호", "작업면적", + "면적 부호", "단위", "수확량", "단위", diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/model/GetHouseholdsExcelReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/model/GetHouseholdsExcelReqVO.java index efd6578a..fff4485e 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/model/GetHouseholdsExcelReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/model/GetHouseholdsExcelReqVO.java @@ -14,6 +14,8 @@ import lombok.Setter; public class GetHouseholdsExcelReqVO { // 연월 private String recordMonth; + // 임가번호 + private String householdNum; // 경영주 검색 필드 (전체, 경영주명, 전화번호) private String ownerField; // 경영주 검색어 diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyWork.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyWork.java index 2eb4e434..175e4d08 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyWork.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyWork.java @@ -19,6 +19,7 @@ public class GetDailyWork { private String workName; private String workMark; private String workLandArea; + private String areaMark; private String areaUnitName; private String harvestQuantity; private String harvestUnitName; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java index 9a0ce4c9..0b29f315 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java @@ -26,6 +26,7 @@ class GetHouseholdsStatusController { getHouseholdsStatusPortIn.operate(pageable, new GetHouseholdsStatusCmd( reqVO.getRecordMonth(), + reqVO.getHouseholdNum(), reqVO.getOwnerField(), reqVO.getOwnerValue(), reqVO.getRegionMainCode(), diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/model/GetHouseholdsStatusReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/model/GetHouseholdsStatusReqVO.java index 213907a1..808140b1 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/model/GetHouseholdsStatusReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/model/GetHouseholdsStatusReqVO.java @@ -13,6 +13,8 @@ import lombok.Setter; public class GetHouseholdsStatusReqVO { // 연월 private String recordMonth; + // 임가번호 + private String householdNum; // 경영주 검색 필드 (전체, 경영주명, 전화번호) private String ownerField; // 경영주 검색어 diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatusCmd.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatusCmd.java index 999fbf6d..06f5a659 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatusCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatusCmd.java @@ -12,6 +12,8 @@ import lombok.Setter; public class GetHouseholdsStatusCmd { // 연월 private String recordMonth; + // 임가번호 + private String householdNum; // 경영주 검색 필드 (전체, 경영주명, 전화번호) private String ownerField; // 경영주 검색어 diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/adapters/web/model/GetHouseholdsUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/adapters/web/model/GetHouseholdsUIReqVO.java index 8e6124b1..3c3aeaa5 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/adapters/web/model/GetHouseholdsUIReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/adapters/web/model/GetHouseholdsUIReqVO.java @@ -15,6 +15,7 @@ public class GetHouseholdsUIReqVO { private String sort; private Integer size; private String recordMonth; + private String householdNum; private String ownerField; private String ownerValue; private String regionMainCode; diff --git a/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml b/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml index b1f2c355..0c4ae00f 100644 --- a/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml +++ b/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml @@ -95,6 +95,11 @@ 1=1 + + /* 임가번호 검색 */ + AND hvr.householdNum ILIKE '%' || #{cmd.householdNum} || '%' + + /* 경영주 검색 */ diff --git a/admin/src/main/resources/mappers/household/excelDownload/GetHouseholdsExcelMapper.xml b/admin/src/main/resources/mappers/household/excelDownload/GetHouseholdsExcelMapper.xml index 754bbf0f..64d99bc3 100644 --- a/admin/src/main/resources/mappers/household/excelDownload/GetHouseholdsExcelMapper.xml +++ b/admin/src/main/resources/mappers/household/excelDownload/GetHouseholdsExcelMapper.xml @@ -312,6 +312,7 @@ dw.work_name , dw.work_mark , dw.work_land_area , + dw.area_mark , case when dw.area_unit_code = 'code.record.area.self' then dw.area_unit_self else unit_code.code_value end as area_unit_name, dw.harvest_quantity , diff --git a/admin/src/main/resources/templates/households/households.html b/admin/src/main/resources/templates/households/households.html index ad101cc5..5c363d67 100644 --- a/admin/src/main/resources/templates/households/households.html +++ b/admin/src/main/resources/templates/households/households.html @@ -31,6 +31,22 @@ + +
+
+

+ 임가번호 +

+
+
+
+
+ +
+
+
+
+
From 60b2e8b5c88eda5d11082be659c7d254214adecb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Wed, 30 Jul 2025 13:57:19 +0900 Subject: [PATCH 6/9] =?UTF-8?q?8=EC=9B=94=201=EC=9D=BC=20=EA=B8=B0?= =?UTF-8?q?=EC=A4=80=204=EC=9B=94=EB=8B=AC=20=EC=9E=85=EB=A0=A5=EA=B0=80?= =?UTF-8?q?=EB=8A=A5=ED=95=98=EA=B2=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/core/config/constants/DailyRecordConstants.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java b/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java index 06b0e938..a4f060d4 100644 --- a/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java +++ b/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java @@ -40,7 +40,7 @@ public final class DailyRecordConstants { * [정책] 해당월 15일까지는 이전달 데이터 등록 가능 * 이전 달을 의미하는 상수 */ - public static final int REGISTER_LIMIT_MONTH = 1; + public static final int REGISTER_LIMIT_MONTH = 4; /** * 일계부 등록 가능 일 @@ -55,7 +55,7 @@ public final class DailyRecordConstants { * [정책] 해당월 15일까지는 이전달 데이터 수정 가능 * 이전 달을 의미하는 상수 */ - public static final int MODIFY_LIMIT_MONTH = 1; + public static final int MODIFY_LIMIT_MONTH = 4; /** * 일계부 수정 가능 일 From 5adbff0226cb468c672837ec213b1310a19c81e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Wed, 30 Jul 2025 13:57:41 +0900 Subject: [PATCH 7/9] =?UTF-8?q?8=EC=9B=94=201=EC=9D=BC=20=EA=B8=B0?= =?UTF-8?q?=EC=A4=80=204=EC=9B=94=EB=8B=AC=20=EC=9E=85=EB=A0=A5=EA=B0=80?= =?UTF-8?q?=EB=8A=A5=ED=95=98=EA=B2=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/module/core/config/constants/DailyRecordConstants.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java b/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java index a4f060d4..7f562bd3 100644 --- a/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java +++ b/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java @@ -46,7 +46,6 @@ public final class DailyRecordConstants { * 일계부 등록 가능 일 * [정책] 해당월 15일까지는 이전달 데이터 등록 가능 * 날짜 기준 정책 - * 임시로 31일로 설정해둠 15일로 변경해야됨. */ public static final int REGISTER_LIMIT_DAY = 31; @@ -61,7 +60,6 @@ public final class DailyRecordConstants { * 일계부 수정 가능 일 * [정책] 해당월 15일까지는 이전달 데이터 수정 가능 * 날짜 기준 정책 - * 임시로 31일로 설정해둠 15일로 변경해야됨. */ public static final int MODIFY_LIMIT_DAY = 31; From 3bb1e244b931f1a09bd944ef04b2e9a6a7add75d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Wed, 30 Jul 2025 16:44:41 +0900 Subject: [PATCH 8/9] =?UTF-8?q?=EC=84=B8=EB=B6=80=20=EC=A7=80=EC=97=AD=20?= =?UTF-8?q?=EC=97=91=EC=85=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapters/web/ChartApiController.java | 5 +- .../mappers/dashboard/ChartMapper.xml | 153 ++++++------------ 2 files changed, 49 insertions(+), 109 deletions(-) diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/web/ChartApiController.java b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/web/ChartApiController.java index 7ff17c16..539c4128 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/web/ChartApiController.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/web/ChartApiController.java @@ -80,9 +80,10 @@ class ChartApiController { List> rows2 = new ArrayList<>(); for (RegionDetailExcelDto item : dashboardExcel.getRegionDetail()) { rows2.add(List.of( + StringUtils.defaultString(item.getRegionName()), StringUtils.defaultString(item.getRegionDetailName()), StringUtils.defaultString(item.getHouseholdCount()), - StringUtils.defaultString(item.getAvgCompletionRate()) + "%", + StringUtils.defaultString(item.getAvgCompletionRate()), StringUtils.defaultString(item.getVisitCount()), StringUtils.defaultString(item.getGiftSentCount()) )); @@ -91,7 +92,7 @@ class ChartApiController { // 시트 2: 세부지역 ExcelSheetDto sheet2 = new ExcelSheetDto( "세부지역", - List.of("세부지역", "할당 임가 수", "일계부 진행률", "현장 방문 수", "답례품 전달 임가 수"), + List.of("지역","세부지역", "할당 임가 수", "일계부 진행률(%)", "현장 방문 수", "답례품 전달 임가 수"), rows2, null, Map.of(0, IndexedColors.LIGHT_YELLOW) diff --git a/admin/src/main/resources/mappers/dashboard/ChartMapper.xml b/admin/src/main/resources/mappers/dashboard/ChartMapper.xml index 7094009e..3704d637 100644 --- a/admin/src/main/resources/mappers/dashboard/ChartMapper.xml +++ b/admin/src/main/resources/mappers/dashboard/ChartMapper.xml @@ -117,7 +117,8 @@ resultType="app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionMainExcelDto"> /* selectRegionMainExcel : 대시보드 엑셀다운로드 (실사) */ SELECT - u.code_text AS region_name, + COALESCE(u.code_text, '전체') AS region_name, + COALESCE( detail_region.code_text,'-') AS region_detail_name, COUNT(DISTINCT a.seq) AS researcher_count, COUNT(DISTINCT rhh.household_seq) AS household_count, CASE @@ -125,8 +126,7 @@ ELSE 0 END AS avg_completion_rate, COUNT(DISTINCT CASE WHEN hv.id IS NOT NULL THEN hv.household_seq END) AS visit_count, - COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) AS gift_sent_count, - u.order_no + COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) AS gift_sent_count FROM uicode u LEFT JOIN admin a ON a.region_main_code = u.id @@ -149,48 +149,16 @@ LEFT JOIN v_monthly_completion_rate v ON v.household_seq = h.seq AND v.record_month = #{recordMonth} + LEFT JOIN uicode detail_region + ON detail_region.id =h.region_detail_code + AND detail_region.is_deleted =false WHERE u.parent_id = 'code.region.main' and u.is_deleted = false and u.in_use = true - GROUP BY u.code_text, u.order_no - UNION ALL - -- 전체 합계 행 - SELECT - '전체' AS region_name, - COUNT(DISTINCT a.seq), - COUNT(DISTINCT rhh.household_seq), - COALESCE(ROUND(AVG(v.current_completion_rate), 1), 0), - COUNT(DISTINCT CASE WHEN hv.id IS NOT NULL THEN hv.household_seq END), - COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END), - -1 as order_no - FROM uicode u - LEFT JOIN admin a - ON a.region_main_code = u.id - AND a.is_deleted = false - LEFT JOIN admin_has_role ahr - ON a.seq = ahr.admin_seq - AND ahr.is_deleted = false - AND ahr.role_id = 'ROLE_RESEARCHER' - LEFT JOIN researcher_has_household rhh - ON rhh.admin_seq = a.seq - AND rhh.is_deleted = false - LEFT JOIN household h - ON h.seq = rhh.household_seq - AND h.is_deleted = false - AND h.is_panel = true - LEFT JOIN household_visit hv - ON hv.household_seq = h.seq - AND hv.is_deleted = false - AND TO_CHAR(hv.visit_date, 'YYYYMM') = #{recordMonth} - LEFT JOIN v_monthly_completion_rate v - ON v.household_seq = h.seq - AND v.record_month = #{recordMonth} - WHERE u.parent_id = 'code.region.main' and u.is_deleted = false - - and u.in_use = true - - ORDER BY order_no + GROUP BY ROLLUP(u.code_text, detail_region.code_text) + ORDER BY CASE WHEN COALESCE(u.code_text, '전체') = '전체' THEN 0 ELSE 1 END, + MIN(u.order_no) NULLS LAST,detail_region.code_text \ No newline at end of file From c6de18850b1d0415b9871dfdcc4167b79678aa60 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Thu, 31 Jul 2025 13:59:54 +0900 Subject: [PATCH 9/9] =?UTF-8?q?[BO]=20=EB=8C=80=EC=8B=9C=EB=B3=B4=EB=93=9C?= =?UTF-8?q?=20=EC=97=91=EC=85=80=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20?= =?UTF-8?q?=EC=BF=BC=EB=A6=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/RegionDetailExcelDto.java | 4 +- .../adapters/web/ChartApiController.java | 24 +- .../mappers/dashboard/ChartMapper.xml | 205 +++++++++++++----- 3 files changed, 161 insertions(+), 72 deletions(-) diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/model/RegionDetailExcelDto.java b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/model/RegionDetailExcelDto.java index a514d293..3447e5ca 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/model/RegionDetailExcelDto.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/model/RegionDetailExcelDto.java @@ -4,12 +4,10 @@ import lombok.Data; @Data public class RegionDetailExcelDto { + private String regionMainName; private String regionDetailName; - private String regionName; private String householdCount; private String avgCompletionRate; private String visitCount; private String giftSentCount; - private String regionOrder; - private String regionDetailOrder; } diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/web/ChartApiController.java b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/web/ChartApiController.java index 539c4128..0b6b5576 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/web/ChartApiController.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/web/ChartApiController.java @@ -1,12 +1,18 @@ package app.module.admin.usecase.dashboard.chart.adapters.web; -import app.module.admin.config.application.util.DateUiUtil; import app.module.admin.config.application.util.ExcelWriterUtil; import app.module.admin.config.application.util.model.ExcelSheetDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.DashboardExcelDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionDetailExcelDto; import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionMainExcelDto; import app.module.admin.usecase.dashboard.chart.ports.ChartPortIn; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -20,14 +26,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - @Slf4j @RestController @RequiredArgsConstructor @@ -62,7 +60,7 @@ class ChartApiController { StringUtils.defaultString(item.getRegionName()), StringUtils.defaultString(item.getResearcherCount()), StringUtils.defaultString(item.getHouseholdCount()), - StringUtils.defaultString(item.getAvgCompletionRate()) + "%", + StringUtils.defaultString(item.getAvgCompletionRate()), StringUtils.defaultString(item.getVisitCount()), StringUtils.defaultString(item.getGiftSentCount()) )); @@ -71,7 +69,7 @@ class ChartApiController { // 시트 1: 실사 ExcelSheetDto sheet1 = new ExcelSheetDto( "실사", - List.of("실사", "할당 조사원 수", "할당 임가 수", "일계부 진행률", "현장 방문 수", "답례품 전달 임가 수"), + List.of("실사", "할당 조사원 수", "할당 임가 수", "당월 일계부 현황(%)", "현장 방문 수", "답례품 전달 임가 수"), rows1, null, Map.of(0, IndexedColors.LIGHT_YELLOW) @@ -80,7 +78,7 @@ class ChartApiController { List> rows2 = new ArrayList<>(); for (RegionDetailExcelDto item : dashboardExcel.getRegionDetail()) { rows2.add(List.of( - StringUtils.defaultString(item.getRegionName()), + StringUtils.defaultString(item.getRegionMainName()), StringUtils.defaultString(item.getRegionDetailName()), StringUtils.defaultString(item.getHouseholdCount()), StringUtils.defaultString(item.getAvgCompletionRate()), @@ -92,7 +90,7 @@ class ChartApiController { // 시트 2: 세부지역 ExcelSheetDto sheet2 = new ExcelSheetDto( "세부지역", - List.of("지역","세부지역", "할당 임가 수", "일계부 진행률(%)", "현장 방문 수", "답례품 전달 임가 수"), + List.of("실사", "세부지역", "할당 임가 수", "당월 일계부 현황(%)", "현장 방문 수", "답례품 전달 임가 수"), rows2, null, Map.of(0, IndexedColors.LIGHT_YELLOW) diff --git a/admin/src/main/resources/mappers/dashboard/ChartMapper.xml b/admin/src/main/resources/mappers/dashboard/ChartMapper.xml index 3704d637..232f9f3c 100644 --- a/admin/src/main/resources/mappers/dashboard/ChartMapper.xml +++ b/admin/src/main/resources/mappers/dashboard/ChartMapper.xml @@ -116,18 +116,29 @@ \ No newline at end of file