diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/persistence/SaveDailyFarmingDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/persistence/SaveDailyFarmingDao.java new file mode 100644 index 00000000..15d00e63 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/persistence/SaveDailyFarmingDao.java @@ -0,0 +1,40 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence.SaveDailyFarmingMapper; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence.modal.GetDailyFarmingDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.SaveDailyFarmingPortOut; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain.GetDailyFarmingCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain.SaveDailyFarmingCmd; +import app.module.core.config.application.annotation.CreateCommand; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service +@RequiredArgsConstructor +public class SaveDailyFarmingDao implements SaveDailyFarmingPortOut { + private final SaveDailyFarmingMapper DailyFarmingMapper; + + @Override + public GetDailyFarmingDto detail(GetDailyFarmingCmd command) { + + return DailyFarmingMapper.getDailyFarming(command); + } + + @CreateCommand + @Override + public void create(GetDailyFarmingCmd findCmd, SaveDailyFarmingCmd command) { + Integer existCount = DailyFarmingMapper.getRecordExistCount(findCmd); + if (existCount == 0) { + DailyFarmingMapper.createDailyFarming(command); + + log.debug("[CreateDailyFarming] command={}", command); + } else { + DailyFarmingMapper.updateDailyFarming(command); + + log.debug("[UpdateDailyFarming] command={}", command); + } + } + +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/persistence/SaveDailyFarmingMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/persistence/SaveDailyFarmingMapper.java new file mode 100644 index 00000000..50976826 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/persistence/SaveDailyFarmingMapper.java @@ -0,0 +1,39 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence.modal.GetDailyFarmingDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain.GetDailyFarmingCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain.SaveDailyFarmingCmd; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SaveDailyFarmingMapper { + /** + * 일계부 농업생산 데이터 조회 + * + * @param command 검색 조건 + * @return 농업생산 데이터 + */ + GetDailyFarmingDto getDailyFarming(GetDailyFarmingCmd command); + + /** + * 일계부 농업생산 데이터 존재 여부 + * + * @param command 검색 조건 + * @return 중복 개수 + */ + Integer getRecordExistCount(GetDailyFarmingCmd command); + + /** + * 일계부 농업생산 등록 + * + * @param command 등록 데이터 + */ + void createDailyFarming(SaveDailyFarmingCmd command); + + /** + * 일계부 농업생산 수정 + * + * @param command 수정 데이터 + */ + void updateDailyFarming(SaveDailyFarmingCmd command); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/persistence/modal/GetDailyFarmingDto.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/persistence/modal/GetDailyFarmingDto.java new file mode 100644 index 00000000..abc00ec2 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/persistence/modal/GetDailyFarmingDto.java @@ -0,0 +1,20 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence.modal; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class GetDailyFarmingDto { + private Long id; + private Long dailyRecordSeq; + private String productCode; + private String productLabel; + private String productSelf; + private String usage; + private String quantity; + private String unitCode; + private String unitLabel; + private String unitSelf; + private Long estimatedValue; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/SaveDailyFarmingController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/SaveDailyFarmingController.java new file mode 100644 index 00000000..0dbc290d --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/SaveDailyFarmingController.java @@ -0,0 +1,87 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence.modal.GetDailyFarmingDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model.DailyFarmingUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model.SaveDailyFarmingReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.validator.SaveDailyFarmingValidator; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.SaveDailyFarmingPortIn; +import app.module.core.config.application.exception.NoRecordDataException; +import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; +import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +@Slf4j +@RestController +@RequiredArgsConstructor +@RequestMapping(path = "/api/household/daily/farming") +public class SaveDailyFarmingController { + private final DailyRecordPortIn dailyRecordPortIn; + private final SaveDailyFarmingPortIn DailyFarmingPortIn; + private final SaveDailyFarmingValidator DailyFarmingValidator; + + /** + * 일계부 농업생산 조회 + * + * @param id 농업생산 일련번호 + * @param reqVO 검색 조건 + */ + @GetMapping(path = "/{id}") + ResponseEntity detail(@PathVariable("id") String id, @ModelAttribute DailyFarmingUIReqVO reqVO) { + + reqVO.setId(Long.parseLong(id)); + + GetDailyFarmingDto detail = DailyFarmingPortIn.detail(reqVO); + if (detail == null) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); + } + + return ResponseEntity.status(HttpStatus.OK).body(detail); + } + + /** + * 일계부 농업생산 등록 처리 + * + * @param formVO 입력 데이터 + * @param bindingResult BindingResult + */ + @PostMapping(path = "/save") + ResponseEntity create(@Valid @RequestBody SaveDailyFarmingReqVO formVO, BindingResult bindingResult) { + + DailyFarmingValidator.validate(formVO, bindingResult); + if (bindingResult.hasErrors()) { + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) + .body(bindingResult.getFieldErrors()); + } + + DailyRecordDto dailyRecord = this.vaildGetDailyRecord(formVO.getDailyId()); + + formVO.setSearchMonth(dailyRecord.getRecordMonth()); + formVO.setGroupNo(dailyRecord.getGroupNo()); + formVO.setDailyId(dailyRecord.getId()); + log.debug("formVO: {}", formVO); + + DailyFarmingPortIn.create(formVO); + + return ResponseEntity.status(HttpStatus.OK).body(formVO); + } + + /** + * 일계부 유효성 체크 및 데이터 조회 + * + * @param dailyRecordSeq 항목 일련번호 + */ + private DailyRecordDto vaildGetDailyRecord(Long dailyRecordSeq) { + DailyRecordDto dailyRecord = dailyRecordPortIn.detail(dailyRecordSeq); + if (dailyRecord == null || dailyRecord.getId() == null) { + throw new NoRecordDataException(); + } + + return dailyRecord; + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/model/DailyFarmingUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/model/DailyFarmingUIReqVO.java new file mode 100644 index 00000000..02f912d6 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/model/DailyFarmingUIReqVO.java @@ -0,0 +1,30 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class DailyFarmingUIReqVO { + /** + * 검색 월(yyyyMM) + */ + private String searchMonth; + /** + * 검색 그룸번호 + */ + private Integer groupNo; + /** + * 임가 일련번호 + */ + private Long householdSeq; + + /** + * 일계부 항목 일련번호 + */ + private Long dailyId; + /** + * 농업생산 일련번호 + */ + private Long id; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/model/SaveDailyFarmingReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/model/SaveDailyFarmingReqVO.java new file mode 100644 index 00000000..e807c96c --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/model/SaveDailyFarmingReqVO.java @@ -0,0 +1,42 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model.DailyFarmingUIReqVO; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString(callSuper = true) +public class SaveDailyFarmingReqVO extends DailyFarmingUIReqVO { + /** + * 생산물 + */ + @NotBlank(message = "생산물을 선택해 주세요.") + private String productCode; + /** + * 생산물 직접 입력 + */ + private String productSelf; + /** + * 용도 + */ + private String usage; + /** + * 수량 + */ + private Double quantity; + /** + * 단위 코드 + */ + private String unitCode; + /** + * 단위 직접 입력 + */ + private String unitSelf; + /** + * 현물평가액 + */ + private Long estimatedValue; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/validator/SaveDailyFarmingValidator.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/validator/SaveDailyFarmingValidator.java new file mode 100644 index 00000000..eed8bb9b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/validator/SaveDailyFarmingValidator.java @@ -0,0 +1,53 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.validator; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model.SaveDailyFarmingReqVO; +import app.module.core.config.constants.CommonConstants; +import lombok.RequiredArgsConstructor; +import org.apache.tika.utils.StringUtils; +import org.springframework.stereotype.Component; +import org.springframework.validation.Errors; +import org.springframework.validation.Validator; + +@Component +@RequiredArgsConstructor +public class SaveDailyFarmingValidator implements Validator { + @Override + public boolean supports(Class clazz) { + return SaveDailyFarmingReqVO.class.equals(clazz); + } + + @Override + public void validate(Object target, Errors errors) { + SaveDailyFarmingReqVO vo = (SaveDailyFarmingReqVO) target; + + if ("code.record.farming.self".equals(vo.getProductCode()) && StringUtils.isBlank(vo.getProductSelf())) { + errors.rejectValue( + "productSelf", "valid.common.required", + "생산물을 입력해 주세요."); + } + + if (vo.getQuantity() == null && !StringUtils.isBlank(vo.getUnitCode())) { + errors.rejectValue( + "quantity", "valid.common.required", + "수량을 입력해 주세요."); + } + + if (vo.getQuantity() != null && StringUtils.isBlank(vo.getUnitCode())) { + errors.rejectValue( + "unitCode", "valid.common.required", + "단위를 선택해 주세요."); + } + + if (CommonConstants.UNIT_CODE_SELF.equals(vo.getUnitCode()) && StringUtils.isBlank(vo.getUnitSelf())) { + errors.rejectValue( + "unitSelf", "valid.common.required", + "단위를 입력해 주세요."); + } + + if (vo.getEstimatedValue() == null) { + errors.rejectValue( + "estimatedValue", "valid.common.required", + "현물평가액을 입력해 주세요."); + } + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/SaveDailyFarmingPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/SaveDailyFarmingPortIn.java new file mode 100644 index 00000000..8114c1f4 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/SaveDailyFarmingPortIn.java @@ -0,0 +1,22 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence.modal.GetDailyFarmingDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model.DailyFarmingUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model.SaveDailyFarmingReqVO; + +public interface SaveDailyFarmingPortIn { + /** + * 일계부 농업생산 조회 + * + * @param reqVO 검색 조건 + * @return 농업생산 상세 + */ + GetDailyFarmingDto detail(DailyFarmingUIReqVO reqVO); + + /** + * 일계부 농업생산 등록 + * + * @param formVO 입력 데이터 + */ + void create(SaveDailyFarmingReqVO formVO); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/SaveDailyFarmingPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/SaveDailyFarmingPortOut.java new file mode 100644 index 00000000..62adf76c --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/SaveDailyFarmingPortOut.java @@ -0,0 +1,23 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence.modal.GetDailyFarmingDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain.GetDailyFarmingCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain.SaveDailyFarmingCmd; + +public interface SaveDailyFarmingPortOut { + /** + * 일계부 농업생산 조회 + * + * @param command 검색 조건 + * @return 농업생산 상세 + */ + GetDailyFarmingDto detail(GetDailyFarmingCmd command); + + /** + * 일계부 농업생산 등록 + * + * @param findCmd 검색 조건 + * @param command 입력 데이터 + */ + void create(GetDailyFarmingCmd findCmd, SaveDailyFarmingCmd command); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/application/SaveDailyFarmingService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/application/SaveDailyFarmingService.java new file mode 100644 index 00000000..0bcebd7d --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/application/SaveDailyFarmingService.java @@ -0,0 +1,68 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence.modal.GetDailyFarmingDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model.DailyFarmingUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model.SaveDailyFarmingReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.SaveDailyFarmingPortIn; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.SaveDailyFarmingPortOut; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain.GetDailyFarmingCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain.SaveDailyFarmingCmd; +import app.module.core.config.application.util.DailyUtil; +import app.module.core.config.constants.DailyRecordConstants; +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 org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.List; + +@Service +@RequiredArgsConstructor +public class SaveDailyFarmingService implements SaveDailyFarmingPortIn { + private final SaveDailyFarmingPortOut portOut; + private final DailyRecordPortIn dailyRecordPortIn; + private final UICodeListPortIn uiCodeListPortIn; + private final DailyUtil dailyUtil; + + @Override + public GetDailyFarmingDto detail(DailyFarmingUIReqVO reqVO) { + GetDailyFarmingCmd findCmd = new GetDailyFarmingCmd( + reqVO.getSearchMonth(), + reqVO.getGroupNo(), + reqVO.getHouseholdSeq(), + reqVO.getId()); + + return portOut.detail(findCmd); + } + + @Override + public void create(SaveDailyFarmingReqVO formVO) { + GetDailyFarmingCmd findCmd = new GetDailyFarmingCmd( + formVO.getSearchMonth(), + formVO.getGroupNo(), + formVO.getHouseholdSeq(), + formVO.getId()); + + HashMap markMap = dailyUtil.getMarkByFarming(uiCodeListPortIn.connect("code.record.farming"), formVO.getProductCode()); + + SaveDailyFarmingCmd command = + new SaveDailyFarmingCmd( + formVO.getId(), + formVO.getDailyId(), + markMap.get("incomeMark"), + markMap.get("expenseMark"), + formVO.getProductCode(), + formVO.getProductSelf(), + formVO.getUsage(), + formVO.getQuantity(), + formVO.getUnitCode(), + formVO.getUnitSelf(), + formVO.getEstimatedValue()); + + portOut.create(findCmd, command); + + dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq()); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/application/domain/GetDailyFarmingCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/application/domain/GetDailyFarmingCmd.java new file mode 100644 index 00000000..d16d7914 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/application/domain/GetDailyFarmingCmd.java @@ -0,0 +1,27 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class GetDailyFarmingCmd { + /** + * 검색 월(yyyyMM) + */ + private String searchMonth; + /** + * 검색 그룸번호 + */ + private Integer groupNo; + /** + * 임가 일련번호 + */ + private Long householdSeq; + /** + * 농업생산 일련번호 + */ + private Long id; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/application/domain/SaveDailyFarmingCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/application/domain/SaveDailyFarmingCmd.java new file mode 100644 index 00000000..a3f5a053 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/application/domain/SaveDailyFarmingCmd.java @@ -0,0 +1,25 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.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 SaveDailyFarmingCmd extends AuditCommand { + private Long id; + private Long dailyRecordSeq; + private String incomeMark; + private String expenseMark; + private String productCode; + private String productSelf; + private String usage; + private Double quantity; + private String unitCode; + private String unitSelf; + private Long estimatedValue; +} diff --git a/admin/src/main/resources/mappers/household/daily/SaveDailyFarmingMapper.xml b/admin/src/main/resources/mappers/household/daily/SaveDailyFarmingMapper.xml new file mode 100644 index 00000000..b6b03947 --- /dev/null +++ b/admin/src/main/resources/mappers/household/daily/SaveDailyFarmingMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + insert into daily_farming ( + daily_record_seq, income_mark, expense_mark + , product_code, product_self, usage + , quantity, unit_code, unit_self, estimated_value + , is_deleted + , + ) values ( + #{dailyRecordSeq}, #{incomeMark}, #{expenseMark} + , #{productCode}, #{productSelf}, #{usage} + , #{quantity}, #{unitCode}, #{unitSelf}, #{estimatedValue} + , false + , + ) + + + + update daily_farming set + , income_mark = #{incomeMark} + , expense_mark = #{expenseMark} + , product_code = #{productCode} + , product_self = #{productSelf} + , usage = #{usage} + , quantity = #{quantity} + , unit_code = #{unitCode} + , unit_self = #{unitSelf} + , estimated_value = #{estimatedValue} + where is_deleted = false + and daily_record_seq = #{dailyRecordSeq} + and id = #{id} + + + diff --git a/admin/src/main/resources/templates/households/modal/modal-daily-farming.html b/admin/src/main/resources/templates/households/modal/modal-daily-farming.html new file mode 100644 index 00000000..639cc04d --- /dev/null +++ b/admin/src/main/resources/templates/households/modal/modal-daily-farming.html @@ -0,0 +1,219 @@ + + + +
+
+ + + + + + + +
+ + + + +
+ \ No newline at end of file diff --git a/admin/src/main/resources/templates/households/tab/daily-record.html b/admin/src/main/resources/templates/households/tab/daily-record.html index c450a01b..7907bfb2 100644 --- a/admin/src/main/resources/templates/households/tab/daily-record.html +++ b/admin/src/main/resources/templates/households/tab/daily-record.html @@ -715,7 +715,7 @@ - ${ifNullHyphen(item.productName)} + ${ifNullHyphen(item.productName)} ${ifNullHyphen(item.usage)} ${ifNullHyphen(item.quantity)} ${ifNullHyphen(item.unitText)} @@ -818,8 +818,8 @@ showDailyPowerModal(); } else if (currentStep === 'FORESTRY') { showDailyForestryModal(); - } else { - alert('TODO : 추가'); + } else if (currentStep === 'FARMING') { + showDailyFarmingModal(); } } diff --git a/admin/src/main/resources/templates/households/{seq}.html b/admin/src/main/resources/templates/households/{seq}.html index 68e37a95..3c18edeb 100644 --- a/admin/src/main/resources/templates/households/{seq}.html +++ b/admin/src/main/resources/templates/households/{seq}.html @@ -181,6 +181,7 @@ + diff --git a/core/src/main/java/app/module/core/config/application/util/DailyUtil.java b/core/src/main/java/app/module/core/config/application/util/DailyUtil.java index 0e4be6a1..4262053d 100644 --- a/core/src/main/java/app/module/core/config/application/util/DailyUtil.java +++ b/core/src/main/java/app/module/core/config/application/util/DailyUtil.java @@ -1,5 +1,6 @@ package app.module.core.config.application.util; +import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -9,6 +10,8 @@ import java.text.DecimalFormat; import java.text.SimpleDateFormat; import java.time.LocalDate; import java.util.Date; +import java.util.HashMap; +import java.util.List; import java.util.Locale; @Slf4j @@ -126,4 +129,35 @@ public class DailyUtil { return new DecimalFormat("###,###").format(Double.parseDouble(value)); } + + /** + * 농업 생산물의 UI Code 데이터의 수입부호, 지출부호 조회 + * + * @param uiCodeList UI Code 목록 + * @param targetCode 조회 코드 + * @return 수입부호, 지출부호 Map + */ + public HashMap getMarkByFarming(List uiCodeList, String targetCode) { + String incomeMark = null; + String expenseMark = null; + if (!"code.record.farming.self".equals(targetCode)) { + String returnValue = null; + for (UICodeElement codeSetup : uiCodeList) { + if (codeSetup.getId().equalsIgnoreCase(targetCode)) { + returnValue = codeSetup.getCodeValue(); + break; + } + } + + if (returnValue != null) { + incomeMark = returnValue.split(",")[0]; + expenseMark = returnValue.split(",")[1]; + } + } + + HashMap returnValue = new HashMap<>(); + returnValue.put("incomeMark", incomeMark); + returnValue.put("expenseMark", expenseMark); + return returnValue; + } } diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/DailyFarmingService.java b/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/DailyFarmingService.java index d4df0d8c..6aa9110a 100644 --- a/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/DailyFarmingService.java +++ b/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/DailyFarmingService.java @@ -1,5 +1,6 @@ package app.module.front.usecase.daily.farming.ports.application; +import app.module.core.config.application.util.DailyUtil; 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; @@ -18,6 +19,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.HashMap; import java.util.List; @Slf4j @@ -25,8 +27,9 @@ import java.util.List; @RequiredArgsConstructor public class DailyFarmingService implements DailyFarmingPortIn { private final DailyFarmingPortOut portOut; - private final UICodeListPortIn uiCodeListPortIn; private final DailyRecordPortIn dailyRecordPortIn; + private final UICodeListPortIn uiCodeListPortIn; + private final DailyUtil dailyUtil; @Override public List list(DailyFarmingUIReqVO reqVO) { @@ -101,30 +104,14 @@ public class DailyFarmingService implements DailyFarmingPortIn { formVO.getHouseholdSeq(), formVO.getId()); - String incomeMark = null; - String expenseMark = null; - if (!"code.record.farming.self".equals(formVO.getProductCode())) { - List recordFarming = uiCodeListPortIn.connect("code.record.farming"); - String returnValue = null; - for (UICodeElement codeSetup : recordFarming) { - if (codeSetup.getId().equalsIgnoreCase(formVO.getProductCode())) { - returnValue = codeSetup.getCodeValue(); - break; - } - } - - if (returnValue != null) { - incomeMark = returnValue.split(",")[0]; - expenseMark = returnValue.split(",")[1]; - } - } + HashMap markMap = dailyUtil.getMarkByFarming(uiCodeListPortIn.connect("code.record.farming"), formVO.getProductCode()); CreateDailyFarmingCmd command = AuditUtil.create( new CreateDailyFarmingCmd( formVO.getId(), formVO.getDailyRecordSeq(), - incomeMark, - expenseMark, + markMap.get("incomeMark"), + markMap.get("expenseMark"), formVO.getProductCode(), formVO.getProductSelf(), formVO.getUsage(),