[FO] 일계부 임업노동 CRUD
This commit is contained in:
@@ -16,7 +16,6 @@ import java.util.List;
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class DailyPowerDao implements DailyPowerPortOut {
|
||||
private final UICodeListPortIn uiCodeListPortIn;
|
||||
private final DailyPowerMapper dailyPowerMapper;
|
||||
|
||||
@Override
|
||||
|
||||
@@ -23,9 +23,9 @@ import org.springframework.web.bind.annotation.*;
|
||||
@RequestMapping(path = "/api/record/power")
|
||||
public class DailyPowerController {
|
||||
private final CoreUtil coreUtil;
|
||||
private final DailyRecordPortIn dailyRecordService;
|
||||
private final DailyPowerPortIn dailyPowerService;
|
||||
private final CreateDailyPowerValidator createDailyPowerValidator;
|
||||
private final DailyRecordPortIn dailyRecordPortIn;
|
||||
private final DailyPowerPortIn dailyPowerPortIn;
|
||||
private final CreateDailyPowerValidator createValidator;
|
||||
|
||||
/**
|
||||
* 일계부 동력 사용시간 등록 처리
|
||||
@@ -41,7 +41,7 @@ public class DailyPowerController {
|
||||
, @PathVariable("id") String id
|
||||
, @Valid @RequestBody CreateDailyPowerReqVO formVO, BindingResult bindingResult) {
|
||||
|
||||
createDailyPowerValidator.validate(formVO, bindingResult);
|
||||
createValidator.validate(formVO, bindingResult);
|
||||
if (bindingResult.hasErrors()) {
|
||||
return coreUtil.getErrorInfo(bindingResult);
|
||||
}
|
||||
@@ -54,7 +54,7 @@ public class DailyPowerController {
|
||||
formVO.setDailyRecordSeq(dailyRecord.getId());
|
||||
log.debug("formVO: {}", formVO);
|
||||
|
||||
dailyPowerService.create(formVO);
|
||||
dailyPowerPortIn.create(formVO);
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK).body(formVO);
|
||||
}
|
||||
@@ -84,7 +84,7 @@ public class DailyPowerController {
|
||||
formVO.setDailyRecordSeq(dailyRecord.getId());
|
||||
log.debug("formVO: {}", formVO);
|
||||
|
||||
dailyPowerService.remove(formVO);
|
||||
dailyPowerPortIn.remove(formVO);
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK).body(formVO);
|
||||
}
|
||||
@@ -106,7 +106,7 @@ public class DailyPowerController {
|
||||
formVO.setDailyRecordSeq(dailyRecord.getId());
|
||||
log.debug("formVO: {}", formVO);
|
||||
|
||||
dailyPowerService.remove(formVO);
|
||||
dailyPowerPortIn.remove(formVO);
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK).body(formVO);
|
||||
}
|
||||
@@ -121,7 +121,7 @@ public class DailyPowerController {
|
||||
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
||||
log.debug("getRecordUIReq: {}", reqVO);
|
||||
|
||||
DailyRecordDto dailyRecord = dailyRecordService.detail(reqVO);
|
||||
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO);
|
||||
if (dailyRecord == null || dailyRecord.getId() == null) {
|
||||
throw new NoRecordDataException();
|
||||
}
|
||||
|
||||
@@ -62,7 +62,7 @@ public class DailyPowerUIController {
|
||||
* @param model Model
|
||||
* @param searchMonth 검색 월(yyyyMM)
|
||||
* @param groupNo 검색 그룹
|
||||
* @param id 수입 일련번호
|
||||
* @param id 동력 사용시간 일련번호
|
||||
*/
|
||||
@GetMapping(path = "/{searchMonth}/{groupNo}/form/{id}")
|
||||
public String formBySelf(Model model, @PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo
|
||||
|
||||
@@ -25,7 +25,6 @@ import java.util.List;
|
||||
@RequiredArgsConstructor
|
||||
public class DailyPowerService implements DailyPowerPortIn {
|
||||
private final DailyPowerPortOut portOut;
|
||||
private final UICodeListPortIn uiCodeListPortIn;
|
||||
|
||||
@Override
|
||||
public List<DailyPowerDto> list(DailyPowerUIReqVO reqVO) {
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
package app.module.front.usecase.daily.work.adapters.persistence;
|
||||
|
||||
import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto;
|
||||
import app.module.front.usecase.daily.work.ports.DailyWorkPortOut;
|
||||
import app.module.front.usecase.daily.work.ports.application.domain.CreateDailyWorkCmd;
|
||||
import app.module.front.usecase.daily.work.ports.application.domain.GetDailyWorkCmd;
|
||||
import app.module.front.usecase.daily.work.ports.application.domain.RemoveDailyWorkCmd;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Slf4j
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class DailyWorkDao implements DailyWorkPortOut {
|
||||
private final DailyWorkMapper dailyWorkMapper;
|
||||
|
||||
@Override
|
||||
public List<DailyWorkDto> list(GetDailyWorkCmd command) {
|
||||
return dailyWorkMapper.getDailyWorkList(command);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void create(GetDailyWorkCmd findCmd, CreateDailyWorkCmd command) {
|
||||
Integer existCount = dailyWorkMapper.getRecordExistCount(findCmd);
|
||||
if (existCount == 0) {
|
||||
dailyWorkMapper.createDailyWork(command);
|
||||
|
||||
log.debug("[CreateDailyWork] record={}", command);
|
||||
} else {
|
||||
dailyWorkMapper.updateDailyWork(command);
|
||||
|
||||
log.debug("[UpdateDailyWork] record={}", command);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void remove(GetDailyWorkCmd findCmd, RemoveDailyWorkCmd command) {
|
||||
Integer existCount = dailyWorkMapper.getRecordExistCount(findCmd);
|
||||
if (existCount != 0) {
|
||||
dailyWorkMapper.removeDailyWork(command);
|
||||
|
||||
log.debug("[RemoveDailyWork] record={}", command);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
package app.module.front.usecase.daily.work.adapters.persistence;
|
||||
|
||||
import app.module.front.usecase.daily.work.ports.application.domain.CreateDailyWorkCmd;
|
||||
import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto;
|
||||
import app.module.front.usecase.daily.work.ports.application.domain.GetDailyWorkCmd;
|
||||
import app.module.front.usecase.daily.work.ports.application.domain.RemoveDailyWorkCmd;
|
||||
import app.module.front.usecase.daily.work.adapters.web.model.DailyWorkUIReqVO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface DailyWorkMapper {
|
||||
/**
|
||||
* 일계부 임업노동 목록 조회
|
||||
*
|
||||
* @param command 검색 조건
|
||||
* @return 임업노동 목록
|
||||
*/
|
||||
List<DailyWorkDto> getDailyWorkList(GetDailyWorkCmd command);
|
||||
|
||||
/**
|
||||
* 일계부 임업노동 데이터 존재 여부
|
||||
*
|
||||
* @param command 검색 조건
|
||||
* @return 중복 개수
|
||||
*/
|
||||
Integer getRecordExistCount(GetDailyWorkCmd command);
|
||||
|
||||
/**
|
||||
* 일계부 임업노동 등록
|
||||
*
|
||||
* @param command 등록 데이터
|
||||
*/
|
||||
void createDailyWork(CreateDailyWorkCmd command);
|
||||
|
||||
/**
|
||||
* 일계부 임업노동 수정
|
||||
*
|
||||
* @param command 수정 데이터
|
||||
*/
|
||||
void updateDailyWork(CreateDailyWorkCmd command);
|
||||
|
||||
/**
|
||||
* 일계부 임업노동 삭제
|
||||
*
|
||||
* @param command 삭제 데이터
|
||||
*/
|
||||
void removeDailyWork(RemoveDailyWorkCmd command);
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
package app.module.front.usecase.daily.work.adapters.persistence.model;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
public class DailyWorkDto {
|
||||
private Long id;
|
||||
private Long dailyRecordSeq;
|
||||
private String itemName;
|
||||
private String itemMark;
|
||||
private String workName;
|
||||
private String workMark;
|
||||
private Double workLandArea;
|
||||
private String areaUnitCode;
|
||||
private String areaUnitLabel;
|
||||
private String areaUnitSelf;
|
||||
private String harvestQuantity;
|
||||
private String harvestUnitCode;
|
||||
private String harvestUnitLabel;
|
||||
private String harvestUnitSelf;
|
||||
private Double ownerTime;
|
||||
private Double spouseTime;
|
||||
private Double familyMHours;
|
||||
private Double familyFHours;
|
||||
private Double hiredMHours;
|
||||
private Double hiredFHours;
|
||||
private Double sharedMHours;
|
||||
private Double sharedFHours;
|
||||
private Double volunteerMHours;
|
||||
private Double volunteerFHours;
|
||||
|
||||
/**
|
||||
* 수정 가능 여부
|
||||
* @return true=가능, false=불가능(등록 상태)
|
||||
*/
|
||||
public boolean isUpdated() {
|
||||
return this.id != null && this.id != 0L;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,135 @@
|
||||
package app.module.front.usecase.daily.work.adapters.web;
|
||||
|
||||
import app.module.core.config.application.exception.NoRecordDataException;
|
||||
import app.module.core.config.application.util.CoreUtil;
|
||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
||||
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
||||
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;
|
||||
import app.module.front.usecase.daily.work.adapters.web.model.CreateDailyWorkReqVO;
|
||||
import app.module.front.usecase.daily.work.adapters.web.model.RemoveDailyWorkReqVO;
|
||||
import app.module.front.usecase.daily.work.adapters.web.validator.CreateDailyWorkValidator;
|
||||
import app.module.front.usecase.daily.work.ports.DailyWorkPortIn;
|
||||
import jakarta.validation.Valid;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
@RequestMapping(path = "/api/record/work")
|
||||
public class DailyWorkController {
|
||||
private final CoreUtil coreUtil;
|
||||
private final DailyRecordPortIn dailyRecordPortIn;
|
||||
private final DailyWorkPortIn dailyWorkPortIn;
|
||||
private final CreateDailyWorkValidator createValidator;
|
||||
|
||||
/**
|
||||
* 일계부 임업노동 등록 처리
|
||||
*
|
||||
* @param searchMonth 검색 월(yyyyMM)
|
||||
* @param groupNo 검색 그룹
|
||||
* @param id 수입 일련번호
|
||||
* @param formVO 입력 데이터
|
||||
* @param bindingResult BindingResult
|
||||
* @return
|
||||
*/
|
||||
@PostMapping(path = "/{searchMonth}/{groupNo}/form/{id}")
|
||||
ResponseEntity<?> create(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo
|
||||
, @PathVariable("id") String id
|
||||
, @Valid @RequestBody CreateDailyWorkReqVO formVO, BindingResult bindingResult) {
|
||||
|
||||
createValidator.validate(formVO, bindingResult);
|
||||
if (bindingResult.hasErrors()) {
|
||||
return coreUtil.getErrorInfo(bindingResult);
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
dailyWorkPortIn.create(formVO);
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK).body(formVO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 일계부 임업노동 삭제 처리
|
||||
*
|
||||
* @param searchMonth 검색 월(yyyyMM)
|
||||
* @param groupNo 검색 그룹
|
||||
* @param formVO 입력 데이터
|
||||
* @param bindingResult BindingResult
|
||||
* @return
|
||||
*/
|
||||
@PostMapping(path = "/{searchMonth}/{groupNo}/remove")
|
||||
ResponseEntity<?> remove(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo
|
||||
, @Valid @RequestBody RemoveDailyWorkReqVO formVO, BindingResult bindingResult) {
|
||||
|
||||
log.debug("before 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);
|
||||
|
||||
dailyWorkPortIn.remove(formVO);
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK).body(formVO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 일계부 임업노동 전체 삭제 처리
|
||||
*
|
||||
* @param searchMonth 검색 월(yyyyMM)
|
||||
* @param groupNo 검색 그룹
|
||||
* @return
|
||||
*/
|
||||
@PostMapping(path = "/{searchMonth}/{groupNo}/reset")
|
||||
ResponseEntity<?> removeAll(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo) {
|
||||
|
||||
DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo);
|
||||
|
||||
RemoveDailyWorkReqVO formVO = new RemoveDailyWorkReqVO();
|
||||
formVO.setSearchMonth(dailyRecord.getRecordMonth());
|
||||
formVO.setGroupNo(dailyRecord.getGroupNo());
|
||||
formVO.setDailyRecordSeq(dailyRecord.getId());
|
||||
log.debug("formVO: {}", formVO);
|
||||
|
||||
dailyWorkPortIn.remove(formVO);
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK).body(formVO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 일계부 유효성 체크 및 데이터 조회
|
||||
*
|
||||
* @param searchMonth 검색 월(yyyyMM)
|
||||
* @param groupNo 검색 그룹
|
||||
* @return
|
||||
*/
|
||||
private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) {
|
||||
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
||||
log.debug("getRecordUIReq: {}", reqVO);
|
||||
|
||||
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO);
|
||||
if (dailyRecord == null || dailyRecord.getId() == null) {
|
||||
throw new NoRecordDataException();
|
||||
}
|
||||
|
||||
return dailyRecord;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,113 @@
|
||||
package app.module.front.usecase.daily.work.adapters.web;
|
||||
|
||||
import app.module.core.config.application.exception.NoRecordDataException;
|
||||
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
||||
import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
||||
import app.module.front.usecase.daily.record.adapters.web.model.DailySort;
|
||||
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
||||
import app.module.front.usecase.daily.record.ports.DailyRecordPortIn;
|
||||
import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto;
|
||||
import app.module.front.usecase.daily.work.adapters.web.model.DailyWorkUIReqVO;
|
||||
import app.module.front.usecase.daily.work.ports.DailyWorkPortIn;
|
||||
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 org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.thymeleaf.util.StringUtils;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Slf4j
|
||||
@Controller
|
||||
@RequiredArgsConstructor
|
||||
@RequestMapping(path = "/record/work")
|
||||
public class DailyWorkUIController {
|
||||
private final UICodeListPortIn uiCodeListPortIn;
|
||||
private final DailyRecordPortIn dailyRecordPortIn;
|
||||
private final DailyWorkPortIn dailyWorkPortIn;
|
||||
|
||||
/**
|
||||
* 일계부 임업노동 목록 화면
|
||||
*
|
||||
* @param model Model
|
||||
* @param searchMonth 검색 월(yyyyMM)
|
||||
* @param groupNo 검색 그룹
|
||||
* @param searchType 수정여부
|
||||
*/
|
||||
@GetMapping(path = "/{searchMonth}/{groupNo}")
|
||||
public String index(Model model, @PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo
|
||||
, @RequestParam(name = "type", required = false) String searchType) {
|
||||
|
||||
DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo);
|
||||
|
||||
DailyWorkUIReqVO reqVO = new DailyWorkUIReqVO(searchMonth, groupNo);
|
||||
log.debug("reqVO: {}", reqVO);
|
||||
|
||||
List<DailyWorkDto> workList = dailyWorkPortIn.list(reqVO);
|
||||
|
||||
model.addAttribute("reqVO", reqVO);
|
||||
model.addAttribute("dailyRecord", dailyRecord);
|
||||
model.addAttribute("workList", workList);
|
||||
model.addAttribute("nextStep", dailyRecord.getNextStep(DailySort.WORK));
|
||||
|
||||
return "record/work/index";
|
||||
}
|
||||
|
||||
/**
|
||||
* 일계부 임업노동 등록 화면
|
||||
*
|
||||
* @param model Model
|
||||
* @param searchMonth 검색 월(yyyyMM)
|
||||
* @param groupNo 검색 그룹
|
||||
* @param id 임업노동 일련번호
|
||||
*/
|
||||
@GetMapping(path = "/{searchMonth}/{groupNo}/form/{id}")
|
||||
public String formBySelf(Model model, @PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo
|
||||
, @PathVariable("id") String id) {
|
||||
|
||||
DailyWorkUIReqVO reqVO = new DailyWorkUIReqVO(searchMonth, groupNo);
|
||||
if (StringUtils.isEmpty(id)) {
|
||||
reqVO.setId(0L);
|
||||
} else {
|
||||
reqVO.setId(Long.parseLong(id));
|
||||
}
|
||||
log.debug("reqVO: {}", reqVO);
|
||||
|
||||
DailyWorkDto detail = new DailyWorkDto();
|
||||
if (reqVO.getId() != 0L) {
|
||||
detail = dailyWorkPortIn.detail(reqVO);
|
||||
if (detail == null || !detail.isUpdated()) {
|
||||
throw new NoRecordDataException();
|
||||
}
|
||||
}
|
||||
|
||||
model.addAttribute("recordUnit", uiCodeListPortIn.connect("code.record.unit"));
|
||||
|
||||
model.addAttribute("reqVO", reqVO);
|
||||
model.addAttribute("detail", detail);
|
||||
|
||||
return "record/work/form";
|
||||
}
|
||||
|
||||
/**
|
||||
* 일계부 유효성 체크 및 데이터 조회
|
||||
*
|
||||
* @param searchMonth 검색 월(yyyyMM)
|
||||
* @param groupNo 검색 그룹
|
||||
*/
|
||||
private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) {
|
||||
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
||||
log.debug("getRecordUIReq: {}", reqVO);
|
||||
|
||||
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO);
|
||||
if (dailyRecord == null || dailyRecord.getId() == null) {
|
||||
throw new NoRecordDataException();
|
||||
}
|
||||
|
||||
return dailyRecord;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,105 @@
|
||||
package app.module.front.usecase.daily.work.adapters.web.model;
|
||||
|
||||
import app.module.front.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 CreateDailyWorkReqVO extends DailyUIReqVO {
|
||||
/**
|
||||
* 수입 일련번호
|
||||
*/
|
||||
private Long id;
|
||||
/**
|
||||
* 일계부 일련번호
|
||||
*/
|
||||
private Long dailyRecordSeq;
|
||||
|
||||
/**
|
||||
* 품목명
|
||||
*/
|
||||
@NotBlank(message = "품목명을 입력해 주세요.")
|
||||
private String itemName;
|
||||
/**
|
||||
* 품목부호
|
||||
*/
|
||||
private Boolean itemMark;
|
||||
/**
|
||||
* 작업명
|
||||
*/
|
||||
@NotBlank(message = "작업명을 입력해 주세요.")
|
||||
private String workName;
|
||||
/**
|
||||
* 작업 부호
|
||||
*/
|
||||
private String workMark;
|
||||
/**
|
||||
* 작업 면적
|
||||
*/
|
||||
private Double workLandArea;
|
||||
/**
|
||||
* 작업 면적 단위 코드
|
||||
*/
|
||||
private String areaUnitCode;
|
||||
/**
|
||||
* 작업 면적 단위 직업입력
|
||||
*/
|
||||
private String areaUnitSelf;
|
||||
/**
|
||||
* 수확량
|
||||
*/
|
||||
@NotBlank(message = "수확량을 입력해 주세요.")
|
||||
private String harvestQuantity;
|
||||
/**
|
||||
* 수확량 단위 코드
|
||||
*/
|
||||
private String harvestUnitCode;
|
||||
/**
|
||||
* 수확량 단위 직접입력
|
||||
*/
|
||||
private String harvestUnitSelf;
|
||||
/**
|
||||
* 경영주 시간
|
||||
*/
|
||||
private Double ownerTime;
|
||||
/**
|
||||
* 배우자 시간
|
||||
*/
|
||||
private Double spouseTime;
|
||||
/**
|
||||
* 가족노동 남 시간
|
||||
*/
|
||||
private Double familyMHours;
|
||||
/**
|
||||
* 가족노동 여 시간
|
||||
*/
|
||||
private Double familyFHours;
|
||||
/**
|
||||
* 고용노동 남 시간
|
||||
*/
|
||||
private Double hiredMHours;
|
||||
/**
|
||||
* 고용돈 여 시간
|
||||
*/
|
||||
private Double hiredFHours;
|
||||
/**
|
||||
* 품앗이 남 시간
|
||||
*/
|
||||
private Double sharedMHours;
|
||||
/**
|
||||
* 품앗이 여 시간
|
||||
*/
|
||||
private Double sharedFHours;
|
||||
/**
|
||||
* 일손돕기 남 시간
|
||||
*/
|
||||
private Double volunteerMHours;
|
||||
/**
|
||||
* 일손돕기 여 시간
|
||||
*/
|
||||
private Double volunteerFHours;
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
package app.module.front.usecase.daily.work.adapters.web.model;
|
||||
|
||||
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
import org.apache.tika.utils.StringUtils;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString(callSuper = true)
|
||||
public class DailyWorkUIReqVO extends DailyUIReqVO {
|
||||
public DailyWorkUIReqVO(String month, String no) {
|
||||
setSearchMonth(month);
|
||||
if (!StringUtils.isBlank(no)) {
|
||||
setGroupNo(Integer.parseInt(no));
|
||||
}
|
||||
}
|
||||
|
||||
public DailyWorkUIReqVO(String month, Integer no) {
|
||||
setSearchMonth(month);
|
||||
setGroupNo(no);
|
||||
}
|
||||
|
||||
/**
|
||||
* 임업노동 일련번호
|
||||
*/
|
||||
private Long id;
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
package app.module.front.usecase.daily.work.adapters.web.model;
|
||||
|
||||
import app.module.front.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 RemoveDailyWorkReqVO extends DailyUIReqVO {
|
||||
/**
|
||||
* 임업노동 일련번호
|
||||
*/
|
||||
@NotBlank(message = "{valid.common.required}")
|
||||
private String id;
|
||||
/**
|
||||
* 일계부 일련번호
|
||||
*/
|
||||
private Long dailyRecordSeq;
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
package app.module.front.usecase.daily.work.adapters.web.validator;
|
||||
|
||||
import app.module.front.usecase.daily.work.adapters.web.model.CreateDailyWorkReqVO;
|
||||
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 CreateDailyWorkValidator implements Validator {
|
||||
|
||||
@Override
|
||||
public boolean supports(Class<?> clazz) {
|
||||
return CreateDailyWorkReqVO.class.equals(clazz);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void validate(Object target, Errors errors) {
|
||||
CreateDailyWorkReqVO vo = (CreateDailyWorkReqVO) target;
|
||||
|
||||
if (vo.getOwnerTime() == null && vo.getSpouseTime() == null
|
||||
&& vo.getFamilyMHours() == null && vo.getFamilyFHours() == null
|
||||
&& vo.getHiredMHours() == null && vo.getHiredFHours() == null
|
||||
&& vo.getSharedMHours() == null && vo.getSharedFHours() == null
|
||||
&& vo.getVolunteerMHours() == null && vo.getVolunteerFHours() == null) {
|
||||
errors.rejectValue(
|
||||
"ownerTime", "valid.common.required",
|
||||
"최소 1개의 항목을 입력해주세요.");
|
||||
}
|
||||
|
||||
if ("SELF".equals(vo.getAreaUnitCode()) && StringUtils.isBlank(vo.getAreaUnitSelf())) {
|
||||
errors.rejectValue(
|
||||
"areaUnitSelf", "valid.common.required",
|
||||
"단위를 입력해 주세요.");
|
||||
}
|
||||
|
||||
if ("SELF".equals(vo.getHarvestUnitCode()) && StringUtils.isBlank(vo.getHarvestUnitSelf())) {
|
||||
errors.rejectValue(
|
||||
"harvestUnitSelf", "valid.common.required",
|
||||
"단위를 입력해 주세요.");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
package app.module.front.usecase.daily.work.ports;
|
||||
|
||||
|
||||
import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto;
|
||||
import app.module.front.usecase.daily.work.adapters.web.model.CreateDailyWorkReqVO;
|
||||
import app.module.front.usecase.daily.work.adapters.web.model.DailyWorkUIReqVO;
|
||||
import app.module.front.usecase.daily.work.adapters.web.model.RemoveDailyWorkReqVO;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface DailyWorkPortIn {
|
||||
/**
|
||||
* 일계부 임업노동 조회
|
||||
*
|
||||
* @param reqVO 검색 조건
|
||||
* @return 임업노동 목록
|
||||
*/
|
||||
List<DailyWorkDto> list(DailyWorkUIReqVO reqVO);
|
||||
|
||||
/**
|
||||
* 일계부 임업노동 조회
|
||||
*
|
||||
* @param reqVO 검색 조건
|
||||
* @return 임업노동 상세
|
||||
*/
|
||||
DailyWorkDto detail(DailyWorkUIReqVO reqVO);
|
||||
|
||||
/**
|
||||
* 일계부 임업노동 등록
|
||||
*
|
||||
* @param formVO 입력 데이터
|
||||
*/
|
||||
void create(CreateDailyWorkReqVO formVO);
|
||||
|
||||
/**
|
||||
* 일계부 임업노동 삭제
|
||||
*
|
||||
* @param formVO 삭제 검색 조건
|
||||
*/
|
||||
void remove(RemoveDailyWorkReqVO formVO);
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
package app.module.front.usecase.daily.work.ports;
|
||||
|
||||
|
||||
|
||||
import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto;
|
||||
import app.module.front.usecase.daily.work.ports.application.domain.CreateDailyWorkCmd;
|
||||
import app.module.front.usecase.daily.work.ports.application.domain.GetDailyWorkCmd;
|
||||
import app.module.front.usecase.daily.work.ports.application.domain.RemoveDailyWorkCmd;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface DailyWorkPortOut {
|
||||
/**
|
||||
* 일계부 임업노동 조회
|
||||
*
|
||||
* @param command 검색 조건
|
||||
* @return 임업노동 목록
|
||||
*/
|
||||
List<DailyWorkDto> list(GetDailyWorkCmd command);
|
||||
|
||||
/**
|
||||
* 일계부 임업노동 등록
|
||||
*
|
||||
* @param findCmd 검색 조건
|
||||
* @param command 입력 데이터
|
||||
*/
|
||||
void create(GetDailyWorkCmd findCmd, CreateDailyWorkCmd command);
|
||||
|
||||
/**
|
||||
* 일계부 임업노동 삭제
|
||||
*
|
||||
* @param findCmd 검색 조건
|
||||
* @param command 삭제 검색 조건
|
||||
*/
|
||||
void remove(GetDailyWorkCmd findCmd, RemoveDailyWorkCmd command);
|
||||
}
|
||||
@@ -0,0 +1,146 @@
|
||||
package app.module.front.usecase.daily.work.ports.application;
|
||||
|
||||
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.config.constants.CommonConstants;
|
||||
import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto;
|
||||
import app.module.front.usecase.daily.work.adapters.web.model.CreateDailyWorkReqVO;
|
||||
import app.module.front.usecase.daily.work.adapters.web.model.DailyWorkUIReqVO;
|
||||
import app.module.front.usecase.daily.work.adapters.web.model.RemoveDailyWorkReqVO;
|
||||
import app.module.front.usecase.daily.work.ports.DailyWorkPortIn;
|
||||
import app.module.front.usecase.daily.work.ports.DailyWorkPortOut;
|
||||
import app.module.front.usecase.daily.work.ports.application.domain.CreateDailyWorkCmd;
|
||||
import app.module.front.usecase.daily.work.ports.application.domain.GetDailyWorkCmd;
|
||||
import app.module.front.usecase.daily.work.ports.application.domain.RemoveDailyWorkCmd;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class DailyWorkService implements DailyWorkPortIn {
|
||||
private final DailyWorkPortOut portOut;
|
||||
private final UICodeListPortIn uiCodeListPortIn;
|
||||
|
||||
@Override
|
||||
public List<DailyWorkDto> list(DailyWorkUIReqVO reqVO) {
|
||||
return this.getRefineList(reqVO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public DailyWorkDto detail(DailyWorkUIReqVO reqVO) {
|
||||
List<DailyWorkDto> list = this.getRefineList(reqVO);
|
||||
if (list.isEmpty()) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return list.get(0);
|
||||
}
|
||||
|
||||
/**
|
||||
* 목록 데이터 조회
|
||||
*
|
||||
* @param reqVO 검색 조건
|
||||
* @return 공통 처리된 목록
|
||||
*/
|
||||
private List<DailyWorkDto> getRefineList(DailyWorkUIReqVO reqVO) {
|
||||
List<DailyWorkDto> list = portOut.list(new GetDailyWorkCmd(reqVO.getSearchMonth(),
|
||||
reqVO.getGroupNo(),
|
||||
reqVO.getHouseholdSeq(),
|
||||
reqVO.getId()));
|
||||
|
||||
List<UICodeElement> recordUnit = uiCodeListPortIn.connect("code.record.unit");
|
||||
|
||||
for (DailyWorkDto dto : list) {
|
||||
if (CommonConstants.UNIT_CODE_SELF.equals(dto.getAreaUnitCode())) {
|
||||
dto.setAreaUnitLabel(dto.getAreaUnitSelf());
|
||||
} else {
|
||||
dto.setAreaUnitLabel(this.getCodeLabel(dto.getAreaUnitCode(), recordUnit));
|
||||
}
|
||||
|
||||
if (CommonConstants.UNIT_CODE_SELF.equals(dto.getHarvestUnitCode())) {
|
||||
dto.setHarvestUnitLabel(dto.getHarvestUnitSelf());
|
||||
} else {
|
||||
dto.setHarvestUnitLabel(this.getCodeLabel(dto.getHarvestUnitCode(), recordUnit));
|
||||
}
|
||||
}
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
/**
|
||||
* 코드명 조회
|
||||
*
|
||||
* @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
|
||||
public void create(CreateDailyWorkReqVO formVO) {
|
||||
GetDailyWorkCmd findCmd = new GetDailyWorkCmd(
|
||||
formVO.getSearchMonth(),
|
||||
formVO.getGroupNo(),
|
||||
formVO.getHouseholdSeq(),
|
||||
formVO.getId());
|
||||
|
||||
CreateDailyWorkCmd command = AuditUtil.create(
|
||||
new CreateDailyWorkCmd(
|
||||
formVO.getId(),
|
||||
formVO.getDailyRecordSeq(),
|
||||
formVO.getItemName(),
|
||||
null,
|
||||
formVO.getWorkName(),
|
||||
null,
|
||||
formVO.getWorkLandArea(),
|
||||
formVO.getAreaUnitCode(),
|
||||
formVO.getAreaUnitSelf(),
|
||||
formVO.getHarvestQuantity(),
|
||||
formVO.getHarvestUnitCode(),
|
||||
formVO.getHarvestUnitSelf(),
|
||||
formVO.getOwnerTime(),
|
||||
formVO.getSpouseTime(),
|
||||
formVO.getFamilyMHours(),
|
||||
formVO.getFamilyFHours(),
|
||||
formVO.getHiredMHours(),
|
||||
formVO.getHiredFHours(),
|
||||
formVO.getSharedMHours(),
|
||||
formVO.getSharedFHours(),
|
||||
formVO.getVolunteerMHours(),
|
||||
formVO.getVolunteerFHours()));
|
||||
|
||||
portOut.create(findCmd, command);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void remove(RemoveDailyWorkReqVO formVO) {
|
||||
Long id = formVO.getId() != null ? Long.parseLong(formVO.getId()) : null;
|
||||
|
||||
GetDailyWorkCmd findCmd = new GetDailyWorkCmd(
|
||||
formVO.getSearchMonth(),
|
||||
formVO.getGroupNo(),
|
||||
formVO.getHouseholdSeq(),
|
||||
id);
|
||||
|
||||
RemoveDailyWorkCmd command = AuditUtil.delete(
|
||||
new RemoveDailyWorkCmd(
|
||||
formVO.getSearchMonth(),
|
||||
formVO.getGroupNo(),
|
||||
id,
|
||||
formVO.getDailyRecordSeq()));
|
||||
|
||||
portOut.remove(findCmd, command);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
package app.module.front.usecase.daily.work.ports.application.domain;
|
||||
|
||||
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 CreateDailyWorkCmd extends FrontAuditCommand {
|
||||
private Long id;
|
||||
private Long dailyRecordSeq;
|
||||
private String itemName;
|
||||
private String itemMark;
|
||||
private String workName;
|
||||
private String workMark;
|
||||
private Double workLandArea;
|
||||
private String areaUnitCode;
|
||||
private String areaUnitSelf;
|
||||
private String harvestQuantity;
|
||||
private String harvestUnitCode;
|
||||
private String harvestUnitSelf;
|
||||
private Double ownerTime;
|
||||
private Double spouseTime;
|
||||
private Double familyMHours;
|
||||
private Double familyFHours;
|
||||
private Double hiredMHours;
|
||||
private Double hiredFHours;
|
||||
private Double sharedMHours;
|
||||
private Double sharedFHours;
|
||||
private Double volunteerMHours;
|
||||
private Double volunteerFHours;
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package app.module.front.usecase.daily.work.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
public class GetDailyWorkCmd {
|
||||
/**
|
||||
* 검색 월(yyyyMM)
|
||||
*/
|
||||
private String searchMonth;
|
||||
/**
|
||||
* 검색 그룸번호
|
||||
*/
|
||||
private Integer groupNo;
|
||||
/**
|
||||
* 임가 일련번호
|
||||
*/
|
||||
private Long householdSeq;
|
||||
/**
|
||||
* 임업노동 일련번호
|
||||
*/
|
||||
private Long id;
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package app.module.front.usecase.daily.work.ports.application.domain;
|
||||
|
||||
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 RemoveDailyWorkCmd extends FrontAuditCommand {
|
||||
private String searchMonth;
|
||||
private Integer groupNo;
|
||||
private Long id;
|
||||
private Long dailyRecordSeq;
|
||||
}
|
||||
Reference in New Issue
Block a user