[BO] 일계부 임업생산물 등록, 수정

This commit is contained in:
김현주
2025-07-01 14:53:10 +09:00
parent 15dd6a4798
commit 5e6365d620
18 changed files with 724 additions and 2 deletions

View File

@@ -0,0 +1,39 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.persistence;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.persistence.modal.GetDailyForestryDto;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.SaveDailyForestryPortOut;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain.GetDailyForestryCmd;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain.SaveDailyForestryCmd;
import app.module.core.config.application.annotation.CreateCommand;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@Slf4j
@Service
@RequiredArgsConstructor
public class SaveDailyForestryDao implements SaveDailyForestryPortOut {
private final SaveDailyForestryMapper dailyForestryMapper;
@Override
public GetDailyForestryDto detail(GetDailyForestryCmd command) {
return dailyForestryMapper.getDailyForestry(command);
}
@CreateCommand
@Override
public void create(GetDailyForestryCmd findCmd, SaveDailyForestryCmd command) {
Integer existCount = dailyForestryMapper.getRecordExistCount(findCmd);
if (existCount == 0) {
dailyForestryMapper.createDailyForestry(command);
log.debug("[CreateDailyForestry] command={}", command);
} else {
dailyForestryMapper.updateDailyForestry(command);
log.debug("[UpdateDailyForestry] command={}", command);
}
}
}

View File

@@ -0,0 +1,39 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.persistence;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.persistence.modal.GetDailyForestryDto;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain.GetDailyForestryCmd;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain.SaveDailyForestryCmd;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface SaveDailyForestryMapper {
/**
* 일계부 임업생산 데이터 조회
*
* @param command 검색 조건
* @return 임업생산 데이터
*/
GetDailyForestryDto getDailyForestry(GetDailyForestryCmd command);
/**
* 일계부 임업생산 데이터 존재 여부
*
* @param command 검색 조건
* @return 중복 개수
*/
Integer getRecordExistCount(GetDailyForestryCmd command);
/**
* 일계부 임업생산 등록
*
* @param command 등록 데이터
*/
void createDailyForestry(SaveDailyForestryCmd command);
/**
* 일계부 임업생산 수정
*
* @param command 수정 데이터
*/
void updateDailyForestry(SaveDailyForestryCmd command);
}

View File

@@ -0,0 +1,18 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.persistence.modal;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class GetDailyForestryDto {
private Long id;
private Long dailyRecordSeq;
private String productName;
private String usage;
private String quantity;
private String unitCode;
private String unitLabel;
private String unitSelf;
private Long estimatedValue;
}

View File

@@ -0,0 +1,87 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.persistence.modal.GetDailyForestryDto;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.model.DailyForestryUIReqVO;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.model.SaveDailyForestryReqVO;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.validator.SaveDailyForestryValidator;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.SaveDailyForestryPortIn;
import app.module.core.config.application.exception.NoRecordDataException;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
@Slf4j
@RestController
@RequiredArgsConstructor
@RequestMapping(path = "/api/household/daily/forestry")
public class SaveDailyForestryController {
private final DailyRecordPortIn dailyRecordPortIn;
private final SaveDailyForestryPortIn dailyForestryPortIn;
private final SaveDailyForestryValidator dailyForestryValidator;
/**
* 일계부 임업생산 조회
*
* @param id 임업생산 일련번호
* @param reqVO 검색 조건
*/
@GetMapping(path = "/{id}")
ResponseEntity<?> detail(@PathVariable("id") String id, @ModelAttribute DailyForestryUIReqVO reqVO) {
reqVO.setId(Long.parseLong(id));
GetDailyForestryDto detail = dailyForestryPortIn.detail(reqVO);
if (detail == null) {
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null);
}
return ResponseEntity.status(HttpStatus.OK).body(detail);
}
/**
* 일계부 임업생산 등록 처리
*
* @param formVO 입력 데이터
* @param bindingResult BindingResult
*/
@PostMapping(path = "/save")
ResponseEntity<?> create(@Valid @RequestBody SaveDailyForestryReqVO formVO, BindingResult bindingResult) {
dailyForestryValidator.validate(formVO, bindingResult);
if (bindingResult.hasErrors()) {
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
.body(bindingResult.getFieldErrors());
}
DailyRecordDto dailyRecord = this.vaildGetDailyRecord(formVO.getDailyId());
formVO.setSearchMonth(dailyRecord.getRecordMonth());
formVO.setGroupNo(dailyRecord.getGroupNo());
formVO.setDailyId(dailyRecord.getId());
log.debug("formVO: {}", formVO);
dailyForestryPortIn.create(formVO);
return ResponseEntity.status(HttpStatus.OK).body(formVO);
}
/**
* 일계부 유효성 체크 및 데이터 조회
*
* @param dailyRecordSeq 항목 일련번호
*/
private DailyRecordDto vaildGetDailyRecord(Long dailyRecordSeq) {
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(dailyRecordSeq);
if (dailyRecord == null || dailyRecord.getId() == null) {
throw new NoRecordDataException();
}
return dailyRecord;
}
}

View File

@@ -0,0 +1,30 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.model;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class DailyForestryUIReqVO {
/**
* 검색 월(yyyyMM)
*/
private String searchMonth;
/**
* 검색 그룸번호
*/
private Integer groupNo;
/**
* 임가 일련번호
*/
private Long householdSeq;
/**
* 일계부 항목 일련번호
*/
private Long dailyId;
/**
* 임업생산 일련번호
*/
private Long id;
}

View File

@@ -0,0 +1,38 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.model;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.model.DailyPowerUIReqVO;
import jakarta.validation.constraints.NotBlank;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
@ToString(callSuper = true)
public class SaveDailyForestryReqVO extends DailyForestryUIReqVO {
/**
* 생산물
*/
@NotBlank(message = "생산물을 입력해 주세요.")
private String productName;
/**
* 용도
*/
private String usage;
/**
* 수량
*/
private Double quantity;
/**
* 단위 코드
*/
private String unitCode;
/**
* 단위 직접 입력
*/
private String unitSelf;
/**
* 현물평가액
*/
private Long estimatedValue;
}

View File

@@ -0,0 +1,47 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.validator;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.model.SaveDailyForestryReqVO;
import app.module.core.config.constants.CommonConstants;
import lombok.RequiredArgsConstructor;
import org.apache.tika.utils.StringUtils;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
@Component
@RequiredArgsConstructor
public class SaveDailyForestryValidator implements Validator {
@Override
public boolean supports(Class<?> clazz) {
return SaveDailyForestryReqVO.class.equals(clazz);
}
@Override
public void validate(Object target, Errors errors) {
SaveDailyForestryReqVO vo = (SaveDailyForestryReqVO) target;
if (vo.getQuantity() == null && !StringUtils.isBlank(vo.getUnitCode())) {
errors.rejectValue(
"quantity", "valid.common.required",
"수량을 입력해 주세요.");
}
if (vo.getQuantity() != null && StringUtils.isBlank(vo.getUnitCode())) {
errors.rejectValue(
"unitCode", "valid.common.required",
"단위를 선택해 주세요.");
}
if (CommonConstants.UNIT_CODE_SELF.equals(vo.getUnitCode()) && StringUtils.isBlank(vo.getUnitSelf())) {
errors.rejectValue(
"unitSelf", "valid.common.required",
"단위를 입력해 주세요.");
}
if (vo.getEstimatedValue() == null) {
errors.rejectValue(
"estimatedValue", "valid.common.required",
"현물평가액을 입력해 주세요.");
}
}
}

View File

@@ -0,0 +1,22 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.persistence.modal.GetDailyForestryDto;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.model.DailyForestryUIReqVO;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.model.SaveDailyForestryReqVO;
public interface SaveDailyForestryPortIn {
/**
* 일계부 임업생산 조회
*
* @param reqVO 검색 조건
* @return 임업생산 상세
*/
GetDailyForestryDto detail(DailyForestryUIReqVO reqVO);
/**
* 일계부 임업생산 등록
*
* @param formVO 입력 데이터
*/
void create(SaveDailyForestryReqVO formVO);
}

View File

@@ -0,0 +1,23 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.persistence.modal.GetDailyForestryDto;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain.GetDailyForestryCmd;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain.SaveDailyForestryCmd;
public interface SaveDailyForestryPortOut {
/**
* 일계부 임업생산 조회
*
* @param command 검색 조건
* @return 임업생산 상세
*/
GetDailyForestryDto detail(GetDailyForestryCmd command);
/**
* 일계부 임업생산 등록
*
* @param findCmd 검색 조건
* @param command 입력 데이터
*/
void create(GetDailyForestryCmd findCmd, SaveDailyForestryCmd command);
}

View File

@@ -0,0 +1,56 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.persistence.modal.GetDailyForestryDto;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.model.DailyForestryUIReqVO;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.model.SaveDailyForestryReqVO;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.SaveDailyForestryPortIn;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.SaveDailyForestryPortOut;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain.GetDailyForestryCmd;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain.SaveDailyForestryCmd;
import app.module.core.config.constants.DailyRecordConstants;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
public class SaveDailyForestryService implements SaveDailyForestryPortIn {
private final SaveDailyForestryPortOut portOut;
private final DailyRecordPortIn dailyRecordPortIn;
@Override
public GetDailyForestryDto detail(DailyForestryUIReqVO reqVO) {
GetDailyForestryCmd findCmd = new GetDailyForestryCmd(
reqVO.getSearchMonth(),
reqVO.getGroupNo(),
reqVO.getHouseholdSeq(),
reqVO.getId());
return portOut.detail(findCmd);
}
@Override
public void create(SaveDailyForestryReqVO formVO) {
GetDailyForestryCmd findCmd = new GetDailyForestryCmd(
formVO.getSearchMonth(),
formVO.getGroupNo(),
formVO.getHouseholdSeq(),
formVO.getId());
SaveDailyForestryCmd command =
new SaveDailyForestryCmd(
formVO.getId(),
formVO.getDailyId(),
DailyRecordConstants.FORESTRY_EXPENSE_MARK,
formVO.getProductName(),
formVO.getUsage(),
formVO.getQuantity(),
formVO.getUnitCode(),
formVO.getUnitSelf(),
formVO.getEstimatedValue());
portOut.create(findCmd, command);
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
}
}

View File

@@ -0,0 +1,27 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
public class GetDailyForestryCmd {
/**
* 검색 월(yyyyMM)
*/
private String searchMonth;
/**
* 검색 그룸번호
*/
private Integer groupNo;
/**
* 임가 일련번호
*/
private Long householdSeq;
/**
* 임업생산 일련번호
*/
private Long id;
}

View File

@@ -0,0 +1,23 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain;
import app.module.core.config.adapters.persistence.component.AuditCommand;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
@AllArgsConstructor
@ToString
public class SaveDailyForestryCmd extends AuditCommand {
private Long id;
private Long dailyRecordSeq;
private String expenseMark;
private String productName;
private String usage;
private Double quantity;
private String unitCode;
private String unitSelf;
private Long estimatedValue;
}

View File

@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.persistence.SaveDailyForestryMapper">
<select id="getDailyForestry"
resultType="app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.persistence.modal.GetDailyForestryDto">
select ds.id, ds.daily_record_seq
, ds.product_name, ds.usage
, ds.quantity, ds.unit_code, ds.unit_self, ds.estimated_value
from daily_forestry ds
<include refid="app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
where ds.is_deleted = false
and ds.id = #{id}
</select>
<select id="getRecordExistCount" resultType="int">
select count(1)
from daily_forestry ds
<include refid="app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
where ds.is_deleted = false
<if test="id != null and id != '0'">
and ds.id = #{id}
</if>
</select>
<insert id="createDailyForestry" useGeneratedKeys="true" keyProperty="id">
insert into daily_forestry (
daily_record_seq, expense_mark
, product_name, usage
, quantity, unit_code, unit_self, estimated_value
, is_deleted
, <include refid="common.fields.CreateUpdateBaseColumns"/>
) values (
#{dailyRecordSeq}, #{expenseMark}
, #{productName}, #{usage}
, #{quantity}, #{unitCode}, #{unitSelf}, #{estimatedValue}
, false
, <include refid="common.fields.CreateUpdateBaseValues"/>
)
</insert>
<update id="updateDailyForestry">
update daily_forestry set <include refid="common.fields.UpdateBaseSet"/>
, expense_mark = #{expenseMark}
, product_name = #{productName}
, usage = #{usage}
, quantity = #{quantity}
, unit_code = #{unitCode}
, unit_self = #{unitSelf}
, estimated_value = #{estimatedValue}
where is_deleted = false
and daily_record_seq = #{dailyRecordSeq}
and id = #{id}
</update>
</mapper>

View File

@@ -0,0 +1,207 @@
<!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="modalFragment">
<form autocomplete="off" method="get" name="reqForestryForm" data-modal-id=".modal-daily-forestry">
<input type="hidden" name="householdSeq" th:value="${seq}">
<input type="hidden" name="searchMonth">
<input type="hidden" name="groupNo">
<input type="hidden" name="id">
<input type="hidden" name="dailyId">
<div class="component-modal mypage-wrap modal01 modal-daily-forestry" data-props-dimm-click="true" data-state="close">
<div class="modal-dimm"></div>
<div class="modal-frame">
<div class="modal-container">
<div class="modal-header">
<h3 class="modal-tit">
일계부 자가임업 생산물 중 자가소비량 등록
</h3>
</div>
<div class="modal-content">
<div class="modal-content-inner">
<table class="type-form confirm">
<colgroup>
<col width="8%" />
<col width="25.3%" />
<col width="8%" />
<col width="25.3%" />
<col width="8%" />
<col width="25.3%" />
</colgroup>
<tbody>
<tr>
<th>생산물<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>
<td>
<div class="component-input">
<div class="input-field">
<input type="text" id="productName" name="productName" maxlength="30">
</div>
</div>
</td>
<th>용도</th>
<td>
<div class="component-input">
<div class="input-field">
<input type="text" id="usage" name="usage" maxlength="30">
</div>
</div>
</td>
</tr>
<tr>
<th>수량</th>
<td>
<div class="component-input">
<div class="input-field">
<input type="number" inputmode="decimal" pattern="[0-9]*" id="quantity" name="quantity" min="1" max="9999999999"
maxlength="10" oninput="limitMaxLength(this);">
</div>
</div>
</td>
<th>단위</th>
<td colspan="2">
<div class="d-flex">
<div class="component-select">
<select class="select-list" name="unitCode" onchange="selectedUnit(this);" required>
<option value="">선택</option>
<option th:each="item : ${recordUnit}"
th:value="${item.id}"
th:text="${item.codeText}">
</select>
</div>
<div class="component-input unit-self-input">
<div class="input-field">
<input type="text" id="unitSelf" name="unitSelf" maxlength="30" disabled>
</div>
</div>
</div>
</td>
</tr>
<tr>
<th>현물평가액(원)<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>
<td>
<div class="component-input">
<div class="input-field">
<input type="number" inputmode="numeric" pattern="[0-9]*" id="estimatedValue" name="estimatedValue" min="1" max="9999999999"
maxlength="10" oninput="limitMaxLength(this);">
</div>
</div>
</td>
</tr>
</tbody>
</table>
<div class="component-btns bottom-btn-group">
<div class="btns-row align-right">
<button type="button" class="btn btn-primary" onclick="saveDailyForestry();">
<span class="btn-txt">등록</span>
</button>
</div>
</div>
</div>
</div>
<button type="button" class="modal-close"></button>
</div>
</div>
</div>
</form>
<script th:inline="javascript">
// form 초기화
const resetDailyForestryForm = () => {
const form = document.reqForestryForm;
if (!form) return;
form.productName.value = '';
form.usage.value = '';
form.quantity.value = '';
form.unitCode.value = '';
form.unitSelf.value = '';
form.estimatedValue.value = '';
}
// 일계부 상세 값 set
const setDailyForestryFormData = (data) => {
const form = document.reqForestryForm;
if (!form) return;
// 폼에 값 세팅
form.productName.value = data.productName || '';
form.usage.value = data.usage || '';
form.quantity.value = data.quantity || '';
form.unitCode.value = data.unitCode || '';
form.unitSelf.value = data.unitSelf || '';
form.estimatedValue.value = data.estimatedValue || '';
// 기타 UI 처리
selectedUnit(form.unitCode);
}
</script>
<script th:inline="javascript">
// 일계부 등록 모달창 띄우기
const showDailyForestryModal = (id) => {
const mf = document.reqForestryForm;
mf.searchMonth.value = document.reqForm.recordMonth.value;
mf.groupNo.value = document.reqForm.groupNo.value;
mf.dailyId.value = document.reqForm.dailyId.value;
mf.id.value = (id === undefined) ? '' : id;
resetDailyForestryForm();
if (id !== null && id !== undefined) {
const obj = $(f).serializeObject();
obj.id = mf.id.value;
obj.searchMonth = obj.recordMonth;
ajaxUtil._ajaxAsyncMethod(
`/api/household/daily/forestry/${id}`,
obj,
function (rstData, status) {
setDailyForestryFormData(rstData);
document.querySelector($(mf).data('modalId')).ui.open();
},
function () {
console.error('Do nothing error.')
},
'get'
);
} else {
document.querySelector($(mf).data('modalId')).ui.open();
}
}
const saveDailyForestry = () => {
const mf = document.reqForestryForm;
let obj = $(mf).serializeObject();
obj.inputType = 'SELF';
obj.id = (obj.id === '' ? '0' : obj.id);
ajaxUtil._ajaxAsyncNoWaiting(
'/api/household/daily/forestry/save',
obj,
function () {
alert('등록이 완료되었습니다.');
document.querySelector($(mf).data('modalId')).ui.close();
getDailyRecordsView(f.dailyId.value, f.groupNo.value, f.dayGroupText.value);
},
function (code, rstData) {
console.error('Do nothing. code: '+ code, rstData);
},
);
}
</script>
</div>
</html>

View File

@@ -676,7 +676,7 @@
</label>
</div>
</td>
<td class="underline">${ifNullHyphen(item.productName)}</td> <!-- 생산물 -->
<td class="underline"><a href="javascript:void(0);" onclick="showDailyForestryModal(${item.id});">${ifNullHyphen(item.productName)}</a></td> <!-- 생산물 -->
<td>${ifNullHyphen(item.usage)}</td><!-- 용도 -->
<td class="align-right">${ifNullHyphen(item.quantity)}</td><!-- 수량 -->
<td>${ifNullHyphen(item.unitText)}</td><!-- 단위 -->
@@ -816,6 +816,8 @@
showDailyExpenseModal();
} else if (currentStep === 'POWER') {
showDailyPowerModal();
} else if (currentStep === 'FORESTRY') {
showDailyForestryModal();
} else {
alert('TODO : 추가');
}

View File

@@ -180,6 +180,7 @@
<th:block th:replace="households/modal/modal-daily-work :: modalFragment"/>
<th:block th:replace="households/modal/modal-daily-expense :: modalFragment"/>
<th:block th:replace="households/modal/modal-daily-power :: modalFragment"/>
<th:block th:replace="households/modal/modal-daily-forestry :: modalFragment"/>
<!-- 조사원 매핑 모달 -->
<th:block th:replace="common/modal-researcher-mapping :: modalFragment"/>