[BO] 일계부 수입 등록&수정
This commit is contained in:
@@ -4,13 +4,10 @@ import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adap
|
|||||||
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.CreateDailyIncomePortOut;
|
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.CreateDailyIncomePortOut;
|
||||||
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.CreateDailyIncomeCmd;
|
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.CreateDailyIncomeCmd;
|
||||||
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.GetDailyIncomeCmd;
|
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.GetDailyIncomeCmd;
|
||||||
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.RemoveDailyIncomeCmd;
|
|
||||||
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;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@Service
|
@Service
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@@ -29,11 +26,11 @@ public class CreateDailyIncomeDao implements CreateDailyIncomePortOut {
|
|||||||
if (existCount == 0) {
|
if (existCount == 0) {
|
||||||
dailyIncomeMapper.createDailyIncome(command);
|
dailyIncomeMapper.createDailyIncome(command);
|
||||||
|
|
||||||
log.debug("[CreateDailyIncome] record={}", command);
|
log.debug("[CreateDailyIncome] command={}", command);
|
||||||
} else {
|
} else {
|
||||||
dailyIncomeMapper.updateDailyIncome(command);
|
dailyIncomeMapper.updateDailyIncome(command);
|
||||||
|
|
||||||
log.debug("[UpdateDailyIncome] record={}", command);
|
log.debug("[UpdateDailyIncome] command={}", command);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal;
|
package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal;
|
||||||
|
|
||||||
|
import app.module.core.config.application.enums.DailyInputType;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
|
|
||||||
@@ -8,7 +9,7 @@ import lombok.Setter;
|
|||||||
public class GetDailyIncomeDto {
|
public class GetDailyIncomeDto {
|
||||||
private Long id;
|
private Long id;
|
||||||
private Long dailyRecordSeq;
|
private Long dailyRecordSeq;
|
||||||
private String inputType; // TODO DailyInputType
|
private DailyInputType inputType;
|
||||||
private Boolean credit;
|
private Boolean credit;
|
||||||
private String cropCode;
|
private String cropCode;
|
||||||
private String cropLabel;
|
private String cropLabel;
|
||||||
@@ -20,12 +21,4 @@ public class GetDailyIncomeDto {
|
|||||||
private String unitSelf;
|
private String unitSelf;
|
||||||
private Long price;
|
private Long price;
|
||||||
private Long estimatedValue;
|
private Long estimatedValue;
|
||||||
|
|
||||||
/**
|
|
||||||
* 수정 가능 여부
|
|
||||||
* @return true=가능, false=불가능(등록 상태)
|
|
||||||
*/
|
|
||||||
public boolean isUpdated() {
|
|
||||||
return this.id != null && this.id != 0L;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,13 +3,11 @@ package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ada
|
|||||||
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
|
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
|
||||||
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.CreateDailyIncomeReqVO;
|
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.CreateDailyIncomeReqVO;
|
||||||
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.DailyIncomeUIReqVO;
|
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.DailyIncomeUIReqVO;
|
||||||
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.RemoveDailyIncomeReqVO;
|
|
||||||
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.validator.CreateDailyIncomeValidator;
|
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.validator.CreateDailyIncomeValidator;
|
||||||
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.CreateDailyIncomePortIn;
|
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.CreateDailyIncomePortIn;
|
||||||
import app.module.core.config.application.exception.NoRecordDataException;
|
import app.module.core.config.application.exception.NoRecordDataException;
|
||||||
import app.module.core.config.application.util.CoreUtil;
|
import app.module.core.config.application.util.CoreUtil;
|
||||||
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
||||||
import app.module.core.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
|
||||||
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||||
import jakarta.validation.Valid;
|
import jakarta.validation.Valid;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
@@ -29,14 +27,21 @@ public class CreateDailyIncomeController {
|
|||||||
private final CreateDailyIncomePortIn dailyIncomePortIn;
|
private final CreateDailyIncomePortIn dailyIncomePortIn;
|
||||||
private final CreateDailyIncomeValidator createValidator;
|
private final CreateDailyIncomeValidator createValidator;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 일계부 수입 조회
|
||||||
|
*
|
||||||
|
* @param id 수입 일련번호
|
||||||
|
* @param reqVO 검색 조건
|
||||||
|
*/
|
||||||
@GetMapping(path = "/{id}")
|
@GetMapping(path = "/{id}")
|
||||||
ResponseEntity<?> detail(@PathVariable("id") String id, @ModelAttribute DailyIncomeUIReqVO reqVO) {
|
ResponseEntity<?> detail(@PathVariable("id") String id, @ModelAttribute DailyIncomeUIReqVO reqVO) {
|
||||||
|
|
||||||
reqVO.setId(Long.parseLong(id));
|
reqVO.setId(Long.parseLong(id));
|
||||||
|
|
||||||
//DailyRecordDto dailyRecord = this.vaildGetDailyRecord(reqVO.getSearchMonth(), reqVO.getGroupNo());
|
|
||||||
|
|
||||||
GetDailyIncomeDto detail = dailyIncomePortIn.detail(reqVO);
|
GetDailyIncomeDto detail = dailyIncomePortIn.detail(reqVO);
|
||||||
|
if (detail == null) {
|
||||||
|
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null);
|
||||||
|
}
|
||||||
|
|
||||||
return ResponseEntity.status(HttpStatus.OK).body(detail);
|
return ResponseEntity.status(HttpStatus.OK).body(detail);
|
||||||
}
|
}
|
||||||
@@ -44,28 +49,26 @@ public class CreateDailyIncomeController {
|
|||||||
/**
|
/**
|
||||||
* 일계부 수입 등록 처리
|
* 일계부 수입 등록 처리
|
||||||
*
|
*
|
||||||
* @param searchMonth 검색 월(yyyyMM)
|
|
||||||
* @param groupNo 검색 그룹
|
|
||||||
* @param id 수입 일련번호
|
* @param id 수입 일련번호
|
||||||
* @param formVO 입력 데이터
|
* @param formVO 입력 데이터
|
||||||
* @param bindingResult BindingResult
|
* @param bindingResult BindingResult
|
||||||
*/
|
*/
|
||||||
@PostMapping(path = "/{id}")
|
@PostMapping(path = "/{id}")
|
||||||
ResponseEntity<?> create(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo
|
ResponseEntity<?> create(@PathVariable("id") String id
|
||||||
, @PathVariable("id") String id
|
|
||||||
, @Valid @RequestBody CreateDailyIncomeReqVO formVO, BindingResult bindingResult) {
|
, @Valid @RequestBody CreateDailyIncomeReqVO formVO, BindingResult bindingResult) {
|
||||||
|
|
||||||
createValidator.validate(formVO, bindingResult);
|
createValidator.validate(formVO, bindingResult);
|
||||||
if (bindingResult.hasErrors()) {
|
if (bindingResult.hasErrors()) {
|
||||||
return coreUtil.getErrorInfo(bindingResult);
|
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
|
||||||
|
.body(bindingResult.getFieldErrors());
|
||||||
}
|
}
|
||||||
|
|
||||||
DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, null);
|
DailyRecordDto dailyRecord = this.vaildGetDailyRecord(formVO.getDailyId());
|
||||||
|
|
||||||
formVO.setSearchMonth(searchMonth);
|
formVO.setSearchMonth(dailyRecord.getRecordMonth());
|
||||||
formVO.setGroupNo(Integer.parseInt(groupNo));
|
formVO.setGroupNo(dailyRecord.getGroupNo());
|
||||||
formVO.setId(Long.parseLong(id));
|
formVO.setId(Long.parseLong(id));
|
||||||
formVO.setDailyRecordSeq(dailyRecord.getId());
|
formVO.setDailyId(dailyRecord.getId());
|
||||||
log.debug("formVO: {}", formVO);
|
log.debug("formVO: {}", formVO);
|
||||||
|
|
||||||
dailyIncomePortIn.create(formVO);
|
dailyIncomePortIn.create(formVO);
|
||||||
@@ -73,18 +76,13 @@ public class CreateDailyIncomeController {
|
|||||||
return ResponseEntity.status(HttpStatus.OK).body(formVO);
|
return ResponseEntity.status(HttpStatus.OK).body(formVO);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 일계부 유효성 체크 및 데이터 조회
|
* 일계부 유효성 체크 및 데이터 조회
|
||||||
*
|
*
|
||||||
* @param searchMonth 검색 월(yyyyMM)
|
* @param dailyRecordSeq 항목 일련번호
|
||||||
* @param groupNo 검색 그룹
|
|
||||||
*/
|
*/
|
||||||
private DailyRecordDto vaildGetDailyRecord(String searchMonth, Integer groupNo) {
|
private DailyRecordDto vaildGetDailyRecord(Long dailyRecordSeq) {
|
||||||
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(dailyRecordSeq);
|
||||||
log.debug("getRecordUIReq: {}", reqVO);
|
|
||||||
|
|
||||||
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
|
|
||||||
if (dailyRecord == null || dailyRecord.getId() == null) {
|
if (dailyRecord == null || dailyRecord.getId() == null) {
|
||||||
throw new NoRecordDataException();
|
throw new NoRecordDataException();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model;
|
package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model;
|
||||||
|
|
||||||
import app.module.core.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
import app.module.core.config.application.enums.DailyInputType;
|
||||||
import jakarta.validation.constraints.NotBlank;
|
import jakarta.validation.constraints.NotBlank;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
@@ -9,15 +9,7 @@ import lombok.ToString;
|
|||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
@ToString(callSuper = true)
|
@ToString(callSuper = true)
|
||||||
public class CreateDailyIncomeReqVO extends DailyUIReqVO {
|
public class CreateDailyIncomeReqVO extends DailyIncomeUIReqVO {
|
||||||
/**
|
|
||||||
* 수입 일련번호
|
|
||||||
*/
|
|
||||||
private Long id;
|
|
||||||
/**
|
|
||||||
* 일계부 일련번호
|
|
||||||
*/
|
|
||||||
private Long dailyRecordSeq;
|
|
||||||
/**
|
/**
|
||||||
* 등록 유형
|
* 등록 유형
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -1,10 +1,8 @@
|
|||||||
package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model;
|
package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model;
|
||||||
|
|
||||||
import app.module.core.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
import lombok.ToString;
|
|
||||||
import org.apache.tika.utils.StringUtils;
|
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
@@ -12,7 +10,7 @@ public class DailyIncomeUIReqVO {
|
|||||||
/**
|
/**
|
||||||
* 검색 월(yyyyMM)
|
* 검색 월(yyyyMM)
|
||||||
*/
|
*/
|
||||||
private String recordMonth;
|
private String searchMonth;
|
||||||
/**
|
/**
|
||||||
* 검색 그룸번호
|
* 검색 그룸번호
|
||||||
*/
|
*/
|
||||||
@@ -21,11 +19,11 @@ public class DailyIncomeUIReqVO {
|
|||||||
* 임가 일련번호
|
* 임가 일련번호
|
||||||
*/
|
*/
|
||||||
private Long householdSeq;
|
private Long householdSeq;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 일계부 항목 일련번호
|
* 일계부 항목 일련번호
|
||||||
*/
|
*/
|
||||||
private Long dailyId;
|
private Long dailyId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 수입 일련번호
|
* 수입 일련번호
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -1,22 +0,0 @@
|
|||||||
package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model;
|
|
||||||
|
|
||||||
import app.module.core.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
|
||||||
import jakarta.validation.constraints.NotBlank;
|
|
||||||
import lombok.Getter;
|
|
||||||
import lombok.Setter;
|
|
||||||
import lombok.ToString;
|
|
||||||
|
|
||||||
@Getter
|
|
||||||
@Setter
|
|
||||||
@ToString(callSuper = true)
|
|
||||||
public class RemoveDailyIncomeReqVO extends DailyUIReqVO {
|
|
||||||
/**
|
|
||||||
* 수입 일련번호
|
|
||||||
*/
|
|
||||||
@NotBlank(message = "{valid.common.required}")
|
|
||||||
private String id;
|
|
||||||
/**
|
|
||||||
* 일계부 일련번호
|
|
||||||
*/
|
|
||||||
private Long dailyRecordSeq;
|
|
||||||
}
|
|
||||||
@@ -4,9 +4,6 @@ package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.por
|
|||||||
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
|
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
|
||||||
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.CreateDailyIncomeReqVO;
|
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.CreateDailyIncomeReqVO;
|
||||||
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.DailyIncomeUIReqVO;
|
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.DailyIncomeUIReqVO;
|
||||||
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.RemoveDailyIncomeReqVO;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public interface CreateDailyIncomePortIn {
|
public interface CreateDailyIncomePortIn {
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -4,16 +4,13 @@ package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.por
|
|||||||
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
|
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
|
||||||
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.CreateDailyIncomeCmd;
|
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.CreateDailyIncomeCmd;
|
||||||
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.GetDailyIncomeCmd;
|
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.GetDailyIncomeCmd;
|
||||||
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.RemoveDailyIncomeCmd;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public interface CreateDailyIncomePortOut {
|
public interface CreateDailyIncomePortOut {
|
||||||
/**
|
/**
|
||||||
* 일계부 수입 조회
|
* 일계부 수입 조회
|
||||||
*
|
*
|
||||||
* @param command 검색 조건
|
* @param command 검색 조건
|
||||||
* @return 수입 목록
|
* @return 수입 상세
|
||||||
*/
|
*/
|
||||||
GetDailyIncomeDto detail(GetDailyIncomeCmd command);
|
GetDailyIncomeDto detail(GetDailyIncomeCmd command);
|
||||||
|
|
||||||
|
|||||||
@@ -3,32 +3,26 @@ package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.por
|
|||||||
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
|
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
|
||||||
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.CreateDailyIncomeReqVO;
|
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.CreateDailyIncomeReqVO;
|
||||||
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.DailyIncomeUIReqVO;
|
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.DailyIncomeUIReqVO;
|
||||||
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.RemoveDailyIncomeReqVO;
|
|
||||||
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.CreateDailyIncomePortIn;
|
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.CreateDailyIncomePortIn;
|
||||||
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.CreateDailyIncomePortOut;
|
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.CreateDailyIncomePortOut;
|
||||||
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.CreateDailyIncomeCmd;
|
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.CreateDailyIncomeCmd;
|
||||||
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.GetDailyIncomeCmd;
|
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.GetDailyIncomeCmd;
|
||||||
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.RemoveDailyIncomeCmd;
|
|
||||||
import app.module.core.config.application.util.AuditUtil;
|
import app.module.core.config.application.util.AuditUtil;
|
||||||
|
import app.module.core.config.constants.DailyRecordConstants;
|
||||||
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||||
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
|
||||||
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public class CreateDailyIncomeService implements CreateDailyIncomePortIn {
|
public class CreateDailyIncomeService implements CreateDailyIncomePortIn {
|
||||||
private final CreateDailyIncomePortOut portOut;
|
private final CreateDailyIncomePortOut portOut;
|
||||||
private final UICodeListPortIn uiCodeListPortIn;
|
|
||||||
private final DailyRecordPortIn dailyRecordPortIn;
|
private final DailyRecordPortIn dailyRecordPortIn;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public GetDailyIncomeDto detail(DailyIncomeUIReqVO reqVO) {
|
public GetDailyIncomeDto detail(DailyIncomeUIReqVO reqVO) {
|
||||||
GetDailyIncomeCmd findCmd = new GetDailyIncomeCmd(
|
GetDailyIncomeCmd findCmd = new GetDailyIncomeCmd(
|
||||||
reqVO.getRecordMonth(),
|
reqVO.getSearchMonth(),
|
||||||
reqVO.getGroupNo(),
|
reqVO.getGroupNo(),
|
||||||
reqVO.getHouseholdSeq(),
|
reqVO.getHouseholdSeq(),
|
||||||
reqVO.getId());
|
reqVO.getId());
|
||||||
@@ -36,24 +30,6 @@ public class CreateDailyIncomeService implements CreateDailyIncomePortIn {
|
|||||||
return portOut.detail(findCmd);
|
return portOut.detail(findCmd);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 코드명 조회
|
|
||||||
*
|
|
||||||
* @param codeId 코드
|
|
||||||
* @param codeList 공통 코드 목록
|
|
||||||
* @return 코드명
|
|
||||||
*/
|
|
||||||
private String getCodeLabel(String codeId, List<UICodeElement> codeList) {
|
|
||||||
String returnValue = null;
|
|
||||||
for (UICodeElement codeSetup : codeList) {
|
|
||||||
if (codeSetup.getId().equalsIgnoreCase(codeId)) {
|
|
||||||
returnValue = codeSetup.getCodeText();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return returnValue;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void create(CreateDailyIncomeReqVO formVO) {
|
public void create(CreateDailyIncomeReqVO formVO) {
|
||||||
GetDailyIncomeCmd findCmd = new GetDailyIncomeCmd(
|
GetDailyIncomeCmd findCmd = new GetDailyIncomeCmd(
|
||||||
@@ -65,10 +41,10 @@ public class CreateDailyIncomeService implements CreateDailyIncomePortIn {
|
|||||||
CreateDailyIncomeCmd command = AuditUtil.create(
|
CreateDailyIncomeCmd command = AuditUtil.create(
|
||||||
new CreateDailyIncomeCmd(
|
new CreateDailyIncomeCmd(
|
||||||
formVO.getId(),
|
formVO.getId(),
|
||||||
formVO.getDailyRecordSeq(),
|
formVO.getDailyId(),
|
||||||
formVO.getInputType(),
|
formVO.getInputType(),
|
||||||
"1", // [정책] 1 고정
|
DailyRecordConstants.INCOME_CATEGORY,
|
||||||
(formVO.getCredit() ? "91206" : null), // [정책] 외상판매 Y 일 경우 지출부호 91206 적재
|
(formVO.getCredit() ? DailyRecordConstants.INCOME_EXPENSE_MARK : null),
|
||||||
formVO.getCredit(),
|
formVO.getCredit(),
|
||||||
formVO.getCropCode(),
|
formVO.getCropCode(),
|
||||||
formVO.getIncomeKind(),
|
formVO.getIncomeKind(),
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain;
|
package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain;
|
||||||
|
|
||||||
import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.DailyInputType;
|
|
||||||
import app.module.core.config.adapters.persistence.component.AuditCommand;
|
import app.module.core.config.adapters.persistence.component.AuditCommand;
|
||||||
|
import app.module.core.config.application.enums.DailyInputType;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
|
|||||||
@@ -1,18 +0,0 @@
|
|||||||
package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.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 RemoveDailyIncomeCmd extends AuditCommand {
|
|
||||||
private String searchMonth;
|
|
||||||
private Integer groupNo;
|
|
||||||
private Long id;
|
|
||||||
private Long dailyRecordSeq;
|
|
||||||
}
|
|
||||||
@@ -10,7 +10,7 @@
|
|||||||
from daily_income ds
|
from daily_income ds
|
||||||
<include refid="app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
|
<include refid="app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
|
||||||
where ds.is_deleted = false
|
where ds.is_deleted = false
|
||||||
and ds.id = ${id}
|
and ds.id = #{id}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getRecordExistCount" resultType="int">
|
<select id="getRecordExistCount" resultType="int">
|
||||||
@@ -19,7 +19,7 @@
|
|||||||
<include refid="app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
|
<include refid="app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
|
||||||
where ds.is_deleted = false
|
where ds.is_deleted = false
|
||||||
<if test="id != null and id != '0'">
|
<if test="id != null and id != '0'">
|
||||||
and ds.id = ${id}
|
and ds.id = #{id}
|
||||||
</if>
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|||||||
@@ -25,47 +25,17 @@ var ajaxUtil = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
_alertError : function (code) {
|
_alertError : function (code) {
|
||||||
var message = ajaxUtil._msg500;
|
let message = ajaxUtil._msg500;
|
||||||
if (code == '400') {
|
if (code === '400') {
|
||||||
message = ajaxUtil._msg400;
|
message = ajaxUtil._msg400;
|
||||||
}
|
}
|
||||||
|
|
||||||
ajaxUtil._alert(message, '오류 안내');
|
ajaxUtil._alert(message, '오류 안내');
|
||||||
},
|
},
|
||||||
_alert : function (alertMessage, alertTitle, afterEvent) {
|
_alert : function (alertMessage, alertTitle) {
|
||||||
etUI.dialog.alert({
|
console.warn(alertTitle)
|
||||||
title: alertTitle,
|
|
||||||
message: alertMessage,
|
|
||||||
type: "alert",
|
|
||||||
callback: function() {
|
|
||||||
console.log("alert callback");
|
|
||||||
},
|
|
||||||
});
|
|
||||||
},
|
|
||||||
_alertId : function (alertId, afterEvent) {
|
|
||||||
ajaxUtil._alertMethod({
|
|
||||||
id: alertId,
|
|
||||||
title: null,
|
|
||||||
message: null,
|
|
||||||
after: afterEvent !== undefined ? (afterEvent ? 'Y' : 'N') : 'N',
|
|
||||||
});
|
|
||||||
},
|
|
||||||
_alertMethod : function (jsonObj) {
|
|
||||||
ajaxUtil._ajaxSyncNoWaiting(
|
|
||||||
'/m/common/alert',
|
|
||||||
jsonObj,
|
|
||||||
function(rstData) {
|
|
||||||
var $wrap = $('#bindWrap');
|
|
||||||
if ($wrap.find('.ui-popup-common-alert').length != 0) {
|
|
||||||
$wrap.find('.ui-popup-common-alert').remove();
|
|
||||||
}
|
|
||||||
|
|
||||||
$wrap.append(rstData);
|
alert(alertMessage);
|
||||||
uxgFn.popup.bind('.ui-popup-common-alert').open();
|
|
||||||
},
|
|
||||||
function(code, rstData) {
|
|
||||||
kri.logger.error('Do nothing. code: '+ code, rstData);
|
|
||||||
},
|
|
||||||
'html');
|
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
@@ -130,22 +100,22 @@ var ajaxUtil = {
|
|||||||
contentType : 'application/json; charset=UTF-8',
|
contentType : 'application/json; charset=UTF-8',
|
||||||
async: async,
|
async: async,
|
||||||
statusCode : {
|
statusCode : {
|
||||||
|
400:function(){
|
||||||
|
ajaxUtil._alertError(ajaxUtil.$400);
|
||||||
|
},
|
||||||
404:function(rstData){
|
404:function(rstData){
|
||||||
ajaxUtil._hideWaiting();
|
ajaxUtil._hideWaiting();
|
||||||
if (typeof errorCallback !== 'undefined') {
|
if (typeof errorCallback !== 'undefined') {
|
||||||
errorCallback(ajaxUtil.$404, rstData);
|
errorCallback(ajaxUtil.$404, rstData);
|
||||||
} else {
|
} else {
|
||||||
// kri.menu.main();
|
console.error('statusCode: 404');
|
||||||
kri.logger.error('statusCode: 404');
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
401:function(){
|
401:function(){
|
||||||
// kri.menu.main();
|
console.error('statusCode: 401');
|
||||||
kri.logger.error('statusCode: 401');
|
|
||||||
},
|
},
|
||||||
403:function(rstData){
|
403:function(rstData){
|
||||||
// kri.menu.main();
|
console.error('statusCode: 403');
|
||||||
kri.logger.error('statusCode: 403');
|
|
||||||
},
|
},
|
||||||
422:function(rstData, status) {
|
422:function(rstData, status) {
|
||||||
console.log(rstData);
|
console.log(rstData);
|
||||||
@@ -195,13 +165,15 @@ var ajaxUtil = {
|
|||||||
},
|
},
|
||||||
success : function(rstData, status) {
|
success : function(rstData, status) {
|
||||||
ajaxUtil._hideWaiting();
|
ajaxUtil._hideWaiting();
|
||||||
|
console.log('succ', rstData)
|
||||||
if (typeof successCallback !== 'undefined') {
|
if (typeof successCallback !== 'undefined') {
|
||||||
successCallback(rstData, status);
|
successCallback(rstData, status);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
error : function(rstData) {
|
error : function(rstData) {
|
||||||
ajaxUtil._hideWaiting();
|
ajaxUtil._hideWaiting();
|
||||||
if (!(rstData.status == 500 || rstData.status == 422)) {
|
console.log('error')
|
||||||
|
if (!(rstData.status == 500 || rstData.status == 422 || rstData.status == 400)) {
|
||||||
if (typeof errorCallback !== 'undefined') {
|
if (typeof errorCallback !== 'undefined') {
|
||||||
errorCallback(rstData.status, rstData);
|
errorCallback(rstData.status, rstData);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -3,9 +3,12 @@
|
|||||||
layout:decorate="~{layout/layout}">
|
layout:decorate="~{layout/layout}">
|
||||||
|
|
||||||
<div class="layer-wrap" th:fragment="modalFragment">
|
<div class="layer-wrap" th:fragment="modalFragment">
|
||||||
<form autocomplete="off" method="get" name="reqIncomeForm">
|
<form autocomplete="off" method="get" name="reqIncomeForm" data-modal-id=".modal-daily-income">
|
||||||
<input type="hidden" name="visitInfoId">
|
|
||||||
<input type="hidden" name="householdSeq" th:value="${seq}">
|
<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-income" data-props-dimm-click="true" data-state="close">
|
<div class="component-modal mypage-wrap modal01 modal-daily-income" data-props-dimm-click="true" data-state="close">
|
||||||
<div class="modal-dimm"></div>
|
<div class="modal-dimm"></div>
|
||||||
@@ -114,7 +117,7 @@
|
|||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<th>현금(원)</th>
|
<th>현금(원)<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>
|
||||||
<td>
|
<td>
|
||||||
<div class="component-input">
|
<div class="component-input">
|
||||||
<div class="input-field">
|
<div class="input-field">
|
||||||
@@ -123,7 +126,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
<th>현물평가액</th>
|
<th>현물평가액(원)<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>
|
||||||
<td>
|
<td>
|
||||||
<div class="component-input">
|
<div class="component-input">
|
||||||
<div class="input-field">
|
<div class="input-field">
|
||||||
@@ -155,7 +158,6 @@
|
|||||||
</form>
|
</form>
|
||||||
|
|
||||||
<script th:inline="javascript">
|
<script th:inline="javascript">
|
||||||
const modalId = '.modal-daily-income';
|
|
||||||
// form 초기화
|
// form 초기화
|
||||||
const resetIncomeForm = () => {
|
const resetIncomeForm = () => {
|
||||||
const form = document.reqIncomeForm;
|
const form = document.reqIncomeForm;
|
||||||
@@ -171,40 +173,6 @@
|
|||||||
form.estimatedValue.value = '';
|
form.estimatedValue.value = '';
|
||||||
document.getElementById('isCredit_N').checked = true;
|
document.getElementById('isCredit_N').checked = true;
|
||||||
}
|
}
|
||||||
</script>
|
|
||||||
|
|
||||||
<script th:inline="javascript">
|
|
||||||
// 일계부 등록 모달창 띄우기
|
|
||||||
const showDailyIncomeModal = (id) => {
|
|
||||||
const mf = document.reqIncomeForm;
|
|
||||||
|
|
||||||
const obj = $(f).serializeObject();
|
|
||||||
console.log(obj)
|
|
||||||
|
|
||||||
resetIncomeForm();
|
|
||||||
|
|
||||||
if(id != null) {
|
|
||||||
mf.visitInfoId.value = id;
|
|
||||||
|
|
||||||
ajaxUtil._ajaxAsyncMethod(
|
|
||||||
`/api/household/daily/income/${id}`,
|
|
||||||
obj,
|
|
||||||
function (rstData) {
|
|
||||||
console.log("일계부 상세 응답값 : ", rstData);
|
|
||||||
setIncomeFormData(rstData);
|
|
||||||
|
|
||||||
document.querySelector(modalId).ui.open();
|
|
||||||
},
|
|
||||||
function () {
|
|
||||||
|
|
||||||
},
|
|
||||||
'get'
|
|
||||||
);
|
|
||||||
|
|
||||||
} else {
|
|
||||||
document.querySelector(modalId).ui.open();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 일계부 상세 값 set
|
// 일계부 상세 값 set
|
||||||
const setIncomeFormData = (data) => {
|
const setIncomeFormData = (data) => {
|
||||||
@@ -234,29 +202,58 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<script th:inline="javascript">
|
<script th:inline="javascript">
|
||||||
// TODO : 임가방문정보 등록
|
// 일계부 등록 모달창 띄우기
|
||||||
|
const showDailyIncomeModal = (id) => {
|
||||||
|
const mf = document.reqIncomeForm;
|
||||||
|
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;
|
||||||
|
|
||||||
|
resetIncomeForm();
|
||||||
|
|
||||||
|
if (id !== null && id !== undefined) {
|
||||||
|
const obj = $(f).serializeObject();
|
||||||
|
obj.id = mf.id.value;
|
||||||
|
obj.searchMonth = obj.recordMonth;
|
||||||
|
|
||||||
|
ajaxUtil._ajaxAsyncMethod(
|
||||||
|
`/api/household/daily/income/${id}`,
|
||||||
|
obj,
|
||||||
|
function (rstData, status) {
|
||||||
|
setIncomeFormData(rstData);
|
||||||
|
|
||||||
|
document.querySelector($(mf).data('modalId')).ui.open();
|
||||||
|
},
|
||||||
|
function () {
|
||||||
|
console.error('Do nothing error.')
|
||||||
|
},
|
||||||
|
'get'
|
||||||
|
);
|
||||||
|
|
||||||
|
} else {
|
||||||
|
document.querySelector($(mf).data('modalId')).ui.open();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const saveDailyIncome = () => {
|
const saveDailyIncome = () => {
|
||||||
const f = document.reqIncomeForm;
|
const mf = document.reqIncomeForm;
|
||||||
let dataOj = $(f).serializeObject();
|
let obj = $(mf).serializeObject();
|
||||||
|
obj.inputType = 'SELF';
|
||||||
|
|
||||||
console.log("dataOj", dataOj);
|
ajaxUtil._ajaxAsyncNoWaiting(
|
||||||
return;
|
'/api/household/daily/income/' + (obj.id === '' ? '0' : obj.id),
|
||||||
|
obj,
|
||||||
|
function () {
|
||||||
|
alert('등록이 완료되었습니다.');
|
||||||
|
|
||||||
ajaxUtil._ajaxMethod(
|
document.querySelector($(mf).data('modalId')).ui.close();
|
||||||
'/api/household/daily/income/save',
|
|
||||||
JSON.stringify(dataOj),
|
getDailyRecordsView(f.dailyId.value, f.groupNo.value, f.dayGroupText.value);
|
||||||
(response) => { // 성공
|
|
||||||
alert("등록이 완료되었습니다.");
|
|
||||||
document.querySelector(modalId).ui.close();
|
|
||||||
getVisitInfo();
|
|
||||||
},
|
},
|
||||||
function (code, rstData) {
|
function (code, rstData) {
|
||||||
if(code == 422) alert(rstData.responseJSON[0].defaultMessage);
|
console.error('Do nothing. code: '+ code, rstData);
|
||||||
if(code == 400) alert(rstData.responseJSON.message); //임가번호 중복체크
|
|
||||||
},
|
},
|
||||||
'post',
|
|
||||||
'json',
|
|
||||||
{ handle422Type: 'alert' }
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model;
|
package app.module.core.config.application.enums;
|
||||||
|
|
||||||
public enum DailyInputType {
|
public enum DailyInputType {
|
||||||
/**
|
/**
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package app.module.core.config.constants;
|
||||||
|
|
||||||
|
public class CommonConstants {
|
||||||
|
private CommonConstants() {
|
||||||
|
throw new IllegalAccessError("어플리케이션에서 공통으로 사용되는 상수 클래스로 생성자를 사용할 수 없습니다.");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 단위의 직접입력 코드
|
||||||
|
*/
|
||||||
|
public static final String UNIT_CODE_SELF = "code.record.unit.self";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 작업 면적의 직접입력 코드
|
||||||
|
*/
|
||||||
|
public static final String AREA_CODE_OTHER = "code.record.area.self";
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
package app.module.core.config.constants;
|
||||||
|
|
||||||
|
public class DailyRecordConstants {
|
||||||
|
private DailyRecordConstants() {
|
||||||
|
throw new IllegalAccessError("어플리케이션에서 일계부에서 사용되는 상수 클래스로 생성자를 사용할 수 없습니다.");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 수입의 유형
|
||||||
|
* [정책] 1 고정
|
||||||
|
*/
|
||||||
|
public static final String INCOME_CATEGORY = "1";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 수입의 지출부호
|
||||||
|
* [정책] 외상판매 Y 일 경우 지출부호 91206 적재
|
||||||
|
*/
|
||||||
|
public static final String INCOME_EXPENSE_MARK = "91206";
|
||||||
|
}
|
||||||
@@ -76,6 +76,8 @@ public class DailyRecordDao implements DailyRecordPortOut {
|
|||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
log.debug("[updateByStatus] command: {}", command);
|
||||||
|
|
||||||
if ("ALL".equals(targetType)) {
|
if ("ALL".equals(targetType)) {
|
||||||
// 전체 입력상태 변경
|
// 전체 입력상태 변경
|
||||||
String allStatus = this.getUpdateAllStatus(recordMonth, dayGroupNo, householdSeq);
|
String allStatus = this.getUpdateAllStatus(recordMonth, dayGroupNo, householdSeq);
|
||||||
@@ -119,10 +121,9 @@ public class DailyRecordDao implements DailyRecordPortOut {
|
|||||||
);
|
);
|
||||||
|
|
||||||
dailyRecordMapper.updateDailyRecordStatus(command);
|
dailyRecordMapper.updateDailyRecordStatus(command);
|
||||||
|
|
||||||
} else {
|
|
||||||
log.debug("[updateByAllStatus] do nothing. findCmd: {}");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
log.debug("[updateByAllStatus] allStatus: {}", allStatus);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -134,7 +135,7 @@ public class DailyRecordDao implements DailyRecordPortOut {
|
|||||||
* @return 변경할 전체 입력상태
|
* @return 변경할 전체 입력상태
|
||||||
*/
|
*/
|
||||||
private String getUpdateAllStatus(String searchMonth, Integer dayGroupNo, Long householdSeq) {
|
private String getUpdateAllStatus(String searchMonth, Integer dayGroupNo, Long householdSeq) {
|
||||||
GetDailyRecordCmd findCmd = new GetDailyRecordCmd(searchMonth, dayGroupNo, householdSeq);
|
GetDailyRecordCmd findCmd = new GetDailyRecordCmd(searchMonth, dayGroupNo, householdSeq, null);
|
||||||
|
|
||||||
DailyRecordStatusDto statusDetail = null;
|
DailyRecordStatusDto statusDetail = null;
|
||||||
List<DailyRecordStatusDto> statusList = dailyRecordMapper.getDailyRecordStatus(findCmd);
|
List<DailyRecordStatusDto> statusList = dailyRecordMapper.getDailyRecordStatus(findCmd);
|
||||||
|
|||||||
@@ -15,6 +15,13 @@ public interface DailyRecordPortIn {
|
|||||||
*/
|
*/
|
||||||
DailyRecordDto detail(String recordMonth, Integer dayGroupNo, Long householdSeq);
|
DailyRecordDto detail(String recordMonth, Integer dayGroupNo, Long householdSeq);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 일계부 항목 조회
|
||||||
|
*
|
||||||
|
* @param dailyRecordSeq
|
||||||
|
*/
|
||||||
|
DailyRecordDto detail(Long dailyRecordSeq);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 일계부 항목 등록
|
* 일계부 항목 등록
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -53,6 +53,36 @@ public class DailyRecordService implements DailyRecordPortIn {
|
|||||||
return dailyRecord;
|
return dailyRecord;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public DailyRecordDto detail(Long dailyRecordSeq) {
|
||||||
|
DailyRecordDto dailyRecord = portOut.detail(new GetDailyRecordCmd(dailyRecordSeq));
|
||||||
|
|
||||||
|
if (dailyRecord != null) {
|
||||||
|
List<DailySort> targetList = new ArrayList<>();
|
||||||
|
if (this.isTarget(dailyRecord.getIncomeStatus())) {
|
||||||
|
targetList.add(DailySort.INCOME);
|
||||||
|
}
|
||||||
|
if (this.isTarget(dailyRecord.getWorkStatus())) {
|
||||||
|
targetList.add(DailySort.WORK);
|
||||||
|
}
|
||||||
|
if (this.isTarget(dailyRecord.getExpenseStatus())) {
|
||||||
|
targetList.add(DailySort.EXPENSE);
|
||||||
|
}
|
||||||
|
if (this.isTarget(dailyRecord.getPowerStatus())) {
|
||||||
|
targetList.add(DailySort.POWER);
|
||||||
|
}
|
||||||
|
if (this.isTarget(dailyRecord.getForestryStatus())) {
|
||||||
|
targetList.add(DailySort.FORESTRY);
|
||||||
|
}
|
||||||
|
if (this.isTarget(dailyRecord.getFarmingStatus())) {
|
||||||
|
targetList.add(DailySort.FARMING);
|
||||||
|
}
|
||||||
|
dailyRecord.setTargetList(targetList);
|
||||||
|
}
|
||||||
|
|
||||||
|
return dailyRecord;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 데이터 등록 대상 여부
|
* 데이터 등록 대상 여부
|
||||||
*
|
*
|
||||||
@@ -68,7 +98,8 @@ public class DailyRecordService implements DailyRecordPortIn {
|
|||||||
GetDailyRecordCmd findCmd = new GetDailyRecordCmd(
|
GetDailyRecordCmd findCmd = new GetDailyRecordCmd(
|
||||||
formVO.getRecordMonth(),
|
formVO.getRecordMonth(),
|
||||||
formVO.getDayGroupNo(),
|
formVO.getDayGroupNo(),
|
||||||
formVO.getHouseholdSeq());
|
formVO.getHouseholdSeq(),
|
||||||
|
null);
|
||||||
|
|
||||||
CreateDailyRecordCmd command = AuditUtil.create(
|
CreateDailyRecordCmd command = AuditUtil.create(
|
||||||
new CreateDailyRecordCmd(
|
new CreateDailyRecordCmd(
|
||||||
|
|||||||
@@ -8,6 +8,16 @@ import lombok.Setter;
|
|||||||
@Setter
|
@Setter
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public class GetDailyRecordCmd {
|
public class GetDailyRecordCmd {
|
||||||
|
public GetDailyRecordCmd(String searchMonth, Integer groupNo, Long householdSeq) {
|
||||||
|
this.searchMonth = searchMonth;
|
||||||
|
this.groupNo = groupNo;
|
||||||
|
this.householdSeq = householdSeq;
|
||||||
|
}
|
||||||
|
|
||||||
|
public GetDailyRecordCmd(Long dailyRecordSeq) {
|
||||||
|
this.dailyRecordSeq = dailyRecordSeq;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 검색 월(yyyyMM)
|
* 검색 월(yyyyMM)
|
||||||
*/
|
*/
|
||||||
@@ -20,4 +30,8 @@ public class GetDailyRecordCmd {
|
|||||||
* 임가 일련번호
|
* 임가 일련번호
|
||||||
*/
|
*/
|
||||||
private Long householdSeq;
|
private Long householdSeq;
|
||||||
|
/**
|
||||||
|
* 일계부 항목 일련번호
|
||||||
|
*/
|
||||||
|
private Long dailyRecordSeq;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,12 +8,20 @@
|
|||||||
, dr.id, dr.record_month, dr.day_group_no, dr.start_date, dr.end_date
|
, dr.id, dr.record_month, dr.day_group_no, dr.start_date, dr.end_date
|
||||||
, dr.all_status, dr.income_status, dr.work_status, dr.expense_status, dr.power_status, dr.forestry_status, dr.farming_status
|
, dr.all_status, dr.income_status, dr.work_status, dr.expense_status, dr.power_status, dr.forestry_status, dr.farming_status
|
||||||
from daily_day_group ddg
|
from daily_day_group ddg
|
||||||
|
<if test="dailyRecordSeq == null">
|
||||||
left join
|
left join
|
||||||
daily_record dr on dr.day_group_no = ddg.group_no and dr.is_deleted = false
|
daily_record dr on dr.day_group_no = ddg.group_no and dr.is_deleted = false
|
||||||
and dr.record_month = #{searchMonth}
|
and dr.record_month = #{searchMonth}
|
||||||
and dr.household_seq = #{householdSeq}
|
and dr.household_seq = #{householdSeq}
|
||||||
where ddg.is_deleted = false
|
where ddg.is_deleted = false
|
||||||
and ddg.group_no = #{groupNo}
|
and ddg.group_no = #{groupNo}
|
||||||
|
</if>
|
||||||
|
<if test="dailyRecordSeq != null">
|
||||||
|
inner join
|
||||||
|
daily_record dr on dr.day_group_no = ddg.group_no and dr.is_deleted = false
|
||||||
|
and dr.id = #{dailyRecordSeq}
|
||||||
|
where ddg.is_deleted = false
|
||||||
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getDailyRecordStatus"
|
<select id="getDailyRecordStatus"
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package app.module.front.usecase.daily.income.ports.application;
|
package app.module.front.usecase.daily.income.ports.application;
|
||||||
|
|
||||||
|
import app.module.core.config.constants.DailyRecordConstants;
|
||||||
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||||
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
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;
|
||||||
@@ -101,8 +102,8 @@ public class DailyIncomeService implements DailyIncomePortIn {
|
|||||||
formVO.getId(),
|
formVO.getId(),
|
||||||
formVO.getDailyRecordSeq(),
|
formVO.getDailyRecordSeq(),
|
||||||
formVO.getInputType(),
|
formVO.getInputType(),
|
||||||
"1", // [정책] 1 고정
|
DailyRecordConstants.INCOME_CATEGORY,
|
||||||
(formVO.getCredit() ? "91206" : null), // [정책] 외상판매 Y 일 경우 지출부호 91206 적재
|
(formVO.getCredit() ? DailyRecordConstants.INCOME_EXPENSE_MARK : null),
|
||||||
formVO.getCredit(),
|
formVO.getCredit(),
|
||||||
formVO.getCropCode(),
|
formVO.getCropCode(),
|
||||||
formVO.getIncomeKind(),
|
formVO.getIncomeKind(),
|
||||||
|
|||||||
Reference in New Issue
Block a user