[FO] 수입 수기 등록 create, update, remove, reset, today-none
This commit is contained in:
@@ -4,7 +4,7 @@ import app.module.front.usecase.daily.calendar.persistence.model.DailyRecordCale
|
||||
import app.module.front.usecase.daily.calendar.persistence.model.DailyRecordStatusDto;
|
||||
import app.module.front.usecase.daily.calendar.web.model.RecordCalendarUIReqVO;
|
||||
import app.module.front.usecase.daily.record.web.model.CreateDailyRecordReqVO;
|
||||
import app.module.front.usecase.daily.record.web.model.UpdateDailyRecordStatusCmd;
|
||||
import app.module.front.usecase.daily.record.persistence.model.UpdateDailyRecordStatusCmd;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@ package app.module.front.usecase.daily.income.persistence;
|
||||
|
||||
import app.module.front.usecase.daily.income.persistence.model.CreateDailyIncomeCmd;
|
||||
import app.module.front.usecase.daily.income.persistence.model.DailyIncomeDto;
|
||||
import app.module.front.usecase.daily.income.persistence.model.RemoveDailyIncomeCmd;
|
||||
import app.module.front.usecase.daily.income.web.model.DailyIncomeUIReqVO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@@ -23,7 +24,7 @@ public interface DailyIncomeMapper {
|
||||
* @param reqVO
|
||||
* @return
|
||||
*/
|
||||
Integer getDailyIncomeExistCount(DailyIncomeUIReqVO reqVO);
|
||||
Integer getRecordExistCount(DailyIncomeUIReqVO reqVO);
|
||||
|
||||
/**
|
||||
* 수입내역 등록
|
||||
@@ -44,7 +45,8 @@ public interface DailyIncomeMapper {
|
||||
/**
|
||||
* 수입내역 삭제
|
||||
*
|
||||
* @param command
|
||||
* @return
|
||||
*/
|
||||
int removeDailyIncome();
|
||||
int removeDailyIncome(RemoveDailyIncomeCmd command);
|
||||
}
|
||||
|
||||
@@ -1,24 +1,30 @@
|
||||
package app.module.front.usecase.daily.income.persistence.model;
|
||||
|
||||
import app.module.front.config.adapters.persistence.component.FrontAuditCommand;
|
||||
import app.module.front.usecase.daily.income.web.model.CreateDailyIncomeReqVO;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
public class CreateDailyIncomeCmd {
|
||||
private Long id;
|
||||
private Long householdSeq;
|
||||
private Boolean isCredit;
|
||||
private String cropCode;
|
||||
// TODO : 수입종류의 코드맵핑 여부 판단
|
||||
private String categoryCode;
|
||||
private String categoryName;
|
||||
private String sourcePurpose;
|
||||
// TODO : 타입
|
||||
private String quantity;
|
||||
private String unitCode;
|
||||
private Integer price;
|
||||
private Integer estimatedValue;
|
||||
// TODO : 무슨 데이터 넣을 것인가?
|
||||
private String createdBy;
|
||||
@AllArgsConstructor
|
||||
@ToString
|
||||
public class CreateDailyIncomeCmd extends FrontAuditCommand {
|
||||
private Long id;
|
||||
private Long dailyRecordSeq;
|
||||
// SELF, OCR
|
||||
private String inputType;
|
||||
private Boolean credit;
|
||||
private String cropCode;
|
||||
// TODO : 수입종류의 코드맵핑 여부 판단
|
||||
private String categoryCode;
|
||||
private String categorySelf;
|
||||
private String sourcePurpose;
|
||||
// TODO : 데이터 타입 재정의 여부
|
||||
private Integer quantity;
|
||||
private String unitCode;
|
||||
private Integer price;
|
||||
private Integer estimatedValue;
|
||||
}
|
||||
|
||||
@@ -12,13 +12,20 @@ public class DailyIncomeDto {
|
||||
private Long dailyRecordSeq;
|
||||
// SELF, OCR
|
||||
private String inputType;
|
||||
private Boolean isCredit;
|
||||
private Boolean credit;
|
||||
private String cropCode;
|
||||
private String cropLabel;
|
||||
private String categoryCode;
|
||||
private String categoryLabel;
|
||||
private String categorySelf;
|
||||
private String sourcePurpose;
|
||||
private String quantity;
|
||||
private Integer quantity;
|
||||
private String unitCode;
|
||||
private String price;
|
||||
private String estimated_value;
|
||||
private String unitLabel;
|
||||
private Integer price;
|
||||
private Integer estimatedValue;
|
||||
|
||||
public boolean isUpdated() {
|
||||
return this.id != null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
package app.module.front.usecase.daily.income.persistence.model;
|
||||
|
||||
import app.module.front.config.adapters.persistence.component.FrontAuditCommand;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@ToString
|
||||
public class RemoveDailyIncomeCmd extends FrontAuditCommand {
|
||||
private String searchMonth;
|
||||
private Integer groupNo;
|
||||
private Long id;
|
||||
private Long dailyRecordSeq;
|
||||
}
|
||||
@@ -8,11 +8,33 @@ import app.module.front.usecase.daily.income.web.model.RemoveDailyIncomeReqVO;
|
||||
import java.util.List;
|
||||
|
||||
public interface DailyIncomeService {
|
||||
/**
|
||||
* 수입내역 목록 조회
|
||||
*
|
||||
* @param reqVO 검색 조건
|
||||
* @return
|
||||
*/
|
||||
List<DailyIncomeDto> getDailyIncomeList(DailyIncomeUIReqVO reqVO);
|
||||
|
||||
/**
|
||||
* 수입내역 조회
|
||||
*
|
||||
* @param reqVO 검색 조건
|
||||
* @return
|
||||
*/
|
||||
DailyIncomeDto getDailyIncome(DailyIncomeUIReqVO reqVO);
|
||||
|
||||
void createDailyIncome(CreateDailyIncomeReqVO command);
|
||||
/**
|
||||
* 수입내역 등록
|
||||
*
|
||||
* @param formVO 등록 데이터
|
||||
*/
|
||||
void create(CreateDailyIncomeReqVO formVO);
|
||||
|
||||
void removeDailyIncome(RemoveDailyIncomeReqVO command);
|
||||
/**
|
||||
* 수입내역 삭제
|
||||
*
|
||||
* @param formVO 검색 조건
|
||||
*/
|
||||
void remove(RemoveDailyIncomeReqVO formVO);
|
||||
}
|
||||
|
||||
@@ -1,7 +1,12 @@
|
||||
package app.module.front.usecase.daily.income.service;
|
||||
|
||||
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
||||
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
||||
import app.module.front.config.application.util.AuditUtil;
|
||||
import app.module.front.usecase.daily.income.persistence.DailyIncomeMapper;
|
||||
import app.module.front.usecase.daily.income.persistence.model.CreateDailyIncomeCmd;
|
||||
import app.module.front.usecase.daily.income.persistence.model.DailyIncomeDto;
|
||||
import app.module.front.usecase.daily.income.persistence.model.RemoveDailyIncomeCmd;
|
||||
import app.module.front.usecase.daily.income.web.model.CreateDailyIncomeReqVO;
|
||||
import app.module.front.usecase.daily.income.web.model.DailyIncomeUIReqVO;
|
||||
import app.module.front.usecase.daily.income.web.model.RemoveDailyIncomeReqVO;
|
||||
@@ -15,6 +20,7 @@ import java.util.List;
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class DailyIncomeServiceImpl implements DailyIncomeService {
|
||||
private final UICodeListPortIn uiCodeListPortIn;
|
||||
private final DailyIncomeMapper dailyIncomeMapper;
|
||||
|
||||
@Override
|
||||
@@ -35,16 +41,86 @@ public class DailyIncomeServiceImpl implements DailyIncomeService {
|
||||
private List<DailyIncomeDto> getRefineIncomeList(DailyIncomeUIReqVO reqVO) {
|
||||
List<DailyIncomeDto> list = dailyIncomeMapper.getDailyIncomeList(reqVO);
|
||||
|
||||
List<UICodeElement> recordIncome = uiCodeListPortIn.connect("code.record.income");
|
||||
List<UICodeElement> recordCrop = uiCodeListPortIn.connect("code.record.crop");
|
||||
List<UICodeElement> recordUnit = uiCodeListPortIn.connect("code.record.unit");
|
||||
|
||||
for (DailyIncomeDto dto : list) {
|
||||
dto.setCategoryLabel(this.getCodeLabel(dto.getCategoryCode(), recordIncome));
|
||||
dto.setCropLabel(this.getCodeLabel(dto.getCropCode(), recordCrop));
|
||||
dto.setUnitLabel(this.getCodeLabel(dto.getUnitCode(), recordUnit));
|
||||
}
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void createDailyIncome(CreateDailyIncomeReqVO command) {
|
||||
|
||||
/**
|
||||
* 코드명 조회
|
||||
* @param code 코드
|
||||
* @param codeList 공통 코드 목록
|
||||
* @return
|
||||
*/
|
||||
private String getCodeLabel(String code, List<UICodeElement> codeList) {
|
||||
String returnValue = null;
|
||||
for (UICodeElement codeSetup : codeList) {
|
||||
if (codeSetup.getCodeValue().equalsIgnoreCase(code)) {
|
||||
returnValue = codeSetup.getCodeText();
|
||||
break;
|
||||
}
|
||||
}
|
||||
return returnValue;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeDailyIncome(RemoveDailyIncomeReqVO command) {
|
||||
public void create(CreateDailyIncomeReqVO formVO) {
|
||||
CreateDailyIncomeCmd command = AuditUtil.create(
|
||||
new CreateDailyIncomeCmd(
|
||||
formVO.getId(),
|
||||
formVO.getDailyRecordSeq(),
|
||||
formVO.getInputType(),
|
||||
formVO.getCredit(),
|
||||
formVO.getCropCode(),
|
||||
formVO.getCategoryCode(),
|
||||
formVO.getCategorySelf(),
|
||||
formVO.getSourcePurpose(),
|
||||
formVO.getQuantity(),
|
||||
formVO.getUnitCode(),
|
||||
formVO.getPrice(),
|
||||
formVO.getEstimatedValue()));
|
||||
|
||||
DailyIncomeUIReqVO existReqVO = new DailyIncomeUIReqVO(formVO.getSearchMonth(), formVO.getGroupNo());
|
||||
existReqVO.setId(formVO.getId());
|
||||
|
||||
Integer existCount = dailyIncomeMapper.getRecordExistCount(existReqVO);
|
||||
if (existCount == 0) {
|
||||
dailyIncomeMapper.createDailyIncome(command);
|
||||
|
||||
log.debug("[CreateDailyIncome] record={}", command);
|
||||
} else {
|
||||
dailyIncomeMapper.updateDailyIncome(command);
|
||||
|
||||
log.debug("[UpdateDailyIncome] record={}", command);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void remove(RemoveDailyIncomeReqVO formVO) {
|
||||
Long id = formVO.getId() != null ? Long.parseLong(formVO.getId()) : null;
|
||||
RemoveDailyIncomeCmd command = AuditUtil.delete(
|
||||
new RemoveDailyIncomeCmd(
|
||||
formVO.getSearchMonth(),
|
||||
formVO.getGroupNo(),
|
||||
id,
|
||||
formVO.getDailyRecordSeq()));
|
||||
|
||||
DailyIncomeUIReqVO existReqVO = new DailyIncomeUIReqVO(formVO.getSearchMonth(), formVO.getGroupNo());
|
||||
existReqVO.setId(id);
|
||||
|
||||
Integer existCount = dailyIncomeMapper.getRecordExistCount(existReqVO);
|
||||
if (existCount != 0) {
|
||||
dailyIncomeMapper.removeDailyIncome(command);
|
||||
|
||||
log.debug("[RemoveDailyIncome] record={}", command);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,63 +1,151 @@
|
||||
package app.module.front.usecase.daily.income.web;
|
||||
|
||||
import app.module.core.config.application.exception.NoMatchingURIException;
|
||||
import app.module.core.config.application.exception.NoRecordDataException;
|
||||
import app.module.front.config.application.util.AuthUtil;
|
||||
import app.module.front.usecase.daily.income.persistence.model.DailyIncomeDto;
|
||||
import app.module.front.usecase.daily.income.service.DailyIncomeService;
|
||||
import app.module.front.usecase.daily.income.web.model.DailyIncomeUIReqVO;
|
||||
import app.module.front.usecase.daily.income.web.model.CreateDailyIncomeReqVO;
|
||||
import app.module.front.usecase.daily.income.web.model.RemoveDailyIncomeReqVO;
|
||||
import app.module.front.usecase.daily.income.web.validator.CreateDailyIncomeValidator;
|
||||
import app.module.front.usecase.daily.record.persistence.model.DailyRecordDto;
|
||||
import app.module.front.usecase.daily.record.service.DailyRecordService;
|
||||
import app.module.front.usecase.daily.record.web.model.DailyRecordUIReqVO;
|
||||
import app.module.front.usecase.daily.record.web.model.DailyTargetStatus;
|
||||
import jakarta.validation.Valid;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
import java.util.List;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
@Slf4j
|
||||
@Controller
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
@RequestMapping(path = "/record/income")
|
||||
@RequestMapping(path = "/api/record/income")
|
||||
public class DailyIncomeController {
|
||||
private final DailyRecordService dailyRecordService;
|
||||
private final DailyIncomeService dailyIncomeService;
|
||||
private final CreateDailyIncomeValidator createDailyIncomeValidator;
|
||||
|
||||
/**
|
||||
* 일계부 수입내역 등록 화면
|
||||
* 일계부 수입내역 등록 처리
|
||||
*
|
||||
* @param model
|
||||
* @param searchMonth 검색 월(yyyyMM)
|
||||
* @param groupNo 검색 그룹
|
||||
* @param searchMonth
|
||||
* @param groupNo
|
||||
* @param id
|
||||
* @param formVO
|
||||
* @param bindingResult
|
||||
* @return
|
||||
*/
|
||||
@GetMapping(path = "/{searchMonth}/{groupNo}")
|
||||
public String index(Model model, @PathVariable(required = true) String searchMonth, @PathVariable(required = true) String groupNo) {
|
||||
@PostMapping(path = "/{searchMonth}/{groupNo}/form/{id}")
|
||||
ResponseEntity<?> create(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo
|
||||
, @PathVariable("id") String id
|
||||
, @Valid @RequestBody CreateDailyIncomeReqVO formVO, BindingResult bindingResult) {
|
||||
|
||||
DailyRecordUIReqVO recordReqVO = new DailyRecordUIReqVO(searchMonth, groupNo);
|
||||
log.debug("recordReqVO: {}", recordReqVO);
|
||||
createDailyIncomeValidator.validate(formVO, bindingResult);
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
|
||||
.body(bindingResult.getFieldErrors());
|
||||
}
|
||||
|
||||
DailyRecordDto dailyRecord = dailyRecordService.getDailyRecord(recordReqVO);
|
||||
DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo);
|
||||
|
||||
formVO.setSearchMonth(searchMonth);
|
||||
formVO.setGroupNo(Integer.parseInt(groupNo));
|
||||
formVO.setId(Long.parseLong(id));
|
||||
formVO.setDailyRecordSeq(dailyRecord.getId());
|
||||
log.debug("formVO: {}", formVO);
|
||||
|
||||
dailyIncomeService.create(formVO);
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK).body(formVO);
|
||||
}
|
||||
|
||||
@PostMapping(path = "/{searchMonth}/{groupNo}/none")
|
||||
ResponseEntity<?> updateByTodayNone(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo) {
|
||||
|
||||
DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo);
|
||||
|
||||
RemoveDailyIncomeReqVO formVO = new RemoveDailyIncomeReqVO();
|
||||
formVO.setSearchMonth(dailyRecord.getRecordMonth());
|
||||
formVO.setGroupNo(dailyRecord.getGroupNo());
|
||||
formVO.setDailyRecordSeq(dailyRecord.getId());
|
||||
log.debug("formVO: {}", formVO);
|
||||
|
||||
dailyRecordService.updateDailyRecordStatus(dailyRecord.getRecordMonth(), dailyRecord.getGroupNo(),
|
||||
"INCOME", DailyTargetStatus.TODAY_NONE.name());
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK).body(null);
|
||||
}
|
||||
|
||||
/**
|
||||
* 일계부 수입내역 삭제 처리
|
||||
*
|
||||
* @param searchMonth
|
||||
* @param groupNo
|
||||
* @param formVO
|
||||
* @param bindingResult
|
||||
* @return
|
||||
*/
|
||||
@PostMapping(path = "/{searchMonth}/{groupNo}/remove")
|
||||
ResponseEntity<?> remove(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo
|
||||
, @Valid @RequestBody RemoveDailyIncomeReqVO formVO, BindingResult bindingResult) {
|
||||
|
||||
log.debug("formVO: {}", formVO);
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
|
||||
.body(bindingResult.getFieldErrors());
|
||||
}
|
||||
|
||||
DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo);
|
||||
formVO.setSearchMonth(dailyRecord.getRecordMonth());
|
||||
formVO.setGroupNo(dailyRecord.getGroupNo());
|
||||
formVO.setDailyRecordSeq(dailyRecord.getId());
|
||||
log.debug("formVO: {}", formVO);
|
||||
|
||||
dailyIncomeService.remove(formVO);
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK).body(formVO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 일계부 수입내역 전체 삭제 처리
|
||||
*
|
||||
* @param searchMonth
|
||||
* @param groupNo
|
||||
* @return
|
||||
*/
|
||||
@PostMapping(path = "/{searchMonth}/{groupNo}/reset")
|
||||
ResponseEntity<?> removeAll(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo) {
|
||||
|
||||
DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo);
|
||||
|
||||
RemoveDailyIncomeReqVO formVO = new RemoveDailyIncomeReqVO();
|
||||
formVO.setSearchMonth(dailyRecord.getRecordMonth());
|
||||
formVO.setGroupNo(dailyRecord.getGroupNo());
|
||||
formVO.setDailyRecordSeq(dailyRecord.getId());
|
||||
log.debug("formVO: {}", formVO);
|
||||
|
||||
dailyIncomeService.remove(formVO);
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK).body(formVO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 일계부 유효성 체크 및 데이터 조회
|
||||
*
|
||||
* @param searchMonth
|
||||
* @param groupNo
|
||||
* @return
|
||||
*/
|
||||
private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) {
|
||||
DailyRecordUIReqVO reqVO = new DailyRecordUIReqVO(searchMonth, groupNo);
|
||||
log.debug("getRecordUIReq: {}", reqVO);
|
||||
|
||||
DailyRecordDto dailyRecord = dailyRecordService.getDailyRecord(reqVO);
|
||||
if (dailyRecord == null || dailyRecord.getId() == null) {
|
||||
throw new NoRecordDataException();
|
||||
}
|
||||
|
||||
DailyIncomeUIReqVO reqVOs = new DailyIncomeUIReqVO();
|
||||
reqVOs.setSearchMonth(searchMonth);
|
||||
reqVOs.setGroupNo(Integer.parseInt(groupNo));
|
||||
reqVOs.setHouseholdSeq(AuthUtil.getUserSeq());
|
||||
log.debug("reqVO: {}", reqVOs);
|
||||
|
||||
List<DailyIncomeDto> incomeList = dailyIncomeService.getDailyIncomeList(reqVOs);
|
||||
|
||||
model.addAttribute("reqVO", reqVOs);
|
||||
model.addAttribute("dailyRecord", dailyRecord);
|
||||
model.addAttribute("incomeList", incomeList);
|
||||
|
||||
return "record/income/index";
|
||||
return dailyRecord;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,111 @@
|
||||
package app.module.front.usecase.daily.income.web;
|
||||
|
||||
import app.module.core.config.application.exception.NoRecordDataException;
|
||||
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
||||
import app.module.front.usecase.daily.income.persistence.model.DailyIncomeDto;
|
||||
import app.module.front.usecase.daily.income.service.DailyIncomeService;
|
||||
import app.module.front.usecase.daily.income.web.model.DailyIncomeUIReqVO;
|
||||
import app.module.front.usecase.daily.record.persistence.model.DailyRecordDto;
|
||||
import app.module.front.usecase.daily.record.service.DailyRecordService;
|
||||
import app.module.front.usecase.daily.record.web.model.DailyRecordUIReqVO;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.thymeleaf.util.StringUtils;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Slf4j
|
||||
@Controller
|
||||
@RequiredArgsConstructor
|
||||
@RequestMapping(path = "/record/income")
|
||||
public class DailyIncomeUIController {
|
||||
private final UICodeListPortIn uiCodeListPortIn;
|
||||
private final DailyRecordService dailyRecordService;
|
||||
private final DailyIncomeService dailyIncomeService;
|
||||
|
||||
/**
|
||||
* 일계부 수입내역 목록 화면
|
||||
*
|
||||
* @param model Model
|
||||
* @param searchMonth 검색 월(yyyyMM)
|
||||
* @param groupNo 검색 그룹
|
||||
* @return
|
||||
*/
|
||||
@GetMapping(path = "/{searchMonth}/{groupNo}")
|
||||
public String index(Model model, @PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo) {
|
||||
|
||||
DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo);
|
||||
|
||||
DailyIncomeUIReqVO reqVO = new DailyIncomeUIReqVO(searchMonth, groupNo);
|
||||
log.debug("reqVO: {}", reqVO);
|
||||
|
||||
List<DailyIncomeDto> incomeList = dailyIncomeService.getDailyIncomeList(reqVO);
|
||||
|
||||
model.addAttribute("reqVO", reqVO);
|
||||
model.addAttribute("dailyRecord", dailyRecord);
|
||||
model.addAttribute("incomeList", incomeList);
|
||||
|
||||
return "record/income/index";
|
||||
}
|
||||
|
||||
/**
|
||||
* 일계부 수입내역 등록 화면
|
||||
*
|
||||
* @param model
|
||||
* @param searchMonth
|
||||
* @param groupNo
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@GetMapping(path = "/{searchMonth}/{groupNo}/form/{id}")
|
||||
public String formBySelf(Model model, @PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo
|
||||
, @PathVariable("id") String id) {
|
||||
|
||||
DailyIncomeUIReqVO reqVO = new DailyIncomeUIReqVO(searchMonth, groupNo);
|
||||
if (StringUtils.isEmpty(id)) {
|
||||
reqVO.setId(0L);
|
||||
} else {
|
||||
reqVO.setId(Long.parseLong(id));
|
||||
}
|
||||
log.debug("reqVO: {}", reqVO);
|
||||
|
||||
DailyIncomeDto detail = new DailyIncomeDto();
|
||||
if (reqVO.getId() != 0L) {
|
||||
detail = dailyIncomeService.getDailyIncome(reqVO);
|
||||
if (detail == null || !detail.isUpdated()) {
|
||||
throw new NoRecordDataException();
|
||||
}
|
||||
}
|
||||
|
||||
model.addAttribute("recordIncome", uiCodeListPortIn.connect("code.record.income"));
|
||||
model.addAttribute("recordCrop", uiCodeListPortIn.connect("code.record.crop"));
|
||||
model.addAttribute("recordUnit", uiCodeListPortIn.connect("code.record.unit"));
|
||||
|
||||
model.addAttribute("reqVO", reqVO);
|
||||
model.addAttribute("detail", detail);
|
||||
|
||||
return "record/income/form";
|
||||
}
|
||||
|
||||
/**
|
||||
* 일계부 유효성 체크 및 데이터 조회
|
||||
*
|
||||
* @param searchMonth
|
||||
* @param groupNo
|
||||
* @return
|
||||
*/
|
||||
private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) {
|
||||
DailyRecordUIReqVO reqVO = new DailyRecordUIReqVO(searchMonth, groupNo);
|
||||
log.debug("getRecordUIReq: {}", reqVO);
|
||||
|
||||
DailyRecordDto dailyRecord = dailyRecordService.getDailyRecord(reqVO);
|
||||
if (dailyRecord == null || dailyRecord.getId() == null) {
|
||||
throw new NoRecordDataException();
|
||||
}
|
||||
|
||||
return dailyRecord;
|
||||
}
|
||||
}
|
||||
@@ -1,22 +1,60 @@
|
||||
package app.module.front.usecase.daily.income.web.model;
|
||||
|
||||
import lombok.Data;
|
||||
import app.module.front.usecase.daily.record.web.model.DailyUIReqVO;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
|
||||
@Data
|
||||
@ToString
|
||||
public class CreateDailyIncomeReqVO {
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString(callSuper = true)
|
||||
public class CreateDailyIncomeReqVO extends DailyUIReqVO {
|
||||
/**
|
||||
* 수입 일련번호
|
||||
*/
|
||||
private Long id;
|
||||
/**
|
||||
* 일계부 일련번호
|
||||
*/
|
||||
private Long dailyRecordSeq;
|
||||
// SELF, OCR
|
||||
/**
|
||||
* 등록 유형(SELF, OCR)
|
||||
*/
|
||||
private String inputType;
|
||||
private Boolean isCredit;
|
||||
/**
|
||||
* 외상판매 여부
|
||||
*/
|
||||
private Boolean credit;
|
||||
/**
|
||||
* 재배형태 코드
|
||||
*/
|
||||
private String cropCode;
|
||||
/**
|
||||
* 수입의 종류 코드
|
||||
*/
|
||||
private String categoryCode;
|
||||
/**
|
||||
* 수입의 종류 직접입력
|
||||
*/
|
||||
private String categorySelf;
|
||||
/**
|
||||
* 수입원
|
||||
*/
|
||||
private String sourcePurpose;
|
||||
private String quantity;
|
||||
/**
|
||||
* 수량
|
||||
*/
|
||||
private Integer quantity;
|
||||
/**
|
||||
* 단위 코드
|
||||
*/
|
||||
private String unitCode;
|
||||
private String price;
|
||||
private String estimated_value;
|
||||
/**
|
||||
* 현금
|
||||
*/
|
||||
private Integer price;
|
||||
/**
|
||||
* 현물평가액
|
||||
*/
|
||||
private Integer estimatedValue;
|
||||
}
|
||||
|
||||
@@ -1,13 +1,29 @@
|
||||
package app.module.front.usecase.daily.income.web.model;
|
||||
|
||||
import lombok.Data;
|
||||
import app.module.front.usecase.daily.record.web.model.DailyUIReqVO;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
import org.apache.tika.utils.StringUtils;
|
||||
|
||||
@Data
|
||||
@ToString
|
||||
public class DailyIncomeUIReqVO {
|
||||
private String searchMonth;
|
||||
private Integer groupNo;
|
||||
private Long householdSeq;
|
||||
private Long incomeId;
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString(callSuper = true)
|
||||
public class DailyIncomeUIReqVO extends DailyUIReqVO {
|
||||
public DailyIncomeUIReqVO(String month, String no) {
|
||||
setSearchMonth(month);
|
||||
if (!StringUtils.isBlank(no)) {
|
||||
setGroupNo(Integer.parseInt(no));
|
||||
}
|
||||
}
|
||||
|
||||
public DailyIncomeUIReqVO(String month, Integer no) {
|
||||
setSearchMonth(month);
|
||||
setGroupNo(no);
|
||||
}
|
||||
|
||||
/**
|
||||
* 수입 일련번호
|
||||
*/
|
||||
private Long id;
|
||||
}
|
||||
|
||||
@@ -1,10 +1,20 @@
|
||||
package app.module.front.usecase.daily.income.web.model;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.ToString;
|
||||
import app.module.front.usecase.daily.record.web.model.DailyUIReqVO;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import lombok.*;
|
||||
|
||||
@Data
|
||||
@ToString
|
||||
public class RemoveDailyIncomeReqVO {
|
||||
private Long id;
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString(callSuper = true)
|
||||
public class RemoveDailyIncomeReqVO extends DailyUIReqVO {
|
||||
/**
|
||||
* 수입 일련번호
|
||||
*/
|
||||
@NotBlank(message = "{valid.common.required}")
|
||||
private String id;
|
||||
/**
|
||||
* 일계부 일련번호
|
||||
*/
|
||||
private Long dailyRecordSeq;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
package app.module.front.usecase.daily.income.web.validator;
|
||||
|
||||
import app.module.core.config.application.util.MessageUtil;
|
||||
import app.module.front.usecase.daily.income.web.model.CreateDailyIncomeReqVO;
|
||||
import app.module.front.usecase.daily.record.web.model.CreateDailyRecordReqVO;
|
||||
import app.module.front.usecase.daily.record.web.model.DailyStatus;
|
||||
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 CreateDailyIncomeValidator implements Validator {
|
||||
private final MessageUtil messageUtil;
|
||||
|
||||
@Override
|
||||
public boolean supports(Class<?> clazz) {
|
||||
return CreateDailyIncomeReqVO.class.equals(clazz);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void validate(Object target, Errors errors) {
|
||||
CreateDailyIncomeReqVO vo = (CreateDailyIncomeReqVO) target;
|
||||
|
||||
if ("SELF".equals(vo.getInputType()) || StringUtils.isBlank(vo.getInputType())) {
|
||||
|
||||
if (StringUtils.isBlank(vo.getCategoryCode())) {
|
||||
errors.rejectValue(
|
||||
"categoryCode", "valid.common.required",
|
||||
"수입 종류를 선택해 주세요.");
|
||||
}
|
||||
}
|
||||
|
||||
// TODO : valid
|
||||
|
||||
}
|
||||
}
|
||||
@@ -3,9 +3,8 @@ package app.module.front.usecase.daily.record.persistence;
|
||||
import app.module.front.usecase.daily.record.persistence.model.CreateDailyRecordCmd;
|
||||
import app.module.front.usecase.daily.record.persistence.model.DailyRecordDto;
|
||||
import app.module.front.usecase.daily.record.web.model.DailyRecordUIReqVO;
|
||||
import app.module.front.usecase.daily.record.web.model.UpdateDailyRecordStatusCmd;
|
||||
import app.module.front.usecase.daily.record.persistence.model.UpdateDailyRecordStatusCmd;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
@Mapper
|
||||
public interface DailyRecordMapper {
|
||||
|
||||
@@ -13,6 +13,7 @@ public class DailyRecordDto {
|
||||
// , all_status, income_status, work_status, expense_status, power_status, forestry_status
|
||||
// , created_at, created_by, is_deleted
|
||||
|
||||
private String recordMonth;
|
||||
private Integer groupNo;
|
||||
private Integer startDay;
|
||||
private Integer endDay;
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
package app.module.front.usecase.daily.record.persistence.model;
|
||||
|
||||
import app.module.front.config.adapters.persistence.component.FrontAuditCommand;
|
||||
import app.module.front.usecase.daily.record.web.model.DailyStatus;
|
||||
import app.module.front.usecase.daily.record.web.model.DailyTargetStatus;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@ToString
|
||||
public class UpdateDailyRecordStatusCmd extends FrontAuditCommand {
|
||||
private String recordMonth;
|
||||
private Integer dayGroupNo;
|
||||
private String allStatus;
|
||||
private String targetType;
|
||||
private String targetStatus;
|
||||
}
|
||||
@@ -8,4 +8,6 @@ public interface DailyRecordService {
|
||||
DailyRecordDto getDailyRecord(DailyRecordUIReqVO reqVO);
|
||||
|
||||
void createDailyRecord(CreateDailyRecordReqVO reqVO);
|
||||
|
||||
void updateDailyRecordStatus(String recordMonth, Integer dayGroupNo, String targetType, String targetStatus);
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ import app.module.front.config.application.util.AuditUtil;
|
||||
import app.module.front.usecase.daily.record.persistence.DailyRecordMapper;
|
||||
import app.module.front.usecase.daily.record.persistence.model.CreateDailyRecordCmd;
|
||||
import app.module.front.usecase.daily.record.persistence.model.DailyRecordDto;
|
||||
import app.module.front.usecase.daily.record.persistence.model.UpdateDailyRecordStatusCmd;
|
||||
import app.module.front.usecase.daily.record.web.model.CreateDailyRecordReqVO;
|
||||
import app.module.front.usecase.daily.record.web.model.DailyRecordUIReqVO;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@@ -68,4 +69,21 @@ public class DailyRecordServiceImpl implements DailyRecordService {
|
||||
log.warn("[DailyRecordCreate] existCount={}, recordMonth={}, dayGroupNo={}", existCount, reqVO.getRecordMonth(), reqVO.getDayGroupNo());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateDailyRecordStatus(String recordMonth, Integer dayGroupNo, String targetType, String targetStatus) {
|
||||
UpdateDailyRecordStatusCmd command = AuditUtil.update(
|
||||
new UpdateDailyRecordStatusCmd(
|
||||
recordMonth,
|
||||
dayGroupNo,
|
||||
"ALL".equals(targetType) ? targetStatus : null,
|
||||
!"ALL".equals(targetType) ? targetType : null,
|
||||
!"ALL".equals(targetType) ? targetStatus : null
|
||||
)
|
||||
);
|
||||
|
||||
dailyRecordMapper.updateDailyRecordStatus(command);
|
||||
|
||||
// TODO : target 업데이트 후 데이터 등록이 완료된 건은 allStatus 값 변경해주기
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,6 +6,7 @@ import app.module.front.usecase.daily.record.persistence.model.DailyRecordDto;
|
||||
import app.module.front.usecase.daily.record.service.DailyRecordService;
|
||||
import app.module.front.usecase.daily.record.web.model.CreateDailyRecordReqVO;
|
||||
import app.module.front.usecase.daily.record.web.model.DailyRecordUIReqVO;
|
||||
import app.module.front.usecase.daily.record.web.model.DailyTargetStatus;
|
||||
import app.module.front.usecase.daily.record.web.validator.CreateDailyRecordValidator;
|
||||
import jakarta.validation.Valid;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@@ -18,39 +19,14 @@ import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
@Slf4j
|
||||
@Controller
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
@RequestMapping(path = "/record/daily")
|
||||
@RequestMapping(path = "/api/record/daily")
|
||||
public class DailyRecordController {
|
||||
private final RecordCalendarService recordCalendarService;
|
||||
private final DailyRecordService dailyRecordService;
|
||||
private final CreateDailyRecordValidator createDailyRecordValidator;
|
||||
|
||||
/**
|
||||
* 일계부 등록 화면
|
||||
*
|
||||
* @param model
|
||||
* @param searchMonth 검색 월(yyyyMM)
|
||||
* @param groupNo 검색 그룹
|
||||
* @return
|
||||
*/
|
||||
@GetMapping(path = "/{searchMonth}/{groupNo}")
|
||||
public String createForm(Model model, @PathVariable(required = true) String searchMonth, @PathVariable(required = true) String groupNo) {
|
||||
|
||||
DailyRecordUIReqVO reqVO = new DailyRecordUIReqVO(searchMonth, groupNo);
|
||||
log.debug("reqVO: {}", reqVO);
|
||||
|
||||
DailyRecordDto dailyRecord = dailyRecordService.getDailyRecord(reqVO);
|
||||
if (dailyRecord == null) {
|
||||
throw new NoMatchingURIException("[Record] 잘못된 접근");
|
||||
}
|
||||
|
||||
model.addAttribute("reqVO", reqVO);
|
||||
model.addAttribute("dailyRecord", dailyRecord);
|
||||
|
||||
return "record/daily";
|
||||
}
|
||||
|
||||
/**
|
||||
* 일계부 등록 처리
|
||||
*
|
||||
@@ -61,7 +37,7 @@ public class DailyRecordController {
|
||||
* @return
|
||||
*/
|
||||
@PostMapping(path = "/{searchMonth}/{groupNo}")
|
||||
ResponseEntity<?> create(@PathVariable(required = true) String searchMonth, @PathVariable(required = true) String groupNo
|
||||
ResponseEntity<?> create(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo
|
||||
, @Valid @RequestBody CreateDailyRecordReqVO formVO, BindingResult bindingResult) {
|
||||
|
||||
createDailyRecordValidator.validate(formVO, bindingResult);
|
||||
@@ -84,4 +60,22 @@ public class DailyRecordController {
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK).body(reqVO);
|
||||
}
|
||||
|
||||
@PostMapping(path = "/{searchMonth}/{groupNo}/today-none")
|
||||
ResponseEntity<?> todayNone(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo
|
||||
, @RequestParam(name = "target", required = true, defaultValue = "") String targetType
|
||||
, @RequestParam(name = "status", required = false, defaultValue = "N") String targetStatus) {
|
||||
|
||||
DailyRecordUIReqVO reqVO = new DailyRecordUIReqVO(searchMonth, groupNo);
|
||||
log.debug("reqVO: {}", reqVO);
|
||||
log.debug("target: {}", targetType);
|
||||
log.debug("status: {}", targetStatus);
|
||||
|
||||
DailyRecordDto detail = dailyRecordService.getDailyRecord(reqVO);
|
||||
|
||||
// TODO : true / false 를 업데이트하는 것은 대상 타켓이 되는 것이라 판단하여 그냥 강제 업데이트할 것인가? valid 체크
|
||||
dailyRecordService.updateDailyRecordStatus(detail.getRecordMonth(), detail.getGroupNo(), targetType, "Y".equals(targetStatus) ? DailyTargetStatus.TODAY_NONE.name() : DailyTargetStatus.TARGET.name());
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK).body(reqVO);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
package app.module.front.usecase.daily.record.web;
|
||||
|
||||
import app.module.core.config.application.exception.NoMatchingURIException;
|
||||
import app.module.front.usecase.daily.calendar.service.RecordCalendarService;
|
||||
import app.module.front.usecase.daily.record.persistence.model.DailyRecordDto;
|
||||
import app.module.front.usecase.daily.record.service.DailyRecordService;
|
||||
import app.module.front.usecase.daily.record.web.model.CreateDailyRecordReqVO;
|
||||
import app.module.front.usecase.daily.record.web.model.DailyRecordUIReqVO;
|
||||
import app.module.front.usecase.daily.record.web.validator.CreateDailyRecordValidator;
|
||||
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.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
@Slf4j
|
||||
@Controller
|
||||
@RequiredArgsConstructor
|
||||
@RequestMapping(path = "/record/daily")
|
||||
public class DailyRecordUIController {
|
||||
private final RecordCalendarService recordCalendarService;
|
||||
private final DailyRecordService dailyRecordService;
|
||||
private final CreateDailyRecordValidator createDailyRecordValidator;
|
||||
|
||||
/**
|
||||
* 일계부 등록 화면
|
||||
*
|
||||
* @param model
|
||||
* @param searchMonth 검색 월(yyyyMM)
|
||||
* @param groupNo 검색 그룹
|
||||
* @return
|
||||
*/
|
||||
@GetMapping(path = "/{searchMonth}/{groupNo}")
|
||||
public String createForm(Model model, @PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo) {
|
||||
|
||||
DailyRecordUIReqVO reqVO = new DailyRecordUIReqVO(searchMonth, groupNo);
|
||||
log.debug("reqVO: {}", reqVO);
|
||||
|
||||
DailyRecordDto dailyRecord = dailyRecordService.getDailyRecord(reqVO);
|
||||
if (dailyRecord == null) {
|
||||
throw new NoMatchingURIException("[Record] 잘못된 접근");
|
||||
}
|
||||
|
||||
model.addAttribute("reqVO", reqVO);
|
||||
model.addAttribute("dailyRecord", dailyRecord);
|
||||
|
||||
return "record/daily";
|
||||
}
|
||||
}
|
||||
@@ -2,9 +2,9 @@ package app.module.front.usecase.daily.record.web.model;
|
||||
|
||||
public enum DailyTargetStatus {
|
||||
/**
|
||||
* 입력 중
|
||||
* 등록 대상
|
||||
*/
|
||||
WAITING,
|
||||
TARGET,
|
||||
/**
|
||||
* 금일 없음
|
||||
*/
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
package app.module.front.usecase.daily.record.web.model;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
public class UpdateDailyRecordStatusCmd {
|
||||
private Long id;
|
||||
private Long householdSeq;
|
||||
private String recordMonth;
|
||||
private int dayGroupNo;
|
||||
// TODO : 전체 상태값 정의 ING, DONE
|
||||
private String allStatus;
|
||||
// TODO : 개별 상태값 정의 WAITING, TYPING, TODAY_NONE, NONE, DONE
|
||||
private String targetType;
|
||||
private String targetStatus;
|
||||
// TODO : 무슨 데이터 넣을 것인가?
|
||||
private String updatedBy;
|
||||
}
|
||||
Reference in New Issue
Block a user