자동이체 - 수입 완료 (형태 변경 아직 필요)

This commit is contained in:
주우성
2025-06-17 20:13:45 +09:00
parent 9a215b1221
commit 3f9b74d1f6
37 changed files with 920 additions and 28 deletions

View File

@@ -0,0 +1,51 @@
package app.module.front.usecase.info.bank.createBank.adapters.persistence;
import app.module.front.usecase.info.bank.createBank.adapters.persistence.model.CreateForestProductDto;
import app.module.front.usecase.info.bank.createBank.ports.CreateBankPortOut;
import app.module.front.usecase.info.bank.createBank.ports.application.domain.CreateBank;
import app.module.front.usecase.info.bank.createBank.ports.application.domain.CreateBankCmd;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
import java.util.Optional;
@Repository
@RequiredArgsConstructor
class CreateBankDao implements CreateBankPortOut {
private final CreateBankMapper mapper;
@Override
@Transactional
public Optional<CreateBank> operate(CreateBankCmd cmd) {
CreateForestProductDto dto =
new CreateForestProductDto(
null,
cmd.getHouseholdSeq(),
cmd.getTransferType(),
cmd.getCropCode(),
cmd.getTransferCategoryCode(),
cmd.getTransferCategory(),
cmd.getIncomeCode(),
cmd.getExpenseCode(),
cmd.getSourcePurpose(),
cmd.getCount(),
cmd.getUnitCode(),
cmd.getPrice(),
cmd.getMonth(),
cmd.getMonthlyInputStatusId(),
cmd.getCreatedAt(),
cmd.getCreatedBy(),
cmd.getUpdatedAt(),
cmd.getUpdatedBy()
);
mapper.createBank(dto);
return Optional.of(new CreateBank(dto.getId()));
}
}

View File

@@ -0,0 +1,9 @@
package app.module.front.usecase.info.bank.createBank.adapters.persistence;
import app.module.front.usecase.info.bank.createBank.adapters.persistence.model.CreateForestProductDto;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface CreateBankMapper {
void createBank(CreateForestProductDto dto);
}

View File

@@ -0,0 +1,43 @@
package app.module.front.usecase.info.bank.createBank.adapters.persistence.model;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
public class CreateForestProductDto {
private Long id;
private Long householdSeq;
private String transferType;
private String cropCode;
private String transferCategoryCode;
private String transferCategory;
private String incomeCode;
private String expenseCode;
private String sourcePurpose;
private Integer count;
private String unitCode;
private Integer price;
private String month;
private Long monthlyInputStatusId;
private LocalDateTime createdAt;
private String createdBy;
private LocalDateTime updatedAt;
private String updatedBy;
}

View File

@@ -0,0 +1,11 @@
package app.module.front.usecase.info.bank.createBank.ports;
import app.module.front.usecase.info.bank.createBank.ports.application.domain.CreateBank;
import app.module.front.usecase.info.bank.createBank.ports.application.domain.CreateBankCmd;
import java.util.Optional;
public interface CreateBankPortIn {
Optional<CreateBank> operate(CreateBankCmd command);
}

View File

@@ -0,0 +1,11 @@
package app.module.front.usecase.info.bank.createBank.ports;
import app.module.front.usecase.info.bank.createBank.ports.application.domain.CreateBank;
import app.module.front.usecase.info.bank.createBank.ports.application.domain.CreateBankCmd;
import java.util.Optional;
public interface CreateBankPortOut {
Optional<CreateBank> operate(CreateBankCmd command);
}

View File

@@ -0,0 +1,24 @@
package app.module.front.usecase.info.bank.createBank.ports.application;
import app.module.core.config.application.annotation.CreateCommand;
import app.module.front.usecase.info.bank.createBank.ports.CreateBankPortIn;
import app.module.front.usecase.info.bank.createBank.ports.CreateBankPortOut;
import app.module.front.usecase.info.bank.createBank.ports.application.domain.CreateBank;
import app.module.front.usecase.info.bank.createBank.ports.application.domain.CreateBankCmd;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.Optional;
@Service
@RequiredArgsConstructor
class CreateBankService implements CreateBankPortIn {
private final CreateBankPortOut portOut;
@Override
@CreateCommand
public Optional<CreateBank> operate(CreateBankCmd command) {
return portOut.operate(command);
}
}

View File

@@ -0,0 +1,14 @@
package app.module.front.usecase.info.bank.createBank.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class CreateBank {
private Long id;
}

View File

@@ -0,0 +1,33 @@
package app.module.front.usecase.info.bank.createBank.ports.application.domain;
import app.module.core.config.adapters.persistence.component.AuditCommand;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class CreateBankCmd extends AuditCommand {
private Long householdSeq;
private String transferType;
private String cropCode;
private String transferCategoryCode;
private String transferCategory;
private String incomeCode;
private String expenseCode;
private String sourcePurpose;
private Integer count;
private String unitCode;
private Integer price;
private String month;
private Long monthlyInputStatusId;
}

View File

@@ -0,0 +1,57 @@
package app.module.front.usecase.info.bank.getBanks.adapters.persistence;
import app.module.front.usecase.info.bank.getBanks.adapters.persistence.model.GetBanksDto;
import app.module.front.usecase.info.bank.getBanks.ports.GetBanksPortOut;
import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanks;
import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanksCmd;
import lombok.RequiredArgsConstructor;
import org.apache.commons.collections4.ListUtils;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Repository;
import java.util.List;
import java.util.stream.Collectors;
@Repository
@RequiredArgsConstructor
class GetBanksDao implements GetBanksPortOut {
private final GetBanksMapper mapper;
@Override
public Page<GetBanks> operate(Pageable pageable, GetBanksCmd command) {
// 게시물 목록 얻기
List<GetBanksDto> contents =
ListUtils.emptyIfNull(mapper.getBanks(pageable, command));
return new PageImpl<>(
contents.stream()
.map(
article ->
new GetBanks(
article.getId(),
article.getHouseholdSeq(),
article.getTransferType(),
article.getCropCode(),
article.getTransferCategoryCode(),
article.getTransferCategory(),
article.getIncomeCode(),
article.getExpenseCode(),
article.getSourcePurpose(),
article.getCount(),
article.getUnitCode(),
article.getPrice(),
article.getMonth(),
article.getMonthlyInputStatusId(),
article.getCreatedAt(),
article.getCreatedBy(),
article.getUpdatedAt(),
article.getUpdatedBy()))
.collect(Collectors.toList()),
pageable,
contents.isEmpty() ? 0 : contents.get(0).getTotal());
}
}

View File

@@ -0,0 +1,17 @@
package app.module.front.usecase.info.bank.getBanks.adapters.persistence;
import app.module.front.usecase.info.bank.getBanks.adapters.persistence.model.GetBanksDto;
import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanksCmd;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.data.domain.Pageable;
import java.util.List;
@Mapper
public interface GetBanksMapper {
List<GetBanksDto> getBanks(
@Param("pageable") Pageable pageable, @Param("cmd") GetBanksCmd cmd);
}

View File

@@ -0,0 +1,41 @@
package app.module.front.usecase.info.bank.getBanks.adapters.persistence.model;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
import java.time.LocalDateTime;
@Getter
@Setter
@AllArgsConstructor
public class GetBanksDto {
private Long id;
private Long householdSeq;
private String transferType;
private String cropCode;
private String transferCategoryCode;
private String transferCategory;
private String incomeCode;
private String expenseCode;
private String sourcePurpose;
private Integer count;
private String unitCode;
private Integer price;
private String month;
private Long monthlyInputStatusId;
private LocalDateTime createdAt;
private String createdBy;
private LocalDateTime updatedAt;
private String updatedBy;
private Long total;
}

View File

@@ -0,0 +1,12 @@
package app.module.front.usecase.info.bank.getBanks.ports;
import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanks;
import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanksCmd;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
public interface GetBanksPortIn {
Page<GetBanks> operate(Pageable pageable, GetBanksCmd command);
}

View File

@@ -0,0 +1,12 @@
package app.module.front.usecase.info.bank.getBanks.ports;
import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanks;
import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanksCmd;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
public interface GetBanksPortOut {
Page<GetBanks> operate(Pageable pageable, GetBanksCmd command);
}

View File

@@ -0,0 +1,23 @@
package app.module.front.usecase.info.bank.getBanks.ports.application;
import app.module.front.usecase.info.bank.getBanks.ports.GetBanksPortIn;
import app.module.front.usecase.info.bank.getBanks.ports.GetBanksPortOut;
import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanks;
import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanksCmd;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
class GetBanksService implements GetBanksPortIn {
private final GetBanksPortOut portOut;
@Override
public Page<GetBanks> operate(Pageable pageable, GetBanksCmd command) {
return portOut.operate(pageable, command);
}
}

View File

@@ -0,0 +1,41 @@
package app.module.front.usecase.info.bank.getBanks.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import java.time.LocalDateTime;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetBanks {
private Long id;
private Long householdSeq;
private String transferType;
private String cropCode;
private String transferCategoryCode;
private String transferCategory;
private String incomeCode;
private String expenseCode;
private String sourcePurpose;
private Integer count;
private String unitCode;
private Integer price;
private String month;
private Long monthlyInputStatusId;
private LocalDateTime createdAt;
private String createdBy;
private LocalDateTime updatedAt;
private String updatedBy;
}

View File

@@ -0,0 +1,16 @@
package app.module.front.usecase.info.bank.getBanks.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetBanksCmd {
private Long monthlyInputStatusId;
private Long householdSeq;
}

View File

@@ -0,0 +1,26 @@
package app.module.front.usecase.info.bank.removeBanks.adapters.persistence;
import app.module.core.config.application.util.CommonUtil;
import app.module.front.usecase.info.bank.removeBanks.adapters.persistence.model.RemoveBanksDto;
import app.module.front.usecase.info.bank.removeBanks.ports.RemoveBanksPortOut;
import app.module.front.usecase.info.bank.removeBanks.ports.application.domain.RemoveBanksCmd;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;
import java.time.LocalDateTime;
@Repository
@RequiredArgsConstructor
class RemoveBanksDao implements RemoveBanksPortOut {
private final RemoveBanksMapper mapper;
@Override
public void operate(RemoveBanksCmd command) {
String loginUser = CommonUtil.getLoginUsername();;
LocalDateTime now = LocalDateTime.now();
mapper.deleteBanks(
new RemoveBanksDto(command.getMonthlyInputStatusId(), command.getHouseholdSeq(), command.getTransferType(), now, loginUser, now, loginUser));
}
}

View File

@@ -0,0 +1,9 @@
package app.module.front.usecase.info.bank.removeBanks.adapters.persistence;
import app.module.front.usecase.info.bank.removeBanks.adapters.persistence.model.RemoveBanksDto;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface RemoveBanksMapper {
void deleteBanks(RemoveBanksDto param);
}

View File

@@ -0,0 +1,20 @@
package app.module.front.usecase.info.bank.removeBanks.adapters.persistence.model;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
import java.time.LocalDateTime;
@Getter
@Setter
@AllArgsConstructor
public class RemoveBanksDto {
private Long monthlyInputStatusId;
private Long householdSeq;
private String transferType;
private LocalDateTime updatedAt;
private String updatedBy;
private LocalDateTime deletedAt;
private String deletedBy;
}

View File

@@ -0,0 +1,7 @@
package app.module.front.usecase.info.bank.removeBanks.ports;
import app.module.front.usecase.info.bank.removeBanks.ports.application.domain.RemoveBanksCmd;
public interface RemoveBanksPortIn {
void operate(RemoveBanksCmd command);
}

View File

@@ -0,0 +1,7 @@
package app.module.front.usecase.info.bank.removeBanks.ports;
import app.module.front.usecase.info.bank.removeBanks.ports.application.domain.RemoveBanksCmd;
public interface RemoveBanksPortOut {
void operate(RemoveBanksCmd command);
}

View File

@@ -0,0 +1,19 @@
package app.module.front.usecase.info.bank.removeBanks.ports.application;
import app.module.front.usecase.info.bank.removeBanks.ports.RemoveBanksPortIn;
import app.module.front.usecase.info.bank.removeBanks.ports.RemoveBanksPortOut;
import app.module.front.usecase.info.bank.removeBanks.ports.application.domain.RemoveBanksCmd;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
class RemoveBanksService implements RemoveBanksPortIn {
private final RemoveBanksPortOut portOut;
@Override
public void operate(RemoveBanksCmd command) {
portOut.operate(command);
}
}

View File

@@ -0,0 +1,17 @@
package app.module.front.usecase.info.bank.removeBanks.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class RemoveBanksCmd {
private Long monthlyInputStatusId;
private Long householdSeq;
private String transferType;
}

View File

@@ -0,0 +1,112 @@
package app.module.front.usecase.info.bankUI.getBankInputUI.adapters.web;
import app.module.core.config.application.enums.MonthStatus;
import app.module.core.config.application.util.CoreUtil;
import app.module.core.usecase.uicode.view.ports.UICodeViewPortIn;
import app.module.core.usecase.uicode.view.ports.application.domain.UICodeView;
import app.module.front.config.application.response.ApiResponse;
import app.module.front.config.application.util.AuthUtil;
import app.module.front.usecase.info.bank.createBank.ports.CreateBankPortIn;
import app.module.front.usecase.info.bank.createBank.ports.application.domain.CreateBankCmd;
import app.module.front.usecase.info.bank.removeBanks.ports.RemoveBanksPortIn;
import app.module.front.usecase.info.bank.removeBanks.ports.application.domain.RemoveBanksCmd;
import app.module.front.usecase.info.bankUI.getBankInputUI.adapters.web.model.CreateBankInputProductReqVO;
import app.module.front.usecase.info.bankUI.getBankInputUI.adapters.web.model.CreateBankInputReqVO;
import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.GetMonthlyInputStatusPortIn;
import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatus;
import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatusCmd;
import app.module.front.usecase.info.monthly.updateMonthlyInputStatus.ports.UpdateMonthlyInputStatusPortIn;
import app.module.front.usecase.info.monthly.updateMonthlyInputStatus.ports.application.domain.UpdateMonthlyInputStatusCmd;
import app.module.front.usecase.info.monthlyProduct.createForestProduct.ports.CreateForestProductPortIn;
import app.module.front.usecase.info.monthlyProduct.createForestProduct.ports.application.domain.CreateForestProductCmd;
import app.module.front.usecase.info.monthlyProduct.removeMonthForestProducts.ports.RemoveMonthForestProductsPortIn;
import app.module.front.usecase.info.monthlyProduct.removeMonthForestProducts.ports.application.domain.RemoveMonthForestProductsCmd;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@Controller
@RequiredArgsConstructor
class CreateBankInputController {
private final GetMonthlyInputStatusPortIn getMonthlyInputStatusPortIn;
private final CreateBankPortIn createBankPortIn;
private final UpdateMonthlyInputStatusPortIn updateMonthlyInputStatusPortIn;
private final RemoveBanksPortIn removeBanksPortIn;
private final CoreUtil coreUtil;
private final UICodeViewPortIn uiCodeViewPortIn;
@PostMapping(path = "/api/front/info/bank/create")
ResponseEntity<?> operate(@RequestBody @Valid CreateBankInputReqVO reqVO, BindingResult bindingResult){
if (bindingResult.hasErrors()) {
return coreUtil.getErrorInfo(bindingResult);
}
GetMonthlyInputStatus currentMonthlyInfo =
getMonthlyInputStatusPortIn.operate(
new GetMonthlyInputStatusCmd(
reqVO.getId(), AuthUtil.getUserSeq())).orElse(null);
if(currentMonthlyInfo!=null) {
//TODO 트렌젝션 고려
removeBanksPortIn.operate(new RemoveBanksCmd(currentMonthlyInfo.getId(), AuthUtil.getUserSeq(), "code.bank.input"));
if (!reqVO.getStatus() && reqVO.getBankList() != null && !reqVO.getBankList().isEmpty()) { // 등록없음 처리가 아님.
for (CreateBankInputProductReqVO item : reqVO.getBankList()) {
UICodeView code = uiCodeViewPortIn.connect(item.getTransferCategoryCode()).orElse(null);
if(code != null) {
createBankPortIn.operate(new CreateBankCmd(
AuthUtil.getUserSeq(),
"code.bank.input",
item.getCropCode(),
item.getTransferCategoryCode(),
item.getTransferCategory(),
code.getCodeType().equals("INPUT") ? code.getCodeValue() : null,
code.getCodeType().equals("OUTPUT") ?code.getCodeValue() : null,
item.getSourcePurpose(),
item.getCount(),
item.getUnitCode(),
item.getPrice(),
currentMonthlyInfo.getMonth(),
currentMonthlyInfo.getId()
));
}
}
updateMonthlyInputStatusPortIn.operate(new UpdateMonthlyInputStatusCmd(
currentMonthlyInfo.getId(),
AuthUtil.getUserSeq(),
currentMonthlyInfo.getMonth(),
currentMonthlyInfo.getBankAutoTransferInputStatus(),
MonthStatus.REGISTERED,
currentMonthlyInfo.getBankAutoTransferOutputStatus()
));
} else {
updateMonthlyInputStatusPortIn.operate(new UpdateMonthlyInputStatusCmd(
currentMonthlyInfo.getId(),
AuthUtil.getUserSeq(),
currentMonthlyInfo.getMonth(),
currentMonthlyInfo.getBankAutoTransferInputStatus(),
MonthStatus.NOTHING,
currentMonthlyInfo.getBankAutoTransferOutputStatus()
));
}
return ResponseEntity.ok(ApiResponse.success(null));
} else {
return ResponseEntity.ok(ApiResponse.failure(null));
}
}
}

View File

@@ -3,13 +3,19 @@ package app.module.front.usecase.info.bankUI.getBankInputUI.adapters.web;
import app.module.core.config.application.enums.MonthStatus;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.front.config.application.util.AuthUtil;
import app.module.front.usecase.info.bank.getBanks.ports.GetBanksPortIn;
import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanks;
import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanksCmd;
import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.GetMonthlyInputStatusPortIn;
import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatus;
import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatusCmd;
import app.module.front.usecase.info.monthly.getPrevMonthlyInputStatus.ports.GetPrevMonthlyInputStatusPortIn;
import app.module.front.usecase.info.monthly.getPrevMonthlyInputStatus.ports.application.domain.GetPrevMonthlyInputStatus;
import app.module.front.usecase.info.monthly.getPrevMonthlyInputStatus.ports.application.domain.GetPrevMonthlyInputStatusCmd;
import app.module.front.usecase.info.monthlyProduct.getMonthlyForestProducts.ports.application.domain.GetMonthlyForestProducts;
import app.module.front.usecase.info.monthlyProduct.getMonthlyForestProducts.ports.application.domain.GetMonthlyForestProductsCmd;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.web.PageableDefault;
@@ -29,13 +35,14 @@ class GetBankInputUIController {
private final GetPrevMonthlyInputStatusPortIn prevMonthlyInputStatusPortIn;
private final GetMonthlyInputStatusPortIn getMonthlyInputStatusPortIn;
private final GetBanksPortIn getBanksPortIn;
private final UICodeListPortIn uiCodeListPortIn;
@GetMapping(path = "/info/bank/create/input/{id}")
public String operate(Model model,
@PathVariable Long id) {
@PathVariable Long id
,@PageableDefault(sort = "createAt", direction = Sort.Direction.DESC, page = 0, size = 100) Pageable pageable) {
String currentMonth = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMM"));
@@ -54,6 +61,22 @@ class GetBankInputUIController {
new GetMonthlyInputStatusCmd(
id, AuthUtil.getUserSeq())).orElse(null);
Page<GetBanks> pastList = Page.empty();
if (pastMonthlyInfo != null) {
pastList = getBanksPortIn.operate(
pageable,
new GetBanksCmd(pastMonthlyInfo.getId(), AuthUtil.getUserSeq()));
}
Page<GetBanks> currentList = Page.empty();
if (currentMonthlyInfo != null) {
currentList = getBanksPortIn.operate(
pageable,
new GetBanksCmd(currentMonthlyInfo.getId(), AuthUtil.getUserSeq()));
}
//수정 가능 여부 판단
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMM");
YearMonth yearMonth = YearMonth.parse(currentMonthlyInfo.getMonth(), formatter);
@@ -66,6 +89,11 @@ class GetBankInputUIController {
model.addAttribute("pastMonthlyInfo", pastMonthlyInfo);
model.addAttribute("currentMonthlyInfo", currentMonthlyInfo);
model.addAttribute("pastBankList", pastList);
model.addAttribute("bankList", currentList);
model.addAttribute("transferCategoryList", uiCodeListPortIn.connect("code.bank.input"));
model.addAttribute("codeRecordCropList", uiCodeListPortIn.connect("code.record.crop"));
model.addAttribute("unitList", uiCodeListPortIn.connect("code.record.unit"));

View File

@@ -0,0 +1,31 @@
package app.module.front.usecase.info.bankUI.getBankInputUI.adapters.web.model;
import lombok.*;
import java.math.BigDecimal;
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode
public class CreateBankInputProductReqVO {
private Long id;
private String transferType;
private String cropCode;
private String transferCategoryCode;
private String transferCategory;
private String incomeCode;
private String expenseCode;
private String sourcePurpose;
private Integer count;
private String unitCode;
private Integer price;
}

View File

@@ -0,0 +1,29 @@
package app.module.front.usecase.info.bankUI.getBankInputUI.adapters.web.model;
import lombok.*;
import java.util.ArrayList;
import java.util.List;
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode
public class CreateBankInputReqVO {
private Boolean status;
private Long id;
private List<CreateBankInputProductReqVO> bankList;
public List<CreateBankInputProductReqVO> getBankList() {
return bankList != null ? bankList : new ArrayList<>();
}
public void setBankList(List<CreateBankInputProductReqVO> bankList) {
this.bankList = bankList;
}
}

View File

@@ -21,6 +21,6 @@ class RemoveMonthForestProductsDao implements RemoveMonthForestProductsPortOut {
LocalDateTime now = LocalDateTime.now();
mapper.deleteForestProducts(
new RemoveMonthForestProductsParam(command.getId(), command.getHouseholdSeq(), now, loginUser, now, loginUser));
new RemoveMonthForestProductsParam(command.getMonthlyInputStatusId(), command.getHouseholdSeq(), now, loginUser, now, loginUser));
}
}

View File

@@ -10,7 +10,7 @@ import java.time.LocalDateTime;
@Setter
@AllArgsConstructor
public class RemoveMonthForestProductsParam {
private Long id;
private Long monthlyInputStatusId;
private Long householdSeq;
private LocalDateTime updatedAt;
private String updatedBy;

View File

@@ -10,6 +10,6 @@ import lombok.Setter;
@AllArgsConstructor
@EqualsAndHashCode
public class RemoveMonthForestProductsCmd {
private Long id;
private Long monthlyInputStatusId;
private Long householdSeq;
}