Merge branch 'dev' into deploy-dev-admin

This commit is contained in:
주수현
2025-06-24 16:13:35 +09:00
86 changed files with 3127 additions and 1409 deletions

View File

@@ -18,7 +18,6 @@ public class GetDailyExpenseRecords {
private String quantity; private String quantity;
private String unitCode; private String unitCode;
private String unitText; private String unitText;
private String unitSelf;
private String price; private String price;
private String estimatedValue; private String estimatedValue;
private String updatedBy; private String updatedBy;

View File

@@ -15,7 +15,6 @@ public class GetDailyFarmingRecords {
private String productName; private String productName;
private String usage; private String usage;
private BigDecimal quantity; private BigDecimal quantity;
private String unitCode;
private String unitText; private String unitText;
private String estimatedValue; private String estimatedValue;
private String updatedBy; private String updatedBy;

View File

@@ -21,7 +21,6 @@ public class GetDailyIncomeRecords {
private BigDecimal quantity; private BigDecimal quantity;
private String unitCode; private String unitCode;
private String unitText; private String unitText;
private String unitSelf;
private String price; private String price;
private String estimatedValue; private String estimatedValue;
private String updatedBy; private String updatedBy;

View File

@@ -14,11 +14,9 @@ public class GetDailyWorkRecords {
private String itemName; private String itemName;
private String workName; private String workName;
private String workLandArea; private String workLandArea;
private String areaUnitCodeText; private String areaUnitText;
private String areaUnitSelf;
private String harvestQuantity; private String harvestQuantity;
private String harvestUnitCodeText; private String harvestUnitText;
private String harvestUnitSelf;
private String ownerTime; private String ownerTime;
private String spouseTime; private String spouseTime;
private String familyMHours; private String familyMHours;

View File

@@ -14,5 +14,5 @@ public class ResearchersVisitDetailReqVO {
private String visitDate; private String visitDate;
private ManagementType managementType; private ManagementType managementType;
private String content; private String content;
private String isGiftSentFlag; private String isGiftSent;
} }

View File

@@ -30,8 +30,11 @@
di.source_purpose, /* 수입원(용도) */ di.source_purpose, /* 수입원(용도) */
di.quantity, /* 수량 */ di.quantity, /* 수량 */
di.unit_code, /* 단위 코드 */ di.unit_code, /* 단위 코드 */
ui_unit.code_text AS unit_text, /* 단위 코드 텍스트 */ CASE
di.unit_self, /* 단위(직접입력) */ WHEN di.unit_code = 'code.record.unit.self'
THEN di.unit_self
ELSE ui_unit.code_text
END AS unit_text, /* 단위 코드 텍스트 */
di.price, /* 현금 */ di.price, /* 현금 */
di.estimated_value, /* 현물평가액 */ di.estimated_value, /* 현물평가액 */
di.updated_by, /* 최종수정자 */ di.updated_by, /* 최종수정자 */
@@ -51,26 +54,32 @@
resultType="app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyWorkRecords"> resultType="app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyWorkRecords">
/* getDailyWorkRecords : 일계부 등록 현황 상세 임업노동 투입 내역 조회 */ /* getDailyWorkRecords : 일계부 등록 현황 상세 임업노동 투입 내역 조회 */
SELECT dw.id, SELECT dw.id,
dw.item_name, /* 품목명 */ dw.item_name, /* 품목명 */
dw.work_name, /* 작업명*/ dw.work_name, /* 작업명*/
dw.work_land_area, /* 작업 면적 */ dw.work_land_area, /* 작업 면적 */
ui_area.code_text AS areaUnitCodeText, /* 작업면적 단위(코드매핑) */ CASE
dw.area_unit_self, /* 작업면적 단위(직접입력) */ WHEN dw.area_unit_code = 'code.record.unit.self'
dw.harvest_quantity, /* 수확량 */ THEN dw.area_unit_self
ui_harvest.code_text AS harvestUnitCodeText, /* 수확량 단위 (코드매핑) */ ELSE ui_area.code_text
dw.harvest_unit_self, /* 수확량 단위 (직접입력) */ END AS areaUnitText, /* 작업면적 단위 텍스트 */
dw.owner_time, /* 경영주 시간 */ dw.harvest_quantity, /* 수확량 */
dw.spouse_time, /* 배우자 시간 */ CASE
dw.family_m_hours, /* 가족노동(남) */ WHEN dw.harvest_unit_code = 'code.record.unit.self'
dw.family_f_hours, /* 가족노동(여) */ THEN dw.harvest_unit_self
dw.hired_m_hours, /* 고용노동(남) */ ELSE ui_harvest.code_text
dw.hired_f_hours, /* 고용노동(여) */ END AS harvestUnitText, /* 수확량 단위 텍스트 */
dw.shared_m_hours, /* 품앗이(남) */ dw.owner_time, /* 경영주 시간 */
dw.shared_f_hours, /* 품앗이(여) */ dw.spouse_time, /* 배우자 시간 */
dw.volunteer_m_hours, /* 일손돕기(남) */ dw.family_m_hours, /* 가족노동(남) */
dw.volunteer_f_hours, /* 일손돕기(여) */ dw.family_f_hours, /* 가족노동(여) */
dw.updated_by, /* 최종수정자 */ dw.hired_m_hours, /* 고용노동(남) */
dw.updated_at /* 최종수정날짜 */ dw.hired_f_hours, /* 고용노동(여) */
dw.shared_m_hours, /* 품앗이(남) */
dw.shared_f_hours, /* 품앗이(여) */
dw.volunteer_m_hours, /* 일손돕기(남) */
dw.volunteer_f_hours, /* 일손돕기(여) */
dw.updated_by, /* 최종수정자 */
dw.updated_at /* 최종수정날짜 */
FROM daily_work dw FROM daily_work dw
LEFT JOIN uicode ui_area LEFT JOIN uicode ui_area
ON ui_area.parent_id = 'code.record.unit' ON ui_area.parent_id = 'code.record.unit'
@@ -92,8 +101,11 @@
de.source_purpose, /* 지출원(용도) */ de.source_purpose, /* 지출원(용도) */
de.quantity, /* 수량 */ de.quantity, /* 수량 */
de.unit_code, /* 단위 */ de.unit_code, /* 단위 */
ui_unit.code_text AS unit_text, /* 단위 코드 텍스트 */ CASE
de.unit_self, /* 단위(직접입력) */ WHEN de.unit_code = 'code.record.unit.self'
THEN de.unit_self
ELSE ui_unit.code_text
END AS unit_text, /* 단위 코드 텍스트 */
de.price, /* 현금 */ de.price, /* 현금 */
de.estimated_value, /* 현물평가액 */ de.estimated_value, /* 현물평가액 */
de.updated_by, /* 최종수정자 */ de.updated_by, /* 최종수정자 */
@@ -128,7 +140,11 @@
df.usage, /* 용도 */ df.usage, /* 용도 */
df.quantity, /* 수량 */ df.quantity, /* 수량 */
df.unit_code, /* 단위 코드 */ df.unit_code, /* 단위 코드 */
ui_unit.code_text AS unit_text, /* 단위 코드 텍스트 */ CASE
WHEN df.unit_code = 'code.record.unit.self'
THEN df.unit_self
ELSE ui_unit.code_text
END AS unit_text, /* 단위 코드 텍스트 */
df.estimated_value, /* 현물평가액 */ df.estimated_value, /* 현물평가액 */
df.updated_by, /* 최종수정자 */ df.updated_by, /* 최종수정자 */
TO_CHAR(df.updated_at, 'YYYY-MM-DD HH24:MI') AS updated_at /* 최종수정날짜 */ TO_CHAR(df.updated_at, 'YYYY-MM-DD HH24:MI') AS updated_at /* 최종수정날짜 */
@@ -145,14 +161,17 @@
/* getDailyFarmingRecords : 일계부 등록 현황 상세 자가농업 생산물 중 자가소비량 조회 */ /* getDailyFarmingRecords : 일계부 등록 현황 상세 자가농업 생산물 중 자가소비량 조회 */
SELECT df.id, /* 자가농업 id */ SELECT df.id, /* 자가농업 id */
CASE CASE
WHEN df.product_self is not null WHEN df.product_code = 'code.record.farming.self'
THEN df.product_self THEN df.product_self
ELSE ui_product.code_text ELSE ui_product.code_text
END AS product_name, /* 생산물명 */ END AS product_name, /* 생산물명 */
df.usage, /* 용도 */ df.usage, /* 용도 */
df.quantity, /* 수량 */ df.quantity, /* 수량 */
df.unit_code, /* 단위 코드 */ CASE
ui_unit.code_text AS unit_text, /* 단위 코드 텍스트 */ WHEN df.unit_code = 'code.record.unit.self'
THEN df.unit_self
ELSE ui_unit.code_text
END AS unit_text, /* 단위 코드 텍스트 */
df.estimated_value, /* 현물평가액 */ df.estimated_value, /* 현물평가액 */
df.updated_by, /* 최종수정자 */ df.updated_by, /* 최종수정자 */
TO_CHAR(df.updated_at, 'YYYY-MM-DD HH24:MI') AS updated_at /* 최종수정날짜 */ TO_CHAR(df.updated_at, 'YYYY-MM-DD HH24:MI') AS updated_at /* 최종수정날짜 */

View File

@@ -37,7 +37,7 @@ uri.admin.household.households.view.{{pathVar}}=\uC784\uAC00 \uC0C1\uC138
uri.admin.researcher=\uC870\uC0AC\uC6D0 \uD604\uD669 uri.admin.researcher=\uC870\uC0AC\uC6D0 \uD604\uD669
uri.admin.researcher.researchers=\uC870\uC0AC\uC6D0 \uD604\uD669 uri.admin.researcher.researchers=\uC870\uC0AC\uC6D0 \uD604\uD669
uri.admin.researcher.researchers.create=\uC870\uC0AC\uC6D0 \uB4F1\uB85D uri.admin.researcher.researchers.create=\uC870\uC0AC\uC6D0 \uB4F1\uB85D
uri.admin.researcher.researchers.view.{{pathVar}}=\uC870\uC0AC\uC6D0 \uC0C1\uC138 uri.admin.researcher.{{pathVar}}=\uC870\uC0AC\uC6D0 \uC0C1\uC138
uri.admin.dashboard=\uB300\uC2DC\uBCF4\uB4DC uri.admin.dashboard=\uB300\uC2DC\uBCF4\uB4DC
uri.admin.dashboard.overview=\uB300\uC2DC\uBCF4\uB4DC uri.admin.dashboard.overview=\uB300\uC2DC\uBCF4\uB4DC

View File

@@ -0,0 +1,6 @@
<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="2.75" y="3.75" width="14.5" height="12.5" rx="1.25" stroke="#212529" stroke-width="1.5"/>
<path d="M3 7H17" stroke="#212529" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M6 2.4668V4.89148" stroke="#212529" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M14 2.4668V4.89148" stroke="#212529" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
</svg>

After

Width:  |  Height:  |  Size: 532 B

View File

@@ -4704,6 +4704,9 @@ button.swiper-pagination-bullet {
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
display: flex; display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
gap: 0.8rem; gap: 0.8rem;
} }
@@ -4827,7 +4830,7 @@ input[type=number] {
-webkit-box-align: center; -webkit-box-align: center;
-webkit-align-items: center; -webkit-align-items: center;
align-items: center; align-items: center;
height: 16rem; height: 32rem;
border: 1px solid gainsboro; border: 1px solid gainsboro;
background-color: #ffffff; background-color: #ffffff;
overflow: hidden; overflow: hidden;
@@ -4984,6 +4987,96 @@ input[type=number] {
color: red; color: red;
} }
.input-file-group input {
display: none;
}
.input-file-group .file-txt {
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
-webkit-box-pack: center;
-webkit-justify-content: center;
justify-content: center;
width: 8rem;
height: 3.6rem;
background-color: #495057;
color: #FFFFFF;
font-size: 1.5rem;
font-weight: 600;
border-radius: 0.4rem;
}
.input-file-group .desc {
margin-top: 0.8rem;
display: block;
text-align: left;
font-size: 1.4rem;
color: #868E96;
}
.input-file-group .file-list {
margin-top: 1.6rem;
text-align: left;
}
.input-file-group .file-list li {
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
}
.input-file-group .file-list li .btn-delete {
margin-left: 0.4rem;
padding: 0;
width: 1.6rem;
height: 1.6rem;
background-image: url("../images/common/ico_close_white.svg");
background-color: #CED4DA;
background-repeat: no-repeat;
background-size: 10px 10px;
background-position: center;
border-radius: 0.2rem;
}
.input-file-group .file-list li + li {
margin-top: 0.8rem;
}
input[type=datetime-local] {
position: relative;
background: url("../images/common/ico_calendar.svg") no-repeat right 16px center/20px auto;
}
input[type=datetime-local]::-webkit-calendar-picker-indicator {
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 100%;
background: transparent;
color: transparent;
cursor: pointer;
}
.date-range-group {
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
gap: 0.6rem;
}
.date-range-group .component-input {
width: -webkit-fit-content !important;
width: -moz-fit-content !important;
width: fit-content !important;
}
.date-range-group .component-input .input-field {
width: 23rem;
}
/* component checkbox */ /* component checkbox */
.component-input { .component-input {
/* component checkbox switch */ /* component checkbox switch */

View File

@@ -10,11 +10,11 @@
<div class="modal-header"> <div class="modal-header">
<h3 class="modal-tit" >임가 매핑</h3> <h3 class="modal-tit" >임가 매핑</h3>
</div> </div>
<div class="modal-content"> <form autocomplete="off" method="get" name="reqHouseholdForm" id="reqHouseholdForm">
<div class="modal-content-inner"> <div class="modal-content">
<section class="filter-wrap"> <div class="modal-content-inner">
<div class="form-area"> <section class="filter-wrap">
<form autocomplete="off" method="get" name="reqHouseholdForm" id="reqHouseholdForm"> <div class="form-area">
<input type="hidden" name="page" th:field="*{reqVO.page}"/> <input type="hidden" name="page" th:field="*{reqVO.page}"/>
<input type="hidden" name="researcherSeq" id="researcherSeq" th:value="${researcherSeq}"> <input type="hidden" name="researcherSeq" id="researcherSeq" th:value="${researcherSeq}">
<input type="hidden" name="regionMainCode" th:value="${regionMainCode}"> <input type="hidden" name="regionMainCode" th:value="${regionMainCode}">
@@ -89,54 +89,55 @@
</div> </div>
</div> </div>
</div> </div>
</form>
</div>
<div class="component-btns">
<div class="btns-row">
<button type="button" class="btn" onclick="resetSearchForm()">
<span class="btn-txt">초기화</span>
</button>
<button type="button" class="btn btn-primary" th:onclick="|searchHouseholdList(0,${regionMainCode})|">
<span class="btn-txt">검색</span>
</button>
</div>
</div>
</section>
<section>
<p class="input-label" style="font-size: 16px;">
총 <span id="mappingHouseholdTotalElements"></span>건
</p>
<table id="householdTable">
<thead>
<tr>
<th>선택</th>
<th>임가번호</th>
<th>경영주명</th>
<th>휴대폰번호</th>
<th>실사</th>
<th>지역</th>
<th>세부지역</th>
<th>조사원</th>
</tr>
</thead>
<tbody id="mappingHousehold-list"></tbody>
</table>
<!-- 페이지네이션 -->
<div class="row paging"></div>
<!-- 등록 버튼 -->
<div class="component-btns bottom-btn-group" th:fragment="modalButtons">
<div class="btns-row align-right">
<button type="button" class="btn btn-primary" onclick="registerHouseholds()">
<span class="btn-txt">등록</span>
</button>
</div> </div>
</div> <div class="component-btns">
</section> <div class="btns-row">
<button type="button" class="btn" onclick="resetSearchForm()">
<span class="btn-txt">초기화</span>
</button>
<button type="button" class="btn btn-primary" th:onclick="|searchHouseholdList(0,${regionMainCode})|">
<span class="btn-txt">검색</span>
</button>
</div>
</div>
</section>
<section>
<p class="input-label" style="font-size: 16px;">
총 <span id="mappingHouseholdTotalElements"></span>건
</p>
<table id="householdTable">
<thead>
<tr>
<th>선택</th>
<th>임가번호</th>
<th>경영주명</th>
<th>휴대폰번호</th>
<th>실사</th>
<th>지역</th>
<th>세부지역</th>
<th>조사원</th>
</tr>
</thead>
<tbody id="mappingHousehold-list"></tbody>
</table>
<!-- 페이지네이션 -->
<div class="row paging"></div>
<!-- 등록 버튼 -->
<div class="component-btns bottom-btn-group" th:fragment="modalButtons">
<div class="btns-row align-right">
<button type="button" class="btn btn-primary" onclick="registerHouseholds()">
<span class="btn-txt">등록</span>
</button>
</div>
</div>
</section>
</div>
<button class="modal-close"></button>
</div> </div>
<button class="modal-close"></button> </form>
</div>
</div> </div>
</div> </div>
</div> </div>

View File

@@ -0,0 +1,175 @@
<!DOCTYPE html>
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:th="http://www.thymeleaf.org"
layout:decorate="~{layout/layout}">
<div class="layer-wrap" th:fragment="tabFragment">
<div class="tab-content bank-auto-transfer" data-tab-value="tab3">
<div class="content-inner">
<div class="content-inner">
<!-- 수입 -->
<section class="table-group">
<div class="table-tit-group">
<h3>수입 <strong>(<span id="bankIncomeCount">0</span>건)</strong></h3>
<div class="component-btns bottom-btn-group">
<div class="btns-row align-right">
<button type="button" class="btn small btn-secondary">
<span class=" btn-txt">삭제</span>
</button>
<button type="button" class="btn small btn-primary">
<span class="btn-txt">추가</span>
</button>
</div>
</div>
</div>
<table id="table-bank-income">
<thead>
<tr>
<th>선택</th>
<th>재배형태</th>
<th>수입의 종류</th>
<th>대상</th>
<th>수입원</th>
<th>수량</th>
<th>단위</th>
<th>현금(원)</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</section>
<!-- 지출 -->
<section class="table-group">
<div class="table-tit-group">
<h3>지출 <strong>(<span id="bankExpenseCount">0</span>건)</strong></h3>
<div class="component-btns bottom-btn-group">
<div class="btns-row align-right">
<button type="button" class="btn small btn-secondary">
<span class=" btn-txt">삭제</span>
</button>
<button type="button" class="btn small btn-primary">
<span class="btn-txt">추가</span>
</button>
</div>
</div>
</div>
<table id="table-bank-expense">
<thead>
<tr>
<th>선택</th>
<th>지출의 종류</th>
<th>용도</th>
<th>수량</th>
<th>단위</th>
<th>현금(원)</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</section>
</div>
</div>
</div>
<script th:inline="javascript">
// 은행자동이체내역 조회
const getBankAutoTransfer = () => {
const f = document.reqForm;
ajaxUtil._ajaxMethod(
'/api/household/bankAutoTransfer',
{
householdSeq: f.householdSeq.value,
recordMonth: f.recordMonth.value
},
(response) => { // 성공
console.log("은행자동이체내역 조회 : ", response);
gridBankIncomeTable(response.incomes);
gridBankExpenseTable(response.expenses);
},
function (code, rstData) { // 실패
console.log("error : ", code);
},
'get',
'json'
);
}
// 은행자동이체내역 수입 테이블 그리기
const gridBankIncomeTable = (data) => {
const tbody = $('#table-bank-income tbody');
tbody.empty();
$('#bankIncomeCount').text(data.length);
if(data.length === 0) {
tbody.append(`<tr><td colspan="8" style="text-align: center;">등록된 내용이 없습니다.</td></tr>`);
return;
}
let tmpl = '';
$(data).each((idx, item) => {
tmpl +=
`
<tr>
<td>
<div class="component-input">
<label class="checkbox-inner">
<input type="checkbox" id="temp_checkbox_000${item.id}" name="temp_checkbox_000${item.id}" value="${item.id}">
</label>
</div>
</td>
<td>${ifNullHyphen(item.cropText)}</td> <!-- 재배형태 -->
<td class="underline">${ifNullHyphen(item.categoryText)}</td> <!-- 수입의 종류 -->
<td>${ifNullHyphen(item.target)}</td><!-- 대상 -->
<td>${ifNullHyphen(item.sourcePurpose)}</td><!-- 수입원 -->
<td class="align-right">${ifNullHyphen(item.count)}</td><!-- 수량 -->
<td>${ifNullHyphen(item.unitText)}</td><!-- 단위 -->
<td class="align-right">${formatNumberWithComma(item.price)}</td><!-- 현금(원) -->
</tr>
`;
});
tbody.append(tmpl);
}
// 은행자동이체내역 수출 테이블 그리기
const gridBankExpenseTable = (data) => {
const tbody = $('#table-bank-expense tbody');
tbody.empty();
$('#bankExpenseCount').text(data.length);
if(data.length === 0) {
tbody.append(`<tr><td colspan="6" style="text-align: center;">등록된 내용이 없습니다.</td></tr>`);
return;
}
let tmpl = '';
$(data).each((idx, item) => {
tmpl +=
`
<tr>
<td>
<div class="component-input">
<label class="checkbox-inner">
<input type="checkbox" id="temp_checkbox_000${item.id}" name="temp_checkbox_000${item.id}" value="${item.id}">
</label>
</div>
</td>
<td class="underline">${ifNullHyphen(item.categoryText)}</td> <!-- 지출의 종류 -->
<td>${ifNullHyphen(item.sourcePurpose)}</td><!-- 용도 -->
<td class="align-right">${ifNullHyphen(item.count)}</td><!-- 수량 -->
<td>${ifNullHyphen(item.unitText)}</td><!-- 단위 -->
<td class="align-right">${formatNumberWithComma(item.price)}</td><!-- 현금(원) -->
</tr>
`;
});
tbody.append(tmpl);
}
</script>
</div>
</html>

View File

@@ -0,0 +1,642 @@
<!DOCTYPE html>
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:th="http://www.thymeleaf.org"
layout:decorate="~{layout/layout}">
<div class="layer-wrap" th:fragment="tabFragment">
<div class="tab-content daily-record" data-tab-value="tab1" >
<!-- 일계부 등록 현황 리스트 -->
<div class="daily-record-content daily-record-list">
<div class="content-inner">
<article class="summary-area">
<ul>
<li>
<p>작성완료</p>
<span><strong id="doneCount">6</strong>건</span>
</li>
<li>
<p>미작성</p>
<span><strong id="emptyCount">6</strong>건</span>
</li>
<li>
<p>미완료</p>
<span><strong id="incompleteCount">6</strong>건</span>
</li>
<li>
<p>대기</p>
<span><strong id="waitingCount">6</strong>건</span>
</li>
<li>
<p>완료율</p>
<span><strong id="progressPercent">56.12</strong>%</span>
</li>
</ul>
</article>
<table>
<thead>
<tr>
<th>입력날짜</th>
<th>완료상태</th>
<th>수입</th>
<th>노동투입</th>
<th>지출</th>
<th>동력사용시간</th>
<th>임업 자가소비량</th>
<th>농업 자가소비량</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</div>
</div>
<!-- 일계부 등록 현황 상세 -->
<div class="daily-record-content daily-record-detail" style="display: none;">
<div class="content-inner">
<!-- 수입 -->
<section class="table-group">
<div class="table-tit-group">
<h3>수입 <strong>(<span id="incomeCount">0</span>건)</strong></h3>
<div class="component-btns bottom-btn-group" th:unless="${activeProfile != 'local'}">
<div class="btns-row align-right">
<button type="button" class="btn small">
<span class="btn-txt">영수증 다운로드 <i class="ico-download" aria-hidden="true"></i></span>
</button>
<button type="button" class="btn small">
<span class="btn-txt">등록여부</span>
</button>
<button type="button" class="btn small btn-secondary">
<span class=" btn-txt">삭제</span>
</button>
<button type="button" class="btn small btn-primary">
<span class="btn-txt">추가</span>
</button>
</div>
</div>
</div>
<table id="table-income">
<thead>
<tr>
<th>선택</th>
<th>외상판매</th>
<th>재배형태</th>
<th>수입의 종류</th>
<th>수입원</th>
<th>수량</th>
<th>단위</th>
<th>현금(원)</th>
<th>현물평가액</th>
<th>최종 수정자</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</section>
<!-- 임업노동 투입 내역 -->
<section class="table-group">
<div class="table-tit-group">
<h3>임업노동 투입 내역 <strong>(<span id="workCount">0</span>건)</strong></h3>
<div class="component-btns bottom-btn-group" th:unless="${activeProfile != 'local'}">
<div class="btns-row align-right">
<button type="button" class="btn small">
<span class="btn-txt">등록여부</span>
</button>
<button type="button" class="btn small btn-secondary">
<span class=" btn-txt">삭제</span>
</button>
<button type="button" class="btn small btn-primary">
<span class="btn-txt">추가</span>
</button>
</div>
</div>
</div>
<table id="table-work">
<thead>
<tr>
<th colspan="7"></th>
<th colspan="10">노동투입시간</th>
<th colspan="1"></th>
</tr>
<tr>
<th>선택</th>
<th>품목명</th>
<th>작업명</th>
<th>작업 면적</th>
<th>단위</th>
<th>수확량</th>
<th>단위</th>
<th>경영주</th>
<th>배우자</th>
<th>가족노동(남)</th>
<th>가족노동(여)</th>
<th>고용노동(남)</th>
<th>고용노동(여)</th>
<th>품앗이(남)</th>
<th>품앗이(여)</th>
<th>일손돕기(남)</th>
<th>일손돕기(여)</th>
<th>최종 수정자</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</section>
<!-- 지출 -->
<section class="table-group">
<div class="table-tit-group">
<h3>지출 <strong>(<span id="expenseCount">0</span>건)</strong></h3>
<div class="component-btns bottom-btn-group" th:unless="${activeProfile != 'local'}">
<div class="btns-row align-right">
<button type="button" class="btn small">
<span class="btn-txt">영수증 다운로드 <i class="ico-download" aria-hidden="true"></i></span>
</button>
<button type="button" class="btn small">
<span class="btn-txt">등록여부</span>
</button>
<button type="button" class="btn small btn-secondary">
<span class=" btn-txt">삭제</span>
</button>
<button type="button" class="btn small btn-primary">
<span class="btn-txt">추가</span>
</button>
</div>
</div>
</div>
<table id="table-expense">
<thead>
<tr>
<th>선택</th>
<th>외상 또는 카드구입</th>
<th>지출의 종류</th>
<th>용도</th>
<th>수량</th>
<th>단위</th>
<th>현금(원)</th>
<th>현물평가액</th>
<th>최종 수정자</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</section>
<!-- 동력사용시간 -->
<section class="table-group">
<div class="table-tit-group">
<h3>동력사용시간 <strong>(<span id="powerCount">0</span>건)</strong></h3>
<div class="component-btns bottom-btn-group" th:unless="${activeProfile != 'local'}">
<div class="btns-row align-right">
<button type="button" class="btn small">
<span class="btn-txt">등록여부</span>
</button>
<button type="button" class="btn small btn-secondary">
<span class=" btn-txt">삭제</span>
</button>
<button type="button" class="btn small btn-primary">
<span class="btn-txt">추가</span>
</button>
</div>
</div>
</div>
<table id="table-power">
<thead>
<tr>
<th>선택</th>
<th>명칭</th>
<th>자가 사용시간</th>
<th>임가 사용시간</th>
<th>최종 수정자</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</section>
<!-- 자가임업 -->
<section class="table-group">
<div class="table-tit-group">
<h3>자가임업 생산물 중 자가소비량 <strong>(<span id="forestryCount">0</span>건)</strong></h3>
<div class="component-btns bottom-btn-group" th:unless="${activeProfile != 'local'}">
<div class="btns-row align-right">
<button type="button" class="btn small">
<span class="btn-txt">등록여부</span>
</button>
<button type="button" class="btn small btn-secondary">
<span class=" btn-txt">삭제</span>
</button>
<button type="button" class="btn small btn-primary">
<span class="btn-txt">추가</span>
</button>
</div>
</div>
</div>
<table id="table-forestry">
<thead>
<tr>
<th>선택</th>
<th>생산물</th>
<th>용도</th>
<th>수량</th>
<th>단위</th>
<th>현물평가액</th>
<th>최종 수정자</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</section>
<!-- 자가농업 -->
<section class="table-group">
<div class="table-tit-group">
<h3>자가농업 생산물 중 자가소비량 <strong>(<span id="farmingCount">0</span>건)</strong></h3>
<div class="component-btns bottom-btn-group" th:unless="${activeProfile != 'local'}">
<div class="btns-row align-right">
<button type="button" class="btn small">
<span class="btn-txt">등록여부</span>
</button>
<button type="button" class="btn small btn-secondary">
<span class=" btn-txt">삭제</span>
</button>
<button type="button" class="btn small btn-primary">
<span class="btn-txt">추가</span>
</button>
</div>
</div>
</div>
<table id="table-farming">
<thead>
<tr>
<th>선택</th>
<th>생산물</th>
<th>용도</th>
<th>수량</th>
<th>단위</th>
<th>현물평가액</th>
<th>최종 수정자</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</section>
</div>
</div>
</div>
<script th:inline="javascript">
// 일계부 등록 현황 리스트 조회
const getDailyRecords = () => {
const f = document.reqForm;
ajaxUtil._ajaxMethod(
'/api/household/dailyRecordsStatus',
{
householdSeq: f.householdSeq.value,
recordMonth: f.recordMonth.value
},
function(response) { // 성공
console.log("일계부 현황 리스트 조회 : ", response);
const listArea = $('.tab-content .daily-record-list');
const detailArea = $('.tab-content .daily-record-detail');
const tbody = listArea.find('tbody');
detailArea.hide();
listArea.show();
tbody.empty();
$('#doneCount').text(response.summary.doneCount);
$('#emptyCount').text(response.summary.emptyCount);
$('#incompleteCount').text(response.summary.incompleteCount);
$('#waitingCount').text(response.summary.waitingCount);
$('#progressPercent').text(response.summary.progressPercent);
let tmpl = '';
$(response.dailyRecords).each((idx, item) => {
tmpl +=
`
<tr>
<td class="underline"><a href="javascript:void(0);" onclick="getDailyRecordsView(${item.id});">${item.dayGroup}</a></td>
<td>
<span class="tag ${statusInfoMap[item.allStatusType].className}">
${statusInfoMap[item.allStatusType].label}
</span>
</td> <!-- 완료상태 -->
<td>${item.incomeStatus}</td><!-- 수입 -->
<td>${item.workStatus}</td><!-- 노동투입 -->
<td>${item.expenseStatus}</td><!-- 지출 -->
<td>${item.powerStatus}</td><!-- 동력사용시간 -->
<td>${item.forestryStatus}</td><!-- 임업 자가소비량 -->
<td>${item.farmingStatus}</td><!-- 농업 자가소비량 -->
</tr>
`;
});
tbody.append(tmpl);
},
function (code, rstData) { // 실패
console.log("error : ", code);
},
'get',
'json'
);
}
// 임산물 등록 현황 상세
const getDailyRecordsView = (id) => {
if(id == null) {
alert('등록 내역이 없습니다.');
return;
}
const listArea = $('.tab-content .daily-record-list');
const detailArea = $('.tab-content .daily-record-detail');
listArea.hide();
detailArea.show();
ajaxUtil._ajaxMethod(
'/api/household/dailyRecordStatus',
{ recordSeq: id },
function(response) { // 성공
console.log("일계부 등록 상세 데이터 : ", response);
gridIncomeTable(response.status.incomeStatus, response.incomes);
gridWorkTable(response.status.workStatus, response.works);
gridExpenseTable(response.status.expenseStatus, response.expenses);
gridPowerTable(response.status.powerStatus, response.powers);
gridForestryTable(response.status.forestryStatus, response.forestries);
gridFarmingTable(response.status.farmingStatus, response.farmings);
},
function (code, rstData) { // 실패
console.log("error : ", code);
},
'get',
'json'
);
}
// 수입 테이블 그리기
const gridIncomeTable = (status, data) => {
const tbody = $('#table-income tbody');
tbody.empty();
$('#incomeCount').text(data.length);
if(data.length === 0) {
noDataDaily(tbody, status, 10);
return;
}
let tmpl = '';
$(data).each((idx, item) => {
tmpl +=
`
<tr>
<td>
<div class="component-input">
<label class="checkbox-inner">
<input type="checkbox" id="temp_checkbox_000${item.id}" name="temp_checkbox_000${item.id}" value="${item.id}">
</label>
</div>
</td>
<td>${item.isCredit ? "Y" : "N"}</td> <!-- 외상판매 -->
<td>${ifNullHyphen(item.cropText)}</td><!-- 재배형태 -->
<td class="underline">${ifNullHyphen(item.incomeKind)}</td><!-- 수입의 종류 -->
<td>${ifNullHyphen(item.sourcePurpose)}</td><!-- 수입원 -->
<td class="align-right">${ifNullHyphen(item.quantity)}</td><!-- 수량 -->
<td>${ifNullHyphen(item.unitText)}</td><!-- 단위 -->
<td class="align-right">${formatNumberWithComma(item.price)}</td><!-- 현금(원) -->
<td class="align-right">${formatNumberWithComma(item.estimatedValue)}</td><!-- 현물평가액 -->
<td>
${item.updatedBy}<br>
(${item.updatedAt})
</td><!-- 최종 수정자 -->
</tr>
`;
});
tbody.append(tmpl);
}
// 임업노동 테이블 그리기
const gridWorkTable = (status, data) => {
const tbody = $('#table-work tbody');
tbody.empty();
$('#workCount').text(data.length);
if(data.length === 0) {
noDataDaily(tbody, status, 18);
return;
}
let tmpl = '';
$(data).each((idx, item) => {
tmpl +=
`
<tr>
<td>
<div class="component-input">
<label class="checkbox-inner">
<input type="checkbox" id="temp_checkbox_000${item.id}" name="temp_checkbox_000${item.id}" value="${item.id}">
</label>
</div>
</td>
<td class="underline">${ifNullHyphen(item.itemName)}</td><!-- 품목명 -->
<td>${ifNullHyphen(item.workName)}</td><!-- 작업명 -->
<td class="align-right">${ifNullHyphen(item.workLandArea)}</td><!-- 작업면적 -->
<td>${ifNullHyphen(item.areaUnitText)}</td><!-- 작업면적 단위 -->
<td class="align-right">${ifNullHyphen(item.harvestQuantity)}</td><!-- 수확량 -->
<td>${ifNullHyphen(item.harvestUnitText)}</td><!-- 수확량 단위 -->
<td>${ifNullHyphen(item.ownerTime)}</td><!-- 경영주 시간 -->
<td>${ifNullHyphen(item.spouseTime)}</td><!-- 배우자 시간 -->
<td>${ifNullHyphen(item.familyMHours)}</td><!-- 가족노동(남) -->
<td>${ifNullHyphen(item.familyFHours)}</td><!-- 가족노동(여) -->
<td>${ifNullHyphen(item.hiredMHours)}</td><!-- 고용노동(남) -->
<td>${ifNullHyphen(item.hiredFHours)}</td><!-- 고용노동(여) -->
<td>${ifNullHyphen(item.sharedMHours)}</td><!-- 품앗이(남) -->
<td>${ifNullHyphen(item.sharedFHours)}</td><!-- 품앗이(여) -->
<td>${ifNullHyphen(item.volunteerMHours)}</td><!-- 일손돕기(남) -->
<td>${ifNullHyphen(item.volunteerFHours)}</td><!-- 일손돕기(여) -->
<td>
${item.updatedBy}<br>
(${item.updatedAt})
</td><!-- 최종 수정자 -->
</tr>
`;
});
tbody.append(tmpl);
}
// 지출 테이블 그리기
const gridExpenseTable = (status, data) => {
const tbody = $('#table-expense tbody');
tbody.empty();
$('#expenseCount').text(data.length);
if(data.length === 0) {
noDataDaily(tbody, status, 9);
return;
}
let tmpl = '';
$(data).each((idx, item) => {
tmpl +=
`
<tr>
<td>
<div class="component-input">
<label class="checkbox-inner">
<input type="checkbox" id="temp_checkbox_000${item.id}" name="temp_checkbox_000${item.id}" value="${item.id}">
</label>
</div>
</td>
<td>${item.isCredit ? "Y" : "N"}</td> <!-- 외상 또는 카드구입 -->
<td class="underline">${ifNullHyphen(item.expenseKind)}</td><!-- 지출의 종류 -->
<td>${ifNullHyphen(item.sourcePurpose)}</td><!-- 용도 -->
<td class="align-right">${ifNullHyphen(item.quantity)}</td><!-- 수량 -->
<td>${ifNullHyphen(item.unitText)}</td><!-- 단위 -->
<td class="align-right">${formatNumberWithComma(item.price)}</td><!-- 현금(원) -->
<td class="align-right">${formatNumberWithComma(item.estimatedValue)}</td><!-- 현물평가액 -->
<td>
${item.updatedBy}<br>
(${item.updatedAt})
</td><!-- 최종 수정자 -->
</tr>
`;
});
tbody.append(tmpl);
}
// 동력사용시간 테이블 그리기
const gridPowerTable = (status, data) => {
const tbody = $('#table-power tbody');
tbody.empty();
$('#powerCount').text(data.length);
if(data.length === 0) {
noDataDaily(tbody, status, 5);
return;
}
let tmpl = '';
$(data).each((idx, item) => {
tmpl +=
`
<tr>
<td>
<div class="component-input">
<label class="checkbox-inner">
<input type="checkbox" id="temp_checkbox_000${item.id}" name="temp_checkbox_000${item.id}" value="${item.id}">
</label>
</div>
</td>
<td class="underline">${ifNullHyphen(item.equipmentName)}</td> <!-- 명칭 -->
<td>${ifNullHyphen(item.ownedHours)}</td><!-- 자가 사용시간 -->
<td>${ifNullHyphen(item.leasedHours)}</td><!-- 임가 사용시간 -->
<td>
${item.updatedBy}<br>
(${item.updatedAt})
</td><!-- 최종 수정자 -->
</tr>
`;
});
tbody.append(tmpl);
}
// 자가임업 테이블 그리기
const gridForestryTable = (status, data) => {
const tbody = $('#table-forestry tbody');
tbody.empty();
$('#forestryCount').text(data.length);
if(data.length === 0) {
noDataDaily(tbody, status, 7);
return;
}
let tmpl = '';
$(data).each((idx, item) => {
tmpl +=
`
<tr>
<td>
<div class="component-input">
<label class="checkbox-inner">
<input type="checkbox" id="temp_checkbox_000${item.id}" name="temp_checkbox_000${item.id}" value="${item.id}">
</label>
</div>
</td>
<td class="underline">${ifNullHyphen(item.productName)}</td> <!-- 생산물 -->
<td>${ifNullHyphen(item.usage)}</td><!-- 용도 -->
<td class="align-right">${ifNullHyphen(item.quantity)}</td><!-- 수량 -->
<td>${ifNullHyphen(item.unitText)}</td><!-- 단위 -->
<td class="align-right">${formatNumberWithComma(item.estimatedValue)}</td><!-- 현물평가액 -->
<td>
${item.updatedBy}<br>
(${item.updatedAt})
</td><!-- 최종 수정자 -->
</tr>
`;
});
tbody.append(tmpl);
}
// 자가농업 테이블 그리기
const gridFarmingTable = (status, data) => {
const tbody = $('#table-farming tbody');
tbody.empty();
$('#farmingCount').text(data.length);
if(data.length === 0) {
noDataDaily(tbody, status, 7);
return;
}
let tmpl = '';
$(data).each((idx, item) => {
tmpl +=
`
<tr>
<td>
<div class="component-input">
<label class="checkbox-inner">
<input type="checkbox" id="temp_checkbox_000${item.id}" name="temp_checkbox_000${item.id}" value="${item.id}">
</label>
</div>
</td>
<td class="underline">${ifNullHyphen(item.productName)}</td> <!-- 생산물 -->
<td>${ifNullHyphen(item.usage)}</td><!-- 용도 -->
<td class="align-right">${ifNullHyphen(item.quantity)}</td><!-- 수량 -->
<td>${ifNullHyphen(item.unitText)}</td><!-- 단위 -->
<td class="align-right">${formatNumberWithComma(item.estimatedValue)}</td><!-- 현물평가액 -->
<td>
${item.updatedBy}<br>
(${item.updatedAt})
</td><!-- 최종 수정자 -->
</tr>
`;
});
tbody.append(tmpl);
}
</script>
</div>
</html>

View File

@@ -0,0 +1,121 @@
<!DOCTYPE html>
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:th="http://www.thymeleaf.org"
layout:decorate="~{layout/layout}">
<div class="layer-wrap" th:fragment="tabFragment">
<div class="tab-content forest-product" data-tab-value="tab2">
<div class="content-inner">
<section class="table-group">
<div class="table-tit-group">
<h3></h3>
<div class="component-btns bottom-btn-group">
<div class="btns-row align-right">
<button type="button" class="btn small">
<span class="btn-txt">등록여부</span>
</button>
<button type="button" class="btn small btn-secondary">
<span class=" btn-txt">삭제</span>
</button>
<button type="button" class="btn small btn-primary">
<span class="btn-txt">추가</span>
</button>
</div>
</div>
</div>
<table id="forest-product">
<thead>
<tr>
<th colspan="7"></th>
<th colspan="4">주생산물</th>
<th colspan="4">부생산물</th>
</tr>
<tr>
<th>선택</th>
<th>지번</th>
<th>지목</th>
<th>읍면동</th>
<th>가능면적(평)</th>
<th>재배작물명</th>
<th>면적(평)</th>
<th>수확량</th>
<th>단위</th>
<th>판매량</th>
<th>단위</th>
<th>수확량</th>
<th>단위</th>
<th>판매량</th>
<th>단위</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</section>
</div>
</div>
<script th:inline="javascript">
// 임산물 현황 탭 조회
const getForestProductsStatus = () => {
const f = document.reqForm;
ajaxUtil._ajaxMethod(
'/api/household/forestProducts',
{
householdSeq: f.householdSeq.value,
recordMonth: f.recordMonth.value
},
(response) => { // 성공
console.log("임산물 현황 리스트 조회 : ", response);
const tbody = $('.tab-content.forest-product tbody');
tbody.empty();
if(response.forestProducts.length === 0) {
noDataMonthly(tbody, response.status, 15);
return;
}
let tmpl = '';
$(response.forestProducts).each((idx, item) => {
tmpl +=
`
<tr>
<td>
<div class="component-input">
<label class="checkbox-inner">
<input type="checkbox" id="temp_checkbox_000${item.id}" name="temp_checkbox_000${item.id}" value="${item.id}">
</label>
</div>
</td>
<td>${ifNullHyphen(item.streetNum)}</td> <!-- 지번 -->
<td>${ifNullHyphen(item.landType)}</td><!-- 지목 -->
<td>${ifNullHyphen(item.town)}</td><!-- 읍면동 -->
<td>${ifNullHyphen(item.availableArea)}</td><!-- 가능면적(평) -->
<td>${ifNullHyphen(item.cropName)}</td><!-- 재배작물명 -->
<td>${ifNullHyphen(item.landArea)}</td><!-- 면적(평) -->
<td class="align-right">${ifNullHyphen(item.mainYield)}</td><!-- 주생산물 수확량 -->
<td>${ifNullHyphen(item.mainYieldUnitText)}</td><!-- 주생산물 수확량 단위 -->
<td class="align-right">${ifNullHyphen(item.mainSaleAmount)}</td><!-- 주생산물 판매량 -->
<td>${ifNullHyphen(item.mainSaleAmountUnitText)}</td><!-- 주생산물 판매량 단위 -->
<td class="align-right">${ifNullHyphen(item.subYield)}</td><!-- 부생산물 수확량 -->
<td>${ifNullHyphen(item.subYieldUnitText)}</td><!-- 부생산물 수확량 단위 -->
<td class="align-right">${ifNullHyphen(item.subSaleAmount)}</td><!-- 부생산물 판매량 -->
<td>${ifNullHyphen(item.subSaleAmountUnitText)}</td><!-- 부생산물 판매량 단위 -->
</tr>
`;
});
tbody.append(tmpl);
},
function (code, rstData) { // 실패
console.log("error : ", code);
},
'get',
'json'
);
}
</script>
</div>
</html>

View File

@@ -0,0 +1,98 @@
<!DOCTYPE html>
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:th="http://www.thymeleaf.org"
layout:decorate="~{layout/layout}">
<div class="layer-wrap" th:fragment="tabFragment">
<div class="tab-content household-visit" data-tab-value="tab4">
<div class="content-inner">
<section class="table-group">
<div class="table-tit-group">
<h3></h3>
<div class="component-btns bottom-btn-group">
<div class="btns-row align-right">
<button type="button" class="btn small btn-secondary">
<span class=" btn-txt">삭제</span>
</button>
<button type="button" class="btn small btn-primary" onclick="showVisitInfoModal();">
<span class="btn-txt">추가</span>
</button>
</div>
</div>
</div>
<table id="household-visit">
<thead>
<tr>
<th>선택</th>
<th>방문일</th>
<th>관리분야</th>
<th>내용</th>
<th>최종 수정자</th>
<th>답례품 전달</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</section>
</div>
</div>
<script th:inline="javascript">
// 임가방문정보 조회
const getVisitInfo = () => {
const f = document.reqForm;
ajaxUtil._ajaxMethod(
'/api/household/visitInfos',
{
householdSeq: f.householdSeq.value,
recordMonth: f.recordMonth.value
},
(response) => { // 성공
console.log("임가 방문정보 조회 : ", response);
const tbody = $('.tab-content.household-visit tbody');
tbody.empty();
if(response.length === 0) {
tbody.append(`<tr><td colspan="6" style="text-align: center;">등록이 필요합니다.</td></tr>`);
return;
}
let tmpl = '';
$(response).each((idx, item) => {
tmpl +=
`
<tr>
<td>
<div class="component-input">
<label class="checkbox-inner">
<input type="checkbox" id="temp_checkbox_000${item.id}" name="temp_checkbox_000${item.id}" value="${item.id}">
</label>
</div>
</td>
<td>${ifNullHyphen(item.visitDate)}</td> <!-- 방문일 -->
<td>${ifNullHyphen(managementType[item.managementType])}</td> <!-- 관리분야 -->
<td class="underline"><a href="javascript:void(0);" onclick="showVisitInfoModal(${item.id});">${ifNullHyphen(item.content)}</a></td> <!-- 내용 -->
<td>
${item.updatedBy}<br>
(${item.updatedAt})
</td><!-- 최종 수정자 -->
<td>${item.isGiftSent ? "전달 완료" : "미전달"}</td> <!-- 답례품 전달 -->
</tr>
`;
});
tbody.append(tmpl);
},
function (code, rstData) { // 실패
console.log("error : ", code);
},
'get',
'json'
);
}
</script>
</div>
</html>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -198,7 +198,7 @@
tbody.append( tbody.append(
` `
<tr data-id="${ct.seq}"> <tr data-id="${ct.seq}">
<td class="underline"><a href="">${ct.householdNum}</a></td> <td><a href="#">${ct.householdNum}</a></td>
<td>${ct.ownerName || '-'}</td> <td>${ct.ownerName || '-'}</td>
<td>${ct.phone || '-'}</td> <td>${ct.phone || '-'}</td>
<td>${ct.regionMainCodeName || '-'}</td> <td>${ct.regionMainCodeName || '-'}</td>
@@ -271,7 +271,7 @@
<input class="form-check-input" name="selectIds" type="checkbox" value="${ct.id}"/> <input class="form-check-input" name="selectIds" type="checkbox" value="${ct.id}"/>
</label> </label>
</td> </td>
<td class="underline"><a href="#" onclick="showHouseholdModal2(${ct.id});">${ct.householdNum}</a></td> <td><a href="#" onclick="showHouseholdModal2(${ct.id});">${ct.householdNum}</a></td>
<td>${ct.ownerName}</td> <td>${ct.ownerName}</td>
<td>${ct.visitDate}</td> <td>${ct.visitDate}</td>
<td>${ct.managementType}</td> <td>${ct.managementType}</td>

View File

@@ -15,71 +15,75 @@
<section> <section>
<form autocomplete="off" method="get" name="householdVisitReqForm" > <form autocomplete="off" method="get" name="householdVisitReqForm" >
<input type="hidden" name="id" id="id" /> <input type="hidden" name="id" id="id" />
<table class="type-form confirm" > <table class="type-form confirm" >
<tbody id="household-visit-detail"> <tbody id="household-visit-detail">
<tr> <tr>
<th>방문일</th> <th>방문일</th>
<td> <td>
<div class="component-datepicker"> <div class="component-datepicker">
<div class="component-input"> <div class="component-input">
<div class="input-field"> <div class="input-field">
<input type="text" class="datepicker-btn-trigger" name="visitDate" id="visitDate" aria-label="방문일" <input type="text" class="datepicker-btn-trigger" name="visitDate" id="visitDate" aria-label="시작일"
placeholder="방문일을 입력해주세요" /> placeholder="방문일을 입력해주세요" />
<span class="input-field-btn datepicker-state"> <span class="input-field-btn datepicker-state">
<span class="hide-txt">달력</span> <span class="hide-txt">달력</span>
<i class="ico-calendar ico-normal" aria-hidden="true"></i> <i class="ico-calendar ico-normal" aria-hidden="true"></i>
</span> </span>
</div>
</div> </div>
</div> </div>
</div> </td>
</td> <th>관리분야</th>
<th>관리분야</th> <td>
<td> <div class="d-flex">
<select id="managementType" name="managementType"> <div class="component-select">
<option value="">선택하세요</option> <select id="managementType" name="managementType" class="select-list" required>
</select> <option value="">선택하세요</option>
</td> </select>
</tr> </div>
<tr>
<th>내용</th>
<td>
<div class="component-input">
<div class="input-textarea-field">
<textarea id="content" name="content" class="textarea" placeholder=""></textarea>
</div> </div>
</div> </td>
</td> </tr>
</tr> <tr>
<tr> <th>내용</th>
<th>답례품 전달</th> <td colspan="5">
<td> <div class="component-input">
<div class="component-input"> <div class="input-textarea-field">
<label class="radio-inner"> <textarea id="textarea_note" class="textarea" name="content" placeholder=""></textarea>
<input type="radio" id="is_gift_sent_y" name="isGiftSent"> </div>
<span class="radio-item"> </div>
<span class="radio-txt">전달</span> </td>
</span> </tr>
</label> <tr>
</div> <th>답례품 전달</th>
<div class="component-input"> <td class="radio-group">
<label class="radio-inner"> <div class="component-input">
<input type="radio" id="is_gift_sent_n" name="isGiftSent"> <label class="radio-inner">
<span class="radio-item"> <input type="radio" id="is_gift_sent_y" name="isGiftSent">
<span class="radio-txt">미전달</span> <span class="radio-item">
</span> <span class="radio-txt">전달</span>
</label> </span>
</div> </label>
</td> </div>
</tr> <div class="component-input">
</tbody> <label class="radio-inner">
</table> <input type="radio" id="is_gift_sent_n" name="isGiftSent">
<div class="component-btns bottom-btn-group" th:fragment="modalButtons"> <span class="radio-item">
<div class="btns-row align-right"> <span class="radio-txt">미전달</span>
<button type="button" class="btn btn-primary" onclick="updateHouseholdVisit()"> </span>
<span class="btn-txt">수정</span> </label>
</button> </div>
</td>
</tr>
</tbody>
</table>
<div class="component-btns bottom-btn-group" th:fragment="modalButtons">
<div class="btns-row align-right">
<button type="button" class="btn btn-primary" onclick="updateHouseholdVisit()">
<span class="btn-txt">수정</span>
</button>
</div>
</div> </div>
</div>
</form> </form>
</section> </section>
</div> </div>
@@ -97,8 +101,22 @@
}); });
const showHouseholdModal2 = (seq) => { const showHouseholdModal2 = (seq) => {
document.querySelector(".modal02").ui.open(); const modal = document.querySelector(".modal02");
//initFlatpickr(); modal.ui.open();
const $el = document.querySelector('.component-datepicker');
const datepicker = etUI.components.DatepickerComp();
datepicker.core.init($el, {
dateSelectCallback: function (selectedDate) {
console.log('선택된 날짜:', selectedDate);
}
});
datepickerInstance = datepicker.getDatepickerInstance();
// 초기 상태 오늘 날짜로
if (datepickerInstance) {
datepickerInstance.setDate(new Date(), { render: true });
}
ajaxUtil._ajaxMethod( ajaxUtil._ajaxMethod(
'/api/researcher/visitHousehold/'+seq, '/api/researcher/visitHousehold/'+seq,
@@ -123,13 +141,15 @@
const setFormData = (data) => { const setFormData = (data) => {
// 폼 필드에 데이터 세팅 // 폼 필드에 데이터 세팅
const f = document.householdVisitReqForm; const f = document.householdVisitReqForm;
if (data.visitDate) {
const visitDate = data.visitDate.substring(0, 10); // 'YYYY-MM-DD' 형식 if (datepickerInstance && data.visitDate) {
if (visitDatePicker) {
f.visitDate.value = visitDate; // 입력 필드 먼저 설정 console.log(data.visitDate);
visitDatePicker.setDate(visitDate); // Flatpickr 동기화 console.log(new Date(data.visitDate));
}
datepickerInstance.setDate(new Date(data.visitDate), { render: true });
} }
if (data.managementType) { if (data.managementType) {
f.managementType.value= data.managementType; f.managementType.value= data.managementType;
} }
@@ -161,27 +181,48 @@
visitDatePicker = null; visitDatePicker = null;
} }
// 1. input 요소가 실제로 존재하는지 확인 // 입력 요소 확인
const input = document.getElementById('visitDate'); const input = document.getElementById('visitDate');
if (!input) { if (!input) {
console.warn('#visitDate input not found!'); console.warn('#visitDate input not found!');
return; return;
} }
// 2. input에 값이 있으면 flatpickr와 동기화 // 현재 값 가져오기
const currentVal = input.value; const currentVal = input.value;
// 3. flatpickr 초기화 // Flatpickr 초기화
visitDatePicker = flatpickr(input, { try {
dateFormat: 'Y-m-d', visitDatePicker = flatpickr(input, {
defaultDate: currentVal || null, // 현재 값으로 초기 선택 날짜 설정 dateFormat: 'Y-m-d',
enableTime: false, defaultDate: currentVal || null,
clickOpens: true, enableTime: false,
onChange: function (selectedDates, dateStr, instance) { clickOpens: true,
console.log('날짜 선택됨:', dateStr); onReady: function () {
input.value = dateStr; // 수동으로 input 값 동기화 console.log('Flatpickr 초기화 완료');
}, },
}); onChange: function (selectedDates, dateStr, instance) {
console.log('날짜 선택됨:', dateStr);
input.value = dateStr; // 입력 필드 동기화
},
onOpen: function () {
console.log('Flatpickr 캘린더 열림');
},
onClose: function () {
console.log('Flatpickr 캘린더 닫힘');
}
});
// 입력 필드 클릭 이벤트 추가 (보조)
input.addEventListener('click', () => {
console.log('visitDate 입력 필드 클릭됨');
if (visitDatePicker) {
visitDatePicker.open(); // 수동으로 캘린더 열기
}
});
} catch (error) {
console.error('Flatpickr 초기화 실패:', error);
}
}; };
const updateHouseholdVisit = () => { const updateHouseholdVisit = () => {

View File

@@ -125,7 +125,7 @@
tbody.append( tbody.append(
` `
<tr data-id="${ct.id}"> <tr data-id="${ct.id}">
<td class="underline"><a href="javascript:goDetail(${ct.seq})">${ct.name || '-'}</a></td> <td><a href="javascript:goDetail(${ct.seq})">${ct.name || '-'}</a></td>
<td>${ct.phone || '-'}</td> <td>${ct.phone || '-'}</td>
<td>${ct.regionMainCodeName || '-'}</td> <td>${ct.regionMainCodeName || '-'}</td>
<td>${ct.householdCount || '-'}</td> <td>${ct.householdCount || '-'}</td>

View File

@@ -153,8 +153,8 @@ CREATE TABLE daily_income (
quantity varchar(10), -- 수량 quantity varchar(10), -- 수량
unit_code varchar(255), -- 단위(매핑코드) unit_code varchar(255), -- 단위(매핑코드)
unit_self varchar(100), -- 단위(직접입력) unit_self varchar(100), -- 단위(직접입력)
price integer, -- 현금(원) price bigint, -- 현금(원)
estimated_value integer, -- 현물(평가액) estimated_value bigint, -- 현물(평가액)
created_at timestamp(6), -- 생성일 created_at timestamp(6), -- 생성일
created_by varchar(255), -- 생성자 created_by varchar(255), -- 생성자
updated_at timestamp(6), -- 수정일 updated_at timestamp(6), -- 수정일
@@ -211,11 +211,11 @@ CREATE TABLE daily_expense (
expense_kind varchar(100), -- 지출의 종류 expense_kind varchar(100), -- 지출의 종류
expense_kind_mark varchar(10), -- 종류 부호 expense_kind_mark varchar(10), -- 종류 부호
source_purpose varchar(10), -- 지출원(용도) source_purpose varchar(10), -- 지출원(용도)
quantity varchar(10), -- 수량 quantity varchar(10), -- 수량
unit_code varchar(255), -- 단위(매핑코드) unit_code varchar(255), -- 단위(매핑코드)
unit_self varchar(100), -- 단위(직접입력) unit_self varchar(100), -- 단위(직접입력)
price integer, -- 현금(원) price bigint, -- 현금(원)
estimated_value integer, -- 현물(평가액) estimated_value bigint, -- 현물(평가액)
created_at timestamp(6), -- 생성일 created_at timestamp(6), -- 생성일
created_by varchar(255), -- 생성자 created_by varchar(255), -- 생성자
updated_at timestamp(6), -- 수정일 updated_at timestamp(6), -- 수정일
@@ -386,7 +386,7 @@ CREATE TABLE daily_forestry (
quantity varchar(10), -- 수량 quantity varchar(10), -- 수량
unit_code varchar(255), -- 단위(매핑코드) unit_code varchar(255), -- 단위(매핑코드)
unit_self varchar(100), -- 단위(직접입력) unit_self varchar(100), -- 단위(직접입력)
estimated_value integer, -- 현물평가 estimated_value bigint, -- 현물평가
created_at timestamp(6), -- 생성일 created_at timestamp(6), -- 생성일
created_by varchar(255), -- 생성자 created_by varchar(255), -- 생성자
updated_at timestamp(6), -- 수정일 updated_at timestamp(6), -- 수정일
@@ -437,7 +437,7 @@ CREATE TABLE daily_farming (
quantity varchar(10), -- 수량 quantity varchar(10), -- 수량
unit_code varchar(255), -- 단위(매핑코드) unit_code varchar(255), -- 단위(매핑코드)
unit_self varchar(100), -- 단위(직접입력) unit_self varchar(100), -- 단위(직접입력)
estimated_value integer, -- 현물평가액 estimated_value bigint, -- 현물평가액
created_at timestamp(6), -- 생성일 created_at timestamp(6), -- 생성일
created_by varchar(255), -- 생성자 created_by varchar(255), -- 생성자
updated_at timestamp(6), -- 수정일 updated_at timestamp(6), -- 수정일

View File

@@ -80,5 +80,5 @@ SELECT
a.name AS researcher_name, a.name AS researcher_name,
a.phone AS researcher_phone a.phone AS researcher_phone
FROM researcher_has_household rhh FROM researcher_has_household rhh
JOIN admin a ON rhh.admin_seq = a.seq JOIN admin a ON rhh.admin_seq = a.seq and a.account_disabled = false
WHERE rhh.is_deleted = false; WHERE rhh.is_deleted = false;

View File

@@ -17,8 +17,8 @@ public class DailyExpenseDto {
private String unitCode; private String unitCode;
private String unitLabel; private String unitLabel;
private String unitSelf; private String unitSelf;
private Integer price; private Long price;
private Integer estimatedValue; private Long estimatedValue;
/** /**
* 수정 가능 여부 * 수정 가능 여부

View File

@@ -52,9 +52,9 @@ public class CreateDailyExpenseReqVO extends DailyUIReqVO {
/** /**
* 현금 * 현금
*/ */
private Integer price; private Long price;
/** /**
* 현물평가액 * 현물평가액
*/ */
private Integer estimatedValue; private Long estimatedValue;
} }

View File

@@ -13,6 +13,7 @@ import app.module.front.usecase.daily.expense.ports.DailyExpensePortOut;
import app.module.front.usecase.daily.expense.ports.application.domain.CreateDailyExpenseCmd; import app.module.front.usecase.daily.expense.ports.application.domain.CreateDailyExpenseCmd;
import app.module.front.usecase.daily.expense.ports.application.domain.GetDailyExpenseCmd; import app.module.front.usecase.daily.expense.ports.application.domain.GetDailyExpenseCmd;
import app.module.front.usecase.daily.expense.ports.application.domain.RemoveDailyExpenseCmd; import app.module.front.usecase.daily.expense.ports.application.domain.RemoveDailyExpenseCmd;
import app.module.front.usecase.daily.record.ports.application.DailyRecordService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -23,6 +24,7 @@ import java.util.List;
public class DailyExpenseService implements DailyExpensePortIn { public class DailyExpenseService implements DailyExpensePortIn {
private final DailyExpensePortOut portOut; private final DailyExpensePortOut portOut;
private final UICodeListPortIn uiCodeListPortIn; private final UICodeListPortIn uiCodeListPortIn;
private final DailyRecordService dailyRecordService;
@Override @Override
public List<DailyExpenseDto> list(DailyExpenseUIReqVO reqVO) { public List<DailyExpenseDto> list(DailyExpenseUIReqVO reqVO) {
@@ -107,6 +109,8 @@ public class DailyExpenseService implements DailyExpensePortIn {
formVO.getEstimatedValue())); formVO.getEstimatedValue()));
portOut.create(findCmd, command); portOut.create(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
} }
@Override @Override
@@ -127,5 +131,7 @@ public class DailyExpenseService implements DailyExpensePortIn {
formVO.getDailyRecordSeq())); formVO.getDailyRecordSeq()));
portOut.remove(findCmd, command); portOut.remove(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
} }
} }

View File

@@ -29,6 +29,6 @@ public class CreateDailyExpenseCmd extends FrontAuditCommand {
private Double quantity; private Double quantity;
private String unitCode; private String unitCode;
private String unitSelf; private String unitSelf;
private Integer price; private Long price;
private Integer estimatedValue; private Long estimatedValue;
} }

View File

@@ -16,7 +16,7 @@ public class DailyFarmingDto {
private String unitCode; private String unitCode;
private String unitLabel; private String unitLabel;
private String unitSelf; private String unitSelf;
private Integer estimatedValue; private Long estimatedValue;
/** /**
* 수정 가능 여부 * 수정 가능 여부

View File

@@ -46,5 +46,5 @@ public class CreateDailyFarmingReqVO extends DailyUIReqVO {
/** /**
* 현물평가액 * 현물평가액
*/ */
private Integer estimatedValue; private Long estimatedValue;
} }

View File

@@ -13,6 +13,7 @@ import app.module.front.usecase.daily.farming.ports.DailyFarmingPortOut;
import app.module.front.usecase.daily.farming.ports.application.domain.CreateDailyFarmingCmd; import app.module.front.usecase.daily.farming.ports.application.domain.CreateDailyFarmingCmd;
import app.module.front.usecase.daily.farming.ports.application.domain.GetDailyFarmingCmd; import app.module.front.usecase.daily.farming.ports.application.domain.GetDailyFarmingCmd;
import app.module.front.usecase.daily.farming.ports.application.domain.RemoveDailyFarmingCmd; import app.module.front.usecase.daily.farming.ports.application.domain.RemoveDailyFarmingCmd;
import app.module.front.usecase.daily.record.ports.application.DailyRecordService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -25,6 +26,7 @@ import java.util.List;
public class DailyFarmingService implements DailyFarmingPortIn { public class DailyFarmingService implements DailyFarmingPortIn {
private final DailyFarmingPortOut portOut; private final DailyFarmingPortOut portOut;
private final UICodeListPortIn uiCodeListPortIn; private final UICodeListPortIn uiCodeListPortIn;
private final DailyRecordService dailyRecordService;
@Override @Override
public List<DailyFarmingDto> list(DailyFarmingUIReqVO reqVO) { public List<DailyFarmingDto> list(DailyFarmingUIReqVO reqVO) {
@@ -132,6 +134,8 @@ public class DailyFarmingService implements DailyFarmingPortIn {
formVO.getEstimatedValue())); formVO.getEstimatedValue()));
portOut.create(findCmd, command); portOut.create(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
} }
@Override @Override
@@ -152,5 +156,7 @@ public class DailyFarmingService implements DailyFarmingPortIn {
formVO.getDailyRecordSeq())); formVO.getDailyRecordSeq()));
portOut.remove(findCmd, command); portOut.remove(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
} }
} }

View File

@@ -21,5 +21,5 @@ public class CreateDailyFarmingCmd extends FrontAuditCommand {
private Double quantity; private Double quantity;
private String unitCode; private String unitCode;
private String unitSelf; private String unitSelf;
private Integer estimatedValue; private Long estimatedValue;
} }

View File

@@ -14,7 +14,7 @@ public class DailyForestryDto {
private String unitCode; private String unitCode;
private String unitLabel; private String unitLabel;
private String unitSelf; private String unitSelf;
private Integer estimatedValue; private Long estimatedValue;
/** /**
* 수정 가능 여부 * 수정 가능 여부

View File

@@ -42,5 +42,5 @@ public class CreateDailyForestryReqVO extends DailyUIReqVO {
/** /**
* 현물평가액 * 현물평가액
*/ */
private Integer estimatedValue; private Long estimatedValue;
} }

View File

@@ -13,6 +13,7 @@ import app.module.front.usecase.daily.forestry.ports.DailyForestryPortOut;
import app.module.front.usecase.daily.forestry.ports.application.domain.CreateDailyForestryCmd; import app.module.front.usecase.daily.forestry.ports.application.domain.CreateDailyForestryCmd;
import app.module.front.usecase.daily.forestry.ports.application.domain.GetDailyForestryCmd; import app.module.front.usecase.daily.forestry.ports.application.domain.GetDailyForestryCmd;
import app.module.front.usecase.daily.forestry.ports.application.domain.RemoveDailyForestryCmd; import app.module.front.usecase.daily.forestry.ports.application.domain.RemoveDailyForestryCmd;
import app.module.front.usecase.daily.record.ports.application.DailyRecordService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -25,6 +26,7 @@ import java.util.List;
public class DailyForestryService implements DailyForestryPortIn { public class DailyForestryService implements DailyForestryPortIn {
private final DailyForestryPortOut portOut; private final DailyForestryPortOut portOut;
private final UICodeListPortIn uiCodeListPortIn; private final UICodeListPortIn uiCodeListPortIn;
private final DailyRecordService dailyRecordService;
@Override @Override
public List<DailyForestryDto> list(DailyForestryUIReqVO reqVO) { public List<DailyForestryDto> list(DailyForestryUIReqVO reqVO) {
@@ -105,6 +107,8 @@ public class DailyForestryService implements DailyForestryPortIn {
formVO.getEstimatedValue())); formVO.getEstimatedValue()));
portOut.create(findCmd, command); portOut.create(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
} }
@Override @Override
@@ -125,5 +129,7 @@ public class DailyForestryService implements DailyForestryPortIn {
formVO.getDailyRecordSeq())); formVO.getDailyRecordSeq()));
portOut.remove(findCmd, command); portOut.remove(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
} }
} }

View File

@@ -19,5 +19,5 @@ public class CreateDailyForestryCmd extends FrontAuditCommand {
private Double quantity; private Double quantity;
private String unitCode; private String unitCode;
private String unitSelf; private String unitSelf;
private Integer estimatedValue; private Long estimatedValue;
} }

View File

@@ -19,8 +19,8 @@ public class DailyIncomeDto {
private String unitCode; private String unitCode;
private String unitLabel; private String unitLabel;
private String unitSelf; private String unitSelf;
private Integer price; private Long price;
private Integer estimatedValue; private Long estimatedValue;
/** /**
* 수정 가능 여부 * 수정 가능 여부

View File

@@ -55,9 +55,9 @@ public class CreateDailyIncomeReqVO extends DailyUIReqVO {
/** /**
* 현금 * 현금
*/ */
private Integer price; private Long price;
/** /**
* 현물평가액 * 현물평가액
*/ */
private Integer estimatedValue; private Long estimatedValue;
} }

View File

@@ -13,6 +13,7 @@ import app.module.front.usecase.daily.income.ports.DailyIncomePortOut;
import app.module.front.usecase.daily.income.ports.application.domain.CreateDailyIncomeCmd; import app.module.front.usecase.daily.income.ports.application.domain.CreateDailyIncomeCmd;
import app.module.front.usecase.daily.income.ports.application.domain.GetDailyIncomeCmd; import app.module.front.usecase.daily.income.ports.application.domain.GetDailyIncomeCmd;
import app.module.front.usecase.daily.income.ports.application.domain.RemoveDailyIncomeCmd; import app.module.front.usecase.daily.income.ports.application.domain.RemoveDailyIncomeCmd;
import app.module.front.usecase.daily.record.ports.application.DailyRecordService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -23,6 +24,7 @@ import java.util.List;
public class DailyIncomeService implements DailyIncomePortIn { public class DailyIncomeService implements DailyIncomePortIn {
private final DailyIncomePortOut portOut; private final DailyIncomePortOut portOut;
private final UICodeListPortIn uiCodeListPortIn; private final UICodeListPortIn uiCodeListPortIn;
private final DailyRecordService dailyRecordService;
@Override @Override
public List<DailyIncomeDto> list(DailyIncomeUIReqVO reqVO) { public List<DailyIncomeDto> list(DailyIncomeUIReqVO reqVO) {
@@ -111,6 +113,8 @@ public class DailyIncomeService implements DailyIncomePortIn {
formVO.getEstimatedValue())); formVO.getEstimatedValue()));
portOut.create(findCmd, command); portOut.create(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
} }
@Override @Override
@@ -131,5 +135,7 @@ public class DailyIncomeService implements DailyIncomePortIn {
formVO.getDailyRecordSeq())); formVO.getDailyRecordSeq()));
portOut.remove(findCmd, command); portOut.remove(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
} }
} }

View File

@@ -30,6 +30,6 @@ public class CreateDailyIncomeCmd extends FrontAuditCommand {
private Double quantity; private Double quantity;
private String unitCode; private String unitCode;
private String unitSelf; private String unitSelf;
private Integer price; private Long price;
private Integer estimatedValue; private Long estimatedValue;
} }

View File

@@ -16,6 +16,7 @@ import app.module.front.usecase.daily.power.ports.DailyPowerPortOut;
import app.module.front.usecase.daily.power.ports.application.domain.CreateDailyPowerCmd; import app.module.front.usecase.daily.power.ports.application.domain.CreateDailyPowerCmd;
import app.module.front.usecase.daily.power.ports.application.domain.GetDailyPowerCmd; import app.module.front.usecase.daily.power.ports.application.domain.GetDailyPowerCmd;
import app.module.front.usecase.daily.power.ports.application.domain.RemoveDailyPowerCmd; import app.module.front.usecase.daily.power.ports.application.domain.RemoveDailyPowerCmd;
import app.module.front.usecase.daily.record.ports.application.DailyRecordService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -25,6 +26,7 @@ import java.util.List;
@RequiredArgsConstructor @RequiredArgsConstructor
public class DailyPowerService implements DailyPowerPortIn { public class DailyPowerService implements DailyPowerPortIn {
private final DailyPowerPortOut portOut; private final DailyPowerPortOut portOut;
private final DailyRecordService dailyRecordService;
@Override @Override
public List<DailyPowerDto> list(DailyPowerUIReqVO reqVO) { public List<DailyPowerDto> list(DailyPowerUIReqVO reqVO) {
@@ -71,6 +73,8 @@ public class DailyPowerService implements DailyPowerPortIn {
formVO.getLeasedHours())); formVO.getLeasedHours()));
portOut.create(findCmd, command); portOut.create(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
} }
@Override @Override
@@ -91,5 +95,7 @@ public class DailyPowerService implements DailyPowerPortIn {
formVO.getDailyRecordSeq())); formVO.getDailyRecordSeq()));
portOut.remove(findCmd, command); portOut.remove(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
} }
} }

View File

@@ -3,7 +3,7 @@ package app.module.front.usecase.daily.record.adapters.persistence;
import app.module.front.config.application.util.AuditUtil; import app.module.front.config.application.util.AuditUtil;
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto; import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto; import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto;
import app.module.front.usecase.daily.record.adapters.web.model.CreateDailyRecordReqVO; import app.module.front.usecase.daily.record.adapters.web.model.DailyStatus;
import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus; import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus;
import app.module.front.usecase.daily.record.ports.DailyRecordPortOut; import app.module.front.usecase.daily.record.ports.DailyRecordPortOut;
import app.module.front.usecase.daily.record.ports.application.domain.CreateDailyRecordCmd; import app.module.front.usecase.daily.record.ports.application.domain.CreateDailyRecordCmd;
@@ -15,7 +15,6 @@ import org.springframework.stereotype.Repository;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
@@ -64,7 +63,7 @@ public class DailyRecordDao implements DailyRecordPortOut {
log.warn("[DailyRecordCreate] existCount={}, recordMonth={}, dayGroupNo={}", existCount, findCmd.getSearchMonth(), findCmd.getGroupNo()); log.warn("[DailyRecordCreate] existCount={}, recordMonth={}, dayGroupNo={}", existCount, findCmd.getSearchMonth(), findCmd.getGroupNo());
} }
this.updateByAllStatus(findCmd); this.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
} }
@Override @Override
@@ -79,24 +78,128 @@ public class DailyRecordDao implements DailyRecordPortOut {
) )
); );
dailyRecordMapper.updateDailyRecordStatus(command); if ("ALL".equals(targetType)) {
String allStatus = this.getUpdateAllStatus(recordMonth, dayGroupNo, command.getHouseholdSeq());
if (allStatus != null) {
command.setAllStatus(allStatus);
this.updateByAllStatus(new GetDailyRecordCmd(recordMonth, dayGroupNo, command.getHouseholdSeq())); dailyRecordMapper.updateDailyRecordStatus(command);
} else {
log.debug("[updateByAllStatus] do nothing. findCmd: {}", command);
}
} else {
dailyRecordMapper.updateDailyRecordStatus(command);
}
} }
/** /**
* TODO : target 업데이트 후 데이터 등록이 완료된 건은 allStatus 값 변경해주기 * 일계부 전체 입력상태 변경
* @param findCmd *
* @param searchMonth
* @param dayGroupNo
* @param householdSeq
*/ */
private void updateByAllStatus(GetDailyRecordCmd findCmd) { private void updateByAllStatus(String searchMonth, Integer dayGroupNo, Long householdSeq) {
String allStatus = this.getUpdateAllStatus(searchMonth, dayGroupNo, householdSeq);
if (allStatus != null) {
UpdateDailyRecordStatusCmd command = AuditUtil.update(
new UpdateDailyRecordStatusCmd(
searchMonth,
dayGroupNo,
allStatus,
null,
null
)
);
dailyRecordMapper.updateDailyRecordStatus(command);
} else {
log.debug("[updateByAllStatus] do nothing. findCmd: {}");
}
}
/**
* TODO 변경할 전체 입력상태 조회
*
* @param searchMonth
* @param dayGroupNo
* @param householdSeq
* @return 변경할 전체 입력상태
*/
private String getUpdateAllStatus(String searchMonth, Integer dayGroupNo, Long householdSeq) {
GetDailyRecordCmd findCmd = new GetDailyRecordCmd(searchMonth, dayGroupNo, householdSeq);
DailyRecordStatusDto statusDetail = null;
List<DailyRecordStatusDto> statusList = dailyRecordMapper.getDailyRecordStatus(findCmd); List<DailyRecordStatusDto> statusList = dailyRecordMapper.getDailyRecordStatus(findCmd);
if (statusList != null && !statusList.isEmpty()) { if (statusList != null && !statusList.isEmpty()) {
DailyRecordStatusDto statusDetail = statusList.get(0); statusDetail = statusList.get(0);
}
if (DailyTargetStatus.TARGET.equals(statusDetail.getIncomeStatus()) && statusDetail.getIncomeCount() != 0) { String allStatus = null;
if (statusDetail != null) {
if (DailyStatus.TODAY_NONE.equals(statusDetail.getAllStatus())) {
// 전체상태=금일없음, 항목=입력대상이 있는지 여부
if (this.checkTarget(statusDetail.getIncomeStatus()) || this.checkTarget(statusDetail.getExpenseStatus())
|| this.checkTarget(statusDetail.getWorkStatus()) || this.checkTarget(statusDetail.getPowerStatus())
|| this.checkTarget(statusDetail.getForestryStatus()) || this.checkTarget(statusDetail.getFarmingStatus())) {
allStatus = DailyStatus.WAITING.name();
}
} else if (DailyStatus.WAITING.equals(statusDetail.getAllStatus())) {
// 전체상태=입력중, 항목 COUNT!=0 이 있는지 여부
int noneCheck = 0;
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getIncomeStatus(), statusDetail.getIncomeCount()) ? 1 : 0);
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getExpenseStatus(), statusDetail.getExpenseCount()) ? 1 : 0);
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getWorkStatus(), statusDetail.getWorkCount()) ? 1 : 0);
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getPowerStatus(), statusDetail.getPowerCount()) ? 1 : 0);
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getForestryStatus(), statusDetail.getForestryCount()) ? 1 : 0);
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getFarmingStatus(), statusDetail.getFarmingCount()) ? 1 : 0);
if (noneCheck == 0) {
allStatus = DailyStatus.DONE.name();
}
} else if (DailyStatus.DONE.equals(statusDetail.getAllStatus())) {
// 전체상태=완료, 항목 COUNT=0 체크
int noneCheck = 0;
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getIncomeStatus(), statusDetail.getIncomeCount()) ? 1 : 0);
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getExpenseStatus(), statusDetail.getExpenseCount()) ? 1 : 0);
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getWorkStatus(), statusDetail.getWorkCount()) ? 1 : 0);
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getPowerStatus(), statusDetail.getPowerCount()) ? 1 : 0);
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getForestryStatus(), statusDetail.getForestryCount()) ? 1 : 0);
noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getFarmingStatus(), statusDetail.getFarmingCount()) ? 1 : 0);
if (noneCheck != 0) {
allStatus = DailyStatus.WAITING.name();
}
} }
} }
return allStatus;
}
/**
* 입력 대상 상태 조회
*
* @param status 조회 상태
* @return true=입력 대상, false=금일 데이터 없음 또는 대상 아님
*/
private boolean checkTarget(DailyTargetStatus status) {
// NONE 은 대상이 아니기 때문에 체크에서 제외
return DailyTargetStatus.TARGET.equals(status);
}
/**
* 등록 대상인데 데이터가 없는 경우 조회
*
* @param status 조회 상태
* @param count 조회 건수
* @return true=입력대상인데 데이터가 없는 경우, false=입력대상 아니거나, 데이터가 있는 경우
*/
private boolean checkTargetDataNone(DailyTargetStatus status, Integer count) {
return DailyTargetStatus.TARGET.equals(status) && count == 0;
} }
} }

View File

@@ -48,6 +48,7 @@ public class DailyRecordController {
formVO.setDayGroupNo(reqVO.getGroupNo()); formVO.setDayGroupNo(reqVO.getGroupNo());
formVO.setStartDate(detail.getStartDate()); formVO.setStartDate(detail.getStartDate());
formVO.setEndDate(detail.getEndDate()); formVO.setEndDate(detail.getEndDate());
formVO.setFarmingStatus(detail.isFarmingOpen());
log.debug("formVO: {}", formVO); log.debug("formVO: {}", formVO);
dailyRecordPortIn.create(formVO); dailyRecordPortIn.create(formVO);

View File

@@ -23,6 +23,7 @@ public class CreateDailyRecordReqVO {
private DailyTargetStatus farmingStatus; private DailyTargetStatus farmingStatus;
public void setTodayNone(String todayNone) { public void setTodayNone(String todayNone) {
this.todayNone = todayNone;
if ("Y".equals(todayNone)) { if ("Y".equals(todayNone)) {
this.allStatus = DailyStatus.TODAY_NONE; this.allStatus = DailyStatus.TODAY_NONE;
this.incomeStatus = DailyTargetStatus.TODAY_NONE; this.incomeStatus = DailyTargetStatus.TODAY_NONE;
@@ -30,13 +31,6 @@ public class CreateDailyRecordReqVO {
this.expenseStatus = DailyTargetStatus.TODAY_NONE; this.expenseStatus = DailyTargetStatus.TODAY_NONE;
this.powerStatus = DailyTargetStatus.TODAY_NONE; this.powerStatus = DailyTargetStatus.TODAY_NONE;
this.forestryStatus = DailyTargetStatus.TODAY_NONE; this.forestryStatus = DailyTargetStatus.TODAY_NONE;
// TODO : 7의 배수와 마지막날의 기준
if (dayGroupNo == 4 || dayGroupNo == 8 || dayGroupNo == 12 || dayGroupNo == 16 || dayGroupNo == 17) {
this.farmingStatus = DailyTargetStatus.TODAY_NONE;
} else {
this.farmingStatus = DailyTargetStatus.NONE;
}
} else { } else {
this.allStatus = DailyStatus.WAITING; this.allStatus = DailyStatus.WAITING;
@@ -55,9 +49,18 @@ public class CreateDailyRecordReqVO {
if (forestryStatus == null) { if (forestryStatus == null) {
this.forestryStatus = DailyTargetStatus.NONE; this.forestryStatus = DailyTargetStatus.NONE;
} }
if (farmingStatus == null) { }
}
public void setFarmingStatus(boolean isOpen) {
if ("Y".equals(todayNone)) {
if (isOpen) {
this.farmingStatus = DailyTargetStatus.TODAY_NONE;
} else {
this.farmingStatus = DailyTargetStatus.NONE; this.farmingStatus = DailyTargetStatus.NONE;
} }
} else if (farmingStatus == null) {
this.farmingStatus = DailyTargetStatus.NONE;
} }
} }
} }

View File

@@ -21,4 +21,6 @@ public interface DailyRecordPortIn {
void create(CreateDailyRecordReqVO formVO); void create(CreateDailyRecordReqVO formVO);
void updateByStatus(String recordMonth, Integer dayGroupNo, String targetType, String targetStatus); void updateByStatus(String recordMonth, Integer dayGroupNo, String targetType, String targetStatus);
void updateByAllStatus(String recordMonth, Integer dayGroupNo);
} }

View File

@@ -95,5 +95,11 @@ public class DailyRecordService implements DailyRecordPortIn {
@Override @Override
public void updateByStatus(String recordMonth, Integer dayGroupNo, String targetType, String targetStatus) { public void updateByStatus(String recordMonth, Integer dayGroupNo, String targetType, String targetStatus) {
portOut.updateByStatus(recordMonth, dayGroupNo, targetType, targetStatus); portOut.updateByStatus(recordMonth, dayGroupNo, targetType, targetStatus);
portOut.updateByStatus(recordMonth, dayGroupNo, "ALL", null);
}
@Override
public void updateByAllStatus(String recordMonth, Integer dayGroupNo) {
portOut.updateByStatus(recordMonth, dayGroupNo, "ALL", null);
} }
} }

View File

@@ -1,5 +1,7 @@
package app.module.front.usecase.daily.work.adapters.persistence; package app.module.front.usecase.daily.work.adapters.persistence;
import app.module.front.usecase.daily.record.adapters.persistence.DailyRecordDao;
import app.module.front.usecase.daily.record.ports.application.DailyRecordService;
import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto; import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto;
import app.module.front.usecase.daily.work.ports.DailyWorkPortOut; import app.module.front.usecase.daily.work.ports.DailyWorkPortOut;
import app.module.front.usecase.daily.work.ports.application.domain.CreateDailyWorkCmd; import app.module.front.usecase.daily.work.ports.application.domain.CreateDailyWorkCmd;

View File

@@ -85,6 +85,8 @@ public class DailyWorkUIController {
} }
} }
model.addAttribute("recordArea", uiCodeListPortIn.connect("code.record.area"));
model.addAttribute("recordUnit", uiCodeListPortIn.connect("code.record.unit")); model.addAttribute("recordUnit", uiCodeListPortIn.connect("code.record.unit"));
model.addAttribute("reqVO", reqVO); model.addAttribute("reqVO", reqVO);

View File

@@ -43,9 +43,16 @@ public class CreateDailyWorkValidator implements Validator {
&& vo.getHiredMHours() == null && vo.getHiredFHours() == null && vo.getHiredMHours() == null && vo.getHiredFHours() == null
&& vo.getSharedMHours() == null && vo.getSharedFHours() == null && vo.getSharedMHours() == null && vo.getSharedFHours() == null
&& vo.getVolunteerMHours() == null && vo.getVolunteerFHours() == null) { && vo.getVolunteerMHours() == null && vo.getVolunteerFHours() == null) {
errors.rejectValue( errors.rejectValue("ownerTime", "valid.common.required");
"ownerTime", "valid.common.required", errors.rejectValue("spouseTime", "valid.common.required");
"최소 1개의 항목을 입력해주세요."); errors.rejectValue("familyMHours", "valid.common.required");
errors.rejectValue("familyFHours", "valid.common.required");
errors.rejectValue("hiredMHours", "valid.common.required");
errors.rejectValue("hiredFHours", "valid.common.required");
errors.rejectValue("sharedMHours", "valid.common.required");
errors.rejectValue("sharedFHours", "valid.common.required");
errors.rejectValue("volunteerMHours", "valid.common.required");
errors.rejectValue("volunteerFHours", "valid.common.required");
} }
} }
} }

View File

@@ -4,6 +4,7 @@ import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
import app.module.front.config.application.util.AuditUtil; import app.module.front.config.application.util.AuditUtil;
import app.module.front.config.constants.CommonConstants; import app.module.front.config.constants.CommonConstants;
import app.module.front.usecase.daily.record.ports.application.DailyRecordService;
import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto; import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto;
import app.module.front.usecase.daily.work.adapters.web.model.CreateDailyWorkReqVO; import app.module.front.usecase.daily.work.adapters.web.model.CreateDailyWorkReqVO;
import app.module.front.usecase.daily.work.adapters.web.model.DailyWorkUIReqVO; import app.module.front.usecase.daily.work.adapters.web.model.DailyWorkUIReqVO;
@@ -23,6 +24,7 @@ import java.util.List;
public class DailyWorkService implements DailyWorkPortIn { public class DailyWorkService implements DailyWorkPortIn {
private final DailyWorkPortOut portOut; private final DailyWorkPortOut portOut;
private final UICodeListPortIn uiCodeListPortIn; private final UICodeListPortIn uiCodeListPortIn;
private final DailyRecordService dailyRecordService;
@Override @Override
public List<DailyWorkDto> list(DailyWorkUIReqVO reqVO) { public List<DailyWorkDto> list(DailyWorkUIReqVO reqVO) {
@@ -51,13 +53,14 @@ public class DailyWorkService implements DailyWorkPortIn {
reqVO.getHouseholdSeq(), reqVO.getHouseholdSeq(),
reqVO.getId())); reqVO.getId()));
List<UICodeElement> recordArea = uiCodeListPortIn.connect("code.record.area");
List<UICodeElement> recordUnit = uiCodeListPortIn.connect("code.record.unit"); List<UICodeElement> recordUnit = uiCodeListPortIn.connect("code.record.unit");
for (DailyWorkDto dto : list) { for (DailyWorkDto dto : list) {
if (CommonConstants.UNIT_CODE_SELF.equals(dto.getAreaUnitCode())) { if (CommonConstants.UNIT_CODE_SELF.equals(dto.getAreaUnitCode())) {
dto.setAreaUnitLabel(dto.getAreaUnitSelf()); dto.setAreaUnitLabel(dto.getAreaUnitSelf());
} else { } else {
dto.setAreaUnitLabel(this.getCodeLabel(dto.getAreaUnitCode(), recordUnit)); dto.setAreaUnitLabel(this.getCodeLabel(dto.getAreaUnitCode(), recordArea));
} }
if (CommonConstants.UNIT_CODE_SELF.equals(dto.getHarvestUnitCode())) { if (CommonConstants.UNIT_CODE_SELF.equals(dto.getHarvestUnitCode())) {
@@ -120,6 +123,8 @@ public class DailyWorkService implements DailyWorkPortIn {
formVO.getVolunteerFHours())); formVO.getVolunteerFHours()));
portOut.create(findCmd, command); portOut.create(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
} }
@Override @Override
@@ -140,5 +145,7 @@ public class DailyWorkService implements DailyWorkPortIn {
formVO.getDailyRecordSeq())); formVO.getDailyRecordSeq()));
portOut.remove(findCmd, command); portOut.remove(findCmd, command);
dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo());
} }
} }

View File

@@ -29,10 +29,10 @@ public class CreateForestProductDto {
private String sourcePurpose; private String sourcePurpose;
private Integer count; private String count;
private String unitCode; private String unitCode;
private String unit; private String unit;
private Integer price; private Long price;
private String month; private String month;
private Long monthlyInputStatusId; private Long monthlyInputStatusId;

View File

@@ -23,10 +23,10 @@ public class CreateBankCmd extends AuditCommand {
private String sourcePurpose; private String sourcePurpose;
private Integer count; private String count;
private String unitCode; private String unitCode;
private String unit; private String unit;
private Integer price; private Long price;
private String month; private String month;
private Long monthlyInputStatusId; private Long monthlyInputStatusId;

View File

@@ -25,10 +25,10 @@ public class GetBanksDto {
private String sourcePurpose; private String sourcePurpose;
private Integer count; private String count;
private String unitCode; private String unitCode;
private String unit; private String unit;
private Integer price; private Long price;
private String month; private String month;
private Long monthlyInputStatusId; private Long monthlyInputStatusId;

View File

@@ -27,10 +27,10 @@ public class GetBanks {
private String sourcePurpose; private String sourcePurpose;
private Integer count; private String count;
private String unitCode; private String unitCode;
private String unit; private String unit;
private Integer price; private Long price;
private String month; private String month;
private Long monthlyInputStatusId; private Long monthlyInputStatusId;

View File

@@ -23,10 +23,10 @@ public class CreateBankInputProductReqVO {
private String sourcePurpose; private String sourcePurpose;
private Integer count; private String count;
private String unitCode; private String unitCode;
private String unit; private String unit;
private Integer price; private Long price;
} }

View File

@@ -21,24 +21,24 @@ public class CreateForestProductDto {
private String landType; // code -> 직접 private String landType; // code -> 직접
private String town; private String town;
private Integer availableArea; private String availableArea;
private String cropName; private String cropName;
private String cropCode; private String cropCode;
private Integer landArea; private String landArea;
private String month; private String month;
private BigDecimal mainYield; private String mainYield;
private String mainYieldUnitCode; private String mainYieldUnitCode;
private String mainYieldUnit; private String mainYieldUnit;
private BigDecimal mainSaleAmount; private String mainSaleAmount;
private String mainSaleUnitCode; private String mainSaleUnitCode;
private String mainSaleUnit; private String mainSaleUnit;
private BigDecimal subYield; private String subYield;
private String subYieldUnitCode; private String subYieldUnitCode;
private String subYieldUnit; private String subYieldUnit;
private BigDecimal subSaleAmount; private String subSaleAmount;
private String subSaleUnitCode; private String subSaleUnitCode;
private String subSaleUnit; private String subSaleUnit;
private Long monthlyInputStatusId; private Long monthlyInputStatusId;

View File

@@ -19,24 +19,24 @@ public class CreateForestProductCmd extends AuditCommand {
private String landType; private String landType;
private String town; private String town;
private Integer availableArea; private String availableArea;
private String cropName; private String cropName;
private String cropCode; private String cropCode;
private Integer landArea; private String landArea;
private String month; private String month;
private BigDecimal mainYield; private String mainYield;
private String mainYieldUnitCode; private String mainYieldUnitCode;
private String mainYieldUnit; private String mainYieldUnit;
private BigDecimal mainSaleAmount; private String mainSaleAmount;
private String mainSaleUnitCode; private String mainSaleUnitCode;
private String mainSaleUnit; private String mainSaleUnit;
private BigDecimal subYield; private String subYield;
private String subYieldUnitCode; private String subYieldUnitCode;
private String subYieldUnit; private String subYieldUnit;
private BigDecimal subSaleAmount; private String subSaleAmount;
private String subSaleUnitCode; private String subSaleUnitCode;
private String subSaleUnit; private String subSaleUnit;

View File

@@ -20,24 +20,24 @@ public class GetForestProduct {
private String landType; private String landType;
private String town; private String town;
private Integer availableArea; private String availableArea;
private String cropName; private String cropName;
private String cropCode; private String cropCode;
private Integer landArea; private String landArea;
private String month; private String month;
private BigDecimal mainYield; private String mainYield;
private String mainYieldUnitCode; private String mainYieldUnitCode;
private String mainYieldUnit; private String mainYieldUnit;
private BigDecimal mainSaleAmount; private String mainSaleAmount;
private String mainSaleUnitCode; private String mainSaleUnitCode;
private String mainSaleUnit; private String mainSaleUnit;
private BigDecimal subYield; private String subYield;
private String subYieldUnitCode; private String subYieldUnitCode;
private String subYieldUnit; private String subYieldUnit;
private BigDecimal subSaleAmount; private String subSaleAmount;
private String subSaleUnitCode; private String subSaleUnitCode;
private String subSaleUnit; private String subSaleUnit;

View File

@@ -19,24 +19,24 @@ public class GetForestProductsDto {
private String landType; private String landType;
private String town; private String town;
private Integer availableArea; private String availableArea;
private String cropName; private String cropName;
private String cropCode; private String cropCode;
private Integer landArea; private String landArea;
private String month; private String month;
private BigDecimal mainYield; private String mainYield;
private String mainYieldUnitCode; private String mainYieldUnitCode;
private String mainYieldUnit; private String mainYieldUnit;
private BigDecimal mainSaleAmount; private String mainSaleAmount;
private String mainSaleUnitCode; private String mainSaleUnitCode;
private String mainSaleUnit; private String mainSaleUnit;
private BigDecimal subYield; private String subYield;
private String subYieldUnitCode; private String subYieldUnitCode;
private String subYieldUnit; private String subYieldUnit;
private BigDecimal subSaleAmount; private String subSaleAmount;
private String subSaleUnitCode; private String subSaleUnitCode;
private String subSaleUnit; private String subSaleUnit;

View File

@@ -21,24 +21,24 @@ public class GetForestProducts {
private String landType; private String landType;
private String town; private String town;
private Integer availableArea; private String availableArea;
private String cropName; private String cropName;
private String cropCode; private String cropCode;
private Integer landArea; private String landArea;
private String month; private String month;
private BigDecimal mainYield; private String mainYield;
private String mainYieldUnitCode; private String mainYieldUnitCode;
private String mainYieldUnit; private String mainYieldUnit;
private BigDecimal mainSaleAmount; private String mainSaleAmount;
private String mainSaleUnitCode; private String mainSaleUnitCode;
private String mainSaleUnit; private String mainSaleUnit;
private BigDecimal subYield; private String subYield;
private String subYieldUnitCode; private String subYieldUnitCode;
private String subYieldUnit; private String subYieldUnit;
private BigDecimal subSaleAmount; private String subSaleAmount;
private String subSaleUnitCode; private String subSaleUnitCode;
private String subSaleUnit; private String subSaleUnit;

View File

@@ -19,24 +19,24 @@ public class GetMonthlyForestProductsDto {
private String landType; private String landType;
private String town; private String town;
private Integer availableArea; private String availableArea;
private String cropName; private String cropName;
private String cropCode; private String cropCode;
private Integer landArea; private String landArea;
private String month; private String month;
private BigDecimal mainYield; private String mainYield;
private String mainYieldUnitCode; private String mainYieldUnitCode;
private String mainYieldUnit; private String mainYieldUnit;
private BigDecimal mainSaleAmount; private String mainSaleAmount;
private String mainSaleUnitCode; private String mainSaleUnitCode;
private String mainSaleUnit; private String mainSaleUnit;
private BigDecimal subYield; private String subYield;
private String subYieldUnitCode; private String subYieldUnitCode;
private String subYieldUnit; private String subYieldUnit;
private BigDecimal subSaleAmount; private String subSaleAmount;
private String subSaleUnitCode; private String subSaleUnitCode;
private String subSaleUnit; private String subSaleUnit;

View File

@@ -21,24 +21,24 @@ public class GetMonthlyForestProducts {
private String landType; private String landType;
private String town; private String town;
private Integer availableArea; private String availableArea;
private String cropName; private String cropName;
private String cropCode; private String cropCode;
private Integer landArea; private String landArea;
private String month; private String month;
private BigDecimal mainYield; private String mainYield;
private String mainYieldUnitCode; private String mainYieldUnitCode;
private String mainYieldUnit; private String mainYieldUnit;
private BigDecimal mainSaleAmount; private String mainSaleAmount;
private String mainSaleUnitCode; private String mainSaleUnitCode;
private String mainSaleUnit; private String mainSaleUnit;
private BigDecimal subYield; private String subYield;
private String subYieldUnitCode; private String subYieldUnitCode;
private String subYieldUnit; private String subYieldUnit;
private BigDecimal subSaleAmount; private String subSaleAmount;
private String subSaleUnitCode; private String subSaleUnitCode;
private String subSaleUnit; private String subSaleUnit;

View File

@@ -21,24 +21,24 @@ public class UpdateForestProductDto {
private String landType; private String landType;
private String town; private String town;
private Integer availableArea; private String availableArea;
private String cropName; private String cropName;
private String cropCode; private String cropCode;
private Integer landArea; private String landArea;
private String month; private String month;
private BigDecimal mainYield; private String mainYield;
private String mainYieldUnitCode; private String mainYieldUnitCode;
private String mainYieldUnit; private String mainYieldUnit;
private BigDecimal mainSaleAmount; private String mainSaleAmount;
private String mainSaleUnitCode; private String mainSaleUnitCode;
private String mainSaleUnit; private String mainSaleUnit;
private BigDecimal subYield; private String subYield;
private String subYieldUnitCode; private String subYieldUnitCode;
private String subYieldUnit; private String subYieldUnit;
private BigDecimal subSaleAmount; private String subSaleAmount;
private String subSaleUnitCode; private String subSaleUnitCode;
private String subSaleUnit; private String subSaleUnit;

View File

@@ -20,24 +20,24 @@ public class UpdateForestProductCmd {
private String landType; private String landType;
private String town; private String town;
private Integer availableArea; private String availableArea;
private String cropName; private String cropName;
private String cropCode; private String cropCode;
private Integer landArea; private String landArea;
private String month; private String month;
private BigDecimal mainYield; private String mainYield;
private String mainYieldUnitCode; private String mainYieldUnitCode;
private String mainYieldUnit; private String mainYieldUnit;
private BigDecimal mainSaleAmount; private String mainSaleAmount;
private String mainSaleUnitCode; private String mainSaleUnitCode;
private String mainSaleUnit; private String mainSaleUnit;
private BigDecimal subYield; private String subYield;
private String subYieldUnitCode; private String subYieldUnitCode;
private String subYieldUnit; private String subYieldUnit;
private BigDecimal subSaleAmount; private String subSaleAmount;
private String subSaleUnitCode; private String subSaleUnitCode;
private String subSaleUnit; private String subSaleUnit;

View File

@@ -16,21 +16,21 @@ public class CreateMonthlyProductReqVO {
private String landType;// private String landType;//
private String town;// private String town;//
private Integer availableArea;// private String availableArea;//
private String cropName;// private String cropName;//
private Integer landArea;// private String landArea;//
private BigDecimal mainYield;// private String mainYield;//
private String mainYieldUnitCode;// private String mainYieldUnitCode;//
private String mainYieldUnit;// private String mainYieldUnit;//
private BigDecimal mainSaleAmount;// private String mainSaleAmount;//
private String mainSaleUnitCode;// private String mainSaleUnitCode;//
private String mainSaleUnit;// private String mainSaleUnit;//
private BigDecimal subYield;// private String subYield;//
private String subYieldUnitCode;// private String subYieldUnitCode;//
private String subYieldUnit;// private String subYieldUnit;//
private BigDecimal subSaleAmount;// private String subSaleAmount;//
private String subSaleUnitCode;// private String subSaleUnitCode;//
private String subSaleUnit;// private String subSaleUnit;//

View File

@@ -19,24 +19,27 @@
<select id="getDailyRecordStatus" <select id="getDailyRecordStatus"
resultType="app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto"> resultType="app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto">
select dr.id as daily_id select dr.id as daily_id
, dr.day_group_no, dr.start_date, dr.end_date , dr.day_group_no, dr.start_date, dr.end_date
, dr.all_status , dr.all_status
, dr.income_status , dr.income_status
, dr.work_status , dr.work_status
, dr.expense_status , dr.expense_status
, dr.power_status , dr.power_status
, dr.forestry_status , dr.forestry_status
, dr.farming_status , dr.farming_status
, (select count(*) from daily_income di where di.daily_record_seq = dr.id and di.is_deleted = false) as income_count , (select count(*) from daily_income di where di.daily_record_seq = dr.id and di.is_deleted = false) as income_count
, (select count(*) from daily_work dw where dw.daily_record_seq = dr.id and dw.is_deleted = false) as work_count , (select count(*) from daily_work dw where dw.daily_record_seq = dr.id and dw.is_deleted = false) as work_count
, (select count(*) from daily_expense de where de.daily_record_seq = dr.id and de.is_deleted = false) as expense_count , (select count(*) from daily_expense de where de.daily_record_seq = dr.id and de.is_deleted = false) as expense_count
, (select count(*) from daily_power dp where dp.daily_record_seq = dr.id and dp.is_deleted = false) as power_count , (select count(*) from daily_power dp where dp.daily_record_seq = dr.id and dp.is_deleted = false) as power_count
, (select count(*) from daily_forestry df1 where df1.daily_record_seq = dr.id and df1.is_deleted = false) as forestry_count , (select count(*) from daily_forestry df1 where df1.daily_record_seq = dr.id and df1.is_deleted = false) as forestry_count
, (select count(*) from daily_farming df2 where df2.daily_record_seq = dr.id and df2.is_deleted = false) as farming_count , (select count(*) from daily_farming df2 where df2.daily_record_seq = dr.id and df2.is_deleted = false) as farming_count
from daily_record dr from daily_record dr
where dr.is_deleted = false where dr.is_deleted = false
and dr.household_seq = #{householdSeq} and dr.household_seq = #{householdSeq}
and dr.record_month = #{searchMonth} and dr.record_month = #{searchMonth}
<if test="groupNo != null">
and dr.day_group_no = #{groupNo}
</if>
</select> </select>
<select id="getDailyRecordExistCount" resultType="int"> <select id="getDailyRecordExistCount" resultType="int">

View File

@@ -14,7 +14,7 @@ uri.front.statistics=\uD1B5\uACC4
uri.front.info=\uB0B4 \uC815\uBCF4 uri.front.info=\uB0B4 \uC815\uBCF4
uri.front.info.path=/info uri.front.info.path=/info
uri.front.info.user=\uAC1C\uC778\uC815\uBCF4 uri.front.info.user=\uAC1C\uC778\uC815\uBCF4 \uBCC0\uACBD
uri.front.info.user.path=/info/user uri.front.info.user.path=/info/user
uri.front.info.user.password=\uAC1C\uC778\uC815\uBCF4 \uBCC0\uACBD uri.front.info.user.password=\uAC1C\uC778\uC815\uBCF4 \uBCC0\uACBD
uri.front.info.notice=\uACF5\uC9C0\uC0AC\uD56D uri.front.info.notice=\uACF5\uC9C0\uC0AC\uD56D

View File

@@ -1159,11 +1159,20 @@ button,
[type=button], [type=button],
[type=reset], [type=reset],
[type=submit] { [type=submit] {
outline: none;
-webkit-appearance: button; -webkit-appearance: button;
-moz-appearance: button; -moz-appearance: button;
appearance: button; appearance: button;
} }
button:focus-visible {
outline: 1px solid #007bff;
}
button:focus:not(:focus-visible) {
outline: none;
}
/* /*
* Remove the inner border and padding in Firefox. * Remove the inner border and padding in Firefox.
*/ */
@@ -4292,6 +4301,7 @@ button.swiper-pagination-bullet {
.btn.btn-tertiary { .btn.btn-tertiary {
border-color: #f1f3f5; border-color: #f1f3f5;
background: #e9ecef; background: #e9ecef;
color: #343a40;
} }
.btn.btn-tertiary .btn-txt { .btn.btn-tertiary .btn-txt {
color: #343a40; color: #343a40;
@@ -5096,6 +5106,12 @@ button.swiper-pagination-bullet {
flex-wrap: wrap; flex-wrap: wrap;
} }
.component-input .input-label .label-txt { .component-input .input-label .label-txt {
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
position: relative; position: relative;
font-size: 1.8rem; font-size: 1.8rem;
line-height: 140%; line-height: 140%;
@@ -5103,6 +5119,7 @@ button.swiper-pagination-bullet {
color: #343a40; color: #343a40;
} }
.component-input .input-label .label-txt span { .component-input .input-label .label-txt span {
display: inline-block;
font-size: 1.7rem; font-size: 1.7rem;
line-height: 140%; line-height: 140%;
font-weight: 400; font-weight: 400;
@@ -6061,6 +6078,9 @@ button.swiper-pagination-bullet {
flex-wrap: wrap; flex-wrap: wrap;
} }
.select-group .select-label .label-txt { .select-group .select-label .label-txt {
display: -webkit-inline-box;
display: -webkit-inline-flex;
display: inline-flex;
position: relative; position: relative;
font-size: 1.8rem; font-size: 1.8rem;
line-height: 140%; line-height: 140%;
@@ -7496,6 +7516,7 @@ button.swiper-pagination-bullet {
-webkit-box-align: center; -webkit-box-align: center;
-webkit-align-items: center; -webkit-align-items: center;
align-items: center; align-items: center;
padding: 0rem;
} }
.header .header-wrap.sub .inner .btn-back { .header .header-wrap.sub .inner .btn-back {
width: 2.4rem; width: 2.4rem;
@@ -8078,6 +8099,19 @@ button.swiper-pagination-bullet {
padding-bottom: 0rem; padding-bottom: 0rem;
} }
.allmenu-wrap.component-modal .modal-content-inner {
height: 100%;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
flex-direction: column;
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
justify-content: space-between;
}
.allmenu-wrap.component-modal .modal-header { .allmenu-wrap.component-modal .modal-header {
padding: 3.2rem 2.4rem 2.4rem; padding: 3.2rem 2.4rem 2.4rem;
display: block; display: block;
@@ -8433,6 +8467,7 @@ button.swiper-pagination-bullet {
justify-content: space-between; justify-content: space-between;
} }
.regist-item-area .item-list .list-item .item-tit-group .item-name { .regist-item-area .item-list .list-item .item-tit-group .item-name {
max-width: 70%;
font-size: 2rem; font-size: 2rem;
line-height: 140%; line-height: 140%;
font-weight: 700; font-weight: 700;
@@ -8488,6 +8523,7 @@ button.swiper-pagination-bullet {
line-height: 140%; line-height: 140%;
} }
.regist-item-area .item-list .list-item .detail-list li span { .regist-item-area .item-list .list-item .detail-list li span {
max-width: 80%;
color: #212529; color: #212529;
} }
@@ -8752,6 +8788,9 @@ button.swiper-pagination-bullet {
flex: 1; flex: 1;
} }
.form-group .input-flex-group.type-num .label-txt { .form-group .input-flex-group.type-num .label-txt {
display: -webkit-inline-box;
display: -webkit-inline-flex;
display: inline-flex;
font-size: 1.8rem; font-size: 1.8rem;
line-height: 140%; line-height: 140%;
font-weight: 700; font-weight: 700;

View File

@@ -163,14 +163,13 @@ var ajaxUtil = {
kri.logger.error('statusCode: 403'); kri.logger.error('statusCode: 403');
}, },
422:function(rstData, status) { 422:function(rstData, status) {
console.log(rstData) console.log('422', rstData)
/** /**
* TODO * TODO
* 폼이 너무 여러가지 형식이 있는데 서버에러를 가지고 처리하는게 맞는지 검토 필요 * 폼이 너무 여러가지 형식이 있는데 서버에러를 가지고 처리하는게 맞는지 검토 필요
* 코드 정리는 나중에 하려고 그냥 만듬.... 정리 필요. * 코드 정리는 나중에 하려고 그냥 만듬.... 정리 필요.
*/ */
let isResetDone = false; let isResetDone = false;
$(rstData.responseJSON.fieldErrors).each((idx, oj) => { $(rstData.responseJSON.fieldErrors).each((idx, oj) => {
@@ -236,6 +235,15 @@ var ajaxUtil = {
ajaxUtil._alert(fieldErrors[0].defaultMessage, '유효성 체크'); ajaxUtil._alert(fieldErrors[0].defaultMessage, '유효성 체크');
} }
} }
// 포커스 이동
if ($('.input-invalid').length != 0) {
$('.input-invalid').eq(0).find('input,select').focus();
}
if (typeof errorCallback !== 'undefined') {
errorCallback(rstData.status, rstData);
}
}, },
500:function(rstData){ 500:function(rstData){
ajaxUtil._hideWaiting(); ajaxUtil._hideWaiting();
@@ -263,6 +271,7 @@ var ajaxUtil = {
}, },
error : function(rstData) { error : function(rstData) {
ajaxUtil._hideWaiting(); ajaxUtil._hideWaiting();
if (!(rstData.status == 500 || rstData.status == 422)) { if (!(rstData.status == 500 || rstData.status == 422)) {
if (typeof errorCallback !== 'undefined') { if (typeof errorCallback !== 'undefined') {
errorCallback(rstData.status, rstData); errorCallback(rstData.status, rstData);

View File

@@ -246,4 +246,10 @@ kri.form.error = function(errorList){
} }
} }
kri.form.maxlength = function(object){
if (object.value.length > object.maxLength) {
object.value = object.value.slice(0, object.maxLength);
}
}

View File

@@ -497,7 +497,7 @@
if (rstData.code === 'SUCCESS') { if (rstData.code === 'SUCCESS') {
ajaxUtil._alert('등록이 완료되었습니다.', null, function () { ajaxUtil._alert('등록이 완료되었습니다.', null, function () {
history.back() location.href = '/info/bank';
}); });
} else if (rstData.code === 'ERROR') { } else if (rstData.code === 'ERROR') {
ajaxUtil._alert('잠시 뒤에 다시 시도해 주세요.', null); ajaxUtil._alert('잠시 뒤에 다시 시도해 주세요.', null);

View File

@@ -120,7 +120,8 @@
</label> </label>
</div> </div>
<div class="input-field"> <div class="input-field">
<input type="number" id="count" placeholder="수량을 입력해 주세요" name="count" class="limitDecimalLength"> <input type="number" id="count" placeholder="수량을 입력해 주세요" name="count" class="limitDecimalLength"
inputmode="decimal" pattern="[0-9]*" maxlength="10" oninput="kri.form.maxlength(this)">
</div> </div>
<ul class="guide-info"> <ul class="guide-info">
<li>예 : 2, 2.5</li> <li>예 : 2, 2.5</li>
@@ -179,7 +180,9 @@
</label> </label>
</div> </div>
<div class="input-field type-price"> <div class="input-field type-price">
<input type="number" id="price" placeholder="금액을 입력해 주세요" name="price" class="limitAmountLength"> <input type="number" id="price" name="price" placeholder="금액을 입력해 주세요"
class="limitAmountLength"
maxlength="10" inputmode="numeric" pattern="[0-9]*" oninput="kri.form.maxlength(this)">
<span class="input-field-txt">원</span> <span class="input-field-txt">원</span>
</div> </div>
<ul class="input-info" style="display:none"> <ul class="input-info" style="display:none">

View File

@@ -117,8 +117,8 @@
bankList : /*[[${bankList.content}]]*/ [], bankList : /*[[${bankList.content}]]*/ [],
pastBankList : /*[[${pastBankList.content}]]*/ [], pastBankList : /*[[${pastBankList.content}]]*/ [],
id: /*[[${currentMonthlyInfo.id}]]*/'', id: /*[[${currentMonthlyInfo.id}]]*/'',
currentStatus: /*[[${currentMonthlyInfo.bankAutoTransferInputStatus}]]*/'', currentStatus: /*[[${currentMonthlyInfo.bankAutoTransferOutputStatus}]]*/'',
pastStatus: /*[[${pastMonthlyInfo?.bankAutoTransferInputStatus}]]*/'', pastStatus: /*[[${pastMonthlyInfo?.bankAutoTransferOutputStatus}]]*/'',
editable: /*[[${editable}]]*/, editable: /*[[${editable}]]*/,
}, },
elementRefs: { elementRefs: {
@@ -491,7 +491,7 @@
if (rstData.code === 'SUCCESS') { if (rstData.code === 'SUCCESS') {
ajaxUtil._alert('등록이 완료되었습니다.', null, function () { ajaxUtil._alert('등록이 완료되었습니다.', null, function () {
history.back() location.href = '/info/bank';
}); });
} else if (rstData.code === 'ERROR') { } else if (rstData.code === 'ERROR') {
ajaxUtil._alert('잠시 뒤에 다시 시도해 주세요.', null); ajaxUtil._alert('잠시 뒤에 다시 시도해 주세요.', null);

View File

@@ -83,7 +83,8 @@
</label> </label>
</div> </div>
<div class="input-field"> <div class="input-field">
<input type="number" id="count" placeholder="수량을 입력해 주세요" name="count" class="limitDecimalLength"> <input type="number" id="count" placeholder="수량을 입력해 주세요" name="count" class="limitDecimalLength"
inputmode="decimal" pattern="[0-9]*" maxlength="10" oninput="kri.form.maxlength(this)">
</div> </div>
<ul class="guide-info"> <ul class="guide-info">
<li>예 : 2, 2.5</li> <li>예 : 2, 2.5</li>
@@ -144,7 +145,9 @@
</label> </label>
</div> </div>
<div class="input-field type-price"> <div class="input-field type-price">
<input type="number" id="price" placeholder="금액을 입력해 주세요" name="price" class="limitAmountLength"> <input type="number" id="price" placeholder="금액을 입력해 주세요" name="price"
class="limitAmountLength"
maxlength="10" inputmode="numeric" pattern="[0-9]*" oninput="kri.form.maxlength(this)">
<span class="input-field-txt">원</span> <span class="input-field-txt">원</span>
</div> </div>
<ul class="input-info" style="display:none"> <ul class="input-info" style="display:none">

View File

@@ -62,7 +62,8 @@
</div> </div>
<div class="input-field"> <div class="input-field">
<input type="number" id="availableArea" placeholder="가능 면적을 입력해 주세요" <input type="number" id="availableArea" placeholder="가능 면적을 입력해 주세요"
name="availableArea" class="limitDecimalLength"> name="availableArea" class="limitDecimalLength"
inputmode="decimal" pattern="[0-9]*" maxlength="10" oninput="kri.form.maxlength(this)">
</div> </div>
</div> </div>
</section> </section>
@@ -95,7 +96,8 @@
</div> </div>
<div class="input-field"> <div class="input-field">
<input type="number" id="landArea" placeholder="작업 면적을 입력해 주세요" <input type="number" id="landArea" placeholder="작업 면적을 입력해 주세요"
name="landArea" class="limitDecimalLength"> name="landArea" class="limitDecimalLength"
inputmode="decimal" pattern="[0-9]*" maxlength="10" oninput="kri.form.maxlength(this)">
</div> </div>
<ul class="guide-info"> <ul class="guide-info">
<li>예 : 180, 6</li> <li>예 : 180, 6</li>
@@ -115,7 +117,8 @@
</div> </div>
<div class="input-field"> <div class="input-field">
<input type="number" id="mainYield" placeholder="수확량을 입력해 주세요" <input type="number" id="mainYield" placeholder="수확량을 입력해 주세요"
name="mainYield" class="limitDecimalLength"> name="mainYield" class="limitDecimalLength"
inputmode="decimal" pattern="[0-9]*" maxlength="10" oninput="kri.form.maxlength(this)">
</div> </div>
</div> </div>
@@ -173,7 +176,8 @@
</div> </div>
<div class="input-field"> <div class="input-field">
<input type="number" id="mainSaleAmount" placeholder="판매량을 입력해 주세요" <input type="number" id="mainSaleAmount" placeholder="판매량을 입력해 주세요"
name="mainSaleAmount" class="limitDecimalLength"> name="mainSaleAmount" class="limitDecimalLength"
inputmode="decimal" pattern="[0-9]*" maxlength="10" oninput="kri.form.maxlength(this)">
</div> </div>
</div> </div>
@@ -231,7 +235,8 @@
</div> </div>
<div class="input-field"> <div class="input-field">
<input type="number" id="subYield" placeholder="수확량을 입력해 주세요" <input type="number" id="subYield" placeholder="수확량을 입력해 주세요"
name="subYield" class="limitDecimalLength"> name="subYield" class="limitDecimalLength"
inputmode="decimal" pattern="[0-9]*" maxlength="10" oninput="kri.form.maxlength(this)">
</div> </div>
</div> </div>
@@ -289,7 +294,8 @@
</div> </div>
<div class="input-field"> <div class="input-field">
<input type="number" id="subSaleAmount" placeholder="판매량을 입력해 주세요" <input type="number" id="subSaleAmount" placeholder="판매량을 입력해 주세요"
name="subSaleAmount" class="limitDecimalLength"> name="subSaleAmount" class="limitDecimalLength"
inputmode="decimal" pattern="[0-9]*" maxlength="10" oninput="kri.form.maxlength(this)">
</div> </div>
</div> </div>

View File

@@ -564,7 +564,8 @@
* TODO * TODO
* 내정보에서만 들어온다는 가정하에서 back을 하게함 SB에는 내정보로 이동하게 되어 있음. * 내정보에서만 들어온다는 가정하에서 back을 하게함 SB에는 내정보로 이동하게 되어 있음.
*/ */
history.back() // history.back()
location.href = '/info/monthly';
}); });
} else if (rstData.code === 'ERROR') { } else if (rstData.code === 'ERROR') {
ajaxUtil._alert('잠시 뒤에 다시 시도해 주세요.', null); ajaxUtil._alert('잠시 뒤에 다시 시도해 주세요.', null);

View File

@@ -105,31 +105,12 @@
</label> </label>
</div> </div>
<div class="d-flex"> <div class="d-flex">
<div class="select-group"> <div class="component-input">
<div class="input-field">
<input type="number" id="phone1Id" th:value="${userInfo.phone1}" readonly>
<div id="phone1Id" class="component-select bottom-sheet"
th:data-props-default="${userInfo.phone1}" data-props-type="bottomSheet">
<input type="hidden" th:field="*{phone1}" data-type="select">
<button type="button" class="select-box">
<span class="select-txt"></span>
</button>
<div class="select-options">
<div class="select-header">
<p>휴대폰 번호</p>
<button type="button" class="select-close">
<span class="hide-txt">닫기</span>
</button>
</div>
<div class="select-scroll">
<ul class="">
<li class="option" data-value="010" th:classappend="${userInfo.phone1 == '010'?' current':'' }">010</li>
<li class="option" data-value="011" th:classappend="${userInfo.phone1 == '011'?' current':'' }">011</li>
</ul>
</div>
</div>
</div> </div>
</div> </div>
<div class="component-input"> <div class="component-input">
<div class="input-field"> <div class="input-field">
<input type="text" id="temp_input_0006" th:field="*{phone2}" <input type="text" id="temp_input_0006" th:field="*{phone2}"

View File

@@ -2,7 +2,7 @@
<div class="modal-content-inner"> <div class="modal-content-inner">
<h2 class="terms-heading-h1">개인정보처리방침</h2> <h2 class="terms-heading-h1">개인정보처리방침</h2>
<div class="terms-group"> <div class="terms-group">
<h3 class="terms-heading-h3">제1조 목적</h3> <h3 class="terms-heading-h2">제1조 목적</h3>
<ul class="terms-list bullet-type"> <ul class="terms-list bullet-type">
<li class="terms-list-item"> <li class="terms-list-item">
본 약관은 ㈜코리아리서치인터내셔널(이하 '회사')가 제공하는 임가경제조사 일계부 (이하 “서비스”)는 이용약관에 동의 후 회원가입한 이용자(이하 “회원”)의 개인정보를 중요시하며, 본 약관은 ㈜코리아리서치인터내셔널(이하 '회사')가 제공하는 임가경제조사 일계부 (이하 “서비스”)는 이용약관에 동의 후 회원가입한 이용자(이하 “회원”)의 개인정보를 중요시하며,
@@ -11,7 +11,7 @@
</ul> </ul>
</div> </div>
<div class="terms-group"> <div class="terms-group">
<h3 class="terms-heading-h3">제2조 개인정보 수집 항목</h3> <h3 class="terms-heading-h2">제2조 개인정보 수집 항목</h3>
<ul class="terms-list bullet-type"> <ul class="terms-list bullet-type">
<li class="terms-list-item"> <li class="terms-list-item">
“회사”는 회원정보변경, 1:1 문의, 일계부 응답 등을 위해 다음과 같은 개인정보를 수집하고 있습니다. “회원”은 개인정보 수집을 거부할 수 있으나, 거부 시 “서비스” 이용이 “회사”는 회원정보변경, 1:1 문의, 일계부 응답 등을 위해 다음과 같은 개인정보를 수집하고 있습니다. “회원”은 개인정보 수집을 거부할 수 있으나, 거부 시 “서비스” 이용이

View File

@@ -1,8 +1,8 @@
<!--/* 공통으로 사용하는 모달 팝업의 bind wrap 영역 */--> <!--/* 공통으로 사용하는 모달 팝업의 bind wrap 영역 */-->
<div class="modal-content-inner"> <div class="modal-content-inner">
<h2 class="terms-heading-h1">이용약관</h2> <!-- <h2 class="terms-heading-h1">이용약관</h2> -->
<div class="terms-group"> <div class="terms-group">
<h3 class="terms-heading-h3">제1조 목적</h3> <h3 class="terms-heading-h2">제1조 목적</h3>
<ul class="terms-list bullet-type"> <ul class="terms-list bullet-type">
<li class="terms-list-item"> <li class="terms-list-item">
본 약관은 ㈜코리아리서치인터내셔널(이하 "회사")이 제공하는 임가경제조사 일계부(이하 “서비스”)의 이용약관에 동의를 완료한 이용자(이하 “회원”)간의 서비스 이용 및 권리, 의무 및 책임사항 규정을 목적으로 합니다. 본 약관은 ㈜코리아리서치인터내셔널(이하 "회사")이 제공하는 임가경제조사 일계부(이하 “서비스”)의 이용약관에 동의를 완료한 이용자(이하 “회원”)간의 서비스 이용 및 권리, 의무 및 책임사항 규정을 목적으로 합니다.
@@ -10,7 +10,7 @@
</ul> </ul>
</div> </div>
<div class="terms-group"> <div class="terms-group">
<h3 class="terms-heading-h3">제2조 약관의 명시와 개정</h3> <h3 class="terms-heading-h2">제2조 약관의 명시와 개정</h3>
<ul class="terms-list bullet-type"> <ul class="terms-list bullet-type">
<li class="terms-list-item"> <li class="terms-list-item">
"회사"는 본 약관의 내용을 상시로 확인할 수 있도록 서비스 화면 하단에 게시합니다. "회사"는 본 약관의 내용을 상시로 확인할 수 있도록 서비스 화면 하단에 게시합니다.
@@ -27,7 +27,7 @@
</ul> </ul>
</div> </div>
<div class="terms-group"> <div class="terms-group">
<h3 class="terms-heading-h3">제3조 회원정보의 변경</h3> <h3 class="terms-heading-h2">제3조 회원정보의 변경</h3>
<ul class="terms-list bullet-type"> <ul class="terms-list bullet-type">
<li class="terms-list-item"> <li class="terms-list-item">
"회원"은 회원정보 수정 화면을 통해 수시로 본인의 개인정보를 열람하고 변경할 수 있습니다. "서비스" 운영 및 관리를 위해 필요한 이름, 나이, 휴대폰 번호는 추가 약관동의를 통해 최신의 정보로 갱신이 가능합니다. "회원"은 회원정보 수정 화면을 통해 수시로 본인의 개인정보를 열람하고 변경할 수 있습니다. "서비스" 운영 및 관리를 위해 필요한 이름, 나이, 휴대폰 번호는 추가 약관동의를 통해 최신의 정보로 갱신이 가능합니다.
@@ -38,7 +38,7 @@
</ul> </ul>
</div> </div>
<div class="terms-group"> <div class="terms-group">
<h3 class="terms-heading-h3">제4조 “회사”의 개인정보보호 의무</h3> <h3 class="terms-heading-h2">제4조 “회사”의 개인정보보호 의무</h3>
<ul class="terms-list bullet-type"> <ul class="terms-list bullet-type">
<li class="terms-list-item"> <li class="terms-list-item">
"회사"는 "정보통신망법" 등 관계법령이 정하는 바에 따라 "회원"의 개인정보를 보호하기 위해 노력합니다. 개인정보의 보호 및 사용에 대해서는 관련법 및 "회사"의 개인정보처리방침이 적용됩니다. 다만, "회사"의 “서비스”에 링크된 공식 사이트와 “서비스 소개 사이트” 이외의 사이트에서는 "회사"의 개인정보처리방침이 적용되지 않습니다. "회사"는 "정보통신망법" 등 관계법령이 정하는 바에 따라 "회원"의 개인정보를 보호하기 위해 노력합니다. 개인정보의 보호 및 사용에 대해서는 관련법 및 "회사"의 개인정보처리방침이 적용됩니다. 다만, "회사"의 “서비스”에 링크된 공식 사이트와 “서비스 소개 사이트” 이외의 사이트에서는 "회사"의 개인정보처리방침이 적용되지 않습니다.
@@ -52,7 +52,7 @@
</ul> </ul>
</div> </div>
<div class="terms-group"> <div class="terms-group">
<h3 class="terms-heading-h3">제5조 "회원"의 "계정" 관리에 대한 의무</h3> <h3 class="terms-heading-h2">제5조 "회원"의 "계정" 관리에 대한 의무</h3>
<ul class="terms-list bullet-type"> <ul class="terms-list bullet-type">
<li class="terms-list-item"> <li class="terms-list-item">
"회원"은 “계정”에 관한 관리책임은 “회원” 본인에게 있으며, 이를 제3자가 이용하도록 하여서는 안 됩니다. "회원"은 “계정”에 관한 관리책임은 “회원” 본인에게 있으며, 이를 제3자가 이용하도록 하여서는 안 됩니다.
@@ -60,7 +60,7 @@
</ul> </ul>
</div> </div>
<div class="terms-group"> <div class="terms-group">
<h3 class="terms-heading-h3">제6조 "회원"의 의무</h3> <h3 class="terms-heading-h2">제6조 "회원"의 의무</h3>
<ul class="terms-list bullet-type"> <ul class="terms-list bullet-type">
<li class="terms-list-item"> <li class="terms-list-item">
"회원"은 다음 행위를 하여서는 안 됩니다. "회원"은 다음 행위를 하여서는 안 됩니다.
@@ -85,11 +85,10 @@
<li class="terms-list-item"> <li class="terms-list-item">
"회원"은 관계법령, 이 약관의 규정, 이용안내 및 "서비스"와 관련하여 고지한 주의사항, "회사"가 통지하는 사항 등을 준수하여야 하며, 기타 "회사"의 업무에 방해되는 행위를 하여서는 안 됩니다. 만약 이를 위반할 경우 “회사”가 “회원”자격을 박탈할 수 있습니다 "회원"은 관계법령, 이 약관의 규정, 이용안내 및 "서비스"와 관련하여 고지한 주의사항, "회사"가 통지하는 사항 등을 준수하여야 하며, 기타 "회사"의 업무에 방해되는 행위를 하여서는 안 됩니다. 만약 이를 위반할 경우 “회사”가 “회원”자격을 박탈할 수 있습니다
</li> </li>
<li class="terms-list-item"></li>
</ul> </ul>
</div> </div>
<div class="terms-group"> <div class="terms-group">
<h3 class="terms-heading-h3">제7조 "서비스"의 이용 및 변경</h3> <h3 class="terms-heading-h2">제7조 "서비스"의 이용 및 변경</h3>
<ul class="terms-list bullet-type"> <ul class="terms-list bullet-type">
<li class="terms-list-item"> <li class="terms-list-item">
"회사"는 컴퓨터 등 정보통신설비의 보수점검, 교체 및 고장, 통신두절 또는 운영상 상당한 이유가 있는 경우 "서비스"의 제공을 일시적으로 중단할 수 있습니다. 다만, "회사"가 사전에 통지할 수 없는 부득이한 사유가 있는 경우 사후에 통지할 수 있습니다. "회사"는 컴퓨터 등 정보통신설비의 보수점검, 교체 및 고장, 통신두절 또는 운영상 상당한 이유가 있는 경우 "서비스"의 제공을 일시적으로 중단할 수 있습니다. 다만, "회사"가 사전에 통지할 수 없는 부득이한 사유가 있는 경우 사후에 통지할 수 있습니다.
@@ -106,7 +105,7 @@
</ul> </ul>
</div> </div>
<div class="terms-group"> <div class="terms-group">
<h3 class="terms-heading-h3">제8조 정보의 제공 및 광고의 게재</h3> <h3 class="terms-heading-h2">제8조 정보의 제공 및 광고의 게재</h3>
<ul class="terms-list bullet-type"> <ul class="terms-list bullet-type">
<li class="terms-list-item"> <li class="terms-list-item">
"회사"는 "회원"이 "서비스" 이용 중 필요하다고 인정되는 다양한 정보를 공지사항, 이메일, 문자메시지, 카카오톡 채널 메시지 등의 방법으로 "회원"에게 제공할 수 있습니다. "회사"는 "회원"이 "서비스" 이용 중 필요하다고 인정되는 다양한 정보를 공지사항, 이메일, 문자메시지, 카카오톡 채널 메시지 등의 방법으로 "회원"에게 제공할 수 있습니다.
@@ -125,7 +124,7 @@
</ul> </ul>
</div> </div>
<div class="terms-group"> <div class="terms-group">
<h3 class="terms-heading-h3">제9조 책임제한</h3> <h3 class="terms-heading-h2">제9조 책임제한</h3>
<ul class="terms-list bullet-type"> <ul class="terms-list bullet-type">
<li class="terms-list-item"> <li class="terms-list-item">
"회사"는 무료로 제공되는 “서비스” 이용과 관련하여 관련법 규정이 없는 한 책임 지지 않습니다. 또한 천재지변 또는 이에 준하는 불가항력으로 인하여 "서비스"를 제공할 수 없는 경우에는 "서비스" 제공에 관한 책임이 면책됩니다. "회사"는 무료로 제공되는 “서비스” 이용과 관련하여 관련법 규정이 없는 한 책임 지지 않습니다. 또한 천재지변 또는 이에 준하는 불가항력으로 인하여 "서비스"를 제공할 수 없는 경우에는 "서비스" 제공에 관한 책임이 면책됩니다.
@@ -136,7 +135,7 @@
</ul> </ul>
</div> </div>
<div class="terms-group"> <div class="terms-group">
<h3 class="terms-heading-h3">제10조 준거법 및 재판관할</h3> <h3 class="terms-heading-h2">제10조 준거법 및 재판관할</h3>
<ul class="terms-list bullet-type"> <ul class="terms-list bullet-type">
<li class="terms-list-item"> <li class="terms-list-item">
"회사"와 "회원" 간 제기된 소송은 대한민국법을 준거법으로 합니다. "회사"와 "회원" 간 제기된 소송은 대한민국법을 준거법으로 합니다.
@@ -147,7 +146,7 @@
</ul> </ul>
</div> </div>
<div class="terms-group"> <div class="terms-group">
<h3 class="terms-heading-h3">제11조 사업자 정보</h3> <h3 class="terms-heading-h2">제11조 사업자 정보</h3>
<ul class="terms-list bullet-type"> <ul class="terms-list bullet-type">
<li class="terms-list-item"> <li class="terms-list-item">
회사명 : ㈜코리아리서치인터내셔널 회사명 : ㈜코리아리서치인터내셔널

View File

@@ -42,7 +42,7 @@
</div> </div>
<div class="component-input"> <div class="component-input">
<label class="switch-inner type-txt"> <label class="switch-inner type-txt">
<span class="switch-label">임업노동 투입 내역</span> <span class="switch-label">임업노동 투입</span>
<input type="checkbox" name="workStatus" value="TARGET" data-target="work" <input type="checkbox" name="workStatus" value="TARGET" data-target="work"
th:checked="${#strings.equals(dailyRecord.workStatus, 'TARGET') or #strings.equals(dailyRecord.workStatus, 'DONE')}"> th:checked="${#strings.equals(dailyRecord.workStatus, 'TARGET') or #strings.equals(dailyRecord.workStatus, 'DONE')}">
<span class="switch-item"> <span class="switch-item">
@@ -72,7 +72,7 @@
</div> </div>
<div class="component-input"> <div class="component-input">
<label class="switch-inner type-txt"> <label class="switch-inner type-txt">
<span class="switch-label">자가임업 생산물 중 자가소비량</span> <span class="switch-label">임업생산물 중 자가소비량</span>
<input type="checkbox" name="forestryStatus" value="TARGET" data-target="forestry" <input type="checkbox" name="forestryStatus" value="TARGET" data-target="forestry"
th:checked="${#strings.equals(dailyRecord.forestryStatus, 'TARGET') or #strings.equals(dailyRecord.forestryStatus, 'DONE')}"> th:checked="${#strings.equals(dailyRecord.forestryStatus, 'TARGET') or #strings.equals(dailyRecord.forestryStatus, 'DONE')}">
<span class="switch-item"> <span class="switch-item">
@@ -82,10 +82,9 @@
</div> </div>
<!--/* [정책] 자가농업 생산물 중 자가소비량은 7일차 등록일에만 노출 및 선택, 21일 이후는 마지막 날 */--> <!--/* [정책] 자가농업 생산물 중 자가소비량은 7일차 등록일에만 노출 및 선택, 21일 이후는 마지막 날 */-->
<div class="component-input" <div class="component-input"
th:if="${reqVO.groupNo eq 4 or reqVO.groupNo eq 8 or reqVO.groupNo eq 12 th:if="${dailyRecord.farmingOpen}">
or reqVO.groupNo eq 16 or reqVO.groupNo eq 17}">
<label class="switch-inner type-txt"> <label class="switch-inner type-txt">
<span class="switch-label">자가농업 생산물 중 자가소비량</span> <span class="switch-label">농업생산물 중 자가소비량</span>
<input type="checkbox" name="farmingStatus" value="TARGET" data-target="farming" <input type="checkbox" name="farmingStatus" value="TARGET" data-target="farming"
th:checked="${#strings.equals(dailyRecord.farmingStatus, 'TARGET') or #strings.equals(dailyRecord.farmingStatus, 'DONE')}"> th:checked="${#strings.equals(dailyRecord.farmingStatus, 'TARGET') or #strings.equals(dailyRecord.farmingStatus, 'DONE')}">
<span class="switch-item"> <span class="switch-item">

View File

@@ -79,7 +79,8 @@
</label> </label>
</div> </div>
<div class="input-field"> <div class="input-field">
<input type="number" inputmode="decimal" pattern="[0-9]*" id="quantity" name="quantity" th:value="${detail.quantity}" maxlength="10" placeholder="수량을 입력해 주세요"> <input type="number" inputmode="decimal" pattern="[0-9]*" id="quantity" name="quantity"
th:value="${detail.quantity}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="수량을 입력해 주세요">
</div> </div>
<ul class="guide-info"> <ul class="guide-info">
<li>예 : 2, 2.5</li> <li>예 : 2, 2.5</li>
@@ -133,7 +134,8 @@
</label> </label>
</div> </div>
<div class="input-field type-price"> <div class="input-field type-price">
<input type="number" inputmode="numeric" pattern="[0-9]*" id="price" name="price" th:value="${detail.price}" maxlength="10" placeholder="금액을 입력해 주세요"> <input type="number" inputmode="numeric" pattern="[0-9]*" id="price" name="price"
th:value="${detail.price}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="금액을 입력해 주세요">
<span class="input-field-txt">원</span> <span class="input-field-txt">원</span>
</div> </div>
<ul class="guide-info"> <ul class="guide-info">
@@ -149,7 +151,8 @@
</label> </label>
</div> </div>
<div class="input-field type-price"> <div class="input-field type-price">
<input type="number" inputmode="numeric" pattern="[0-9]*" id="estimatedValue" name="estimatedValue" th:value="${detail.estimatedValue}" maxlength="10" placeholder="금액을 입력해 주세요"> <input type="number" inputmode="numeric" pattern="[0-9]*" id="estimatedValue" name="estimatedValue"
th:value="${detail.estimatedValue}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="금액을 입력해 주세요">
<span class="input-field-txt">원</span> <span class="input-field-txt">원</span>
</div> </div>
<ul class="guide-info"> <ul class="guide-info">

View File

@@ -67,7 +67,7 @@
</div> </div>
<div class="input-field"> <div class="input-field">
<input type="number" inputmode="decimal" pattern="[0-9]*" id="quantity" name="quantity" <input type="number" inputmode="decimal" pattern="[0-9]*" id="quantity" name="quantity"
th:value="${detail.quantity}" maxlength="10" placeholder="수량을 입력해 주세요"> th:value="${detail.quantity}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="수량을 입력해 주세요">
</div> </div>
<ul class="guide-info"> <ul class="guide-info">
<li>예 : 2, 2.5</li> <li>예 : 2, 2.5</li>
@@ -122,7 +122,7 @@
</div> </div>
<div class="input-field type-price"> <div class="input-field type-price">
<input type="number" inputmode="numeric" pattern="[0-9]*" id="estimatedValue" name="estimatedValue" <input type="number" inputmode="numeric" pattern="[0-9]*" id="estimatedValue" name="estimatedValue"
th:value="${detail.estimatedValue}" maxlength="10" placeholder="금액을 입력해 주세요"> th:value="${detail.estimatedValue}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="금액을 입력해 주세요">
<span class="input-field-txt">원</span> <span class="input-field-txt">원</span>
</div> </div>
<ul class="guide-info"> <ul class="guide-info">

View File

@@ -42,7 +42,7 @@
</div> </div>
<div class="input-field"> <div class="input-field">
<input type="number" inputmode="decimal" pattern="[0-9]*" id="quantity" name="quantity" <input type="number" inputmode="decimal" pattern="[0-9]*" id="quantity" name="quantity"
th:value="${detail.quantity}" maxlength="10" placeholder="수량을 입력해 주세요"> th:value="${detail.quantity}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="수량을 입력해 주세요">
</div> </div>
<ul class="guide-info"> <ul class="guide-info">
<li>예 : 2, 2.5</li> <li>예 : 2, 2.5</li>
@@ -97,7 +97,7 @@
</div> </div>
<div class="input-field type-price"> <div class="input-field type-price">
<input type="number" inputmode="numeric" pattern="[0-9]*" id="estimatedValue" name="estimatedValue" <input type="number" inputmode="numeric" pattern="[0-9]*" id="estimatedValue" name="estimatedValue"
th:value="${detail.estimatedValue}" maxlength="10" placeholder="금액을 입력해 주세요"> th:value="${detail.estimatedValue}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="금액을 입력해 주세요">
<span class="input-field-txt">원</span> <span class="input-field-txt">원</span>
</div> </div>
<ul class="guide-info"> <ul class="guide-info">

View File

@@ -15,7 +15,7 @@
<th:block th:if="not ${dailyRecord.startDay eq dailyRecord.endDay}"> <th:block th:if="not ${dailyRecord.startDay eq dailyRecord.endDay}">
[[${#temporals.format(dailyRecord.startDate, 'M월 d일')}]]~[[${#temporals.format(dailyRecord.endDate, 'd일')}]], <br> [[${#temporals.format(dailyRecord.startDate, 'M월 d일')}]]~[[${#temporals.format(dailyRecord.endDate, 'd일')}]], <br>
</th:block> </th:block>
<strong>임업생산물 중 자가소비량 [[${#lists.isEmpty(forestryList) ? 0 : #lists.size(forestryList)}]]건 등록</strong> <strong>임업생산물 중 자가소비량 내역 [[${#lists.isEmpty(forestryList) ? 0 : #lists.size(forestryList)}]]건 등록</strong>
되었습니다. 되었습니다.
</h3> </h3>
<p th:if="${#lists.isEmpty(forestryList)}">자가임업생산물 중 자가소비량 내역을 등록해 주세요.</p> <p th:if="${#lists.isEmpty(forestryList)}">자가임업생산물 중 자가소비량 내역을 등록해 주세요.</p>

View File

@@ -110,7 +110,7 @@
</div> </div>
<div class="input-field"> <div class="input-field">
<input type="number" inputmode="decimal" pattern="[0-9]*" id="quantity" name="quantity" <input type="number" inputmode="decimal" pattern="[0-9]*" id="quantity" name="quantity"
th:value="${detail.quantity}" maxlength="10" placeholder="수량을 입력해 주세요"> th:value="${detail.quantity}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="수량을 입력해 주세요">
</div> </div>
<ul class="guide-info"> <ul class="guide-info">
<li>예 : 2, 2.5</li> <li>예 : 2, 2.5</li>
@@ -165,7 +165,7 @@
</div> </div>
<div class="input-field type-price"> <div class="input-field type-price">
<input type="number" inputmode="numeric" pattern="[0-9]*" id="price" name="price" <input type="number" inputmode="numeric" pattern="[0-9]*" id="price" name="price"
th:value="${detail.price}" maxlength="10" placeholder="금액을 입력해 주세요"> th:value="${detail.price}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="금액을 입력해 주세요">
<span class="input-field-txt">원</span> <span class="input-field-txt">원</span>
</div> </div>
<ul class="guide-info"> <ul class="guide-info">
@@ -182,7 +182,7 @@
</div> </div>
<div class="input-field type-price"> <div class="input-field type-price">
<input type="number" inputmode="numeric" pattern="[0-9]*" id="estimatedValue" name="estimatedValue" <input type="number" inputmode="numeric" pattern="[0-9]*" id="estimatedValue" name="estimatedValue"
th:value="${detail.estimatedValue}" maxlength="10" placeholder="금액을 입력해 주세요"> th:value="${detail.estimatedValue}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="금액을 입력해 주세요">
<span class="input-field-txt">원</span> <span class="input-field-txt">원</span>
</div> </div>
<ul class="guide-info"> <ul class="guide-info">

View File

@@ -45,7 +45,8 @@
</label> </label>
</div> </div>
<div class="input-field type-hour"> <div class="input-field type-hour">
<input type="number" inputmode="decimal" pattern="[0-9]*" id="ownedHours" name="ownedHours" th:value="${detail.ownedHours}" maxlength="10" placeholder="00"> <input type="number" inputmode="decimal" pattern="[0-9]*" id="ownedHours" name="ownedHours"
th:value="${detail.ownedHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
<span class="input-field-txt">시간</span> <span class="input-field-txt">시간</span>
</div> </div>
</div> </div>
@@ -57,7 +58,8 @@
</label> </label>
</div> </div>
<div class="input-field type-hour"> <div class="input-field type-hour">
<input type="number" inputmode="decimal" pattern="[0-9]*" id="leasedHours" name="leasedHours" th:value="${detail.leasedHours}" maxlength="10" placeholder="00"> <input type="number" inputmode="decimal" pattern="[0-9]*" id="leasedHours" name="leasedHours"
th:value="${detail.leasedHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
<span class="input-field-txt">시간</span> <span class="input-field-txt">시간</span>
</div> </div>
</div> </div>

View File

@@ -52,7 +52,7 @@
</div> </div>
<div class="input-field"> <div class="input-field">
<input type="number" inputmode="decimal" pattern="[0-9]*" id="workLandArea" name="workLandArea" <input type="number" inputmode="decimal" pattern="[0-9]*" id="workLandArea" name="workLandArea"
th:value="${detail.workLandArea}" maxlength="10" placeholder="작업 면적을 입력해 주세요"> th:value="${detail.workLandArea}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="작업 면적을 입력해 주세요">
</div> </div>
<ul class="guide-info"> <ul class="guide-info">
<li>예 : 180, 6</li> <li>예 : 180, 6</li>
@@ -79,7 +79,7 @@
</div> </div>
<div class="select-scroll"> <div class="select-scroll">
<ul class=""> <ul class="">
<li class="option" th:each="uiCode : ${recordUnit}" <li class="option" th:each="uiCode : ${recordArea}"
th:data-value="${uiCode.id}" th:data-value="${uiCode.id}"
th:text="${uiCode.codeText}" th:text="${uiCode.codeText}"
th:selected="${uiCode.id eq detail.areaUnitCode ? 'current' : ''}" th:selected="${uiCode.id eq detail.areaUnitCode ? 'current' : ''}"
@@ -109,7 +109,7 @@
</div> </div>
<div class="input-field"> <div class="input-field">
<input type="number" inputmode="decimal" pattern="[0-9]*" id="harvestQuantity" name="harvestQuantity" <input type="number" inputmode="decimal" pattern="[0-9]*" id="harvestQuantity" name="harvestQuantity"
th:value="${detail.harvestQuantity}" maxlength="10" placeholder="수확량을 입력해 주세요"> th:value="${detail.harvestQuantity}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="수확량을 입력해 주세요">
</div> </div>
</div> </div>
<div class="select-group"> <div class="select-group">
@@ -174,7 +174,7 @@
</div> </div>
<div class="input-field type-hour"> <div class="input-field type-hour">
<input type="number" inputmode="decimal" pattern="[0-9]*" id="ownerTime" name="ownerTime" <input type="number" inputmode="decimal" pattern="[0-9]*" id="ownerTime" name="ownerTime"
th:value="${detail.ownerTime}" maxlength="10" placeholder="00"> th:value="${detail.ownerTime}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
<span class="input-field-txt">시간</span> <span class="input-field-txt">시간</span>
</div> </div>
</div> </div>
@@ -187,7 +187,7 @@
</div> </div>
<div class="input-field type-hour"> <div class="input-field type-hour">
<input type="number" inputmode="decimal" pattern="[0-9]*" id="spouseTime" name="spouseTime" <input type="number" inputmode="decimal" pattern="[0-9]*" id="spouseTime" name="spouseTime"
th:value="${detail.spouseTime}" maxlength="10" placeholder="00"> th:value="${detail.spouseTime}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
<span class="input-field-txt">시간</span> <span class="input-field-txt">시간</span>
</div> </div>
</div> </div>
@@ -202,7 +202,7 @@
<div class="input-field type-hour"> <div class="input-field type-hour">
<span class="input-front-txt">남</span> <span class="input-front-txt">남</span>
<input type="number" inputmode="decimal" pattern="[0-9]*" id="familyMHours" name="familyMHours" <input type="number" inputmode="decimal" pattern="[0-9]*" id="familyMHours" name="familyMHours"
th:value="${detail.familyMHours}" maxlength="10" placeholder="00"> th:value="${detail.familyMHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
<span class="input-field-txt">시간</span> <span class="input-field-txt">시간</span>
</div> </div>
</div> </div>
@@ -210,7 +210,7 @@
<div class="input-field type-hour"> <div class="input-field type-hour">
<span class="input-front-txt">여</span> <span class="input-front-txt">여</span>
<input type="number" inputmode="decimal" pattern="[0-9]*" id="familyFHours" name="familyFHours" <input type="number" inputmode="decimal" pattern="[0-9]*" id="familyFHours" name="familyFHours"
th:value="${detail.familyFHours}" maxlength="10" placeholder="00"> th:value="${detail.familyFHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
<span class="input-field-txt">시간</span> <span class="input-field-txt">시간</span>
</div> </div>
</div> </div>
@@ -227,7 +227,7 @@
<div class="input-field type-hour"> <div class="input-field type-hour">
<span class="input-front-txt">남</span> <span class="input-front-txt">남</span>
<input type="number" inputmode="decimal" pattern="[0-9]*" id="hiredMHours" name="hiredMHours" <input type="number" inputmode="decimal" pattern="[0-9]*" id="hiredMHours" name="hiredMHours"
th:value="${detail.hiredMHours}" maxlength="10" placeholder="00"> th:value="${detail.hiredMHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
<span class="input-field-txt">시간</span> <span class="input-field-txt">시간</span>
</div> </div>
</div> </div>
@@ -235,7 +235,7 @@
<div class="input-field type-hour"> <div class="input-field type-hour">
<span class="input-front-txt">여</span> <span class="input-front-txt">여</span>
<input type="number" inputmode="decimal" pattern="[0-9]*" id="hiredFHours" name="hiredFHours" <input type="number" inputmode="decimal" pattern="[0-9]*" id="hiredFHours" name="hiredFHours"
th:value="${detail.hiredFHours}" maxlength="10" placeholder="00"> th:value="${detail.hiredFHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
<span class="input-field-txt">시간</span> <span class="input-field-txt">시간</span>
</div> </div>
</div> </div>
@@ -252,7 +252,7 @@
<div class="input-field type-hour"> <div class="input-field type-hour">
<span class="input-front-txt">남</span> <span class="input-front-txt">남</span>
<input type="number" inputmode="decimal" pattern="[0-9]*" id="sharedMHours" name="sharedMHours" <input type="number" inputmode="decimal" pattern="[0-9]*" id="sharedMHours" name="sharedMHours"
th:value="${detail.sharedMHours}" maxlength="10" placeholder="00"> th:value="${detail.sharedMHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
<span class="input-field-txt">시간</span> <span class="input-field-txt">시간</span>
</div> </div>
</div> </div>
@@ -260,7 +260,7 @@
<div class="input-field type-hour"> <div class="input-field type-hour">
<span class="input-front-txt">여</span> <span class="input-front-txt">여</span>
<input type="number" inputmode="decimal" pattern="[0-9]*" id="sharedFHours" name="sharedFHours" <input type="number" inputmode="decimal" pattern="[0-9]*" id="sharedFHours" name="sharedFHours"
th:value="${detail.sharedFHours}" maxlength="10" placeholder="00"> th:value="${detail.sharedFHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
<span class="input-field-txt">시간</span> <span class="input-field-txt">시간</span>
</div> </div>
</div> </div>
@@ -277,7 +277,7 @@
<div class="input-field type-hour"> <div class="input-field type-hour">
<span class="input-front-txt">남</span> <span class="input-front-txt">남</span>
<input type="number" inputmode="decimal" pattern="[0-9]*" id="volunteerMHours" name="volunteerMHours" <input type="number" inputmode="decimal" pattern="[0-9]*" id="volunteerMHours" name="volunteerMHours"
th:value="${detail.volunteerMHours}" maxlength="10" placeholder="00"> th:value="${detail.volunteerMHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
<span class="input-field-txt">시간</span> <span class="input-field-txt">시간</span>
</div> </div>
</div> </div>
@@ -285,7 +285,7 @@
<div class="input-field type-hour"> <div class="input-field type-hour">
<span class="input-front-txt">여</span> <span class="input-front-txt">여</span>
<input type="number" inputmode="decimal" pattern="[0-9]*" id="volunteerFHours" name="volunteerFHours" <input type="number" inputmode="decimal" pattern="[0-9]*" id="volunteerFHours" name="volunteerFHours"
th:value="${detail.volunteerFHours}" maxlength="10" placeholder="00"> th:value="${detail.volunteerFHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
<span class="input-field-txt">시간</span> <span class="input-field-txt">시간</span>
</div> </div>
</div> </div>

View File

@@ -258,6 +258,12 @@
function (rstData, status) { function (rstData, status) {
location.reload(); location.reload();
}, },
function () {
// 노동투입시간 invalid reset
$('.segment-label .guide-info li').eq(2).addClass('invalid');
$('.type-sub').find('.input-info').remove();
$('.input-flex-group').find('.input-info').remove();
}
); );
}, },
}; };

View File

@@ -21,8 +21,8 @@
</label> </label>
</div> </div>
<div class="input-field"> <div class="input-field">
<input autofocus class="" id="floatingInput" name="username" placeholder="임가번호를 입력해 주세요" value="11111" <input autofocus maxlength="5" id="floatingInput" pattern="[0-9]*" name="username" placeholder="임가번호를 입력해 주세요"
type="number" maxlength="5"> type="text" inputmode="numeric">
</div> </div>
<ul class="input-info" id="username-error" style="display: none;"> <ul class="input-info" id="username-error" style="display: none;">
<li>임가번호를 입력해주세요</li> <li>임가번호를 입력해주세요</li>
@@ -35,7 +35,7 @@
</label> </label>
</div> </div>
<div class="input-field"> <div class="input-field">
<input type="password" name="password" id="floatingPassword" placeholder="비밀번호 4자리를 입력해 주세요" value="1111" maxlength="4"> <input type="password" name="password" id="floatingPassword" placeholder="비밀번호 4자리를 입력해 주세요" maxlength="4">
</div> </div>
<ul class="input-info" id="password-error" style="display: none;"> <ul class="input-info" id="password-error" style="display: none;">
<li>비밀번호를 입력해주세요</li> <li>비밀번호를 입력해주세요</li>
@@ -43,7 +43,7 @@
</div> </div>
<div class="component-input" roleDto="group" aria-label="Basic checkbox toggle button group"> <div class="component-input" roleDto="group" aria-label="Basic checkbox toggle button group">
<label for="btn_ck1" class="checkbox-inner"> <label for="btn_ck1" class="checkbox-inner">
<input autocomplete="off" type="checkbox" id="btn_ck1" name="remember-me"> <input autocomplete="off" type="checkbox" id="btn_ck1" name="remember-me" checked>
<span class="checkbox-item"> <span class="checkbox-item">
<span class="checkbox-txt">로그인 상태 유지</span> <span class="checkbox-txt">로그인 상태 유지</span>
</span> </span>
@@ -95,7 +95,8 @@
const userNameValue = floatingInput.value; const userNameValue = floatingInput.value;
const errorContainer = document.getElementById('username-error'); const errorContainer = document.getElementById('username-error');
const parentComponent = floatingInput.closest('.component-input'); const parentComponent = floatingInput.closest('.component-input');
if (userNameValue.length < 5) { const isNumeric = /^[0-9]+$/.test(userNameValue);
if (userNameValue.length < 5 || !isNumeric) {
parentComponent.classList.add('input-invalid'); parentComponent.classList.add('input-invalid');
errorContainer.style.display = 'block'; errorContainer.style.display = 'block';
} else { } else {