diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/ChartDao.java b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/ChartDao.java index c76e1ca3..32fa891a 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/ChartDao.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/ChartDao.java @@ -55,9 +55,9 @@ public class ChartDao implements ChartPortOut { return new ChartDto( recordMonthText, chartMapper.selectTotalPercentage(reqVO,activeProfiles), - null, + chartMapper.selectLocalRegionPercentage(reqVO,activeProfiles), chartMapper.selectLocalRegionResearcherPercentage(reqVO,activeProfiles), - null); + null); } else if("ROLE_LOCAL_INSPECTOR".equals(AdminUtil.getLoginUserRole())) { // 조사원 일경우 reqVO.setAdminSeq(AdminUtil.getLoginUserSeq()); 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 951c3a58..aa4c6ede 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 @@ -390,7 +390,7 @@ class GetHouseholdsExcelController { rows.add(List.of( StringUtils.defaultString(item.getHouseholdNum()), StringUtils.defaultString(item.getOwnerName()), - StringUtils.defaultString(item.getTransferTypeName()), + StringUtils.defaultString(item.getTransferType()), StringUtils.defaultString(item.getIncomeCode()), StringUtils.defaultString(item.getExpenseCode()), StringUtils.defaultString(item.getCropCode()), @@ -577,7 +577,8 @@ class GetHouseholdsExcelController { rows.add(List.of( StringUtils.defaultString(item.getHouseholdNum()), StringUtils.defaultString(item.getOwnerName()), - StringUtils.defaultString(item.getWeekOfMonth()), + StringUtils.defaultString(item.getStartDay()), + StringUtils.defaultString(item.getEndDay()), StringUtils.defaultString(item.getIncomeMark()), StringUtils.defaultString(item.getExpenseMark()), StringUtils.defaultString(item.getProductName()), @@ -592,7 +593,8 @@ class GetHouseholdsExcelController { List.of( "임가번호", "경영주 성명", - "차수", + "날", + "짜", "수입 부호", "지출 부호", "생산물", @@ -611,8 +613,7 @@ class GetHouseholdsExcelController { rows.add(List.of( StringUtils.defaultString(item.getHouseholdNum()), StringUtils.defaultString(item.getOwnerName()), - StringUtils.defaultString(item.getStartDay()), - StringUtils.defaultString(item.getEndDay()), + StringUtils.defaultString(item.getWeekOfMonth()), StringUtils.defaultString(item.getIncomeMark()), StringUtils.defaultString(item.getExpenseMark()), StringUtils.defaultString(item.getProductName()), @@ -627,8 +628,7 @@ class GetHouseholdsExcelController { List.of( "임가번호", "경영주 성명", - "날", - "짜", + "차수", "수입 부호", "지출 부호", "생산물", diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetBankAutoTransfers.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetBankAutoTransfers.java index f893e9e2..32073af1 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetBankAutoTransfers.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetBankAutoTransfers.java @@ -12,7 +12,7 @@ import lombok.Setter; public class GetBankAutoTransfers { private String householdNum; private String ownerName; - private String transferTypeName; + private String transferType; private String incomeCode; private String expenseCode; private String cropCode; diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyFarming.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyFarming.java index b19b720f..175da5eb 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyFarming.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyFarming.java @@ -12,8 +12,7 @@ import lombok.Setter; public class GetDailyFarming { private String householdNum; private String ownerName; - private String startDay; - private String endDay; + private String weekOfMonth; private String incomeMark; private String expenseMark; private String productName; diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyForestry.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyForestry.java index 94eca131..309b978c 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyForestry.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyForestry.java @@ -12,7 +12,8 @@ import lombok.Setter; public class GetDailyForestry { private String householdNum; private String ownerName; - private String weekOfMonth; + private String startDay; + private String endDay; private String incomeMark; private String expenseMark; private String productName; diff --git a/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/persistence/UpdateHouseholdDao.java b/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/persistence/UpdateHouseholdDao.java index efbea153..cd035362 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/persistence/UpdateHouseholdDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/persistence/UpdateHouseholdDao.java @@ -20,15 +20,15 @@ class UpdateHouseholdDao implements UpdateHouseholdPortOut { mapper.updateHousehold(AuditUtil.update(outCmd)); // 임가 담당 조사원 수정 - if(outCmd.getResearcherSeq() != null) { + if (outCmd.getResearcherSeq() != null) { // 매핑 정보 먼저 삭제 mapper.deleteResearcherHasHousehold(AuditUtil.delete( - new UpdateResearcherHasHouseholdCmd(outCmd.getResearcherSeq(), + new UpdateResearcherHasHouseholdCmd(outCmd.getHouseholdSeq(), outCmd.getResearcherSeq()))); - + // 다시 등록 mapper.createResearcherHasHousehold(AuditUtil.create( - new UpdateResearcherHasHouseholdCmd(outCmd.getResearcherSeq(), + new UpdateResearcherHasHouseholdCmd(outCmd.getHouseholdSeq(), outCmd.getResearcherSeq()))); } } diff --git a/admin/src/main/resources/mappers/dashboard/ChartMapper.xml b/admin/src/main/resources/mappers/dashboard/ChartMapper.xml index d7bb8ac9..54a9f0c1 100644 --- a/admin/src/main/resources/mappers/dashboard/ChartMapper.xml +++ b/admin/src/main/resources/mappers/dashboard/ChartMapper.xml @@ -76,6 +76,9 @@ and u.in_use = true + + and h.region_main_code = #{reqVO.regionMainCode} + GROUP BY ROLLUP(u.code_text) ORDER BY CASE WHEN COALESCE(u.code_text, '전체') = '전체' THEN 1 ELSE 0 END, MIN(u.order_no) NULLS LAST, @@ -197,7 +200,7 @@ SELECT detail_uicode.code_text AS region_detail_name, parent_uicode.code_text AS region_name, - COUNT(DISTINCT h.seq) AS household_count, + COUNT(DISTINCT rhh.household_seq) AS household_count, CASE WHEN AVG(v.completion_rate) > 0 THEN ROUND(AVG(v.completion_rate), 1) ELSE 0 @@ -212,6 +215,9 @@ ON h.region_detail_code = detail_uicode.id AND h.is_deleted = false AND h.is_panel = true + LEFT JOIN researcher_has_household rhh + ON rhh.household_seq = h.seq + AND rhh.is_deleted = false LEFT JOIN v_monthly_completion_rate v ON v.household_seq = h.seq AND v.record_month = #{recordMonth} @@ -235,13 +241,16 @@ SELECT '전체' AS region_detail_name, '전체' AS region_name, - COUNT(DISTINCT h.seq) AS household_count, + COUNT(DISTINCT rhh.household_seq) AS household_count, COALESCE(ROUND(AVG(v.completion_rate), 1), 0), COUNT(DISTINCT hv_visit.household_seq), COUNT(DISTINCT hv_gift.household_seq), -1 AS region_order, -1 AS region_detail_order FROM household h + LEFT JOIN researcher_has_household rhh + ON rhh.household_seq = h.seq + AND rhh.is_deleted = false LEFT JOIN v_monthly_completion_rate v ON v.household_seq = h.seq AND v.record_month = #{recordMonth} diff --git a/admin/src/main/resources/mappers/household/excelDownload/GetHouseholdsExcelMapper.xml b/admin/src/main/resources/mappers/household/excelDownload/GetHouseholdsExcelMapper.xml index c655e7d6..754bbf0f 100644 --- a/admin/src/main/resources/mappers/household/excelDownload/GetHouseholdsExcelMapper.xml +++ b/admin/src/main/resources/mappers/household/excelDownload/GetHouseholdsExcelMapper.xml @@ -205,7 +205,7 @@ SELECT h.household_num, h.owner_name, - transfer_type.code_text as transfer_type_name, + case when transfer_type.id = 'code.bank.input' then '1' else '2' end as transfer_type, bat.income_code, bat.expense_code, split_part( bat.crop_code,'code.record.crop.',2 ) as crop_code, @@ -369,7 +369,8 @@ select h.household_num , h.owner_name , - extract(week from dr.start_date) - extract(week from DATE_TRUNC('month', dr.start_date)) + 1 AS week_of_month, + dg.start_day , + case when dg.start_day = dg.end_day then null else dg.end_day end as end_day , df.income_mark, df.expense_mark, df.product_name, @@ -396,8 +397,12 @@ select h.household_num , h.owner_name , - dg.start_day , - case when dg.start_day = dg.end_day then null else dg.end_day end as end_day , + CASE + WHEN EXTRACT(DAY FROM dr.start_date) <= 7 THEN 1 + WHEN EXTRACT(DAY FROM dr.start_date) <= 14 THEN 2 + WHEN EXTRACT(DAY FROM dr.start_date) <= 21 THEN 3 + ELSE 4 + END AS week_of_month, df.income_mark , df.expense_mark , case when df.product_code = 'code.record.farming.self' then df.product_self diff --git a/admin/src/main/resources/messages/security-message.properties b/admin/src/main/resources/messages/security-message.properties index 3a311469..e59353c5 100644 --- a/admin/src/main/resources/messages/security-message.properties +++ b/admin/src/main/resources/messages/security-message.properties @@ -1,6 +1,6 @@ -AbstractUserDetailsAuthenticationProvider.badCredentials=\uC544\uC774\uB514\uB098 \uBE44\uBC00\uBC88\uD638\uAC00 \uB9DE\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
\uB2E4\uC2DC \uD655\uC778\uD574\uC8FC\uC138\uC694. +AbstractUserDetailsAuthenticationProvider.badCredentials=\uC544\uC774\uB514\uB098 \uBE44\uBC00\uBC88\uD638\uAC00 \uB9DE\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.\n\uB2E4\uC2DC \uD655\uC778\uD574\uC8FC\uC138\uC694. AbstractUserDetailsAuthenticationProvider.credentialsExpired=\uBE44\uBC00\uBC88\uD638 \uC720\uD6A8\uAE30\uAC04\uC774 \uB9CC\uB8CC \uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uAD00\uB9AC\uC790\uC5D0\uAC8C \uBB38\uC758\uD558\uC138\uC694. -AbstractUserDetailsAuthenticationProvider.disabled=\uACC4\uC815\uC774 \uBE44\uD65C\uC131\uD654\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uAD00\uB9AC\uC790\uC5D0\uAC8C \uBB38\uC758\uD558\uC138\uC694 +AbstractUserDetailsAuthenticationProvider.disabled=\uC0AC\uC6A9\uBD88\uAC00\uD55C \uACC4\uC815\uC785\uB2C8\uB2E4. AbstractUserDetailsAuthenticationProvider.expired=\uACC4\uC815\uC774 \uB9CC\uB8CC\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uAD00\uB9AC\uC790\uC5D0\uAC8C \uBB38\uC758\uD558\uC138\uC694. AbstractUserDetailsAuthenticationProvider.locked=\uACC4\uC815\uC774 \uC7A0\uACA8\uC788\uC2B5\uB2C8\uB2E4. \uAD00\uB9AC\uC790\uC5D0\uAC8C \uBB38\uC758\uD558\uC138\uC694. security.password.change.notify=\uBE44\uBC00\uBC88\uD638 \uBCC0\uACBD \uB9CC\uB8CC {0}\uC77C\uC804 \uC785\uB2C8\uB2E4. diff --git a/admin/src/main/resources/templates/home.html b/admin/src/main/resources/templates/home.html index 488d1b2e..391a8cb2 100644 --- a/admin/src/main/resources/templates/home.html +++ b/admin/src/main/resources/templates/home.html @@ -135,7 +135,7 @@ -
+