Merge branch 'dev' into deploy-dev-admin

This commit is contained in:
kangsunlee
2025-07-18 16:47:19 +09:00
16 changed files with 54 additions and 39 deletions

View File

@@ -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());

View File

@@ -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(
"임가번호",
"경영주 성명",
"날",
"짜",
"차수",
"수입 부호",
"지출 부호",
"생산물",

View File

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

View File

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

View File

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

View File

@@ -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())));
}
}

View File

@@ -76,6 +76,9 @@
<if test="'prod'.equals(activeProfiles)">
and u.in_use = true
</if>
<if test="reqVO.regionMainCode != null and reqVO.regionMainCode != ''">
and h.region_main_code = #{reqVO.regionMainCode}
</if>
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}

View File

@@ -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) &lt;= 7 THEN 1
WHEN EXTRACT(DAY FROM dr.start_date) &lt;= 14 THEN 2
WHEN EXTRACT(DAY FROM dr.start_date) &lt;= 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

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.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.

View File

@@ -135,7 +135,7 @@
</table>
</div>
</div>
<div class="component-btns bottom-btn-group">
<div class="component-btns bottom-btn-group" th:if="${loginUserRoles.id == 'ROLE_ADMIN'}">
<div class="btns-row align-right">
<div class="btns-col-2">
<button type="button" class="btn" onclick="goExcel();">

View File

@@ -267,7 +267,8 @@
<div class="component-btns bottom-btn-group">
<div class="btns-row align-right">
<button type="button" class="btn" onclick="showExcelHouseholdModal();" >
<!-- 관리자만 노출 -->
<button type="button" class="btn" th:if="${userRole == 'ROLE_ADMIN'}" onclick="showExcelHouseholdModal();" >
<span class="btn-txt">엑셀 업로드</span>
</button>
<button type="button" class="btn" onclick="showExcelDownloadModal();">

View File

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

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 104 KiB

After

Width:  |  Height:  |  Size: 104 KiB

View File

@@ -36,45 +36,45 @@
</dd>
<dd>
<span>임가경제조사 콜센터</span>
<a href="02-3415-5187">02-3415-5187</a>
<a href="tel:02-3415-5187">02-3415-5187</a>
</dd>
</dl>
<dl>
<dt>코리아리서치 임가경제조사 연구부서</dt>
<dd>
<span>김동윤 책임</span>
<a href="02-6009-2739">02-6009-2739</a>
<a href="tel:02-6009-2739">02-6009-2739</a>
</dd>
<dd>
<span>성지현 선임</span>
<a href="02-6009-2747">02-6009-2747</a>
<a href="tel:02-6009-2747">02-6009-2747</a>
</dd>
</dl>
<dl>
<dt>코리아리서치 임가경제조사 실사부서</dt>
<dd>
<span>서울</span>
<a href="02-6009-2729">02-6009-2729</a>
<a href="tel:02-6009-2729">02-6009-2729</a>
</dd>
<dd>
<span>강원</span>
<a href="033-257-4042">033-257-4042</a>
<a href="tel:033-257-4042">033-257-4042</a>
</dd>
<dd>
<span>광주</span>
<a href="062-525-2100">062-525-2100</a>
<a href="tel:062-525-2100">062-525-2100</a>
</dd>
<dd>
<span>대전</span>
<a href="042-257-8551">042-257-8551</a>
<a href="tel:042-257-8551">042-257-8551</a>
</dd>
<dd>
<span>대구</span>
<a href="053-657-4505">053-657-4505</a>
<a href="tel:053-657-4505">053-657-4505</a>
</dd>
<dd>
<span>부산</span>
<a href="051-817-9100">051-817-9100</a>
<a href="tel:051-817-9100">051-817-9100</a>
</dd>
</dl>
</section>

View File

@@ -178,7 +178,7 @@
<li>
<p class="step-tit">
<span class="num">3</span>
단계별로 등록하기
등록 내용 확인하기
</p>
<img th:src="@{/static/assets/images/guide/detail_step03_03.png}" alt="가이드 이미지" />
</li>