[2차][FO] 입력현황
This commit is contained in:
@@ -17,6 +17,19 @@
|
||||
ds.id desc
|
||||
</select>
|
||||
|
||||
<select id="getDailyExpenseMonthList"
|
||||
resultType="app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseDto">
|
||||
select ds.id, ds.daily_record_seq, ds.input_type, ds.is_credit as credit
|
||||
, ds.expense_kind, ds.source_purpose
|
||||
, ds.quantity, ds.unit_code, ds.unit_self, ds.price, ds.estimated_value
|
||||
, dr.start_date, dr.end_date, ddg.group_no
|
||||
from daily_expense ds
|
||||
<include refid="app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecordMonth"/>
|
||||
where ds.is_deleted = false
|
||||
order by
|
||||
ddg.group_no, ds.id
|
||||
</select>
|
||||
|
||||
<select id="getRecordExistCount" resultType="int">
|
||||
select count(1)
|
||||
from daily_expense ds
|
||||
|
||||
@@ -14,7 +14,20 @@
|
||||
and ds.id = #{id}
|
||||
</if>
|
||||
order by
|
||||
ds.id desc
|
||||
ds.id desc
|
||||
</select>
|
||||
|
||||
<select id="getDailyFarmingMonthList"
|
||||
resultType="app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFarmingDto">
|
||||
select ds.id, ds.daily_record_seq
|
||||
, ds.product_code, ds.product_self, ds.usage
|
||||
, ds.quantity, ds.unit_code, ds.unit_self, ds.estimated_value
|
||||
, dr.start_date, dr.end_date, ddg.group_no
|
||||
from daily_farming ds
|
||||
<include refid="app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecordMonth"/>
|
||||
where ds.is_deleted = false
|
||||
order by
|
||||
ddg.group_no, ds.id
|
||||
</select>
|
||||
|
||||
<select id="getRecordExistCount" resultType="int">
|
||||
|
||||
@@ -14,7 +14,20 @@
|
||||
and ds.id = #{id}
|
||||
</if>
|
||||
order by
|
||||
ds.id desc
|
||||
ds.id desc
|
||||
</select>
|
||||
|
||||
<select id="getDailyForestryMonthList"
|
||||
resultType="app.module.front.usecase.daily.forestry.adapters.persistence.model.DailyForestryDto">
|
||||
select ds.id, ds.daily_record_seq
|
||||
, ds.product_name, ds.usage
|
||||
, ds.quantity, ds.unit_code, ds.unit_self, ds.estimated_value
|
||||
, dr.start_date, dr.end_date, ddg.group_no
|
||||
from daily_forestry ds
|
||||
<include refid="app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecordMonth"/>
|
||||
where ds.is_deleted = false
|
||||
order by
|
||||
ddg.group_no, ds.id
|
||||
</select>
|
||||
|
||||
<select id="getRecordExistCount" resultType="int">
|
||||
|
||||
@@ -16,6 +16,18 @@
|
||||
ds.id desc
|
||||
</select>
|
||||
|
||||
<select id="getDailyPowerMonthList"
|
||||
resultType="app.module.front.usecase.daily.power.adapters.persistence.model.DailyPowerDto">
|
||||
select ds.id, ds.daily_record_seq
|
||||
, ds.equipment_name, ds.owned_hours, ds.leased_hours
|
||||
, dr.start_date, dr.end_date, ddg.group_no
|
||||
from daily_power ds
|
||||
<include refid="app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecordMonth"/>
|
||||
where ds.is_deleted = false
|
||||
order by
|
||||
ddg.group_no, ds.id
|
||||
</select>
|
||||
|
||||
<select id="getRecordExistCount" resultType="int">
|
||||
select count(1)
|
||||
from daily_power ds
|
||||
|
||||
@@ -19,6 +19,21 @@
|
||||
ds.id desc
|
||||
</select>
|
||||
|
||||
<select id="getDailyWorkMonthList"
|
||||
resultType="app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto">
|
||||
select ds.id, ds.daily_record_seq
|
||||
, ds.item_name, ds.work_name
|
||||
, ds.work_land_area, ds.area_unit_code, ds.area_unit_self, ds.harvest_quantity, ds.harvest_unit_code, ds.harvest_unit_self
|
||||
, ds.owner_time, ds.spouse_time, ds.family_m_hours, ds.family_f_hours, ds.hired_m_hours
|
||||
, ds.hired_f_hours, ds.shared_m_hours, ds.shared_f_hours, ds.volunteer_m_hours, ds.volunteer_f_hours
|
||||
, dr.start_date, dr.end_date, ddg.group_no
|
||||
from daily_work ds
|
||||
<include refid="app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecordMonth"/>
|
||||
where ds.is_deleted = false
|
||||
order by
|
||||
ddg.group_no, ds.id
|
||||
</select>
|
||||
|
||||
<select id="getRecordExistCount" resultType="int">
|
||||
select count(1)
|
||||
from daily_work ds
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
|
||||
xmlns:th="http://www.thymeleaf.org" lang="ko">
|
||||
|
||||
<div layout:fragment="content" th:classappend="regi-wrap">
|
||||
<div class="modal-content-inner">
|
||||
<hgroup class="tit-group">
|
||||
<h3>
|
||||
[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이 <br>
|
||||
<strong>[[${#lists.size(list)}]]건 등록</strong> 되었습니다.
|
||||
</h3>
|
||||
</hgroup>
|
||||
|
||||
<section class="regist-item-area"
|
||||
th:unless="${#lists.isEmpty(list)}">
|
||||
<th:block th:each="recordItem, recordItemStatus : ${list}">
|
||||
<p class="month-tit">
|
||||
<th:block th:if="${recordItem.startDate eq recordItem.endDate}">
|
||||
[[${#temporals.format(recordItem.startDate, 'M월 d일')}]]
|
||||
</th:block>
|
||||
<th:block th:if="not ${recordItem.startDate eq recordItem.endDate}">
|
||||
[[${#temporals.format(recordItem.startDate, 'M월 d일')}]]~[[${#temporals.format(recordItem.endDate, 'd일')}]]
|
||||
</th:block>
|
||||
</p>
|
||||
|
||||
<!--/* [INFO] templates/record/xxxx/index.html 의 item-list 와 동일한 HTML */-->
|
||||
<div class="item-list">
|
||||
<div class="list-item"
|
||||
th:each="item, itemStatus : ${recordItem.children}">
|
||||
<div class="item-tit-group">
|
||||
<p class="item-name">[[${item.expenseKind}]]</p>
|
||||
</div>
|
||||
<ul class="detail-list">
|
||||
<li th:if="${item.credit != null}">
|
||||
<p>외상 또는 카드 구입 여부</p>
|
||||
<span th:text="${item.credit ? '예' : '아니오'}">아니오</span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.sourcePurpose)}">
|
||||
<p>용도</p>
|
||||
<span th:text="${item.sourcePurpose}">소비자</span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.quantity)}">
|
||||
<p>수량</p>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.quantity)}${#strings.defaultString(item.unitLabel,'')}|">500g</span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.price)}">
|
||||
<p>현금 </p>
|
||||
<span th:text="|${#numbers.formatInteger(item.price, 1, 'COMMA')}원|">302,000원</span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.estimatedValue)}">
|
||||
<p>현물평가액</p>
|
||||
<span th:text="|${#numbers.formatInteger(item.estimatedValue, 1, 'COMMA')}원|">302,000원</span>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<!--/* //[INFO] templates/record/xxxx/index.html 의 item-list 와 동일한 HTML */-->
|
||||
</th:block>
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</html>
|
||||
@@ -0,0 +1,55 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
|
||||
xmlns:th="http://www.thymeleaf.org" lang="ko">
|
||||
|
||||
<div layout:fragment="content" th:classappend="regi-wrap">
|
||||
<div class="modal-content-inner">
|
||||
<hgroup class="tit-group">
|
||||
<h3>
|
||||
[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이 <br>
|
||||
<strong>[[${#lists.size(list)}]]건 등록</strong> 되었습니다.
|
||||
</h3>
|
||||
</hgroup>
|
||||
|
||||
<section class="regist-item-area"
|
||||
th:unless="${#lists.isEmpty(list)}">
|
||||
<th:block th:each="recordItem, recordItemStatus : ${list}">
|
||||
<p class="month-tit">
|
||||
<th:block th:if="${recordItem.startDate eq recordItem.endDate}">
|
||||
[[${#temporals.format(recordItem.startDate, 'M월 d일')}]]
|
||||
</th:block>
|
||||
<th:block th:if="not ${recordItem.startDate eq recordItem.endDate}">
|
||||
[[${#temporals.format(recordItem.startDate, 'M월 d일')}]]~[[${#temporals.format(recordItem.endDate, 'd일')}]]
|
||||
</th:block>
|
||||
</p>
|
||||
|
||||
<!--/* [INFO] templates/record/xxxx/index.html 의 item-list 와 동일한 HTML */-->
|
||||
<div class="item-list">
|
||||
<div class="list-item"
|
||||
th:each="item, itemStatus : ${recordItem.children}">
|
||||
<div class="item-tit-group">
|
||||
<p class="item-name">[[${item.productLabel}]]</p>
|
||||
</div>
|
||||
<ul class="detail-list">
|
||||
<li th:if="${not #strings.isEmpty(item.usage)}">
|
||||
<p>용도</p>
|
||||
<span th:text="${item.usage}">0시간</span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.quantity)}">
|
||||
<p>수량</p>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.quantity)}${#strings.defaultString(item.unitLabel,'')}|">500g</span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.estimatedValue)}">
|
||||
<p>현물평가액</p>
|
||||
<span th:text="|${#numbers.formatInteger(item.estimatedValue, 1, 'COMMA')}원|">302,000원</span>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<!--/* //[INFO] templates/record/xxxx/index.html 의 item-list 와 동일한 HTML */-->
|
||||
</th:block>
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</html>
|
||||
@@ -0,0 +1,55 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
|
||||
xmlns:th="http://www.thymeleaf.org" lang="ko">
|
||||
|
||||
<div layout:fragment="content" th:classappend="regi-wrap">
|
||||
<div class="modal-content-inner">
|
||||
<hgroup class="tit-group">
|
||||
<h3>
|
||||
[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이 <br>
|
||||
<strong>[[${#lists.size(list)}]]건 등록</strong> 되었습니다.
|
||||
</h3>
|
||||
</hgroup>
|
||||
|
||||
<section class="regist-item-area"
|
||||
th:unless="${#lists.isEmpty(list)}">
|
||||
<th:block th:each="recordItem, recordItemStatus : ${list}">
|
||||
<p class="month-tit">
|
||||
<th:block th:if="${recordItem.startDate eq recordItem.endDate}">
|
||||
[[${#temporals.format(recordItem.startDate, 'M월 d일')}]]
|
||||
</th:block>
|
||||
<th:block th:if="not ${recordItem.startDate eq recordItem.endDate}">
|
||||
[[${#temporals.format(recordItem.startDate, 'M월 d일')}]]~[[${#temporals.format(recordItem.endDate, 'd일')}]]
|
||||
</th:block>
|
||||
</p>
|
||||
|
||||
<!--/* [INFO] templates/record/xxxx/index.html 의 item-list 와 동일한 HTML */-->
|
||||
<div class="item-list">
|
||||
<div class="list-item"
|
||||
th:each="item, itemStatus : ${recordItem.children}">
|
||||
<div class="item-tit-group">
|
||||
<p class="item-name">[[${item.productName}]]</p>
|
||||
</div>
|
||||
<ul class="detail-list">
|
||||
<li th:if="${not #strings.isEmpty(item.usage)}">
|
||||
<p>용도</p>
|
||||
<span th:text="${item.usage}">0시간</span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.quantity)}">
|
||||
<p>수량</p>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.quantity)}${#strings.defaultString(item.unitLabel,'')}|">500g</span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.estimatedValue)}">
|
||||
<p>현물평가액</p>
|
||||
<span th:text="|${#numbers.formatInteger(item.estimatedValue, 1, 'COMMA')}원|">302,000원</span>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<!--/* //[INFO] templates/record/xxxx/index.html 의 item-list 와 동일한 HTML */-->
|
||||
</th:block>
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</html>
|
||||
@@ -0,0 +1,51 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
|
||||
xmlns:th="http://www.thymeleaf.org" lang="ko">
|
||||
|
||||
<div layout:fragment="content" th:classappend="regi-wrap">
|
||||
<div class="modal-content-inner">
|
||||
<hgroup class="tit-group">
|
||||
<h3>
|
||||
[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이 <br>
|
||||
<strong>[[${#lists.size(list)}]]건 등록</strong> 되었습니다.
|
||||
</h3>
|
||||
</hgroup>
|
||||
|
||||
<section class="regist-item-area"
|
||||
th:unless="${#lists.isEmpty(list)}">
|
||||
<th:block th:each="recordItem, recordItemStatus : ${list}">
|
||||
<p class="month-tit">
|
||||
<th:block th:if="${recordItem.startDate eq recordItem.endDate}">
|
||||
[[${#temporals.format(recordItem.startDate, 'M월 d일')}]]
|
||||
</th:block>
|
||||
<th:block th:if="not ${recordItem.startDate eq recordItem.endDate}">
|
||||
[[${#temporals.format(recordItem.startDate, 'M월 d일')}]]~[[${#temporals.format(recordItem.endDate, 'd일')}]]
|
||||
</th:block>
|
||||
</p>
|
||||
|
||||
<!--/* [INFO] templates/record/xxxx/index.html 의 item-list 와 동일한 HTML */-->
|
||||
<div class="item-list">
|
||||
<div class="list-item"
|
||||
th:each="item, itemStatus : ${recordItem.children}">
|
||||
<div class="item-tit-group">
|
||||
<p class="item-name">[[${item.equipmentName}]]</p>
|
||||
</div>
|
||||
<ul class="detail-list">
|
||||
<li th:if="${not #strings.isEmpty(item.ownedHours)}">
|
||||
<p>자가 사용시간</p>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.ownedHours)}시간|">0시간</span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.leasedHours)}">
|
||||
<p>임차 사용시간</p>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.leasedHours)}시간|">0시간</span>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<!--/* //[INFO] templates/record/xxxx/index.html 의 item-list 와 동일한 HTML */-->
|
||||
</th:block>
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</html>
|
||||
@@ -0,0 +1,95 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
|
||||
xmlns:th="http://www.thymeleaf.org" lang="ko">
|
||||
|
||||
<div layout:fragment="content" th:classappend="regi-wrap">
|
||||
<div class="modal-content-inner">
|
||||
<hgroup class="tit-group">
|
||||
<h3>
|
||||
[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이 <br>
|
||||
<strong>[[${#lists.size(list)}]]건 등록</strong> 되었습니다.
|
||||
</h3>
|
||||
</hgroup>
|
||||
|
||||
<section class="regist-item-area"
|
||||
th:unless="${#lists.isEmpty(list)}">
|
||||
<th:block th:each="recordItem, recordItemStatus : ${list}">
|
||||
<p class="month-tit">
|
||||
<th:block th:if="${recordItem.startDate eq recordItem.endDate}">
|
||||
[[${#temporals.format(recordItem.startDate, 'M월 d일')}]]
|
||||
</th:block>
|
||||
<th:block th:if="not ${recordItem.startDate eq recordItem.endDate}">
|
||||
[[${#temporals.format(recordItem.startDate, 'M월 d일')}]]~[[${#temporals.format(recordItem.endDate, 'd일')}]]
|
||||
</th:block>
|
||||
</p>
|
||||
|
||||
<!--/* [INFO] templates/record/xxxx/index.html 의 item-list 와 동일한 HTML */-->
|
||||
<div class="item-list">
|
||||
<div class="list-item"
|
||||
th:each="item, itemStatus : ${recordItem.children}">
|
||||
<div class="item-tit-group">
|
||||
<p class="item-name">[[${item.itemName}]]</p>
|
||||
</div>
|
||||
<ul class="detail-list">
|
||||
<li th:if="${not #strings.isEmpty(item.workName)}">
|
||||
<p>작업명</p>
|
||||
<span th:text="${item.workName}">수확</span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.workLandArea)}">
|
||||
<p>작업 면적</p>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.workLandArea)}${#strings.defaultString(item.areaUnitLabel,'')}|"></span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.harvestQuantity)}">
|
||||
<p>수확량</p>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.harvestQuantity)}${#strings.defaultString(item.harvestUnitLabel,'')}|"></span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.ownerTime)}">
|
||||
<p>경영주 노동투입시간</p>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.ownerTime)}시간|"></span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.spouseTime)}">
|
||||
<p>배우자 노동투입시간</p>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.spouseTime)}시간|"></span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.familyMHours)}">
|
||||
<p>가족노동(남)</p>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.familyMHours)}시간|"></span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.familyFHours)}">
|
||||
<p>가족노동(여)</p>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.familyFHours)}시간|"></span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.hiredMHours)}">
|
||||
<p>고용노동(남)</p>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.hiredMHours)}시간|"></span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.hiredFHours)}">
|
||||
<p>고용노동(여)</p>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.hiredFHours)}시간|"></span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.sharedMHours)}">
|
||||
<p>품앗이(남)</p>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.sharedMHours)}시간|"></span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.sharedFHours)}">
|
||||
<p>품앗이(여)</p>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.sharedFHours)}시간|"></span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.volunteerMHours)}">
|
||||
<p>일손돕기(남)</p>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.volunteerMHours)}시간|"></span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.volunteerFHours)}">
|
||||
<p>일손돕기(여)</p>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.volunteerFHours)}시간|"></span>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<!--/* //[INFO] templates/record/xxxx/index.html 의 item-list 와 동일한 HTML */-->
|
||||
</th:block>
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</html>
|
||||
Reference in New Issue
Block a user