diff --git a/admin/src/main/java/app/module/admin/config/application/enums/MonthlyInputStatusType.java b/admin/src/main/java/app/module/admin/config/application/enums/MonthlyInputStatusType.java new file mode 100644 index 00000000..a178d27a --- /dev/null +++ b/admin/src/main/java/app/module/admin/config/application/enums/MonthlyInputStatusType.java @@ -0,0 +1,13 @@ +package app.module.admin.config.application.enums; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter +@RequiredArgsConstructor +public enum MonthlyInputStatusType { + NONE("미등록"), + NOTHING("등록 내용없음"), + REGISTERED("등록완료"); + private final String desc; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/GetHouseholdStatusUIController.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/adapters/web/GetHouseholdStatusUIController.java similarity index 89% rename from admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/GetHouseholdStatusUIController.java rename to admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/adapters/web/GetHouseholdStatusUIController.java index 19dd87b5..b003eb9b 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/GetHouseholdStatusUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/adapters/web/GetHouseholdStatusUIController.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getHouseholdStatusUI; +package app.module.admin.usecase.household.getHouseholdStatusUI.adapters.web; import app.module.admin.config.application.util.AdminUtil; import app.module.admin.config.application.util.DateUiUtil; @@ -11,7 +11,7 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; -import app.module.admin.usecase.household.getHouseholdStatusUI.model.GetHouseholdStatusUIReqVO; +import app.module.admin.usecase.household.getHouseholdStatusUI.adapters.web.model.GetHouseholdStatusUIReqVO; import org.springframework.web.bind.annotation.RequestParam; @Controller diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/model/GetHouseholdStatusUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/adapters/web/model/GetHouseholdStatusUIReqVO.java similarity index 93% rename from admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/model/GetHouseholdStatusUIReqVO.java rename to admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/adapters/web/model/GetHouseholdStatusUIReqVO.java index a49de0a2..bbc62d52 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/model/GetHouseholdStatusUIReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/adapters/web/model/GetHouseholdStatusUIReqVO.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getHouseholdStatusUI.model; +package app.module.admin.usecase.household.getHouseholdStatusUI.adapters.web.model; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/GetHouseholdsStatusUIController.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/adapters/web/GetHouseholdsStatusUIController.java similarity index 97% rename from admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/GetHouseholdsStatusUIController.java rename to admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/adapters/web/GetHouseholdsStatusUIController.java index c7449fb4..0d269c18 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/GetHouseholdsStatusUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/adapters/web/GetHouseholdsStatusUIController.java @@ -1,8 +1,8 @@ -package app.module.admin.usecase.household.getHouseholdsStatusUI; +package app.module.admin.usecase.household.getHouseholdsStatusUI.adapters.web; import app.module.admin.config.application.util.AdminUtil; import app.module.admin.config.application.util.DateUiUtil; -import app.module.admin.usecase.household.getHouseholdsStatusUI.model.GetHouseholdsUIReqVO; +import app.module.admin.usecase.household.getHouseholdsStatusUI.adapters.web.model.GetHouseholdsUIReqVO; import app.module.core.config.application.util.CommonUtil; import app.module.core.usecase.admin.view.ports.AdminViewPortIn; import app.module.core.usecase.admin.view.ports.application.domain.AdminView; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/model/GetHouseholdsUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/adapters/web/model/GetHouseholdsUIReqVO.java similarity index 98% rename from admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/model/GetHouseholdsUIReqVO.java rename to admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/adapters/web/model/GetHouseholdsUIReqVO.java index ee34a95e..8e6124b1 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/model/GetHouseholdsUIReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/adapters/web/model/GetHouseholdsUIReqVO.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getHouseholdsStatusUI.model; +package app.module.admin.usecase.household.getHouseholdsStatusUI.adapters.web.model; import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.ProgressType; import lombok.AllArgsConstructor; diff --git a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/adapters/persistence/UpdateMonthlyInputStatusDao.java b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/adapters/persistence/UpdateMonthlyInputStatusDao.java new file mode 100644 index 00000000..2e332a4e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/adapters/persistence/UpdateMonthlyInputStatusDao.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.adapters.persistence; + +import app.module.core.config.application.annotation.UpdateCommand; +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.ports.application.domain.UpdateForestProductStatusCmd; +import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.ports.UpdateMonthlyInputStatusPortOut; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class UpdateMonthlyInputStatusDao implements UpdateMonthlyInputStatusPortOut { + private final UpdateMonthlyInputStatusMapper mapper; + + @Override + @UpdateCommand + public void updateForestProductStatus(UpdateForestProductStatusCmd cmd) { + mapper.updateForestProductStatus(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/adapters/persistence/UpdateMonthlyInputStatusMapper.java b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/adapters/persistence/UpdateMonthlyInputStatusMapper.java new file mode 100644 index 00000000..cdfc03d9 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/adapters/persistence/UpdateMonthlyInputStatusMapper.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.adapters.persistence; + +import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.ports.application.domain.UpdateForestProductStatusCmd; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface UpdateMonthlyInputStatusMapper { + void updateForestProductStatus(UpdateForestProductStatusCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/ports/UpdateMonthlyInputStatusPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/ports/UpdateMonthlyInputStatusPortIn.java new file mode 100644 index 00000000..b92d3e34 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/ports/UpdateMonthlyInputStatusPortIn.java @@ -0,0 +1,7 @@ +package app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.ports; + +import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.ports.application.domain.UpdateForestProductStatusCmd; + +public interface UpdateMonthlyInputStatusPortIn { + void updateForestProductStatus(UpdateForestProductStatusCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/ports/UpdateMonthlyInputStatusPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/ports/UpdateMonthlyInputStatusPortOut.java new file mode 100644 index 00000000..cca72d63 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/ports/UpdateMonthlyInputStatusPortOut.java @@ -0,0 +1,7 @@ +package app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.ports; + +import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.ports.application.domain.UpdateForestProductStatusCmd; + +public interface UpdateMonthlyInputStatusPortOut { + void updateForestProductStatus(UpdateForestProductStatusCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/ports/application/UpdateMonthlyInputStatusService.java b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/ports/application/UpdateMonthlyInputStatusService.java new file mode 100644 index 00000000..d4357e49 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/ports/application/UpdateMonthlyInputStatusService.java @@ -0,0 +1,18 @@ +package app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.ports.application; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.ports.application.domain.UpdateForestProductStatusCmd; +import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.ports.UpdateMonthlyInputStatusPortIn; +import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.ports.UpdateMonthlyInputStatusPortOut; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class UpdateMonthlyInputStatusService implements UpdateMonthlyInputStatusPortIn { + private final UpdateMonthlyInputStatusPortOut portOut; + + @Override + public void updateForestProductStatus(UpdateForestProductStatusCmd cmd) { + portOut.updateForestProductStatus(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/ports/application/domain/UpdateForestProductStatusCmd.java b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/ports/application/domain/UpdateForestProductStatusCmd.java new file mode 100644 index 00000000..858b5104 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/monthlyInputStatus/updateMonthlyInputStatus/ports/application/domain/UpdateForestProductStatusCmd.java @@ -0,0 +1,15 @@ +package app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.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 UpdateForestProductStatusCmd extends AuditCommand { + private Long id; + private String status; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/adapters/persistence/RemoveForestProductsDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/adapters/persistence/RemoveForestProductsDao.java new file mode 100644 index 00000000..b7bb6694 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/adapters/persistence/RemoveForestProductsDao.java @@ -0,0 +1,33 @@ +package app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.adapters.persistence; + +import app.module.admin.config.application.enums.MonthlyInputStatusType; +import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.adapters.persistence.UpdateMonthlyInputStatusMapper; +import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.ports.application.domain.UpdateForestProductStatusCmd; +import app.module.core.config.application.annotation.DeleteCommand; +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.ports.application.domain.RemoveForestProductsCmd; +import app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.ports.RemoveForestProductsPortOut; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +@Repository +@RequiredArgsConstructor +class RemoveForestProductsDao implements RemoveForestProductsPortOut { + private final RemoveForestProductsMapper removeForestProductsMapper; + private final UpdateMonthlyInputStatusMapper updateMonthlyInputStatusMapper; + + @Override + @DeleteCommand + @Transactional + public void operate(RemoveForestProductsCmd cmd) { + // 임산물 현황 삭제 + removeForestProductsMapper.removeForestProducts(cmd); + + // 임산물 모두 삭제됐을 경우 입력상태 미등록으로 update + if (!removeForestProductsMapper.existsForestProduct(cmd.getMonthlyInputStatusId())) { + updateMonthlyInputStatusMapper.updateForestProductStatus( + new UpdateForestProductStatusCmd(cmd.getMonthlyInputStatusId(), + MonthlyInputStatusType.NONE.name())); + } + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/adapters/persistence/RemoveForestProductsMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/adapters/persistence/RemoveForestProductsMapper.java new file mode 100644 index 00000000..1117241a --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/adapters/persistence/RemoveForestProductsMapper.java @@ -0,0 +1,10 @@ +package app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.adapters.persistence; + +import app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.ports.application.domain.RemoveForestProductsCmd; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface RemoveForestProductsMapper { + void removeForestProducts(RemoveForestProductsCmd cmd); + boolean existsForestProduct(Long monthlyInputStatusId); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/adapters/web/RemoveForestProductsController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/adapters/web/RemoveForestProductsController.java new file mode 100644 index 00000000..5fe5f500 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/adapters/web/RemoveForestProductsController.java @@ -0,0 +1,36 @@ +package app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.adapters.web; + +import app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.ports.RemoveForestProductsPortIn; +import app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.ports.application.domain.RemoveForestProductsCmd; +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.DeleteMapping; +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.removeForestProducts.adapters.web.model.RemoveForestProductsReqVO; +import app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.adapters.web.model.RemoveForestProductsResVO; + +@RestController +@RequiredArgsConstructor +class RemoveForestProductsController { + private final RemoveForestProductsPortIn portIn; + private final MessageUtil messageUtil; + + @DeleteMapping(path = "/api/household/forestProducts/delete") + ResponseEntity operate(@Valid @RequestBody RemoveForestProductsReqVO reqVO, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY).body(bindingResult); + } + + portIn.operate( + new RemoveForestProductsCmd(reqVO.getMonthlyInputStatusId(), reqVO.getForestRemoveIds())); + + return ResponseEntity.status(HttpStatus.OK).body( + new RemoveForestProductsResVO(messageUtil.getMessage("operation.common.remove.done"))); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/adapters/web/model/RemoveForestProductsReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/adapters/web/model/RemoveForestProductsReqVO.java new file mode 100644 index 00000000..9af219a6 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/adapters/web/model/RemoveForestProductsReqVO.java @@ -0,0 +1,17 @@ +package app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.adapters.web.model; + +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@EqualsAndHashCode +public class RemoveForestProductsReqVO { + private Long monthlyInputStatusId; + private List forestRemoveIds; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/adapters/web/model/RemoveForestProductsResVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/adapters/web/model/RemoveForestProductsResVO.java new file mode 100644 index 00000000..7d169cf3 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/adapters/web/model/RemoveForestProductsResVO.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class RemoveForestProductsResVO { + private String message; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/ports/RemoveForestProductsPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/ports/RemoveForestProductsPortIn.java new file mode 100644 index 00000000..91e4899e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/ports/RemoveForestProductsPortIn.java @@ -0,0 +1,7 @@ +package app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.ports; + +import app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.ports.application.domain.RemoveForestProductsCmd; + +public interface RemoveForestProductsPortIn { + void operate(RemoveForestProductsCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/ports/RemoveForestProductsPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/ports/RemoveForestProductsPortOut.java new file mode 100644 index 00000000..d2d1b66b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/ports/RemoveForestProductsPortOut.java @@ -0,0 +1,7 @@ +package app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.ports; + +import app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.ports.application.domain.RemoveForestProductsCmd; + +public interface RemoveForestProductsPortOut { + void operate(RemoveForestProductsCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/ports/application/RemoveForestProductsService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/ports/application/RemoveForestProductsService.java new file mode 100644 index 00000000..d06fae44 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/ports/application/RemoveForestProductsService.java @@ -0,0 +1,18 @@ +package app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.ports.application; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.ports.application.domain.RemoveForestProductsCmd; +import app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.ports.RemoveForestProductsPortIn; +import app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.ports.RemoveForestProductsPortOut; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class RemoveForestProductsService implements RemoveForestProductsPortIn { + private final RemoveForestProductsPortOut portOut; + + @Override + public void operate(RemoveForestProductsCmd cmd) { + portOut.operate(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/ports/application/domain/RemoveForestProductsCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/ports/application/domain/RemoveForestProductsCmd.java new file mode 100644 index 00000000..672e6872 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/removeForestProducts/ports/application/domain/RemoveForestProductsCmd.java @@ -0,0 +1,17 @@ +package app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.ports.application.domain; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class RemoveForestProductsCmd extends AuditCommand { + private Long monthlyInputStatusId; + private List removeIds; +} 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 index 28b77e34..60b61971 100644 --- 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 @@ -1,5 +1,8 @@ package app.module.admin.usecase.household.tab.forestProduct.saveForestProduct.adapters.persistence; +import app.module.admin.config.application.enums.MonthlyInputStatusType; +import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.adapters.persistence.UpdateMonthlyInputStatusMapper; +import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.ports.application.domain.UpdateForestProductStatusCmd; 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; @@ -10,15 +13,28 @@ import org.springframework.transaction.annotation.Transactional; @Repository @RequiredArgsConstructor class SaveForestProductDao implements SaveForestProductPortOut { - private final SaveForestProductMapper mapper; + private final SaveForestProductMapper saveForestProductMapper; + private final UpdateMonthlyInputStatusMapper updateMonthlyInputStatusMapper; @Override @Transactional public void operate(SaveForestProductCmd inCmd) { if (inCmd.getForestProductId() == null) { - mapper.createForestProduct(AuditUtil.create(inCmd)); + String status = saveForestProductMapper.getForestProductStatus(inCmd.getMonthlyInputStatusId()); + + // 등록 상태가 "REGISTERED"가 아닐 경우 "REGISTERED"로 update + if(!MonthlyInputStatusType.REGISTERED.name().equals(status)) { + updateMonthlyInputStatusMapper.updateForestProductStatus( + new UpdateForestProductStatusCmd( + inCmd.getMonthlyInputStatusId(), + MonthlyInputStatusType.REGISTERED.name())); + } + + // 임산물 현황 등록 + saveForestProductMapper.createForestProduct(AuditUtil.create(inCmd)); } else { - mapper.updateForestProduct(AuditUtil.update(inCmd)); + // 임산물 현황 update + saveForestProductMapper.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 index 95eb3adf..f754e7ed 100644 --- 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 @@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface SaveForestProductMapper { + String getForestProductStatus(Long monthlyInputStatusId); void createForestProduct(SaveForestProductCmd cmd); void updateForestProduct(SaveForestProductCmd cmd); } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/adapters/persistence/UpdateForestProductNoneDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/adapters/persistence/UpdateForestProductNoneDao.java new file mode 100644 index 00000000..426f8f9a --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/adapters/persistence/UpdateForestProductNoneDao.java @@ -0,0 +1,34 @@ +package app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.adapters.persistence; + +import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.adapters.persistence.UpdateMonthlyInputStatusMapper; +import app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.ports.application.domain.UpdateForestProductStatusCmd; +import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.application.domain.UpdateForestProductNoneOutCmd; +import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.application.domain.UpdateMonthlyForestProductStatusCmd; +import app.module.core.config.application.util.AuditUtil; +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.application.domain.UpdateForestProductNoneInCmd; +import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.UpdateForestProductNonePortOut; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +@Repository +@RequiredArgsConstructor +class UpdateForestProductNoneDao implements UpdateForestProductNonePortOut { + private final UpdateForestProductNoneMapper updateForestProductNoneMapper; + private final UpdateMonthlyInputStatusMapper updateMonthlyInputStatusMapper; + + @Override + @Transactional + public void operate(UpdateForestProductNoneOutCmd outCmd) { + // 금일 데이터 없음 체크시 데이터 일괄 삭제 + if ("NOTHING".equals(outCmd.getCurrentStatus())) { + updateForestProductNoneMapper.removeForestProduct(AuditUtil.delete(outCmd)); + } + + // 임산물 현황 상태값 변경 + updateMonthlyInputStatusMapper.updateForestProductStatus( + AuditUtil.update(new UpdateForestProductStatusCmd( + outCmd.getMonthlyInputStatusId(), + outCmd.getCurrentStatus()))); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/adapters/persistence/UpdateForestProductNoneMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/adapters/persistence/UpdateForestProductNoneMapper.java new file mode 100644 index 00000000..53cf5d27 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/adapters/persistence/UpdateForestProductNoneMapper.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.adapters.persistence; + +import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.application.domain.UpdateForestProductNoneOutCmd; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface UpdateForestProductNoneMapper { + void removeForestProduct(UpdateForestProductNoneOutCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/adapters/web/UpdateForestProductNoneController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/adapters/web/UpdateForestProductNoneController.java new file mode 100644 index 00000000..8cd74f22 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/adapters/web/UpdateForestProductNoneController.java @@ -0,0 +1,31 @@ +package app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.adapters.web; + +import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.UpdateForestProductNonePortIn; +import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.application.domain.UpdateForestProductNoneInCmd; +import app.module.core.config.application.util.MessageUtil; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.GetMapping; +import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.adapters.web.model.UpdateForestProductNoneReqVO; +import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.adapters.web.model.UpdateForestProductNoneResVO; + +@RestController +@RequiredArgsConstructor +class UpdateForestProductNoneController { + private final UpdateForestProductNonePortIn portIn; + private final MessageUtil messageUtil; + + @PatchMapping(path = "/api/household/forestProduct/nothing") + ResponseEntity operate(@RequestBody UpdateForestProductNoneReqVO reqVO) { + + portIn.operate(new UpdateForestProductNoneInCmd(reqVO.getMonthlyInputStatusId(), + reqVO.getTodayNone())); + + return ResponseEntity.status(HttpStatus.OK).body(new UpdateForestProductNoneResVO( + messageUtil.getMessage("operation.common.update.done"))); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/adapters/web/model/UpdateForestProductNoneReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/adapters/web/model/UpdateForestProductNoneReqVO.java new file mode 100644 index 00000000..b38f655e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/adapters/web/model/UpdateForestProductNoneReqVO.java @@ -0,0 +1,16 @@ +package app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@EqualsAndHashCode +public class UpdateForestProductNoneReqVO { + private Long monthlyInputStatusId; + private String todayNone; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/adapters/web/model/UpdateForestProductNoneResVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/adapters/web/model/UpdateForestProductNoneResVO.java new file mode 100644 index 00000000..9971e271 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/adapters/web/model/UpdateForestProductNoneResVO.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class UpdateForestProductNoneResVO { + private String message; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/ports/UpdateForestProductNonePortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/ports/UpdateForestProductNonePortIn.java new file mode 100644 index 00000000..c4c973c2 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/ports/UpdateForestProductNonePortIn.java @@ -0,0 +1,7 @@ +package app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports; + +import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.application.domain.UpdateForestProductNoneInCmd; + +public interface UpdateForestProductNonePortIn { + void operate(UpdateForestProductNoneInCmd inCmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/ports/UpdateForestProductNonePortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/ports/UpdateForestProductNonePortOut.java new file mode 100644 index 00000000..a181922b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/ports/UpdateForestProductNonePortOut.java @@ -0,0 +1,8 @@ +package app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports; + +import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.application.domain.UpdateForestProductNoneInCmd; +import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.application.domain.UpdateForestProductNoneOutCmd; + +public interface UpdateForestProductNonePortOut { + void operate(UpdateForestProductNoneOutCmd outCmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/ports/application/UpdateForestProductNoneService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/ports/application/UpdateForestProductNoneService.java new file mode 100644 index 00000000..d998f168 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/ports/application/UpdateForestProductNoneService.java @@ -0,0 +1,22 @@ +package app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.application; + +import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.application.domain.UpdateForestProductNoneOutCmd; +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.application.domain.UpdateForestProductNoneInCmd; +import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.UpdateForestProductNonePortIn; +import app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.UpdateForestProductNonePortOut; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class UpdateForestProductNoneService implements UpdateForestProductNonePortIn { + private final UpdateForestProductNonePortOut portOut; + + @Override + public void operate(UpdateForestProductNoneInCmd inCmd) { + portOut.operate(new UpdateForestProductNoneOutCmd( + inCmd.getMonthlyInputStatusId(), + "Y".equals(inCmd.getTodayNone()) ? "NOTHING" : "NONE" + )); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/ports/application/domain/UpdateForestProductNoneInCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/ports/application/domain/UpdateForestProductNoneInCmd.java new file mode 100644 index 00000000..0abe0a27 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/ports/application/domain/UpdateForestProductNoneInCmd.java @@ -0,0 +1,13 @@ +package app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class UpdateForestProductNoneInCmd { + private Long monthlyInputStatusId; + private String todayNone; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/ports/application/domain/UpdateForestProductNoneOutCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/ports/application/domain/UpdateForestProductNoneOutCmd.java new file mode 100644 index 00000000..1e7444dd --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/ports/application/domain/UpdateForestProductNoneOutCmd.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.ports.application.domain; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class UpdateForestProductNoneOutCmd extends AuditCommand { + private Long monthlyInputStatusId; + private String currentStatus; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/ports/application/domain/UpdateMonthlyForestProductStatusCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/ports/application/domain/UpdateMonthlyForestProductStatusCmd.java new file mode 100644 index 00000000..6ebac2cb --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/updateForestProductNone/ports/application/domain/UpdateMonthlyForestProductStatusCmd.java @@ -0,0 +1,15 @@ +package app.module.admin.usecase.household.tab.forestProduct.updateForestProductNone.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 UpdateMonthlyForestProductStatusCmd extends AuditCommand { + private Long monthlyInputStatusId; + private String forestProductStatus; +} diff --git a/admin/src/main/resources/mappers/household/RemoveForestProductsMapper.xml b/admin/src/main/resources/mappers/household/RemoveForestProductsMapper.xml new file mode 100644 index 00000000..83329571 --- /dev/null +++ b/admin/src/main/resources/mappers/household/RemoveForestProductsMapper.xml @@ -0,0 +1,25 @@ + + + + + /* removeForestProducts : 임산물현황 삭제*/ + UPDATE forest_product + SET + WHERE id IN + + #{id} + + + + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/RemoveHouseholdVisitInfosMapper.xml b/admin/src/main/resources/mappers/household/RemoveHouseholdVisitInfosMapper.xml index d4a0516a..6a4ae1c6 100644 --- a/admin/src/main/resources/mappers/household/RemoveHouseholdVisitInfosMapper.xml +++ b/admin/src/main/resources/mappers/household/RemoveHouseholdVisitInfosMapper.xml @@ -3,13 +3,13 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > - - /* removeHouseholdVisitInfos : 임가방문정보 삭제 */ - UPDATE household_visit - SET - WHERE id IN - - #{id} - - + + /* removeHouseholdVisitInfos : 임가방문정보 삭제 */ + UPDATE household_visit + SET + WHERE id IN + + #{id} + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/SaveForestProductMapper.xml b/admin/src/main/resources/mappers/household/SaveForestProductMapper.xml index 477198a2..0f9b4dd7 100644 --- a/admin/src/main/resources/mappers/household/SaveForestProductMapper.xml +++ b/admin/src/main/resources/mappers/household/SaveForestProductMapper.xml @@ -3,6 +3,13 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > + + /* createForestProduct : 임산물 현황 등록 */ INSERT INTO forest_product diff --git a/admin/src/main/resources/mappers/household/UpdateForestProductNoneMapper.xml b/admin/src/main/resources/mappers/household/UpdateForestProductNoneMapper.xml new file mode 100644 index 00000000..2e95b510 --- /dev/null +++ b/admin/src/main/resources/mappers/household/UpdateForestProductNoneMapper.xml @@ -0,0 +1,13 @@ + + + + + /* removeForestProduct : 임산물 현황 삭제 */ + UPDATE forest_product + SET + WHERE is_deleted = false + AND monthly_input_status_id = #{monthlyInputStatusId} + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/UpdateMonthlyInputStatusMapper.xml b/admin/src/main/resources/mappers/household/UpdateMonthlyInputStatusMapper.xml new file mode 100644 index 00000000..be531bf9 --- /dev/null +++ b/admin/src/main/resources/mappers/household/UpdateMonthlyInputStatusMapper.xml @@ -0,0 +1,14 @@ + + + + + /* updateForestProductStatus : 임산물현황 입력상태 수정 */ + UPDATE monthly_input_status + SET forest_product_status = #{status}, + + WHERE is_deleted = false + AND id = #{id} + + \ No newline at end of file diff --git a/admin/src/main/resources/messages/operation.properties b/admin/src/main/resources/messages/operation.properties index a8608005..6ffc55b0 100644 --- a/admin/src/main/resources/messages/operation.properties +++ b/admin/src/main/resources/messages/operation.properties @@ -19,3 +19,4 @@ operation.uri.move.cannot.before=\uB354\uC774\uC0C1 \uC774\uC804\uC73C\uB85C \uC operation.uri.move.cannot.after=\uB354\uC774\uC0C1 \uB2E4\uC74C\uC73C\uB85C \uC774\uB3D9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. operation.role.save.choose.first=\uC800\uC7A5\uD560 '\uAD00\uB9AC\uC790 \uAD8C\uD55C' \uC744 \uBA3C\uC800 \uC120\uD0DD\uD558\uC138\uC694. operation.orderNo.updated=\uC815\uB82C\uC21C\uC11C\uAC00 \uBCC0\uACBD\uB418\uC5C8\uC2B5\uB2C8\uB2E4. +operation.common.update.done=\uC218\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4. diff --git a/admin/src/main/resources/templates/common/components.html b/admin/src/main/resources/templates/common/components.html index 842c3d97..c1286df0 100644 --- a/admin/src/main/resources/templates/common/components.html +++ b/admin/src/main/resources/templates/common/components.html @@ -25,6 +25,7 @@ + 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 6393ddb7..a8f63ae9 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 @@ -364,7 +364,7 @@ ajaxUtil._ajaxMethod( '/api/forestProduct/save', JSON.stringify(dataOj), - (response) => { // 성공 + () => { // 성공 alert("등록이 완료되었습니다."); document.querySelector(".modal-forest-product").ui.close(); diff --git a/admin/src/main/resources/templates/households/tab/forest-product.html b/admin/src/main/resources/templates/households/tab/forest-product.html index 3fd9cb03..0e8bc902 100644 --- a/admin/src/main/resources/templates/households/tab/forest-product.html +++ b/admin/src/main/resources/templates/households/tab/forest-product.html @@ -13,12 +13,19 @@
- -
@@ -73,8 +80,14 @@ // 임산물 현황 등록 상태 id set f.monthlyInputStatusId.value = response.monthlyStatus.id; - const tbody = $('.tab-content.forest-product tbody'); + // 이번달 등록내용 없음 체크 - NONE : 미등록, NOTHING : 이번달 등록내용 없음 , REGISTERED : 등록완료 + $('#forestProductStatus').attr('checked', response.monthlyStatus.forestStatus === 'NOTHING'); + + // 이번달 등록내용 없음 에 따라 버튼 hide 처리 + showForestProductNoneBtn(); + + const tbody = $('.tab-content.forest-product tbody'); tbody.empty(); if(response.forestProducts.length === 0) { @@ -90,7 +103,7 @@
@@ -123,6 +136,124 @@ 'json' ); } + + // 금일 데이터 없음에 따라 버튼 hide/show 처리 + const showForestProductNoneBtn = () => { + $('.table-tit-group').each(function(index, item) { + let checkedIndex = false; + $(item).find('[type="button"]').each(function(indexBtn, itemBtn) { + let $chkBox = $(itemBtn).find('input[type="checkbox"]'); + if (($chkBox.length !== 0 && $chkBox.is(':disabled'))) { + checkedIndex = true; + } + + if (checkedIndex) { + $(itemBtn).hide(); + } else { + $(itemBtn).show(); + } + + if ($chkBox.length !== 0) { + checkedIndex = $chkBox.is(':checked') || $chkBox.is(':disabled'); + } + }); + }); + } + + // 데이터 초기화 Confirm + const showForestProductNoneConfirm = (el) => { + const todayNone = $(el).is(':checked') ? 'Y' : 'N'; + + const obj = $(f).serializeObject(); + obj.todayNone = todayNone; + + if (todayNone === 'Y') { + etUI.dialog.confirm({ + title: '초기화 안내', + message: '등록하신 모든 내용을 삭제하시겠어요?
삭제된 내용은 복구할 수 없습니다.', + negativeCallback: function () { + $(el).prop('checked', todayNone !== 'Y'); + }, + positiveCallback: function () { + updateForestProductNone(obj); + }, + }); + + } else { + updateForestProductNone(obj); + } + } + + // 이번달 등록내용 없음 수정 처리 + const updateForestProductNone = (obj) => { + console.log(obj); + ajaxUtil._ajaxMethod( + '/api/household/forestProduct/nothing', + JSON.stringify(obj), + () => { + if (obj.todayNone === 'Y') { + alert('데이터 초기화가 완료되었습니다.'); + } else { + alert('등록 상태가 변경되었습니다.'); + } + + getForestProductsStatus(); + }, + function (code, rstData) { + + }, + 'patch', + 'json', + { handle422Type: 'alert' } + ); + } + + // 임산물현황 삭제 Confirm + const showDeleteForestProductConfirm = () => { + const checkedIds = Array.from( + document.querySelectorAll('input[name="forestRemoveIds"]:checked') + ).map(el => Number(el.value)); + + if(checkedIds.length <= 0) { + alert("임산물을 선택해주세요."); + return + } + + etUI.dialog.confirm({ + title: '삭제 안내', + message: '선택하신 내용을 삭제하시겠습니까?
삭제한 항목은 복구할 수 없습니다.', + negativeCallback: function () { + + }, + positiveCallback: function () { + goDeleteForestProduct(checkedIds); + }, + }); + } + + // 임산물현황 삭제 + const goDeleteForestProduct = (checkedIds) => { + const f = document.reqForm; + console.log("f.monthlyInputStatusId.value", f.monthlyInputStatusId.value); + + ajaxUtil._ajaxMethod( + '/api/household/forestProducts/delete', + JSON.stringify({ + monthlyInputStatusId: f.monthlyInputStatusId.value, + forestRemoveIds: checkedIds + }), + () => { // 성공 + alert("임산물현황이 삭제되었습니다."); + getForestProductsStatus(); + }, + function (code, rstData) { + if(code == 422) alert(rstData.responseText); + }, + 'delete', + 'json', + { handle422Type: 'alert' } + ); + }
\ No newline at end of file