This commit is contained in:
김현주
2025-07-18 17:35:03 +09:00
10 changed files with 36 additions and 25 deletions

View File

@@ -390,7 +390,7 @@ class GetHouseholdsExcelController {
rows.add(List.of( rows.add(List.of(
StringUtils.defaultString(item.getHouseholdNum()), StringUtils.defaultString(item.getHouseholdNum()),
StringUtils.defaultString(item.getOwnerName()), StringUtils.defaultString(item.getOwnerName()),
StringUtils.defaultString(item.getTransferTypeName()), StringUtils.defaultString(item.getTransferType()),
StringUtils.defaultString(item.getIncomeCode()), StringUtils.defaultString(item.getIncomeCode()),
StringUtils.defaultString(item.getExpenseCode()), StringUtils.defaultString(item.getExpenseCode()),
StringUtils.defaultString(item.getCropCode()), StringUtils.defaultString(item.getCropCode()),
@@ -577,7 +577,8 @@ class GetHouseholdsExcelController {
rows.add(List.of( rows.add(List.of(
StringUtils.defaultString(item.getHouseholdNum()), StringUtils.defaultString(item.getHouseholdNum()),
StringUtils.defaultString(item.getOwnerName()), StringUtils.defaultString(item.getOwnerName()),
StringUtils.defaultString(item.getWeekOfMonth()), StringUtils.defaultString(item.getStartDay()),
StringUtils.defaultString(item.getEndDay()),
StringUtils.defaultString(item.getIncomeMark()), StringUtils.defaultString(item.getIncomeMark()),
StringUtils.defaultString(item.getExpenseMark()), StringUtils.defaultString(item.getExpenseMark()),
StringUtils.defaultString(item.getProductName()), StringUtils.defaultString(item.getProductName()),
@@ -592,7 +593,8 @@ class GetHouseholdsExcelController {
List.of( List.of(
"임가번호", "임가번호",
"경영주 성명", "경영주 성명",
"차수", "날",
"짜",
"수입 부호", "수입 부호",
"지출 부호", "지출 부호",
"생산물", "생산물",
@@ -611,8 +613,7 @@ class GetHouseholdsExcelController {
rows.add(List.of( rows.add(List.of(
StringUtils.defaultString(item.getHouseholdNum()), StringUtils.defaultString(item.getHouseholdNum()),
StringUtils.defaultString(item.getOwnerName()), StringUtils.defaultString(item.getOwnerName()),
StringUtils.defaultString(item.getStartDay()), StringUtils.defaultString(item.getWeekOfMonth()),
StringUtils.defaultString(item.getEndDay()),
StringUtils.defaultString(item.getIncomeMark()), StringUtils.defaultString(item.getIncomeMark()),
StringUtils.defaultString(item.getExpenseMark()), StringUtils.defaultString(item.getExpenseMark()),
StringUtils.defaultString(item.getProductName()), StringUtils.defaultString(item.getProductName()),
@@ -627,8 +628,7 @@ class GetHouseholdsExcelController {
List.of( List.of(
"임가번호", "임가번호",
"경영주 성명", "경영주 성명",
"날", "차수",
"짜",
"수입 부호", "수입 부호",
"지출 부호", "지출 부호",
"생산물", "생산물",

View File

@@ -12,7 +12,7 @@ import lombok.Setter;
public class GetBankAutoTransfers { public class GetBankAutoTransfers {
private String householdNum; private String householdNum;
private String ownerName; private String ownerName;
private String transferTypeName; private String transferType;
private String incomeCode; private String incomeCode;
private String expenseCode; private String expenseCode;
private String cropCode; private String cropCode;

View File

@@ -12,8 +12,7 @@ import lombok.Setter;
public class GetDailyFarming { public class GetDailyFarming {
private String householdNum; private String householdNum;
private String ownerName; private String ownerName;
private String startDay; private String weekOfMonth;
private String endDay;
private String incomeMark; private String incomeMark;
private String expenseMark; private String expenseMark;
private String productName; private String productName;

View File

@@ -12,7 +12,8 @@ import lombok.Setter;
public class GetDailyForestry { public class GetDailyForestry {
private String householdNum; private String householdNum;
private String ownerName; private String ownerName;
private String weekOfMonth; private String startDay;
private String endDay;
private String incomeMark; private String incomeMark;
private String expenseMark; private String expenseMark;
private String productName; private String productName;

View File

@@ -23,12 +23,12 @@ class UpdateHouseholdDao implements UpdateHouseholdPortOut {
if (outCmd.getResearcherSeq() != null) { if (outCmd.getResearcherSeq() != null) {
// 매핑 정보 먼저 삭제 // 매핑 정보 먼저 삭제
mapper.deleteResearcherHasHousehold(AuditUtil.delete( mapper.deleteResearcherHasHousehold(AuditUtil.delete(
new UpdateResearcherHasHouseholdCmd(outCmd.getResearcherSeq(), new UpdateResearcherHasHouseholdCmd(outCmd.getHouseholdSeq(),
outCmd.getResearcherSeq()))); outCmd.getResearcherSeq())));
// 다시 등록 // 다시 등록
mapper.createResearcherHasHousehold(AuditUtil.create( mapper.createResearcherHasHousehold(AuditUtil.create(
new UpdateResearcherHasHouseholdCmd(outCmd.getResearcherSeq(), new UpdateResearcherHasHouseholdCmd(outCmd.getHouseholdSeq(),
outCmd.getResearcherSeq()))); outCmd.getResearcherSeq())));
} }
} }

View File

@@ -200,7 +200,7 @@
SELECT SELECT
detail_uicode.code_text AS region_detail_name, detail_uicode.code_text AS region_detail_name,
parent_uicode.code_text AS region_name, parent_uicode.code_text AS region_name,
COUNT(DISTINCT h.seq) AS household_count, COUNT(DISTINCT rhh.household_seq) AS household_count,
CASE CASE
WHEN AVG(v.completion_rate) > 0 THEN ROUND(AVG(v.completion_rate), 1) WHEN AVG(v.completion_rate) > 0 THEN ROUND(AVG(v.completion_rate), 1)
ELSE 0 ELSE 0
@@ -215,6 +215,9 @@
ON h.region_detail_code = detail_uicode.id ON h.region_detail_code = detail_uicode.id
AND h.is_deleted = false AND h.is_deleted = false
AND h.is_panel = true 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 LEFT JOIN v_monthly_completion_rate v
ON v.household_seq = h.seq ON v.household_seq = h.seq
AND v.record_month = #{recordMonth} AND v.record_month = #{recordMonth}
@@ -238,13 +241,16 @@
SELECT SELECT
'전체' AS region_detail_name, '전체' AS region_detail_name,
'전체' AS region_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), COALESCE(ROUND(AVG(v.completion_rate), 1), 0),
COUNT(DISTINCT hv_visit.household_seq), COUNT(DISTINCT hv_visit.household_seq),
COUNT(DISTINCT hv_gift.household_seq), COUNT(DISTINCT hv_gift.household_seq),
-1 AS region_order, -1 AS region_order,
-1 AS region_detail_order -1 AS region_detail_order
FROM household h 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 LEFT JOIN v_monthly_completion_rate v
ON v.household_seq = h.seq ON v.household_seq = h.seq
AND v.record_month = #{recordMonth} AND v.record_month = #{recordMonth}

View File

@@ -205,7 +205,7 @@
SELECT SELECT
h.household_num, h.household_num,
h.owner_name, 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.income_code,
bat.expense_code, bat.expense_code,
split_part( bat.crop_code,'code.record.crop.',2 ) as crop_code, split_part( bat.crop_code,'code.record.crop.',2 ) as crop_code,
@@ -369,7 +369,8 @@
select select
h.household_num , h.household_num ,
h.owner_name , 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.income_mark,
df.expense_mark, df.expense_mark,
df.product_name, df.product_name,
@@ -396,8 +397,12 @@
select select
h.household_num , h.household_num ,
h.owner_name , h.owner_name ,
dg.start_day , CASE
case when dg.start_day = dg.end_day then null else dg.end_day end as end_day , 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.income_mark ,
df.expense_mark , df.expense_mark ,
case when df.product_code = 'code.record.farming.self' then df.product_self case when df.product_code = 'code.record.farming.self' then df.product_self

View File

@@ -1,6 +1,6 @@
AbstractUserDetailsAuthenticationProvider.badCredentials=\uC544\uC774\uB514\uB098 \uBE44\uBC00\uBC88\uD638\uAC00 \uB9DE\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.<br/>\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.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.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. 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. security.password.change.notify=\uBE44\uBC00\uBC88\uD638 \uBCC0\uACBD \uB9CC\uB8CC {0}\uC77C\uC804 \uC785\uB2C8\uB2E4.

View File

@@ -65,7 +65,7 @@
document.addEventListener('DOMContentLoaded', function() { document.addEventListener('DOMContentLoaded', function() {
const errorMessage = /*[[${session['SPRING_SECURITY_LAST_EXCEPTION']?.message}]]*/ null; const errorMessage = /*[[${session['SPRING_SECURITY_LAST_EXCEPTION']?.message}]]*/ null;
if (errorMessage) { if (errorMessage) {
alert("입력하신 정보가 맞지 않습니다.\n 다시 확인해주세요."); alert(errorMessage);
document.loginForm.reset(); document.loginForm.reset();
} }
}); });

View File

@@ -80,7 +80,7 @@ class ExcelSaveAdminIdDao implements ExcelSaveAdminPortOut {
} }
workbook.close(); workbook.close();
return new ExcelResultVO(sheet.getLastRowNum()-1 , success); return new ExcelResultVO(sheet.getLastRowNum() , success);
} }
// 셀 값을 문자열로 변환 // 셀 값을 문자열로 변환