From f1aad02b70abd9b0ce582a673a79cc4e5df582bb Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Thu, 26 Jun 2025 14:24:12 +0900 Subject: [PATCH] =?UTF-8?q?[BO]=20=EC=9E=84=EC=82=B0=EB=AC=BC=ED=98=84?= =?UTF-8?q?=ED=99=A9=20=EB=93=B1=EB=A1=9D=20=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GetForestProductsStatusDao.java | 3 +- .../GetForestProductsStatusMapper.java | 3 +- .../domain/GetForestProductsStatusResult.java | 2 +- .../GetMonthlyForestProductsStatus.java | 15 ++++ .../persistence/SaveForestProductDao.java | 24 +++++ .../persistence/SaveForestProductMapper.java | 10 +++ .../web/SaveForestProductController.java | 61 +++++++++++++ .../web/model/SaveForestProductReqVO.java | 37 ++++++++ .../web/model/SaveForestProductResVO.java | 14 +++ .../validator/SaveForestProductValidator.java | 25 ++++++ .../ports/SaveForestProductPortIn.java | 7 ++ .../ports/SaveForestProductPortOut.java | 7 ++ .../application/SaveForestProductService.java | 18 ++++ .../domain/SaveForestProductCmd.java | 35 ++++++++ .../web/SaveHouseholdVisitInfoController.java | 2 +- .../GetForestProductsStatusMapper.xml | 5 +- .../household/SaveForestProductMapper.xml | 88 +++++++++++++++++++ .../modal/modal-forest-product.html | 58 +++++++++--- .../households/modal/modal-visit-info.html | 2 +- .../households/tab/forest-product.html | 7 +- .../resources/templates/households/{seq}.html | 3 - 21 files changed, 401 insertions(+), 25 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/ports/application/domain/GetMonthlyForestProductsStatus.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/persistence/SaveForestProductDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/persistence/SaveForestProductMapper.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/SaveForestProductController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/model/SaveForestProductReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/model/SaveForestProductResVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/validator/SaveForestProductValidator.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/ports/SaveForestProductPortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/ports/SaveForestProductPortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/ports/application/SaveForestProductService.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/ports/application/domain/SaveForestProductCmd.java create mode 100644 admin/src/main/resources/mappers/household/SaveForestProductMapper.xml diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/adapters/persistence/GetForestProductsStatusDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/adapters/persistence/GetForestProductsStatusDao.java index 5f327c74..e3951a04 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/adapters/persistence/GetForestProductsStatusDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/adapters/persistence/GetForestProductsStatusDao.java @@ -4,6 +4,7 @@ import app.module.admin.usecase.household.tab.forestProduct.getForestProductsSta import app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application.domain.GetForestProductsStatus; import app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd; import app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application.domain.GetForestProductsStatusResult; +import app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application.domain.GetMonthlyForestProductsStatus; import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; @@ -17,7 +18,7 @@ class GetForestProductsStatusDao implements GetForestProductsStatusPortOut { public GetForestProductsStatusResult operate(GetForestProductsStatusCmd cmd) { // 임산물 등록 상태 조회 - String monthlyStatus = mapper.getMonthlyStatus(cmd); + GetMonthlyForestProductsStatus monthlyStatus = mapper.getMonthlyStatus(cmd); // 임산물 목록 조회 List forestProducts = mapper.getForestProductsStatus(cmd); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/adapters/persistence/GetForestProductsStatusMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/adapters/persistence/GetForestProductsStatusMapper.java index 87fb4f25..aeec235d 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/adapters/persistence/GetForestProductsStatusMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/adapters/persistence/GetForestProductsStatusMapper.java @@ -2,11 +2,12 @@ package app.module.admin.usecase.household.tab.forestProduct.getForestProductsSt import app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application.domain.GetForestProductsStatus; import app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd; +import app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application.domain.GetMonthlyForestProductsStatus; import java.util.List; import org.apache.ibatis.annotations.Mapper; @Mapper public interface GetForestProductsStatusMapper { - String getMonthlyStatus(GetForestProductsStatusCmd cmd); + GetMonthlyForestProductsStatus getMonthlyStatus(GetForestProductsStatusCmd cmd); List getForestProductsStatus(GetForestProductsStatusCmd cmd); } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/ports/application/domain/GetForestProductsStatusResult.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/ports/application/domain/GetForestProductsStatusResult.java index 873bc0ff..54c89130 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/ports/application/domain/GetForestProductsStatusResult.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/ports/application/domain/GetForestProductsStatusResult.java @@ -11,6 +11,6 @@ import lombok.Setter; @AllArgsConstructor @EqualsAndHashCode public class GetForestProductsStatusResult { - private String monthlyStatus; + private GetMonthlyForestProductsStatus monthlyStatus; private List forestProducts; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/ports/application/domain/GetMonthlyForestProductsStatus.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/ports/application/domain/GetMonthlyForestProductsStatus.java new file mode 100644 index 00000000..1174e369 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/ports/application/domain/GetMonthlyForestProductsStatus.java @@ -0,0 +1,15 @@ +package app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetMonthlyForestProductsStatus { + private Long id; + private String forestStatus; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/persistence/SaveForestProductDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/persistence/SaveForestProductDao.java new file mode 100644 index 00000000..28b77e34 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/persistence/SaveForestProductDao.java @@ -0,0 +1,24 @@ +package app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.adapters.persistence; + +import app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.ports.SaveForestProductPortOut; +import app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.ports.application.domain.SaveForestProductCmd; +import app.module.core.config.application.util.AuditUtil; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +@Repository +@RequiredArgsConstructor +class SaveForestProductDao implements SaveForestProductPortOut { + private final SaveForestProductMapper mapper; + + @Override + @Transactional + public void operate(SaveForestProductCmd inCmd) { + if (inCmd.getForestProductId() == null) { + mapper.createForestProduct(AuditUtil.create(inCmd)); + } else { + mapper.updateForestProduct(AuditUtil.update(inCmd)); + } + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/persistence/SaveForestProductMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/persistence/SaveForestProductMapper.java new file mode 100644 index 00000000..95eb3adf --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/persistence/SaveForestProductMapper.java @@ -0,0 +1,10 @@ +package app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.adapters.persistence; + +import app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.ports.application.domain.SaveForestProductCmd; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SaveForestProductMapper { + void createForestProduct(SaveForestProductCmd cmd); + void updateForestProduct(SaveForestProductCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/SaveForestProductController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/SaveForestProductController.java new file mode 100644 index 00000000..6076b034 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/SaveForestProductController.java @@ -0,0 +1,61 @@ +package app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.adapters.web; + +import app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.ports.SaveForestProductPortIn; +import app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.ports.application.domain.SaveForestProductCmd; +import app.module.core.config.application.util.MessageUtil; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.BindingResult; +import app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.adapters.web.model.SaveForestProductReqVO; +import app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.adapters.web.model.SaveForestProductResVO; +import app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.adapters.web.validator.SaveForestProductValidator; + +@RestController +@RequiredArgsConstructor +class SaveForestProductController { + private final SaveForestProductValidator validator; + private final SaveForestProductPortIn portIn; + private final MessageUtil messageUtil; + + @PostMapping(path = "/api/forestProduct/save") + ResponseEntity operate(@Valid @RequestBody SaveForestProductReqVO reqVO, + BindingResult bindingResult) { + validator.validate(reqVO, bindingResult); + if (bindingResult.hasErrors()) { + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) + .body(bindingResult.getFieldErrors()); + } + + portIn.operate(new SaveForestProductCmd( + reqVO.getForestProductId(), + reqVO.getHouseholdSeq(), + reqVO.getMonthlyInputStatusId(), + reqVO.getRecordMonth(), + reqVO.getStreetNum(), + reqVO.getLandType(), + reqVO.getTown(), + reqVO.getCropName(), + reqVO.getLandArea(), + reqVO.getAvailableArea(), + reqVO.getMainYield(), + reqVO.getMainYieldUnitCode(), + reqVO.getMainYieldUnit(), + reqVO.getMainSaleAmount(), + reqVO.getMainSaleUnitCode(), + reqVO.getMainSaleUnit(), + reqVO.getSubYield(), + reqVO.getSubYieldUnitCode(), + reqVO.getSubYieldUnit(), + reqVO.getSubSaleAmount(), + reqVO.getSubSaleUnitCode(), + reqVO.getSubSaleUnit())); + + return ResponseEntity.status(HttpStatus.OK).body( + new SaveForestProductResVO(messageUtil.getMessage("operation.common.save.done"))); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/model/SaveForestProductReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/model/SaveForestProductReqVO.java new file mode 100644 index 00000000..673d718e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/model/SaveForestProductReqVO.java @@ -0,0 +1,37 @@ +package app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.adapters.web.model; + +import jakarta.validation.constraints.NotBlank; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@EqualsAndHashCode +public class SaveForestProductReqVO { + private Long forestProductId; + private Long householdSeq; + private Long monthlyInputStatusId; + private String recordMonth; + private String streetNum; + private String landType; + private String town; + private String cropName; + private String landArea; + private String availableArea; + private String mainYield; + private String mainYieldUnitCode; + private String mainYieldUnit; + private String mainSaleAmount; + private String mainSaleUnitCode; + private String mainSaleUnit; + private String subYield; + private String subYieldUnitCode; + private String subYieldUnit; + private String subSaleAmount; + private String subSaleUnitCode; + private String subSaleUnit; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/model/SaveForestProductResVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/model/SaveForestProductResVO.java new file mode 100644 index 00000000..decd5dc5 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/model/SaveForestProductResVO.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class SaveForestProductResVO { + private String message; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/validator/SaveForestProductValidator.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/validator/SaveForestProductValidator.java new file mode 100644 index 00000000..fb55563a --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/adapters/web/validator/SaveForestProductValidator.java @@ -0,0 +1,25 @@ +package app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.adapters.web.validator; + +import app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.adapters.web.model.SaveForestProductReqVO; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; +import org.springframework.validation.Errors; +import org.springframework.validation.Validator; + +@Component +public class SaveForestProductValidator implements Validator { + + @Override + public boolean supports(Class clazz) { + return SaveForestProductReqVO.class.equals(clazz); + } + + @Override + public void validate(Object target, Errors errors) { + SaveForestProductReqVO vo = (SaveForestProductReqVO) target; + + if (!StringUtils.hasText(vo.getCropName())) { + errors.rejectValue("cropName", "error.cropName", "재배 작물명을 입력해주세요."); + } + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/ports/SaveForestProductPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/ports/SaveForestProductPortIn.java new file mode 100644 index 00000000..8bbe77ed --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/ports/SaveForestProductPortIn.java @@ -0,0 +1,7 @@ +package app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.ports; + +import app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.ports.application.domain.SaveForestProductCmd; + +public interface SaveForestProductPortIn { + void operate(SaveForestProductCmd inCmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/ports/SaveForestProductPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/ports/SaveForestProductPortOut.java new file mode 100644 index 00000000..220db4aa --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/ports/SaveForestProductPortOut.java @@ -0,0 +1,7 @@ +package app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.ports; + +import app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.ports.application.domain.SaveForestProductCmd; + +public interface SaveForestProductPortOut { + void operate(SaveForestProductCmd inCmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/ports/application/SaveForestProductService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/ports/application/SaveForestProductService.java new file mode 100644 index 00000000..0d9c4d41 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/ports/application/SaveForestProductService.java @@ -0,0 +1,18 @@ +package app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.ports.application; + +import app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.ports.SaveForestProductPortIn; +import app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.ports.SaveForestProductPortOut; +import app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.ports.application.domain.SaveForestProductCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class SaveForestProductService implements SaveForestProductPortIn { + private final SaveForestProductPortOut portOut; + + @Override + public void operate(SaveForestProductCmd cmd) { + portOut.operate(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/ports/application/domain/SaveForestProductCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/ports/application/domain/SaveForestProductCmd.java new file mode 100644 index 00000000..208ada31 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/saveForestProduct/ports/application/domain/SaveForestProductCmd.java @@ -0,0 +1,35 @@ +package app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.ports.application.domain; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class SaveForestProductCmd extends AuditCommand { + private Long forestProductId; + private Long householdSeq; + private Long monthlyInputStatusId; + private String recordMonth; + private String streetNum; + private String landType; + private String town; + private String cropName; + private String landArea; + private String availableArea; + private String mainYield; + private String mainYieldUnitCode; + private String mainYieldUnit; + private String mainSaleAmount; + private String mainSaleUnitCode; + private String mainSaleUnit; + private String subYield; + private String subYieldUnitCode; + private String subYieldUnit; + private String subSaleAmount; + private String subSaleUnitCode; + private String subSaleUnit; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/SaveHouseholdVisitInfoController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/SaveHouseholdVisitInfoController.java index c3284314..e46cefe4 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/SaveHouseholdVisitInfoController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/SaveHouseholdVisitInfoController.java @@ -30,7 +30,7 @@ class SaveHouseholdVisitInfoController { if (bindingResult.hasErrors()) { return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) - .body(bindingResult.getAllErrors().get(0).getDefaultMessage()); + .body(bindingResult.getFieldErrors()); } portIn.operate(new SaveHouseholdVisitInfoCmd( diff --git a/admin/src/main/resources/mappers/household/GetForestProductsStatusMapper.xml b/admin/src/main/resources/mappers/household/GetForestProductsStatusMapper.xml index 98d5c62b..6af17c80 100644 --- a/admin/src/main/resources/mappers/household/GetForestProductsStatusMapper.xml +++ b/admin/src/main/resources/mappers/household/GetForestProductsStatusMapper.xml @@ -4,9 +4,10 @@ - /* getMonthlyStatus : 임산물 현황 등록 상태 조회 */ - SELECT forest_product_status + SELECT id, + forest_product_status FROM monthly_input_status mis WHERE household_seq = #{householdSeq} AND month = #{recordMonth} diff --git a/admin/src/main/resources/mappers/household/SaveForestProductMapper.xml b/admin/src/main/resources/mappers/household/SaveForestProductMapper.xml new file mode 100644 index 00000000..477198a2 --- /dev/null +++ b/admin/src/main/resources/mappers/household/SaveForestProductMapper.xml @@ -0,0 +1,88 @@ + + + + + /* createForestProduct : 임산물 현황 등록 */ + INSERT INTO forest_product + ( + household_seq, + month, + street_num, + land_type, + town, + crop_name, + land_area, + available_area, + main_yield, + main_yield_unit_code, + main_yield_unit, + main_sale_amount, + main_sale_unit_code, + main_sale_unit, + sub_yield, + sub_yield_unit_code, + sub_yield_unit, + sub_sale_amount, + sub_sale_unit_code, + sub_sale_unit, + monthly_input_status_id, + + ) + VALUES + ( + #{householdSeq}, + #{recordMonth}, + #{streetNum}, + #{landType}, + #{town}, + #{cropName}, + #{landArea}, + #{availableArea}, + #{mainYield}, + #{mainYieldUnitCode}, + #{mainYieldUnit}, + #{mainSaleAmount}, + #{mainSaleUnitCode}, + #{mainSaleUnit}, + #{subYield}, + #{subYieldUnitCode}, + #{subYieldUnit}, + #{subSaleAmount}, + #{subSaleUnitCode}, + #{subSaleUnit}, + #{monthlyInputStatusId}, + + ) + + + + /* updateForestProduct : 임산물 현황 수정 */ + UPDATE forest_product + SET + household_seq = #{householdSeq}, + street_num = #{streetNum}, + land_type = #{landType}, + town = #{town}, + available_area = #{availableArea}, + crop_name = #{cropName}, + land_area = #{landArea}, + month = #{recordMonth}, + main_yield = #{mainYield}, + main_yield_unit_code = #{mainYieldUnitCode}, + main_yield_unit = #{mainYieldUnit}, + main_sale_amount = #{mainSaleAmount}, + main_sale_unit_code = #{mainSaleUnitCode}, + main_sale_unit = #{mainSaleUnit}, + sub_yield = #{subYield}, + sub_yield_unit_code = #{subYieldUnitCode}, + sub_yield_unit = #{subYieldUnit}, + sub_sale_amount = #{subSaleAmount}, + sub_sale_unit_code = #{subSaleUnitCode}, + sub_sale_unit = #{subSaleUnit}, + monthly_input_status_id = #{monthlyInputStatusId}, + + WHERE id = #{forestProductId} + + \ No newline at end of file diff --git a/admin/src/main/resources/templates/households/modal/modal-forest-product.html b/admin/src/main/resources/templates/households/modal/modal-forest-product.html index 70447288..6393ddb7 100644 --- a/admin/src/main/resources/templates/households/modal/modal-forest-product.html +++ b/admin/src/main/resources/templates/households/modal/modal-forest-product.html @@ -8,6 +8,7 @@ +