[2차][FO] 입력현황 WIP

This commit is contained in:
김현주
2025-07-08 13:46:39 +09:00
parent 48cbe00b2e
commit 7082aec871
17 changed files with 73 additions and 70 deletions

View File

@@ -24,7 +24,7 @@ public class DailyIncomeDao implements DailyIncomePortOut {
@Override
public List<DailyIncomeDto> monthList(GetDailyIncomeCmd command) {
return dailyIncomeMapper.getDailyIncomeListByMonth(command);
return dailyIncomeMapper.getDailyIncomeMonthList(command);
}
@Override

View File

@@ -24,7 +24,7 @@ public interface DailyIncomeMapper {
* @param command 검색 조건
* @return 수입 목록
*/
List<DailyIncomeDto> getDailyIncomeListByMonth(GetDailyIncomeCmd command);
List<DailyIncomeDto> getDailyIncomeMonthList(GetDailyIncomeCmd command);
/**
* 일계부 수입 데이터 존재 여부

View File

@@ -1,6 +1,5 @@
package app.module.front.usecase.daily.income.adapters.persistence.model;
import app.module.front.usecase.daily.income.adapters.web.model.DailyInputType;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
@@ -11,7 +10,7 @@ import java.util.List;
@Getter
@Setter
@ToString
public class DailyMonthIncomeDto {
public class DailyIncomeMonthDto {
private Long dailyRecordSeq;
private LocalDate startDate;
private LocalDate endDate;

View File

@@ -1,7 +1,7 @@
package app.module.front.usecase.daily.income.ports;
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto;
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyMonthIncomeDto;
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeMonthDto;
import app.module.front.usecase.daily.income.adapters.web.model.CreateDailyIncomeReqVO;
import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO;
import app.module.front.usecase.daily.income.adapters.web.model.RemoveDailyIncomeReqVO;
@@ -23,7 +23,7 @@ public interface DailyIncomePortIn {
* @param reqVO 검색 조건
* @return 수입 목록
*/
List<DailyMonthIncomeDto> monthList(DailyIncomeUIReqVO reqVO);
List<DailyIncomeMonthDto> monthList(DailyIncomeUIReqVO reqVO);
/**
* 일계부 수입 조회

View File

@@ -1,8 +1,6 @@
package app.module.front.usecase.daily.income.ports;
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto;
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyMonthIncomeDto;
import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO;
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.RemoveDailyIncomeCmd;

View File

@@ -7,7 +7,7 @@ import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElemen
import app.module.front.config.application.util.AuditUtil;
import app.module.front.config.constants.CommonConstants;
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto;
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyMonthIncomeDto;
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeMonthDto;
import app.module.front.usecase.daily.income.adapters.web.model.CreateDailyIncomeReqVO;
import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO;
import app.module.front.usecase.daily.income.adapters.web.model.RemoveDailyIncomeReqVO;
@@ -16,12 +16,12 @@ 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.GetDailyIncomeCmd;
import app.module.front.usecase.daily.income.ports.application.domain.RemoveDailyIncomeCmd;
import app.module.core.usecase.daily.record.ports.application.DailyRecordService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@Service
@@ -37,23 +37,18 @@ public class DailyIncomeService implements DailyIncomePortIn {
}
@Override
public List<DailyMonthIncomeDto> monthList(DailyIncomeUIReqVO reqVO) {
List<DailyMonthIncomeDto> monthList = new ArrayList<>();
public List<DailyIncomeMonthDto> monthList(DailyIncomeUIReqVO reqVO) {
List<DailyIncomeDto> list = this.getRefineList(reqVO, false);
// DailyIncomeDto> children;
List<Long> seqList = list.stream().map(m -> m.getDailyRecordSeq()).distinct().collect(Collectors.toList());
for (Long seq : seqList) {
DailyMonthIncomeDto month = new DailyMonthIncomeDto();
List<DailyIncomeMonthDto> monthList = new ArrayList<>();
List<Long> recordSeqList = list.stream().map(DailyIncomeDto::getDailyRecordSeq).distinct().toList();
for (Long seq : recordSeqList) {
DailyIncomeMonthDto month = new DailyIncomeMonthDto();
month.setDailyRecordSeq(seq);
month.setStartDate(list.stream().filter(f -> f.getDailyRecordSeq() == seq).map(m -> m.getStartDate()).findFirst().get());
month.setEndDate(list.stream().filter(f -> f.getDailyRecordSeq() == seq).map(m -> m.getEndDate()).findFirst().get());
month.setChildren(list.stream().filter(f -> f.getDailyRecordSeq() == seq).collect(Collectors.toList()));
month.setStartDate(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).map(DailyIncomeDto::getStartDate).findFirst().orElse(null));
month.setEndDate(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).map(DailyIncomeDto::getEndDate).findFirst().orElse(null));
month.setChildren(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).collect(Collectors.toList()));
monthList.add(month);
}
@@ -74,7 +69,7 @@ public class DailyIncomeService implements DailyIncomePortIn {
* 목록 데이터 조회
*
* @param reqVO 검색 조건
* @param dayGroup 일 그룹 조건
* @param dayGroup 일 그룹 조건(true=일, false=월)
* @return 공통 처리된 목록
*/
private List<DailyIncomeDto> getRefineList(DailyIncomeUIReqVO reqVO, boolean dayGroup) {

View File

@@ -3,7 +3,7 @@ package app.module.front.usecase.daily.status.adapters.persistence;
import app.module.front.usecase.daily.status.adapters.persistence.model.DailyItemStatusDto;
import app.module.front.usecase.daily.status.adapters.persistence.model.DailyMonthStatusDto;
import app.module.front.usecase.daily.status.ports.DailyStatusPortOut;
import app.module.front.usecase.daily.status.ports.application.domain.DailyStatusCmd;
import app.module.front.usecase.daily.status.ports.application.domain.GetDailyStatusCmd;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;
@@ -15,7 +15,7 @@ public class DailyStatusDao implements DailyStatusPortOut {
private final DailyStatusMapper dailyStatusMapper;
@Override
public DailyMonthStatusDto operate(DailyStatusCmd command) {
public DailyMonthStatusDto operate(GetDailyStatusCmd command) {
DailyMonthStatusDto detail = dailyStatusMapper.getDailyStatusByMonth(command);
List<DailyItemStatusDto> countList = dailyStatusMapper.getDailyStatusByItemCount(command);
List<DailyItemStatusDto> valueList = dailyStatusMapper.getDailyStatusByItemValue(command);

View File

@@ -2,7 +2,7 @@ package app.module.front.usecase.daily.status.adapters.persistence;
import app.module.front.usecase.daily.status.adapters.persistence.model.DailyItemStatusDto;
import app.module.front.usecase.daily.status.adapters.persistence.model.DailyMonthStatusDto;
import app.module.front.usecase.daily.status.ports.application.domain.DailyStatusCmd;
import app.module.front.usecase.daily.status.ports.application.domain.GetDailyStatusCmd;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@@ -14,7 +14,7 @@ public interface DailyStatusMapper {
* @param command 검색 조건
* @return 월별 입력 현황
*/
DailyMonthStatusDto getDailyStatusByMonth(DailyStatusCmd command);
DailyMonthStatusDto getDailyStatusByMonth(GetDailyStatusCmd command);
/**
* 항목별 월별 입력 현황 건 수 조회
@@ -22,7 +22,7 @@ public interface DailyStatusMapper {
* @param command 검색 조건
* @return 항목별 월별 현황 건 수
*/
List<DailyItemStatusDto> getDailyStatusByItemCount(DailyStatusCmd command);
List<DailyItemStatusDto> getDailyStatusByItemCount(GetDailyStatusCmd command);
/**
* 항목별 월별 입력 현황 값(금액/시간) 조회
@@ -30,5 +30,5 @@ public interface DailyStatusMapper {
* @param command 검색 조건
* @return 항목별 월별 현황 값(금액/시간)
*/
List<DailyItemStatusDto> getDailyStatusByItemValue(DailyStatusCmd command);
List<DailyItemStatusDto> getDailyStatusByItemValue(GetDailyStatusCmd command);
}

View File

@@ -2,7 +2,7 @@ package app.module.front.usecase.daily.status.adapters.web;
import app.module.core.config.application.enums.DailySort;
import app.module.core.config.application.exception.NoMatchingURIException;
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyMonthIncomeDto;
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeMonthDto;
import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO;
import app.module.front.usecase.daily.income.ports.DailyIncomePortIn;
import app.module.front.usecase.daily.status.adapters.web.model.DailyStatusUIReqVO;
@@ -52,10 +52,8 @@ public class DailyStatusUIController {
@GetMapping(path = "/{step}/{searchMonth}")
public String detail(Model model, @PathVariable("step") String step, @PathVariable("searchMonth") String searchMonth) {
if (DailySort.INCOME.name().equalsIgnoreCase(step)) {
List<DailyMonthIncomeDto> list = dailyIncomePortIn.monthList(new DailyIncomeUIReqVO(searchMonth, ""));
model.addAttribute("step", DailySort.INCOME);
model.addAttribute("list", list);
model.addAttribute("list", dailyIncomePortIn.monthList(new DailyIncomeUIReqVO(searchMonth, "")));
// } else if (DailySort.WORK.name().equalsIgnoreCase(step)) {
// List<DailyMonthIncomeDto> list = dailyIncomePortIn.monthList(new DailyIncomeUIReqVO(searchMonth, ""));
//

View File

@@ -1,7 +1,7 @@
package app.module.front.usecase.daily.status.ports;
import app.module.front.usecase.daily.status.adapters.persistence.model.DailyMonthStatusDto;
import app.module.front.usecase.daily.status.ports.application.domain.DailyStatusCmd;
import app.module.front.usecase.daily.status.ports.application.domain.GetDailyStatusCmd;
public interface DailyStatusPortOut {
/**
@@ -10,5 +10,5 @@ public interface DailyStatusPortOut {
* @param command 검색 조건
* @return 특정월의 일계부 입력 현황
*/
DailyMonthStatusDto operate(DailyStatusCmd command);
DailyMonthStatusDto operate(GetDailyStatusCmd command);
}

View File

@@ -4,7 +4,7 @@ import app.module.front.usecase.daily.status.adapters.persistence.model.DailyMon
import app.module.front.usecase.daily.status.adapters.web.model.DailyStatusUIReqVO;
import app.module.front.usecase.daily.status.ports.DailyStatusPortIn;
import app.module.front.usecase.daily.status.ports.DailyStatusPortOut;
import app.module.front.usecase.daily.status.ports.application.domain.DailyStatusCmd;
import app.module.front.usecase.daily.status.ports.application.domain.GetDailyStatusCmd;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -15,6 +15,6 @@ public class DailyStatusService implements DailyStatusPortIn {
@Override
public DailyMonthStatusDto operate(DailyStatusUIReqVO reqVO) {
return portOut.operate(new DailyStatusCmd(reqVO.getSearchMonth(), reqVO.getHouseholdSeq()));
return portOut.operate(new GetDailyStatusCmd(reqVO.getSearchMonth(), reqVO.getHouseholdSeq()));
}
}

View File

@@ -7,7 +7,7 @@ import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
public class DailyStatusCmd {
public class GetDailyStatusCmd {
/**
* 검색 월(yyyyMM)
*/

View File

@@ -17,17 +17,17 @@
ds.id desc
</select>
<select id="getDailyIncomeListByMonth"
<select id="getDailyIncomeMonthList"
resultType="app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto">
select ds.id, ds.daily_record_seq, ds.input_type, ds.is_credit as credit
, ds.crop_code, ds.income_kind, ds.source_purpose
, ds.quantity, ds.unit_code, ds.unit_self, ds.price, ds.estimated_value
, dr.start_date, dr.end_date
, dr.start_date, dr.end_date, ddg.group_no
from daily_income ds
<include refid="app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecordMonth"/>
where ds.is_deleted = false
order by
dr.id, ds.id
ddg.group_no, ds.id
</select>
<select id="getRecordExistCount" resultType="int">

View File

@@ -41,22 +41,22 @@
left join
daily_income di on di.daily_record_seq = dg.daily_record_seq and di.is_deleted = false
union all
select 'EXPENSE' as step
, count(distinct dg.day) as day_count
, count(distinct dg.day) filter (where (dg.expense_status = 'TARGET' and de.id is not null) or dg.expense_status = 'TODAY_NONE') as done_count
, count(distinct de.id) as input_count
from day_gorup dg
left join
daily_expense de on de.daily_record_seq = dg.daily_record_seq and de.is_deleted = false
union all
select 'WORK' as step
, count(distinct dg.day) as day_count
, count(distinct dg.day) filter (where (dg.work_status = 'TARGET' and dw.id is not null) or dg.work_status = 'TODAY_NONE') as done_count
, count(distinct dw.id) as input_count
, count(distinct dg.day) as day_count
, count(distinct dg.day) filter (where (dg.work_status = 'TARGET' and dw.id is not null) or dg.work_status = 'TODAY_NONE') as done_count
, count(distinct dw.id) as input_count
from day_gorup dg
left join
left join
daily_work dw on dw.daily_record_seq = dg.daily_record_seq and dw.is_deleted = false
union all
select 'EXPENSE' as step
, count(distinct dg.day) as day_count
, count(distinct dg.day) filter (where (dg.expense_status = 'TARGET' and de.id is not null) or dg.expense_status = 'TODAY_NONE') as done_count
, count(distinct de.id) as input_count
from day_gorup dg
left join
daily_expense de on de.daily_record_seq = dg.daily_record_seq and de.is_deleted = false
union all
select 'POWER' as step
, count(distinct dg.day) as day_count
, count(distinct dg.day) filter (where (dg.power_status = 'TARGET' and dp.id is not null) or dg.power_status = 'TODAY_NONE') as done_count
@@ -90,14 +90,18 @@
select dr.id from daily_record dr where dr.record_month = #{recordMonth} and dr.household_seq = #{householdSeq} and dr.is_deleted = false
)
select 'INCOME' as step
, COALESCE(sum( COALESCE(di.price, 0) + COALESCE(di.estimated_value, 0) ), 0) as total_value
, COALESCE(sum(
COALESCE(di.price, 0) + COALESCE(di.estimated_value, 0)
), 0) as total_value
from daily_income di
inner join
r_daily_record dr on dr.id = di.daily_record_seq
where di.is_deleted = false
union all
select 'EXPENSE' as step
, COALESCE(sum( COALESCE(de.price, 0) + COALESCE(de.estimated_value, 0) ), 0) as total_value
, COALESCE(sum(
COALESCE(de.price, 0) + COALESCE(de.estimated_value, 0)
), 0) as total_value
from daily_expense de
inner join
r_daily_record dr on dr.id = de.daily_record_seq
@@ -106,10 +110,10 @@
select 'WORK' as step
, COALESCE(sum(
COALESCE(cast(dw.owner_time as numeric), 0) + COALESCE(cast(dw.spouse_time as numeric), 0)
+ COALESCE(cast(dw.family_f_hours as numeric), 0) + COALESCE(cast(dw.family_m_hours as numeric), 0)
+ COALESCE(cast(dw.hired_m_hours as numeric), 0) + COALESCE(cast(dw.hired_f_hours as numeric), 0)
+ COALESCE(cast(dw.shared_m_hours as numeric), 0) + COALESCE(cast(dw.shared_f_hours as numeric), 0)
+ COALESCE(cast(dw.volunteer_m_hours as numeric), 0) + COALESCE(cast(dw.volunteer_f_hours as numeric), 0)
+ COALESCE(cast(dw.family_f_hours as numeric), 0) + COALESCE(cast(dw.family_m_hours as numeric), 0)
+ COALESCE(cast(dw.hired_m_hours as numeric), 0) + COALESCE(cast(dw.hired_f_hours as numeric), 0)
+ COALESCE(cast(dw.shared_m_hours as numeric), 0) + COALESCE(cast(dw.shared_f_hours as numeric), 0)
+ COALESCE(cast(dw.volunteer_m_hours as numeric), 0) + COALESCE(cast(dw.volunteer_f_hours as numeric), 0)
), 0) as total_value
from daily_work dw
inner join
@@ -117,21 +121,27 @@
where dw.is_deleted = false
union all
select 'POWER' as step
, COALESCE(sum( COALESCE(cast(dp.owned_hours as numeric), 0) + COALESCE(cast(dp.leased_hours as numeric), 0) ), 0) as total_value
, COALESCE(sum(
COALESCE(cast(dp.owned_hours as numeric), 0) + COALESCE(cast(dp.leased_hours as numeric), 0)
), 0) as total_value
from daily_power dp
inner join
r_daily_record dr on dr.id = dp.daily_record_seq
where dp.is_deleted = false
union all
select 'FORESTRY' as step
, COALESCE(sum( COALESCE(df1.estimated_value, 0) ), 0) as total_value
, COALESCE(sum(
COALESCE(df1.estimated_value, 0)
), 0) as total_value
from daily_forestry df1
inner join
r_daily_record dr on dr.id = df1.daily_record_seq
where df1.is_deleted = false
union all
select 'FARMING' as step
, COALESCE(sum( COALESCE(df2.estimated_value, 0) ), 0) as total_value
, COALESCE(sum(
COALESCE(df2.estimated_value, 0)
), 0) as total_value
from daily_farming df2
inner join
r_daily_record dr on dr.id = df2.daily_record_seq

View File

@@ -53,7 +53,7 @@
<th:block th:each="item, itemStatus : ${detail.itemList}">
<li th:classappend="${item.inputCount != 0} ? 'view'">
<th:block th:if="${item.inputCount != 0}">
<a href="javascript:void(0);" th:onclick="formControl.detailModal([[${#strings.toLowerCase(item.step.name)}]], [[${#strings.toLowerCase(item.step.desc2)}]])">
<a href="javascript:void(0);" th:onclick="formControl.detailModal([[${#strings.toLowerCase(item.step.name)}]], [[${#strings.toLowerCase(item.step.desc2)}]])">
</th:block>
<p class="label">[[${item.step.desc2}]]</p>
<ul class="value">
@@ -84,7 +84,7 @@
</li>
</ul>
<th:block th:if="${item.inputCount != 0}">
</a >
</a>
</th:block>
</li>
</th:block>
@@ -134,7 +134,6 @@
this._bindUI();
},
_bindUI() {
console.log('_bindUI()')
const $select1 = document.querySelector('#searchMonth');
const selectboxInstance1 = $select1.ui;
selectboxInstance1.core.init($select1, {

View File

@@ -58,6 +58,7 @@
</ul>
</div>
</div>
<!--/* //[INFO] templates/record/xxxx/index.html 의 item-list 와 동일한 HTML */-->
</th:block>
</section>
</div>