diff --git a/admin/src/main/java/app/module/admin/config/application/enums/ManagementType.java b/admin/src/main/java/app/module/admin/config/application/enums/ManagementType.java index 24215339..bccd32cf 100644 --- a/admin/src/main/java/app/module/admin/config/application/enums/ManagementType.java +++ b/admin/src/main/java/app/module/admin/config/application/enums/ManagementType.java @@ -1,7 +1,9 @@ package app.module.admin.config.application.enums; +import com.fasterxml.jackson.annotation.JsonCreator; import lombok.Getter; import lombok.RequiredArgsConstructor; +import org.springframework.util.StringUtils; @Getter @RequiredArgsConstructor @@ -10,4 +12,10 @@ public enum ManagementType { CALL("전화상담"), ETC("기타"); private final String desc; + + @JsonCreator + public static ManagementType from(String value) { + if (!StringUtils.hasText(value)) return null; + return ManagementType.valueOf(value.toUpperCase()); + } } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/persistence/RemoveHouseholdVisitInfosDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/persistence/RemoveHouseholdVisitInfosDao.java new file mode 100644 index 00000000..a70eed48 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/persistence/RemoveHouseholdVisitInfosDao.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.adapters.persistence; + +import app.module.core.config.application.annotation.DeleteCommand; +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.application.domain.RemoveHouseholdVisitInfosCmd; +import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.RemoveHouseholdVisitInfosPortOut; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class RemoveHouseholdVisitInfosDao implements RemoveHouseholdVisitInfosPortOut { + private final RemoveHouseholdVisitInfosMapper mapper; + + @Override + @DeleteCommand + public void operate(RemoveHouseholdVisitInfosCmd cmd) { + mapper.removeHouseholdVisitInfos(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/persistence/RemoveHouseholdVisitInfosMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/persistence/RemoveHouseholdVisitInfosMapper.java new file mode 100644 index 00000000..6e0b122c --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/persistence/RemoveHouseholdVisitInfosMapper.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.adapters.persistence; + +import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.application.domain.RemoveHouseholdVisitInfosCmd; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface RemoveHouseholdVisitInfosMapper { + void removeHouseholdVisitInfos(RemoveHouseholdVisitInfosCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/web/RemoveHouseholdVisitInfosController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/web/RemoveHouseholdVisitInfosController.java new file mode 100644 index 00000000..db2ead06 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/web/RemoveHouseholdVisitInfosController.java @@ -0,0 +1,38 @@ +package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.adapters.web; + +import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.RemoveHouseholdVisitInfosPortIn; +import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.application.domain.RemoveHouseholdVisitInfosCmd; +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.householdVisit.removeHouseholdVisitInfos.adapters.web.model.RemoveHouseholdVisitInfosReqVO; +import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.adapters.web.model.RemoveHouseholdVisitInfosResVO; + +@RestController +@RequiredArgsConstructor +class RemoveHouseholdVisitInfosController { + + private final MessageUtil messageUtil; + private final RemoveHouseholdVisitInfosPortIn portIn; + + @DeleteMapping(path = "/api/visitInfo/remove") + ResponseEntity operate( + @Valid @RequestBody RemoveHouseholdVisitInfosReqVO reqVO, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY).body(bindingResult); + } + + portIn.operate( + new RemoveHouseholdVisitInfosCmd(reqVO.getHouseholdSeq(), reqVO.getRemoveIds())); + + return ResponseEntity.status(HttpStatus.OK).body(new RemoveHouseholdVisitInfosResVO( + 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/householdVisit/removeHouseholdVisitInfos/adapters/web/model/RemoveHouseholdVisitInfosReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/web/model/RemoveHouseholdVisitInfosReqVO.java new file mode 100644 index 00000000..152bedbf --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/web/model/RemoveHouseholdVisitInfosReqVO.java @@ -0,0 +1,17 @@ +package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.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 RemoveHouseholdVisitInfosReqVO { + private Long householdSeq; + private List removeIds; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/web/model/RemoveHouseholdVisitInfosResVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/web/model/RemoveHouseholdVisitInfosResVO.java new file mode 100644 index 00000000..522610ec --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/adapters/web/model/RemoveHouseholdVisitInfosResVO.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class RemoveHouseholdVisitInfosResVO { + private String message; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/RemoveHouseholdVisitInfosPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/RemoveHouseholdVisitInfosPortIn.java new file mode 100644 index 00000000..1f4bd74d --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/RemoveHouseholdVisitInfosPortIn.java @@ -0,0 +1,7 @@ +package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports; + +import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.application.domain.RemoveHouseholdVisitInfosCmd; + +public interface RemoveHouseholdVisitInfosPortIn { + void operate(RemoveHouseholdVisitInfosCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/RemoveHouseholdVisitInfosPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/RemoveHouseholdVisitInfosPortOut.java new file mode 100644 index 00000000..0bcc317d --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/RemoveHouseholdVisitInfosPortOut.java @@ -0,0 +1,7 @@ +package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports; + +import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.application.domain.RemoveHouseholdVisitInfosCmd; + +public interface RemoveHouseholdVisitInfosPortOut { + void operate(RemoveHouseholdVisitInfosCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/application/RemoveHouseholdVisitInfosService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/application/RemoveHouseholdVisitInfosService.java new file mode 100644 index 00000000..622386db --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/application/RemoveHouseholdVisitInfosService.java @@ -0,0 +1,18 @@ +package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.application; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.application.domain.RemoveHouseholdVisitInfosCmd; +import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.RemoveHouseholdVisitInfosPortIn; +import app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.ports.RemoveHouseholdVisitInfosPortOut; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class RemoveHouseholdVisitInfosService implements RemoveHouseholdVisitInfosPortIn { + private final RemoveHouseholdVisitInfosPortOut portOut; + + @Override + public void operate(RemoveHouseholdVisitInfosCmd cmd) { + portOut.operate(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/application/domain/RemoveHouseholdVisitInfosCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/application/domain/RemoveHouseholdVisitInfosCmd.java new file mode 100644 index 00000000..47511d12 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/removeHouseholdVisitInfos/ports/application/domain/RemoveHouseholdVisitInfosCmd.java @@ -0,0 +1,16 @@ +package app.module.admin.usecase.household.tab.householdVisit.removeHouseholdVisitInfos.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 +public class RemoveHouseholdVisitInfosCmd extends AuditCommand { + private Long householdSeq; + private List removeIds; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoDao.java new file mode 100644 index 00000000..d008d48e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoDao.java @@ -0,0 +1,28 @@ +package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.persistence; + +import app.module.core.config.application.util.AuditUtil; +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application.domain.SaveHouseholdVisitInfoCmd; +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.SaveHouseholdVisitInfoPortOut; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +@Repository +@RequiredArgsConstructor +class SaveHouseholdVisitInfoDao implements SaveHouseholdVisitInfoPortOut { + private final SaveHouseholdVisitInfoMapper mapper; + + @Override + @Transactional + public void operate(SaveHouseholdVisitInfoCmd cmd) { + if (cmd.getVisitInfoId() != null) { + mapper.findById(cmd.getHouseholdSeq()) + .ifPresentOrElse( + v -> mapper.updateHouseholdVisitInfo(AuditUtil.update(cmd)), + () -> { throw new IllegalArgumentException("방문정보가 없습니다."); } + ); + } else { + mapper.createHouseholdVisitInfo(AuditUtil.create(cmd)); + } + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoMapper.java new file mode 100644 index 00000000..294a2f83 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/persistence/SaveHouseholdVisitInfoMapper.java @@ -0,0 +1,12 @@ +package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.persistence; + +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application.domain.SaveHouseholdVisitInfoCmd; +import java.util.Optional; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SaveHouseholdVisitInfoMapper { + Optional findById(Long id); + void createHouseholdVisitInfo(SaveHouseholdVisitInfoCmd cmd); + void updateHouseholdVisitInfo(SaveHouseholdVisitInfoCmd cmd); +} 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 new file mode 100644 index 00000000..c3284314 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/SaveHouseholdVisitInfoController.java @@ -0,0 +1,47 @@ +package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.web; + +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.SaveHouseholdVisitInfoPortIn; +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application.domain.SaveHouseholdVisitInfoCmd; +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.householdVisit.saveHouseholdVisitInfo.adapters.web.model.SaveHouseholdVisitInfoReqVO; +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.web.model.SaveHouseholdVisitInfoResVO; +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.web.validator.SaveHouseholdVisitInfoValidator; + +@RestController +@RequiredArgsConstructor +class SaveHouseholdVisitInfoController { + private final SaveHouseholdVisitInfoValidator validator; + private final SaveHouseholdVisitInfoPortIn portIn; + private final MessageUtil messageUtil; + + @PostMapping(path = "/api/visitInfo/save") + ResponseEntity operate( + @Valid @RequestBody SaveHouseholdVisitInfoReqVO reqVO, + BindingResult bindingResult) { + validator.validate(reqVO, bindingResult); + + if (bindingResult.hasErrors()) { + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) + .body(bindingResult.getAllErrors().get(0).getDefaultMessage()); + } + + portIn.operate(new SaveHouseholdVisitInfoCmd( + reqVO.getVisitInfoId(), + reqVO.getHouseholdSeq(), + reqVO.getVisitDate(), + reqVO.getManagementType().name(), + reqVO.getContent(), + reqVO.getIsGiftSent())); + + return ResponseEntity.status(HttpStatus.OK).body( + new SaveHouseholdVisitInfoResVO(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/householdVisit/saveHouseholdVisitInfo/adapters/web/model/SaveHouseholdVisitInfoReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/model/SaveHouseholdVisitInfoReqVO.java new file mode 100644 index 00000000..cd3afaab --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/model/SaveHouseholdVisitInfoReqVO.java @@ -0,0 +1,25 @@ +package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.web.model; + +import app.module.admin.config.application.enums.ManagementType; +import com.fasterxml.jackson.annotation.JsonFormat; +import groovy.transform.NamedParam; +import java.util.Date; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@EqualsAndHashCode +public class SaveHouseholdVisitInfoReqVO { + private Long visitInfoId; + private Long householdSeq; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date visitDate; + private ManagementType managementType; + private String content; + private Boolean isGiftSent; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/model/SaveHouseholdVisitInfoResVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/model/SaveHouseholdVisitInfoResVO.java new file mode 100644 index 00000000..30a32a70 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/model/SaveHouseholdVisitInfoResVO.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class SaveHouseholdVisitInfoResVO { + private String message; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/validator/SaveHouseholdVisitInfoValidator.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/validator/SaveHouseholdVisitInfoValidator.java new file mode 100644 index 00000000..20d7dcfb --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/adapters/web/validator/SaveHouseholdVisitInfoValidator.java @@ -0,0 +1,45 @@ +package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.web.validator; + +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.adapters.web.model.SaveHouseholdVisitInfoReqVO; +import java.util.Date; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; +import org.springframework.validation.Errors; +import org.springframework.validation.Validator; + +@Component +public class SaveHouseholdVisitInfoValidator implements Validator { + + @Override + public boolean supports(Class clazz) { + return SaveHouseholdVisitInfoReqVO.class.equals(clazz); + } + + @Override + public void validate(Object target, Errors errors) { + SaveHouseholdVisitInfoReqVO vo = (SaveHouseholdVisitInfoReqVO) target; + + if (vo.getHouseholdSeq() == null) { + errors.reject("householdSeq", "임가 정보가 없습니다."); + return; + } + + if (vo.getVisitDate() == null) { + errors.reject("visitDate", "방문일자를 입력해 주세요."); + return; + } + + if (vo.getVisitDate().after(new Date())) { + errors.reject("visitDate", "미래 날짜는 입력할 수 없습니다."); + return; + } + + if (vo.getManagementType() == null) { + errors.reject("managementType", "방문조사 유형을 선택해 주세요."); + } + + if (!StringUtils.hasText(vo.getContent())) { + errors.reject("content", "내용을 입력해 주세요."); + } + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/SaveHouseholdVisitInfoPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/SaveHouseholdVisitInfoPortIn.java new file mode 100644 index 00000000..ed9d50df --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/SaveHouseholdVisitInfoPortIn.java @@ -0,0 +1,7 @@ +package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports; + +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application.domain.SaveHouseholdVisitInfoCmd; + +public interface SaveHouseholdVisitInfoPortIn { + void operate(SaveHouseholdVisitInfoCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/SaveHouseholdVisitInfoPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/SaveHouseholdVisitInfoPortOut.java new file mode 100644 index 00000000..930daf06 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/SaveHouseholdVisitInfoPortOut.java @@ -0,0 +1,7 @@ +package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports; + +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application.domain.SaveHouseholdVisitInfoCmd; + +public interface SaveHouseholdVisitInfoPortOut { + void operate(SaveHouseholdVisitInfoCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/application/SaveHouseholdVisitInfoService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/application/SaveHouseholdVisitInfoService.java new file mode 100644 index 00000000..c4304e3b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/application/SaveHouseholdVisitInfoService.java @@ -0,0 +1,18 @@ +package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application.domain.SaveHouseholdVisitInfoCmd; +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.SaveHouseholdVisitInfoPortIn; +import app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.SaveHouseholdVisitInfoPortOut; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class SaveHouseholdVisitInfoService implements SaveHouseholdVisitInfoPortIn { + private final SaveHouseholdVisitInfoPortOut portOut; + + @Override + public void operate(SaveHouseholdVisitInfoCmd cmd) { + portOut.operate(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/application/domain/SaveHouseholdVisitInfoCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/application/domain/SaveHouseholdVisitInfoCmd.java new file mode 100644 index 00000000..3b4ea0ee --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/saveHouseholdVisitInfo/ports/application/domain/SaveHouseholdVisitInfoCmd.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.household.tab.householdVisit.saveHouseholdVisitInfo.ports.application.domain; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import java.util.Date; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class SaveHouseholdVisitInfoCmd extends AuditCommand { + private Long visitInfoId; + private Long householdSeq; + private Date visitDate; + private String managementType; + private String content; + private Boolean isGiftSent; +} diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java index a746c5ad..4b9a68a9 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java @@ -54,6 +54,11 @@ public class ResearcherDao implements ResearcherPortOut { return new PageImpl<>(result, pageable, total); } + @Override + public VisitHouseholdPercentageDto selectVisitHouseholdPercentage(ResearchersDetailReqVO reqVO) { + return researcherMapper.selectVisitHouseholdPercentage(reqVO); + } + @Override public Page visitHouseholdList(ResearchersDetailReqVO reqVO) { List result = researcherMapper.visitHouseholdList(reqVO); diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherMapper.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherMapper.java index da23f937..0eb5e6d4 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherMapper.java @@ -22,6 +22,7 @@ public interface ResearcherMapper { ResearchersHouseholdVisitDto visitHouseholdDetail(Integer id); Long visitHouseholdListCountAll(ResearchersDetailReqVO reqVO); Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO); + VisitHouseholdPercentageDto selectVisitHouseholdPercentage(ResearchersDetailReqVO reqVO); Integer visitHouseholdDelete(@Param("selectIds") List selectIds,@Param("deletedBy") String deletedBy); void deleteHouseholdResearcherMapping(@Param("researcherSeq") Integer researcherSeq, @Param("householdSeq") Integer householdSeq, @Param("deletedBy") String deletedBy); Integer insertHouseholdResearcherMapping(@Param("researcherSeq") Integer researcherSeq, @Param("householdSeq") Integer householdSeq, @Param("createdBy") String createdBy); diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/VisitHouseholdPercentageDto.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/VisitHouseholdPercentageDto.java new file mode 100644 index 00000000..ccb8604e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/VisitHouseholdPercentageDto.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.researcher.adpaters.persistence.model; + +import lombok.Data; + +@Data +public class VisitHouseholdPercentageDto { + private Integer totalHouseholdCount; + private Integer firstVisitCount; + private Integer secondVisitCount; + private Integer giftSentCount; + private Double firstVisitPercentage; + private Double secondVisitPercentage; + private Double giftSentPercentage; +} diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java index d9a4ea86..b96e643f 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java @@ -29,6 +29,11 @@ class ResearcherApiController { return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.mappingHouseholdList(reqVO)); } + @GetMapping(path = "/visitHousehold/percentage") + ResponseEntity selectVisitHouseholdPercentage( @ModelAttribute ResearchersDetailReqVO reqVO) { + return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.selectVisitHouseholdPercentage(reqVO)); + } + @GetMapping(path = "/visitHousehold/list") ResponseEntity visitHouseholdList( @ModelAttribute ResearchersDetailReqVO reqVO) { return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.visitHouseholdList(reqVO)); diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java index e5e2652f..3ac93585 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java @@ -11,6 +11,7 @@ public interface ResearcherPortIn { ResearchersDto detail(Integer adminSeq); Page mappingHouseholdList(ResearchersDetailReqVO reqVO); Page visitHouseholdList(ResearchersDetailReqVO reqVO); + VisitHouseholdPercentageDto selectVisitHouseholdPercentage(ResearchersDetailReqVO reqVO); Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO); ResearchersHouseholdVisitPopUpDto visitHouseholdDetail(Integer id); Integer visitHouseholdDelete(List selectIds); diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortOut.java b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortOut.java index caf95b57..161a2971 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortOut.java @@ -10,6 +10,7 @@ public interface ResearcherPortOut { Page list(ResearchersListReqVO reqVO); ResearchersDto detail(Integer adminSeq); Page mappingHouseholdList(ResearchersDetailReqVO reqVO); + VisitHouseholdPercentageDto selectVisitHouseholdPercentage(ResearchersDetailReqVO reqVO); Page visitHouseholdList(ResearchersDetailReqVO reqVO); Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO); ResearchersHouseholdVisitPopUpDto visitHouseholdDetail(Integer id); diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/ports/application/ResearcherService.java b/admin/src/main/java/app/module/admin/usecase/researcher/ports/application/ResearcherService.java index c590aab5..d992bc91 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/ports/application/ResearcherService.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/ports/application/ResearcherService.java @@ -35,6 +35,11 @@ class ResearcherService implements ResearcherPortIn { return portOut.visitHouseholdList(reqVO); } + @Override + public VisitHouseholdPercentageDto selectVisitHouseholdPercentage(ResearchersDetailReqVO reqVO) { + return portOut.selectVisitHouseholdPercentage(reqVO); + } + @Override public Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO) { return portOut.updateVisitHousehold(reqVO); diff --git a/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml b/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml index 325b8ea5..e7f65e2e 100644 --- a/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml +++ b/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml @@ -44,6 +44,7 @@ AND bat.household_seq = #{householdSeq} AND bat.month = #{recordMonth} AND bat.is_deleted = false + ORDER BY bat.created_at \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/GetHouseholdVisitInfosMapper.xml b/admin/src/main/resources/mappers/household/GetHouseholdVisitInfosMapper.xml index 8be8421f..f5186220 100644 --- a/admin/src/main/resources/mappers/household/GetHouseholdVisitInfosMapper.xml +++ b/admin/src/main/resources/mappers/household/GetHouseholdVisitInfosMapper.xml @@ -16,5 +16,7 @@ FROM household_visit hv WHERE household_seq = #{householdSeq} AND TO_CHAR(visit_date, 'YYYYMM') = #{recordMonth} + AND hv.is_deleted = false + ORDER BY hv.created_at \ 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 new file mode 100644 index 00000000..d4a0516a --- /dev/null +++ b/admin/src/main/resources/mappers/household/RemoveHouseholdVisitInfosMapper.xml @@ -0,0 +1,15 @@ + + + + + /* removeHouseholdVisitInfos : 임가방문정보 삭제 */ + UPDATE household_visit + SET + WHERE id IN + + #{id} + + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/SaveHouseholdVisitInfoMapper.xml b/admin/src/main/resources/mappers/household/SaveHouseholdVisitInfoMapper.xml new file mode 100644 index 00000000..b6f15d51 --- /dev/null +++ b/admin/src/main/resources/mappers/household/SaveHouseholdVisitInfoMapper.xml @@ -0,0 +1,47 @@ + + + + + /* createHouseholdVisitInfo : 임가방문정보 등록 */ + INSERT INTO household_visit + ( + household_seq, + visit_date, + management_type, + is_gift_sent, + content, + + ) + VALUES + ( + #{householdSeq}, + #{visitDate}, + #{managementType}, + #{isGiftSent}, + #{content}, + + ) + + + + /* updateHouseholdVisitInfo : 임가방문정보 수정 */ + UPDATE household_visit + SET + visit_date = #{visitDate}, + management_type = #{managementType}, + is_gift_sent = #{isGiftSent}, + content = #{content}, + + WHERE id = #{visitInfoId} + + + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml index f5c8a24e..d3fe3f15 100644 --- a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml +++ b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml @@ -121,9 +121,8 @@ case rhv.is_gift_sent when false then '전달완료' when true then '-' end is_gift_sent_flag, rhv.created_at from household_visit rhv - join researcher_has_household rhh on rhh.household_seq = rhv.household_seq - join household h on rhh.household_seq = h.seq - join admin a on a.seq = rhh.admin_seq + join household h on rhv.household_seq = h.seq + join researcher_has_household rhh on rhh.household_seq = h.seq and rhh.is_deleted = false where rhv.is_deleted = false and rhh.admin_seq = #{seq} @@ -134,6 +133,66 @@ LIMIT #{size} OFFSET #{page}*#{size} + + `); + ``);*/ // 업로드 파일 정보 보이기 uiUtil.showFileInfo(input, res, $(input).attr('accept') === 'image/*'); @@ -274,18 +276,16 @@ uiUtil.uploadFile = (fileUploadType, input) => { * @param {boolean} showImg 미리보기 이미지 노출 여부 */ uiUtil.showFileInfo = (input, uploadFile, showImg) => { - const inputGroup = $(input).parent('.input-group'); + const inputGroup = $(input).parent().parent().find('.input-group'); if (!inputGroup.length) { alert( `${input.name} 앨리먼트의 부모가 input-group 클래스를 가져야 showFileInfo 메서드를 실행할 수 있습니다.`); return; } - inputGroup.find('.fileInfo').remove(); + /* inputGroup.find('.fileInfo').remove();*/ - - - inputGroup.append(` +/* inputGroup.append(` - `); + `);*/ + + inputGroup.append(` + `); + const fileInfo = inputGroup.find('.fileInfo'); - if (!showImg) { +/* if (!showImg) { fileInfo.find('img').remove(); - } + }*/ // 파일 삭제 함수 정의 - inputGroup.find('.resetFile').on('click', () => { - let fileInput = inputGroup.find('input[type=file]'); - fileInput.replaceWith(` - - `); - - inputGroup.find('input[name=fileMappingId]').remove(); - inputGroup.find('.fileInfo').fadeOut((evt) => { - $(evt.target).remove(); + inputGroup.find('.resetFile').on('click', function () { + const $fileInfo = $(this).closest('.fileInfo'); + $fileInfo.fadeOut(function () { + $(this).remove(); }); - return false; }); diff --git a/admin/src/main/resources/templates/communication/notice/{id}.html b/admin/src/main/resources/templates/communication/notice/{id}.html index 6eb51c31..9f248ec7 100644 --- a/admin/src/main/resources/templates/communication/notice/{id}.html +++ b/admin/src/main/resources/templates/communication/notice/{id}.html @@ -14,11 +14,11 @@ 제목* -
-
- -
+
+
+
+
@@ -28,20 +28,28 @@ - 첨부파일* + 첨부파일 +
+ +

첨부 가능 파일 형식: 문서(pdf, docx, xlsx, pptx, hwp), 이미지(jpg, jpeg, png, gif), 기타(zip, + csv, txt) / 파일당 최대 5MB까지 등록 가능합니다.

+
    + +
+
+ + - 게시기간* @@ -57,11 +65,9 @@
- - 노출여부* @@ -75,8 +81,6 @@ - - @@ -102,7 +106,6 @@ @@ -215,11 +217,6 @@ datepickerInstance.setDate(new Date(), { render: true }); } }); - - $(document).ready(() => { - const reqForm = document.reqForm; - document.reqVisitForm.householdSeq.value = reqForm.householdSeq.value; - }); \ No newline at end of file diff --git a/admin/src/main/resources/templates/households/tab/household-visit.html b/admin/src/main/resources/templates/households/tab/household-visit.html index 9c8e3d32..2afcc4e4 100644 --- a/admin/src/main/resources/templates/households/tab/household-visit.html +++ b/admin/src/main/resources/templates/households/tab/household-visit.html @@ -10,7 +10,7 @@

-
\ No newline at end of file diff --git a/admin/src/main/resources/templates/households/{seq}-2.html b/admin/src/main/resources/templates/households/{seq}-backup.html similarity index 100% rename from admin/src/main/resources/templates/households/{seq}-2.html rename to admin/src/main/resources/templates/households/{seq}-backup.html diff --git a/admin/src/main/resources/templates/households/{seq}.html b/admin/src/main/resources/templates/households/{seq}.html index aa2f76a1..52a1f1a2 100644 --- a/admin/src/main/resources/templates/households/{seq}.html +++ b/admin/src/main/resources/templates/households/{seq}.html @@ -178,6 +178,10 @@
+ + @@ -816,7 +818,11 @@ {{include tmpl="#titleTmpl" /}}
    - {{for list tmpl="#basicRowTmpl" /}} + {{if modifiable}} + {{for list tmpl="#basicRowTmpl1" /}} + {{else}} + {{for list tmpl="#basicRowTmpl2" /}} + {{/if}}
{{include tmpl="#etcRowTmpl" /}} @@ -828,24 +834,42 @@

{{:date.start}} ~ {{:date.end}}

{{/if}} - +