diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/persistence/CreateNoticeDao.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/persistence/CreateNoticeDao.java new file mode 100644 index 00000000..3b62b575 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/persistence/CreateNoticeDao.java @@ -0,0 +1,57 @@ +package app.module.admin.usecase.communication.notice.createNotice.adapters.persistence; + +import app.module.admin.usecase.communication.notice.createNotice.adapters.persistence.model.CreateNoticeDto; +import app.module.admin.usecase.communication.notice.createNotice.adapters.persistence.model.CreateNoticeHasUploadFilesParam; +import app.module.admin.usecase.communication.notice.createNotice.ports.CreateNoticePortOut; +import app.module.admin.usecase.communication.notice.createNotice.ports.application.domain.CreateNotice; +import app.module.admin.usecase.communication.notice.createNotice.ports.application.domain.CreateNoticeCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Optional; +import java.util.stream.Collectors; + +@Repository +@RequiredArgsConstructor +class CreateNoticeDao implements CreateNoticePortOut { + + private final CreateNoticeMapper mapper; + + @Override + @Transactional + public Optional operate(CreateNoticeCmd command) { + + + CreateNoticeDto dto = + new CreateNoticeDto( + null, + command.getTitle(), + command.getContent(), + command.getVisible(), + command.getStartDate(), + command.getEndDate(), + command.getFileMappingId(), + command.getCreatedAt(), + command.getCreatedBy(), + command.getUpdatedAt(), + command.getUpdatedBy()); + + mapper.createNotice(dto); + + if (dto.getFileMappingId() != null && !dto.getFileMappingId().isEmpty()) { + mapper.createNoticeHasUploadFile(new CreateNoticeHasUploadFilesParam( + dto.getId(), + dto.getFileMappingId().stream() + .map(Long::parseLong) + .collect(Collectors.toList()), + dto.getCreatedAt(), + dto.getCreatedBy(), + dto.getUpdatedAt(), + dto.getUpdatedBy() + )); + } + + return Optional.of(new CreateNotice(dto.getId())); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/persistence/CreateNoticeMapper.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/persistence/CreateNoticeMapper.java new file mode 100644 index 00000000..5784775f --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/persistence/CreateNoticeMapper.java @@ -0,0 +1,11 @@ +package app.module.admin.usecase.communication.notice.createNotice.adapters.persistence; + +import app.module.admin.usecase.communication.notice.createNotice.adapters.persistence.model.CreateNoticeDto; +import app.module.admin.usecase.communication.notice.createNotice.adapters.persistence.model.CreateNoticeHasUploadFilesParam; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CreateNoticeMapper { + void createNotice(CreateNoticeDto dto); + void createNoticeHasUploadFile(CreateNoticeHasUploadFilesParam param); +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/persistence/model/CreateNoticeDto.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/persistence/model/CreateNoticeDto.java new file mode 100644 index 00000000..610c2b16 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/persistence/model/CreateNoticeDto.java @@ -0,0 +1,27 @@ +package app.module.admin.usecase.communication.notice.createNotice.adapters.persistence.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.time.LocalDateTime; +import java.util.List; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class CreateNoticeDto { + private Long id; + private String title; + private String content; + private Boolean visible; + private LocalDateTime startDate; + private LocalDateTime endDate; + private List fileMappingId; + private LocalDateTime createdAt; + private String createdBy; + private LocalDateTime updatedAt; + private String updatedBy; +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/persistence/model/CreateNoticeHasUploadFilesParam.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/persistence/model/CreateNoticeHasUploadFilesParam.java new file mode 100644 index 00000000..1dfe4cfc --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/persistence/model/CreateNoticeHasUploadFilesParam.java @@ -0,0 +1,22 @@ +package app.module.admin.usecase.communication.notice.createNotice.adapters.persistence.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.time.LocalDateTime; +import java.util.List; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class CreateNoticeHasUploadFilesParam { + private Long id; + private List fileMappingIds; + private LocalDateTime createdAt; + private String createdBy; + private LocalDateTime updatedAt; + private String updatedBy; +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/CreateNoticeController.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/CreateNoticeController.java new file mode 100644 index 00000000..1e4dc05b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/CreateNoticeController.java @@ -0,0 +1,44 @@ +package app.module.admin.usecase.communication.notice.createNotice.adapters.web; + + +import app.module.admin.usecase.communication.notice.createNotice.adapters.web.model.CreateNoticeReqVO; +import app.module.admin.usecase.communication.notice.createNotice.ports.CreateNoticePortIn; +import app.module.admin.usecase.communication.notice.createNotice.ports.application.domain.CreateNotice; +import app.module.admin.usecase.communication.notice.createNotice.ports.application.domain.CreateNoticeCmd; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@Controller +@RequiredArgsConstructor +class CreateNoticeController { + + private final CreateNoticePortIn createNoticePortIn; + @PostMapping(path = "/api/communication/notices/create") + ResponseEntity operate(@RequestBody @Valid CreateNoticeReqVO reqVO, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) + .body(bindingResult.getFieldErrors()); + } + + CreateNotice article = + createNoticePortIn + .operate( + new CreateNoticeCmd( + reqVO.getTitle(), + reqVO.getContent(), + reqVO.getVisible(), + reqVO.getStartDate(), + reqVO.getEndDate(), + reqVO.getFileMappingId())) + .orElseThrow(); + + return ResponseEntity.status(HttpStatus.OK).body(article); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/CreateNoticeUIController.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/CreateNoticeUIController.java new file mode 100644 index 00000000..b0c0f412 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/CreateNoticeUIController.java @@ -0,0 +1,23 @@ +package app.module.admin.usecase.communication.notice.createNotice.adapters.web; + + +import app.module.admin.usecase.communication.notice.createNotice.adapters.web.model.CreateNoticeReqVO; +import app.module.admin.usecase.communication.notice.createNotice.adapters.web.model.CreateNoticeUIReqVO; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; + +@Controller +@RequiredArgsConstructor +class CreateNoticeUIController { + + @GetMapping(path = "/communication/notices/create") + String operate( + Model model, + @ModelAttribute("reqVO") CreateNoticeUIReqVO reqVO) { + + return "communication/notice/create"; + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/model/CreateNoticeReqVO.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/model/CreateNoticeReqVO.java new file mode 100644 index 00000000..2d1faf61 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/model/CreateNoticeReqVO.java @@ -0,0 +1,42 @@ +package app.module.admin.usecase.communication.notice.createNotice.adapters.web.model; + +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.*; +import org.apache.commons.text.StringEscapeUtils; + +import java.time.LocalDateTime; +import java.util.List; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode +public class CreateNoticeReqVO { + @NotBlank(message = "{valid.common.required}") + private String title; + + @NotBlank(message = "{valid.common.required}") + private String content; + + @NotNull(message = "{valid.common.required}") + private Boolean visible; + + @NotNull(message = "{valid.common.required}") + private LocalDateTime startDate; + + @NotNull(message = "{valid.common.required}") + private LocalDateTime endDate; + + private List fileMappingId; + + public String getTitle() { + return StringEscapeUtils.escapeHtml4(title); + } + + public String getContent() { + return StringEscapeUtils.escapeHtml4(content); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/model/CreateNoticeUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/model/CreateNoticeUIReqVO.java new file mode 100644 index 00000000..6cb3962f --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/model/CreateNoticeUIReqVO.java @@ -0,0 +1,20 @@ +package app.module.admin.usecase.communication.notice.createNotice.adapters.web.model; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; +import org.apache.commons.text.StringEscapeUtils; + +import java.time.LocalDateTime; +import java.util.List; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class CreateNoticeUIReqVO { + +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/ports/CreateNoticePortIn.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/ports/CreateNoticePortIn.java new file mode 100644 index 00000000..89a8fd44 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/ports/CreateNoticePortIn.java @@ -0,0 +1,12 @@ +package app.module.admin.usecase.communication.notice.createNotice.ports; + + +import app.module.admin.usecase.communication.notice.createNotice.ports.application.domain.CreateNotice; +import app.module.admin.usecase.communication.notice.createNotice.ports.application.domain.CreateNoticeCmd; + +import java.util.Optional; + +public interface CreateNoticePortIn { + + Optional operate(CreateNoticeCmd command); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/ports/CreateNoticePortOut.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/ports/CreateNoticePortOut.java new file mode 100644 index 00000000..85868cb8 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/ports/CreateNoticePortOut.java @@ -0,0 +1,12 @@ +package app.module.admin.usecase.communication.notice.createNotice.ports; + + +import app.module.admin.usecase.communication.notice.createNotice.ports.application.domain.CreateNotice; +import app.module.admin.usecase.communication.notice.createNotice.ports.application.domain.CreateNoticeCmd; + +import java.util.Optional; + +public interface CreateNoticePortOut { + + Optional operate(CreateNoticeCmd command); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/ports/application/CreateNoticeService.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/ports/application/CreateNoticeService.java new file mode 100644 index 00000000..34c3b996 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/ports/application/CreateNoticeService.java @@ -0,0 +1,24 @@ +package app.module.admin.usecase.communication.notice.createNotice.ports.application; + +import app.module.admin.usecase.communication.notice.createNotice.ports.CreateNoticePortIn; +import app.module.admin.usecase.communication.notice.createNotice.ports.CreateNoticePortOut; +import app.module.admin.usecase.communication.notice.createNotice.ports.application.domain.CreateNotice; +import app.module.admin.usecase.communication.notice.createNotice.ports.application.domain.CreateNoticeCmd; +import app.module.core.config.application.annotation.CreateCommand; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Optional; + +@Service +@RequiredArgsConstructor +class CreateNoticeService implements CreateNoticePortIn { + + private final CreateNoticePortOut portOut; + + @Override + @CreateCommand + public Optional operate(CreateNoticeCmd command) { + return portOut.operate(command); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/ports/application/domain/CreateNotice.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/ports/application/domain/CreateNotice.java new file mode 100644 index 00000000..63992faa --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/ports/application/domain/CreateNotice.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.communication.notice.createNotice.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class CreateNotice { + private Long id; +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/ports/application/domain/CreateNoticeCmd.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/ports/application/domain/CreateNoticeCmd.java new file mode 100644 index 00000000..846838a8 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/ports/application/domain/CreateNoticeCmd.java @@ -0,0 +1,23 @@ +package app.module.admin.usecase.communication.notice.createNotice.ports.application.domain; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDateTime; +import java.util.List; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class CreateNoticeCmd extends AuditCommand { + private String title; + private String content; + private Boolean visible; + private LocalDateTime startDate; + private LocalDateTime endDate; + private List fileMappingId; +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/adapters/persistence/GetNoticeDao.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/adapters/persistence/GetNoticeDao.java new file mode 100644 index 00000000..ddde16d9 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/adapters/persistence/GetNoticeDao.java @@ -0,0 +1,52 @@ +package app.module.admin.usecase.communication.notice.getNotice.adapters.persistence; + +import app.module.admin.usecase.communication.notice.getNotice.ports.GetNoticePortOut; +import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNotice; +import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNoticeCmd; +import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNoticeUploadFile; +import app.module.core.usecase.file.url.application.port.in.FileUrlPortIn; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +@Repository +@RequiredArgsConstructor +class GetNoticeDao implements GetNoticePortOut { + + private final GetNoticeMapper mapper; + private final FileUrlPortIn fileUrlPortIn; + + @Override + @Transactional + public Optional operate(GetNoticeCmd command) { + GetNotice secArticle = mapper.getNotice(command); + + List setArticleUploadFile = + mapper.getUploadFiles(command.getId()); + + secArticle.setUploadFiles( + setArticleUploadFile.stream() + .map( + uploadFile -> { + // 참조 URL 전달 + uploadFile.setReferURL( + fileUrlPortIn.getInline( + uploadFile.getType().getFileStorageType(), + uploadFile.getPath(), + uploadFile.getName())); + // attachment URL 전달 + uploadFile.setAttachmentURL( + fileUrlPortIn.getAttachment( + uploadFile.getType().getFileStorageType(), uploadFile.getId())); + + return uploadFile; + }) + .collect(Collectors.toList())); + + return Optional.of(secArticle); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/adapters/persistence/GetNoticeMapper.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/adapters/persistence/GetNoticeMapper.java new file mode 100644 index 00000000..21cedd05 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/adapters/persistence/GetNoticeMapper.java @@ -0,0 +1,16 @@ +package app.module.admin.usecase.communication.notice.getNotice.adapters.persistence; + +import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNotice; +import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNoticeCmd; +import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNoticeUploadFile; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface GetNoticeMapper { + + GetNotice getNotice(GetNoticeCmd command); + + List getUploadFiles(Long id); +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/adapters/web/GetNoticeController.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/adapters/web/GetNoticeController.java new file mode 100644 index 00000000..91a054ad --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/adapters/web/GetNoticeController.java @@ -0,0 +1,23 @@ +package app.module.admin.usecase.communication.notice.getNotice.adapters.web; + +import app.module.admin.usecase.communication.notice.getNotice.ports.GetNoticePortIn; +import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNoticeCmd; +import app.module.core.usecase.article.getArticle.ports.application.domain.GetArticleCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +class GetNoticeController { + private final GetNoticePortIn getNoticePortIn; + + @GetMapping(path = "/api/communication/notices/{id}") + ResponseEntity operate(@PathVariable Long id) { + return ResponseEntity.status(HttpStatus.OK) + .body(getNoticePortIn.operate(new GetNoticeCmd(id)).orElseThrow()); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/GetNoticePortIn.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/GetNoticePortIn.java new file mode 100644 index 00000000..6f1047fd --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/GetNoticePortIn.java @@ -0,0 +1,12 @@ +package app.module.admin.usecase.communication.notice.getNotice.ports; + + +import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNotice; +import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNoticeCmd; + +import java.util.Optional; + +public interface GetNoticePortIn { + + Optional operate(GetNoticeCmd command); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/GetNoticePortOut.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/GetNoticePortOut.java new file mode 100644 index 00000000..588d9f01 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/GetNoticePortOut.java @@ -0,0 +1,12 @@ +package app.module.admin.usecase.communication.notice.getNotice.ports; + + +import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNotice; +import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNoticeCmd; + +import java.util.Optional; + +public interface GetNoticePortOut { + + Optional operate(GetNoticeCmd command); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/GetNoticeService.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/GetNoticeService.java new file mode 100644 index 00000000..ee8ccb3a --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/GetNoticeService.java @@ -0,0 +1,22 @@ +package app.module.admin.usecase.communication.notice.getNotice.ports.application; + +import app.module.admin.usecase.communication.notice.getNotice.ports.GetNoticePortIn; +import app.module.admin.usecase.communication.notice.getNotice.ports.GetNoticePortOut; +import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNotice; +import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNoticeCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Optional; + +@Service +@RequiredArgsConstructor +class GetNoticeService implements GetNoticePortIn { + + private final GetNoticePortOut portOut; + + @Override + public Optional operate(GetNoticeCmd command) { + return portOut.operate(command); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/domain/GetNotice.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/domain/GetNotice.java new file mode 100644 index 00000000..ed1de43e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/domain/GetNotice.java @@ -0,0 +1,31 @@ +package app.module.admin.usecase.communication.notice.getNotice.ports.application.domain; + +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.time.LocalDateTime; +import java.util.List; + +@Getter +@Setter +@NoArgsConstructor +@EqualsAndHashCode +public class GetNotice { + private Long id; + private String title; + private String content; + private Boolean visible; + private LocalDateTime startDate; + private LocalDateTime endDate; + private LocalDateTime createdAt; + private String createdBy; + private LocalDateTime updatedAt; + private String updatedBy; + private List uploadFiles; + public boolean getNewDate() { + LocalDateTime now = LocalDateTime.now(); + return now.toLocalDate().isEqual(createdAt.toLocalDate()); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/domain/GetNoticeCmd.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/domain/GetNoticeCmd.java new file mode 100644 index 00000000..d631614d --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/domain/GetNoticeCmd.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.communication.notice.getNotice.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetNoticeCmd { + private Long id; +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/domain/GetNoticeUploadFile.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/domain/GetNoticeUploadFile.java new file mode 100644 index 00000000..a8101264 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/domain/GetNoticeUploadFile.java @@ -0,0 +1,31 @@ +package app.module.admin.usecase.communication.notice.getNotice.ports.application.domain; + +import app.module.core.config.application.enums.FileUploadType; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * DTO for {@link app.module.core.config.adapters.persistence.entity.UploadFile} + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class GetNoticeUploadFile implements Serializable { + + private LocalDateTime createdAt; + private String createdBy; + private LocalDateTime updatedAt; + private String updatedBy; + private Long id; + private FileUploadType type; + private String path; + private String name; + private String originName; + private Long fileLength; + private String referURL; + private String attachmentURL; +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticeUI/GetNoticesUIController.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticeUI/GetNoticesUIController.java deleted file mode 100644 index eb98c216..00000000 --- a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticeUI/GetNoticesUIController.java +++ /dev/null @@ -1,21 +0,0 @@ -package app.module.admin.usecase.communication.notice.getNoticeUI; - -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import app.module.admin.usecase.communication.notice.getNoticeUI.model.GetNoticesReqVO; - -@Controller -@RequiredArgsConstructor -class GetNoticesUIController { - - @GetMapping(path = "/communication/notices") - String operate( - Model model, - @ModelAttribute("reqVO") GetNoticesReqVO reqVO) { - - return "communication/notices"; - } -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/persistence/GetNoticesDao.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/persistence/GetNoticesDao.java new file mode 100644 index 00000000..b82c65b9 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/persistence/GetNoticesDao.java @@ -0,0 +1,127 @@ +package app.module.admin.usecase.communication.notice.getNoticesUI.adapters.persistence; + +import app.module.admin.usecase.communication.notice.getNoticesUI.adapters.persistence.model.GetNoticesDto; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.GetNoticesPortOut; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNoticeFiles; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNotices; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNoticesCmd; +import app.module.core.config.application.enums.FileUploadType; +import lombok.RequiredArgsConstructor; +import org.apache.commons.collections4.ListUtils; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +@Repository +@RequiredArgsConstructor +class GetNoticesDao implements GetNoticesPortOut { + + private final GetNoticesMapper mapper; + + @Override + @Transactional + public Page operate(Pageable pageable, GetNoticesCmd command) { + // 게시물 목록 얻기 + List contents = + ListUtils.emptyIfNull(mapper.getNotices(pageable, command)); + + // 대표 이미지 목록 얻기 + List uploadFiles = + contents.isEmpty() + ? Collections.emptyList() + : ListUtils.emptyIfNull( + mapper.getUploadFiles( + contents.stream().map(GetNoticesDto::getId) + .collect(Collectors.toList()), + FileUploadType.NOTICE)); + + return new PageImpl<>( + contents.stream() + .map( + article -> + new GetNotices( + article.getId(), + article.getUpdatedBy(), + article.getUpdatedAt(), + article.getCreatedBy(), + article.getCreatedAt(), + article.getTitle(), + article.getContent(), + article.getVisible(), + article.getStartDate(), + article.getEndDate(), + uploadFiles.stream() + .filter(file -> file.getNoticeId().equals(article.getId())) + .findFirst() + .orElse(null))) + .collect(Collectors.toList()), + pageable, + contents.isEmpty() ? 0 : contents.get(0).getTotal()); + } + + @Override + @Transactional + public List operateList(GetNoticesCmd command) { + /*// 검색조건 초기화 + Specification
spec = (root, query, criteriaBuilder) -> null; + + // 검색어 - like 검색 + if (!StringUtils.isEmpty(command.getSearchField())) { + spec = + spec.and( + (root, query, builder) -> + builder.like( + root.get(command.getSearchField()), + "%" + command.getSearchValue() + "%")); + } + + // 공개여부 검색 + if (!StringUtils.isEmpty(command.getSearchOpen())) { + spec = + spec.and( + ((root, query, criteriaBuilder) -> + criteriaBuilder.equal( + root.get("visible"), Boolean.valueOf(command.getSearchOpen())))); + } + + List
result = getArticlesRepo.findAll(spec); + + return result.stream() + .map( + article -> + new GetArticles( + article.getId(), + article.getUpdatedBy(), + article.getUpdatedAt(), + article.getTitle(), + article.getContent(), + article.getVisible(), + article.getStartDate(), + article.getEndDate(), + article.getOrderNo(), + article.getUploadFiles().stream() + // 목록에 보여줄 대표이미지만 담는다 + .filter( + uploadFile -> uploadFile.getType() + .equals(FileUploadType.EXAMPLE_REP)) + .map( + uploadFile -> + new GetArticleFiles( + uploadFile.getId(), + uploadFile.getType(), + uploadFile.getPath(), + uploadFile.getName(), + uploadFile.getOriginName(), + uploadFile.getFileLength())) + .findFirst() + .orElse(null))) + .collect(Collectors.toList());*/ + return null; + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/persistence/GetNoticesMapper.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/persistence/GetNoticesMapper.java new file mode 100644 index 00000000..8b50d39d --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/persistence/GetNoticesMapper.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.communication.notice.getNoticesUI.adapters.persistence; + +import app.module.admin.usecase.communication.notice.getNoticesUI.adapters.persistence.model.GetNoticesDto; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNoticeFiles; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNoticesCmd; +import app.module.core.config.application.enums.FileUploadType; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.data.domain.Pageable; + +import java.util.List; + +@Mapper +public interface GetNoticesMapper { + List getNotices( + @Param("pageable") Pageable pageable, @Param("cmd") GetNoticesCmd cmd); + List getUploadFiles( + @Param("ids") List ids, @Param("fileUploadType") FileUploadType fileUploadType); +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/persistence/model/GetNoticesDto.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/persistence/model/GetNoticesDto.java new file mode 100644 index 00000000..0512dcd4 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/persistence/model/GetNoticesDto.java @@ -0,0 +1,24 @@ +package app.module.admin.usecase.communication.notice.getNoticesUI.adapters.persistence.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDateTime; + +@Getter +@Setter +@AllArgsConstructor +public class GetNoticesDto { + private Long id; + private String updatedBy; + private LocalDateTime updatedAt; + private String createdBy; + private LocalDateTime createdAt; + private String title; + private String content; + private Boolean visible; + private LocalDateTime startDate; + private LocalDateTime endDate; + private Long total; +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/web/GetNoticesController.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/web/GetNoticesController.java new file mode 100644 index 00000000..1cbbb135 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/web/GetNoticesController.java @@ -0,0 +1,37 @@ +package app.module.admin.usecase.communication.notice.getNoticesUI.adapters.web; + +import app.module.admin.usecase.communication.notice.getNoticesUI.adapters.web.model.GetNoticesReqVO; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.GetNoticesPortIn; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNotices; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNoticesCmd; +import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; +import org.springframework.data.web.PageableDefault; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; + +@Controller +@RequiredArgsConstructor +class GetNoticesController { + + private final GetNoticesPortIn getNoticesPortIn; + private final UICodeListPortIn uiCodeListPortIn; + + @GetMapping(path = "/api/communication/notices") + ResponseEntity operate( + @PageableDefault(sort = "createdAt", direction = Sort.Direction.DESC, page = 0, size = 10) Pageable pageable, + GetNoticesReqVO reqVO) { + return ResponseEntity.status(HttpStatus.OK) + .body(getNoticesPortIn.operate(pageable, new GetNoticesCmd( + reqVO.getSearchField(), + reqVO.getSearchValue(), + reqVO.getSearchOpen() + ))); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/web/GetNoticesUIController.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/web/GetNoticesUIController.java new file mode 100644 index 00000000..6e0309a0 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/web/GetNoticesUIController.java @@ -0,0 +1,43 @@ +package app.module.admin.usecase.communication.notice.getNoticesUI.adapters.web; + +import app.module.admin.config.application.util.AdminUtil; +import app.module.admin.usecase.communication.notice.getNoticesUI.adapters.web.model.GetNoticesReqVO; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.GetNoticesPortIn; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNotices; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNoticesCmd; +import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; +import org.springframework.data.web.PageableDefault; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; + +@Controller +@RequiredArgsConstructor +class GetNoticesUIController { + + private final GetNoticesPortIn getNoticesPortIn; + private final UICodeListPortIn uiCodeListPortIn; + + @GetMapping(path = "/communication/notices") + String operate(Model model, @PageableDefault(sort = "createdAt", direction = Sort.Direction.DESC, page = 0, size = 10) Pageable pageable + , GetNoticesReqVO reqVO) { + + Page notices = + getNoticesPortIn.operate( + pageable, + new GetNoticesCmd( + reqVO.getSearchField(), reqVO.getSearchValue(), reqVO.getSearchOpen())); + + model.addAttribute("reqVO", reqVO); + model.addAttribute("notices", notices); + + model.addAttribute("userRole", AdminUtil.getLoginUserRole()); + model.addAttribute("pageRows", uiCodeListPortIn.connect("code.pageable.rows")); + + return "communication/notice/notices"; + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/web/model/GetNoticesReqVO.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/web/model/GetNoticesReqVO.java new file mode 100644 index 00000000..6b1a685b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/adapters/web/model/GetNoticesReqVO.java @@ -0,0 +1,39 @@ +package app.module.admin.usecase.communication.notice.getNoticesUI.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; +import org.thymeleaf.util.StringUtils; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetNoticesReqVO { + + private String searchField; + private String searchValue; + private String searchOpen; + + + private Integer page; + private String sort; + private Integer size; + + public Integer getPage() { + // 요청 페이지 넘버 - 초기값 `0` + return page != null ? page : 0; + } + + public String getSort() { + // 정렬 값 - 초기값 `orderNo 내림차순` + return StringUtils.isEmpty(sort) ? "createdAt,DESC" : sort; + } + + public Integer getSize() { + // 페이지 당 아이템 수 - 초기값 `10` + return size != null ? size : 10; + } + +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/GetNoticesPortIn.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/GetNoticesPortIn.java new file mode 100644 index 00000000..fc01e7a9 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/GetNoticesPortIn.java @@ -0,0 +1,15 @@ +package app.module.admin.usecase.communication.notice.getNoticesUI.ports; + +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNotices; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNoticesCmd; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; + +import java.util.List; + +public interface GetNoticesPortIn { + + Page operate(Pageable pageable, GetNoticesCmd command); + + List operateList(GetNoticesCmd command); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/GetNoticesPortOut.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/GetNoticesPortOut.java new file mode 100644 index 00000000..62296dce --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/GetNoticesPortOut.java @@ -0,0 +1,15 @@ +package app.module.admin.usecase.communication.notice.getNoticesUI.ports; + +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNotices; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNoticesCmd; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; + +import java.util.List; + +public interface GetNoticesPortOut { + + Page operate(Pageable pageable, GetNoticesCmd command); + + List operateList(GetNoticesCmd command); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/application/GetNoticesService.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/application/GetNoticesService.java new file mode 100644 index 00000000..a8a69299 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/application/GetNoticesService.java @@ -0,0 +1,29 @@ +package app.module.admin.usecase.communication.notice.getNoticesUI.ports.application; + +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.GetNoticesPortIn; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.GetNoticesPortOut; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNotices; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNoticesCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@RequiredArgsConstructor +class GetNoticesService implements GetNoticesPortIn { + + private final GetNoticesPortOut portOut; + + @Override + public Page operate(Pageable pageable, GetNoticesCmd command) { + return portOut.operate(pageable, command); + } + + @Override + public List operateList(GetNoticesCmd command) { + return portOut.operateList(command); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/application/domain/GetNoticeFiles.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/application/domain/GetNoticeFiles.java new file mode 100644 index 00000000..95e71754 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/application/domain/GetNoticeFiles.java @@ -0,0 +1,21 @@ +package app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain; + +import app.module.core.config.application.enums.FileUploadType; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetNoticeFiles { + private Long noticeId; + private Long id; + private FileUploadType type; + private String path; + private String name; + private String originName; + private Long fileLength; +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/application/domain/GetNotices.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/application/domain/GetNotices.java new file mode 100644 index 00000000..bb9ef372 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/application/domain/GetNotices.java @@ -0,0 +1,31 @@ +package app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDateTime; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetNotices { + private Long id; + private String updatedBy; + private LocalDateTime updatedAt; + private String createdBy; + private LocalDateTime createdAt; + private String title; + private String content; + private Boolean visible; + private LocalDateTime startDate; + private LocalDateTime endDate; + private GetNoticeFiles uploadFile; + + public boolean getNewDate() { + LocalDateTime now = LocalDateTime.now(); + return now.toLocalDate().isEqual(createdAt.toLocalDate()); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/application/domain/GetNoticesCmd.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/application/domain/GetNoticesCmd.java new file mode 100644 index 00000000..0f5c49c7 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/ports/application/domain/GetNoticesCmd.java @@ -0,0 +1,17 @@ +package app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetNoticesCmd { + + private String searchField; + private String searchValue; + private String searchOpen; +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/adapters/persistence/RemoveNoticesDao.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/adapters/persistence/RemoveNoticesDao.java new file mode 100644 index 00000000..15af73d6 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/adapters/persistence/RemoveNoticesDao.java @@ -0,0 +1,28 @@ +package app.module.admin.usecase.communication.notice.removeNotices.adapters.persistence; + +import app.module.admin.usecase.communication.notice.removeNotices.adapters.persistence.model.RemoveNoticesParam; +import app.module.admin.usecase.communication.notice.removeNotices.ports.RemoveNoticesPortOut; +import app.module.admin.usecase.communication.notice.removeNotices.ports.application.domain.RemoveNoticesCmd; +import app.module.core.config.application.util.CommonUtil; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +import java.time.LocalDateTime; + +@Repository +@RequiredArgsConstructor +class RemoveNoticesDao implements RemoveNoticesPortOut { + + private final RemoveNoticesMapper mapper; + + @Override + public void operate(RemoveNoticesCmd command) { + String loginUser = CommonUtil.getLoginUsername();; + LocalDateTime now = LocalDateTime.now(); + + mapper.deleteNoticeHasFiles( + new RemoveNoticesParam(command.getRemoveIds(), now, loginUser, now, loginUser)); + mapper.deleteNotices( + new RemoveNoticesParam(command.getRemoveIds(), now, loginUser, now, loginUser)); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/adapters/persistence/RemoveNoticesMapper.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/adapters/persistence/RemoveNoticesMapper.java new file mode 100644 index 00000000..6f2fdcce --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/adapters/persistence/RemoveNoticesMapper.java @@ -0,0 +1,10 @@ +package app.module.admin.usecase.communication.notice.removeNotices.adapters.persistence; + +import app.module.admin.usecase.communication.notice.removeNotices.adapters.persistence.model.RemoveNoticesParam; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface RemoveNoticesMapper { + void deleteNotices(RemoveNoticesParam param); + void deleteNoticeHasFiles(RemoveNoticesParam param); +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/adapters/persistence/model/RemoveNoticesParam.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/adapters/persistence/model/RemoveNoticesParam.java new file mode 100644 index 00000000..97002d89 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/adapters/persistence/model/RemoveNoticesParam.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.communication.notice.removeNotices.adapters.persistence.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDateTime; +import java.util.Set; + +@Getter +@Setter +@AllArgsConstructor +public class RemoveNoticesParam { + private Set removeIds; + private LocalDateTime updatedAt; + private String updatedBy; + private LocalDateTime deletedAt; + private String deletedBy; +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/adapters/web/RemoveNoticesController.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/adapters/web/RemoveNoticesController.java new file mode 100644 index 00000000..f789f0b8 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/adapters/web/RemoveNoticesController.java @@ -0,0 +1,30 @@ +package app.module.admin.usecase.communication.notice.removeNotices.adapters.web; + +import app.module.admin.usecase.communication.notice.removeNotices.adapters.web.model.RemoveNoticesReqVO; +import app.module.admin.usecase.communication.notice.removeNotices.ports.RemoveNoticesPortIn; +import app.module.admin.usecase.communication.notice.removeNotices.ports.application.domain.RemoveNoticesCmd; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +class RemoveNoticesController { + private final RemoveNoticesPortIn removeNoticesPortIn; + + @DeleteMapping(path = "/api/communication/notices/remove") + ResponseEntity operate(@Valid RemoveNoticesReqVO reqVO, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) + .body(bindingResult.getFieldErrors()); + } + + removeNoticesPortIn.operate(new RemoveNoticesCmd(reqVO.getSelectIds())); + + return ResponseEntity.status(HttpStatus.OK).body(reqVO); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/adapters/web/model/RemoveNoticesReqVO.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/adapters/web/model/RemoveNoticesReqVO.java new file mode 100644 index 00000000..38efb322 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/adapters/web/model/RemoveNoticesReqVO.java @@ -0,0 +1,16 @@ +package app.module.admin.usecase.communication.notice.removeNotices.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +import java.util.Set; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class RemoveNoticesReqVO { + private Set selectIds; +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/ports/RemoveNoticesPortIn.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/ports/RemoveNoticesPortIn.java new file mode 100644 index 00000000..868352d4 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/ports/RemoveNoticesPortIn.java @@ -0,0 +1,8 @@ +package app.module.admin.usecase.communication.notice.removeNotices.ports; + + +import app.module.admin.usecase.communication.notice.removeNotices.ports.application.domain.RemoveNoticesCmd; + +public interface RemoveNoticesPortIn { + void operate(RemoveNoticesCmd command); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/ports/RemoveNoticesPortOut.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/ports/RemoveNoticesPortOut.java new file mode 100644 index 00000000..1797f923 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/ports/RemoveNoticesPortOut.java @@ -0,0 +1,8 @@ +package app.module.admin.usecase.communication.notice.removeNotices.ports; + + +import app.module.admin.usecase.communication.notice.removeNotices.ports.application.domain.RemoveNoticesCmd; + +public interface RemoveNoticesPortOut { + void operate(RemoveNoticesCmd command); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/ports/application/RemoveNoticesService.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/ports/application/RemoveNoticesService.java new file mode 100644 index 00000000..63311299 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/ports/application/RemoveNoticesService.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.communication.notice.removeNotices.ports.application; + +import app.module.admin.usecase.communication.notice.removeNotices.ports.RemoveNoticesPortIn; +import app.module.admin.usecase.communication.notice.removeNotices.ports.RemoveNoticesPortOut; +import app.module.admin.usecase.communication.notice.removeNotices.ports.application.domain.RemoveNoticesCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class RemoveNoticesService implements RemoveNoticesPortIn { + + private final RemoveNoticesPortOut portOut; + + @Override + public void operate(RemoveNoticesCmd command) { + portOut.operate(command); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/ports/application/domain/RemoveNoticesCmd.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/ports/application/domain/RemoveNoticesCmd.java new file mode 100644 index 00000000..6f2ded2c --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/removeNotices/ports/application/domain/RemoveNoticesCmd.java @@ -0,0 +1,16 @@ +package app.module.admin.usecase.communication.notice.removeNotices.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +import java.util.Set; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class RemoveNoticesCmd { + private Set removeIds; +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/persistence/UpdateNoticeDao.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/persistence/UpdateNoticeDao.java new file mode 100644 index 00000000..f5276435 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/persistence/UpdateNoticeDao.java @@ -0,0 +1,54 @@ +package app.module.admin.usecase.communication.notice.updateNotice.adapters.persistence; + +import app.module.admin.usecase.communication.notice.updateNotice.adapters.persistence.model.CreateUploadFileParam; +import app.module.admin.usecase.communication.notice.updateNotice.adapters.persistence.model.UpdateNoticeDto; +import app.module.admin.usecase.communication.notice.updateNotice.ports.UpdateNoticePortOut; +import app.module.admin.usecase.communication.notice.updateNotice.ports.application.domain.UpdateNoticeCmd; +import app.module.core.config.adapters.persistence.entity.NoticeHasUploadFile; +import app.module.core.config.application.util.CommonUtil; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +import java.time.LocalDateTime; + +@Repository +@RequiredArgsConstructor +class UpdateNoticeDao implements UpdateNoticePortOut { + + private final UpdateNoticeMapper mapper; + + + @Override + public void operate(UpdateNoticeCmd command) { + mapper.updateNotice( + + new UpdateNoticeDto( + command.getId(), + command.getTitle(), + command.getContent(), + command.getVisible(), + command.getStartDate(), + command.getEndDate(), + command.getFileMappingId(), + LocalDateTime.now(), + CommonUtil.getLoginUsername() + )); + + // 첨부파일 초기화 + mapper.deleteFileUploads(new NoticeHasUploadFile(command.getId())); + + // 첨부파일 있을 시, 등록 + if (command.getFileMappingId() != null && !command.getFileMappingId().isEmpty()) { + mapper.createFileUploads(new CreateUploadFileParam( + command.getId(), + command.getFileMappingId().stream() + .map(Long::parseLong) + .toList(), + LocalDateTime.now(), + CommonUtil.getLoginUsername(), + LocalDateTime.now(), + CommonUtil.getLoginUsername() + )); + } + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/persistence/UpdateNoticeMapper.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/persistence/UpdateNoticeMapper.java new file mode 100644 index 00000000..f2b2c4ef --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/persistence/UpdateNoticeMapper.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.communication.notice.updateNotice.adapters.persistence; + +import app.module.admin.usecase.communication.notice.updateNotice.adapters.persistence.model.CreateUploadFileParam; +import app.module.admin.usecase.communication.notice.updateNotice.adapters.persistence.model.UpdateNoticeDto; +import app.module.core.config.adapters.persistence.entity.ArticleHasUploadFile; +import app.module.core.config.adapters.persistence.entity.NoticeHasUploadFile; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface UpdateNoticeMapper { + void updateNotice(UpdateNoticeDto dto); + void deleteFileUploads(NoticeHasUploadFile noticeHasUploadFile); + void createFileUploads(CreateUploadFileParam param); +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/persistence/model/CreateUploadFileParam.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/persistence/model/CreateUploadFileParam.java new file mode 100644 index 00000000..99fce30b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/persistence/model/CreateUploadFileParam.java @@ -0,0 +1,18 @@ +package app.module.admin.usecase.communication.notice.updateNotice.adapters.persistence.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.time.LocalDateTime; +import java.util.List; + +@Getter +@AllArgsConstructor +public class CreateUploadFileParam { + private Long id; + private List fileMappingId; + private LocalDateTime createdAt; + private String createdBy; + private LocalDateTime updatedAt; + private String updatedBy; +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/persistence/model/UpdateNoticeDto.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/persistence/model/UpdateNoticeDto.java new file mode 100644 index 00000000..26041e2a --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/persistence/model/UpdateNoticeDto.java @@ -0,0 +1,25 @@ +package app.module.admin.usecase.communication.notice.updateNotice.adapters.persistence.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.time.LocalDateTime; +import java.util.List; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class UpdateNoticeDto { + private Long id; + private String title; + private String content; + private Boolean visible; + private LocalDateTime startDate; + private LocalDateTime endDate; + private List fileMappingId; + private LocalDateTime updatedAt; + private String updatedBy; +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/UpdateNoticeController.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/UpdateNoticeController.java new file mode 100644 index 00000000..7159cd89 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/UpdateNoticeController.java @@ -0,0 +1,42 @@ +package app.module.admin.usecase.communication.notice.updateNotice.adapters.web; + +import app.module.admin.usecase.communication.notice.updateNotice.adapters.web.model.UpdateNoticeReqVO; +import app.module.admin.usecase.communication.notice.updateNotice.ports.UpdateNoticePortIn; +import app.module.admin.usecase.communication.notice.updateNotice.ports.application.domain.UpdateNoticeCmd; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +class UpdateNoticeController { + private final UpdateNoticePortIn updateNoticePortIn; + + @PutMapping(path = "/api/communication/notices/update") + ResponseEntity operate(@RequestBody @Valid UpdateNoticeReqVO reqVO, BindingResult bindingResult) { + + + if (bindingResult.hasErrors()) { + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) + .body(bindingResult.getFieldErrors()); + } + + updateNoticePortIn.operate( + new UpdateNoticeCmd( + reqVO.getId(), + reqVO.getTitle(), + reqVO.getContent(), + reqVO.getVisible(), + reqVO.getStartDate(), + reqVO.getEndDate(), + reqVO.getFileMappingId() + )); + + return ResponseEntity.status(HttpStatus.OK).body(reqVO); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/UpdateNoticeUIController.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/UpdateNoticeUIController.java new file mode 100644 index 00000000..2d7237d9 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/UpdateNoticeUIController.java @@ -0,0 +1,35 @@ +package app.module.admin.usecase.communication.notice.updateNotice.adapters.web; + +import app.module.admin.config.application.util.AdminUtil; +import app.module.admin.usecase.communication.notice.getNoticesUI.adapters.web.model.GetNoticesReqVO; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.GetNoticesPortIn; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNotices; +import app.module.admin.usecase.communication.notice.getNoticesUI.ports.application.domain.GetNoticesCmd; +import app.module.admin.usecase.communication.notice.updateNotice.ports.UpdateNoticePortIn; +import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; +import org.springframework.data.web.PageableDefault; +import org.springframework.stereotype.Controller; +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; + +@Controller +@RequiredArgsConstructor +class UpdateNoticeUIController { + + private final UpdateNoticePortIn updateNoticePortIn; + private final UICodeListPortIn uiCodeListPortIn; + + @GetMapping(path = "/communication/notices/{id}") + String operate(Model model + , @PathVariable @ModelAttribute("id") Long id) { + + + return "communication/notice/{id}"; + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/model/UpdateNoticeReqVO.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/model/UpdateNoticeReqVO.java new file mode 100644 index 00000000..2124128a --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/model/UpdateNoticeReqVO.java @@ -0,0 +1,49 @@ +package app.module.admin.usecase.communication.notice.updateNotice.adapters.web.model; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.*; +import org.apache.commons.text.StringEscapeUtils; + +import java.time.LocalDateTime; +import java.util.List; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode +public class UpdateNoticeReqVO { + @NotNull(message = "{valid.common.required}") + private Long id; + + @NotBlank(message = "{valid.common.required}") + private String title; + + @NotBlank(message = "{valid.common.required}") + private String content; + + @NotNull(message = "{valid.common.required}") + private Boolean visible; + + + @NotNull(message = "{valid.common.required}") + private LocalDateTime startDate; + + @NotNull(message = "{valid.common.required}") + private LocalDateTime endDate; + + private List fileMappingId; + + private LocalDateTime createdAt; + + private String createdBy; + + public String getTitle() { + return StringEscapeUtils.escapeHtml4(title); + } + + public String getContent() { + return StringEscapeUtils.escapeHtml4(content); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/ports/UpdateNoticePortIn.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/ports/UpdateNoticePortIn.java new file mode 100644 index 00000000..9e393175 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/ports/UpdateNoticePortIn.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.communication.notice.updateNotice.ports; + + +import app.module.admin.usecase.communication.notice.updateNotice.ports.application.domain.UpdateNoticeCmd; + +public interface UpdateNoticePortIn { + + void operate(UpdateNoticeCmd command); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/ports/UpdateNoticePortOut.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/ports/UpdateNoticePortOut.java new file mode 100644 index 00000000..120af13c --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/ports/UpdateNoticePortOut.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.communication.notice.updateNotice.ports; + + +import app.module.admin.usecase.communication.notice.updateNotice.ports.application.domain.UpdateNoticeCmd; + +public interface UpdateNoticePortOut { + + void operate(UpdateNoticeCmd command); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/ports/application/UpdateNoticeService.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/ports/application/UpdateNoticeService.java new file mode 100644 index 00000000..ca91ed2b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/ports/application/UpdateNoticeService.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.communication.notice.updateNotice.ports.application; + +import app.module.admin.usecase.communication.notice.updateNotice.ports.UpdateNoticePortIn; +import app.module.admin.usecase.communication.notice.updateNotice.ports.UpdateNoticePortOut; +import app.module.admin.usecase.communication.notice.updateNotice.ports.application.domain.UpdateNoticeCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class UpdateNoticeService implements UpdateNoticePortIn { + + private final UpdateNoticePortOut portOut; + + @Override + public void operate(UpdateNoticeCmd command) { + portOut.operate(command); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/ports/application/domain/UpdateNoticeCmd.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/ports/application/domain/UpdateNoticeCmd.java new file mode 100644 index 00000000..e22bc500 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/ports/application/domain/UpdateNoticeCmd.java @@ -0,0 +1,23 @@ +package app.module.admin.usecase.communication.notice.updateNotice.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDateTime; +import java.util.List; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class UpdateNoticeCmd { + private Long id; + private String title; + private String content; + private Boolean visible; + private LocalDateTime startDate; + private LocalDateTime endDate; + private List fileMappingId; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdDao.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdDao.java index 2f69a273..a2a2d49b 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdDao.java @@ -1,5 +1,6 @@ package app.module.admin.usecase.household.createHousehold.adapters.persistence; +import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateResearcherHasHouseholdCmd; import app.module.core.config.application.annotation.CreateCommand; import app.module.core.config.application.util.AuditUtil; import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdHasRoleCmd; @@ -7,6 +8,7 @@ import app.module.admin.usecase.household.createHousehold.ports.application.doma import lombok.RequiredArgsConstructor; import app.module.admin.usecase.household.createHousehold.ports.CreateHouseholdPortOut; import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; @Repository @RequiredArgsConstructor @@ -14,13 +16,22 @@ class CreateHouseholdDao implements CreateHouseholdPortOut { private final CreateHouseholdMapper mapper; @Override + @Transactional @CreateCommand public void operate(CreateHouseholdOutCmd outCmd) { + // 임가 등록 mapper.createHousehold(outCmd); - if(outCmd.getResearcherSeq() != null) { + // 임가 역할 등록 + if(outCmd.getRoleIds() != null && !outCmd.getRoleIds().isEmpty()) { mapper.createHouseholdHasRole( AuditUtil.create(new CreateHouseholdHasRoleCmd(outCmd.getSeq(), outCmd.getRoleIds()))); } + + // 임가 담당 조사원 등록 + if(outCmd.getAdminSeq() != null) { + mapper.createResearcherHasHousehold( + AuditUtil.create(new CreateResearcherHasHouseholdCmd(outCmd.getSeq(), outCmd.getAdminSeq()))); + } } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java index 5171007b..f6da0d55 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java @@ -2,10 +2,12 @@ package app.module.admin.usecase.household.createHousehold.adapters.persistence; import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdHasRoleCmd; import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd; +import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateResearcherHasHouseholdCmd; import org.apache.ibatis.annotations.Mapper; @Mapper public interface CreateHouseholdMapper { void createHousehold(CreateHouseholdOutCmd outCmd); void createHouseholdHasRole(CreateHouseholdHasRoleCmd cmd); + void createResearcherHasHousehold(CreateResearcherHasHouseholdCmd cmd); } diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/CreateHouseholdController.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/CreateHouseholdController.java index bde6492e..35af7336 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/CreateHouseholdController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/CreateHouseholdController.java @@ -1,5 +1,6 @@ package app.module.admin.usecase.household.createHousehold.adapters.web; +import app.module.admin.usecase.household.createHousehold.adapters.web.model.CreateHouseholdResVO; import app.module.core.config.application.util.MessageUtil; import app.module.admin.usecase.household.createHousehold.ports.CreateHouseholdPortIn; import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd; @@ -50,13 +51,13 @@ class CreateHouseholdController { reqVO.getIndustryMiddleCode(), reqVO.getIndustrySubMiddle(), reqVO.getIndustryDetail(), - reqVO.getResearcherSeq(), + reqVO.getAdminSeq(), reqVO.getIsPanel(), reqVO.getMemo() ) ); return ResponseEntity.status(HttpStatus.OK) - .body(messageUtil.getMessage("operation.common.save.done")); + .body(new CreateHouseholdResVO(reqVO.getHouseholdNum())); } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdReqVO.java index 8c0399d6..540efb54 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdReqVO.java @@ -31,7 +31,7 @@ public class CreateHouseholdReqVO { private String industryMiddleCode; private String industrySubMiddle; private String industryDetail; - private Long researcherSeq; + private Long adminSeq; private Boolean isPanel; private String memo; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdResVO.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdResVO.java index 435ae49c..122ddb47 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdResVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdResVO.java @@ -10,4 +10,5 @@ import lombok.Setter; @AllArgsConstructor @EqualsAndHashCode public class CreateHouseholdResVO { + private String householdNum; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java index fbf52db5..749e3137 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java @@ -27,7 +27,7 @@ public class CreateHouseholdOutCmd extends AuditCommand { private String industryMiddleCode; private String industrySubMiddle; private String industryDetail; - private Long researcherSeq; + private Long adminSeq; private Boolean isPanel; private String memo; private List roleIds; diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateResearcherHasHouseholdCmd.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateResearcherHasHouseholdCmd.java new file mode 100644 index 00000000..c332f0d3 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateResearcherHasHouseholdCmd.java @@ -0,0 +1,17 @@ +package app.module.admin.usecase.household.createHousehold.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 CreateResearcherHasHouseholdCmd extends AuditCommand { + private Long householdSeq; + private Long adminSeq; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/persistence/CreateResearcherMappingDao.java b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/persistence/CreateResearcherMappingDao.java new file mode 100644 index 00000000..0388b660 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/persistence/CreateResearcherMappingDao.java @@ -0,0 +1,27 @@ +package app.module.admin.usecase.household.createResearcherMapping.adapters.persistence; + +import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.DeleteResearcherMappingCmd; +import app.module.core.config.application.util.AuditUtil; +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.CreateResearcherMappingCmd; +import app.module.admin.usecase.household.createResearcherMapping.ports.CreateResearcherMappingPortOut; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +@Repository +@RequiredArgsConstructor +class CreateResearcherMappingDao implements CreateResearcherMappingPortOut { + private final CreateResearcherMappingMapper mapper; + + @Override + @Transactional + public void operate(CreateResearcherMappingCmd cmd) { + // 조사원 임가 매핑 되어있던 것 delete + mapper.deleteResearcherMapping( + AuditUtil.delete(new DeleteResearcherMappingCmd(cmd.getHouseholdSeqs()))); + + // 조사원 임가 매핑 새로 insert + mapper.createResearcherMapping( + AuditUtil.create(new CreateResearcherMappingCmd(cmd.getAdminSeq(), cmd.getHouseholdSeqs()))); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/persistence/CreateResearcherMappingMapper.java b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/persistence/CreateResearcherMappingMapper.java new file mode 100644 index 00000000..bbde9536 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/persistence/CreateResearcherMappingMapper.java @@ -0,0 +1,11 @@ +package app.module.admin.usecase.household.createResearcherMapping.adapters.persistence; + +import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.CreateResearcherMappingCmd; +import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.DeleteResearcherMappingCmd; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CreateResearcherMappingMapper { + void deleteResearcherMapping(DeleteResearcherMappingCmd cmd); + void createResearcherMapping(CreateResearcherMappingCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/CreateResearcherMappingController.java b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/CreateResearcherMappingController.java new file mode 100644 index 00000000..b6c8f36d --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/CreateResearcherMappingController.java @@ -0,0 +1,38 @@ +package app.module.admin.usecase.household.createResearcherMapping.adapters.web; + +import app.module.admin.usecase.household.createResearcherMapping.ports.CreateResearcherMappingPortIn; +import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.CreateResearcherMappingCmd; +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.createResearcherMapping.adapters.web.model.CreateResearcherMappingReqVO; +import app.module.admin.usecase.household.createResearcherMapping.adapters.web.model.CreateResearcherMappingResVO; + +@RestController +@RequiredArgsConstructor +class CreateResearcherMappingController { + + private final CreateResearcherMappingPortIn portIn; + private final MessageUtil messageUtil; + + @PostMapping(path = "/api/household/researcherMapping/create") + ResponseEntity operate(@Valid @RequestBody CreateResearcherMappingReqVO reqVO, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY).body(bindingResult); + } + + // 등록 + portIn.operate( + new CreateResearcherMappingCmd(reqVO.getAdminSeq(), reqVO.getHouseholdSeqs())); + + return ResponseEntity.status(HttpStatus.OK) + .body(new CreateResearcherMappingResVO(reqVO.getAdminSeq(), reqVO.getHouseholdSeqs())); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/model/CreateResearcherMappingReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/model/CreateResearcherMappingReqVO.java new file mode 100644 index 00000000..bf981835 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/model/CreateResearcherMappingReqVO.java @@ -0,0 +1,17 @@ +package app.module.admin.usecase.household.createResearcherMapping.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 CreateResearcherMappingReqVO { + private Long adminSeq; + private List householdSeqs; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/model/CreateResearcherMappingResVO.java b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/model/CreateResearcherMappingResVO.java new file mode 100644 index 00000000..725f7033 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/adapters/web/model/CreateResearcherMappingResVO.java @@ -0,0 +1,16 @@ +package app.module.admin.usecase.household.createResearcherMapping.adapters.web.model; + +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class CreateResearcherMappingResVO { + private Long adminSeq; + private List householdSeqs; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/CreateResearcherMappingPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/CreateResearcherMappingPortIn.java new file mode 100644 index 00000000..5fadf5d1 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/CreateResearcherMappingPortIn.java @@ -0,0 +1,7 @@ +package app.module.admin.usecase.household.createResearcherMapping.ports; + +import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.CreateResearcherMappingCmd; + +public interface CreateResearcherMappingPortIn { + void operate(CreateResearcherMappingCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/CreateResearcherMappingPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/CreateResearcherMappingPortOut.java new file mode 100644 index 00000000..3ba8703d --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/CreateResearcherMappingPortOut.java @@ -0,0 +1,7 @@ +package app.module.admin.usecase.household.createResearcherMapping.ports; + +import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.CreateResearcherMappingCmd; + +public interface CreateResearcherMappingPortOut { + void operate(CreateResearcherMappingCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/CreateResearcherMappingService.java b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/CreateResearcherMappingService.java new file mode 100644 index 00000000..984e37a0 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/CreateResearcherMappingService.java @@ -0,0 +1,18 @@ +package app.module.admin.usecase.household.createResearcherMapping.ports.application; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.createResearcherMapping.ports.application.domain.CreateResearcherMappingCmd; +import app.module.admin.usecase.household.createResearcherMapping.ports.CreateResearcherMappingPortIn; +import app.module.admin.usecase.household.createResearcherMapping.ports.CreateResearcherMappingPortOut; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class CreateResearcherMappingService implements CreateResearcherMappingPortIn { + private final CreateResearcherMappingPortOut portOut; + + @Override + public void operate(CreateResearcherMappingCmd cmd) { + portOut.operate(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/domain/CreateResearcherMappingCmd.java b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/domain/CreateResearcherMappingCmd.java new file mode 100644 index 00000000..b3277670 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/domain/CreateResearcherMappingCmd.java @@ -0,0 +1,17 @@ +package app.module.admin.usecase.household.createResearcherMapping.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 CreateResearcherMappingCmd extends AuditCommand { + private Long adminSeq; + private List householdSeqs; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/domain/DeleteResearcherMappingCmd.java b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/domain/DeleteResearcherMappingCmd.java new file mode 100644 index 00000000..036c3731 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/createResearcherMapping/ports/application/domain/DeleteResearcherMappingCmd.java @@ -0,0 +1,16 @@ +package app.module.admin.usecase.household.createResearcherMapping.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 DeleteResearcherMappingCmd extends AuditCommand { + private List householdSeqs; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferExpenseRecords.java b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferExpenseRecords.java index 2299a127..47ac71e4 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferExpenseRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferExpenseRecords.java @@ -12,7 +12,6 @@ import lombok.Setter; public class GetBankAutoTransferExpenseRecords { private Long id; private String categoryText; - private String categorySelf; private String sourcePurpose; private Integer count; private String unitText; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferIncomeRecords.java b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferIncomeRecords.java index 36103540..e049e6fa 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferIncomeRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferIncomeRecords.java @@ -13,7 +13,7 @@ public class GetBankAutoTransferIncomeRecords { private Long id; private String cropText; private String categoryText; - private String categorySelf; + private String target; private String sourcePurpose; private Integer count; private String unitText; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/domain/GetForestProductsStatus.java b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/domain/GetForestProductsStatus.java index 520230a1..c23d71f7 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/domain/GetForestProductsStatus.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/domain/GetForestProductsStatus.java @@ -18,11 +18,11 @@ public class GetForestProductsStatus { private String cropName; private String landArea; private String mainYield; - private String mainYieldText; + private String mainYieldUnitText; private String mainSaleAmount; - private String mainSaleAmountText; + private String mainSaleAmountUnitText; private String subYield; - private String subYieldText; + private String subYieldUnitText; private String subSaleAmount; - private String subSaleAmountText; + private String subSaleAmountUnitText; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/persistence/GetPopupResearchersDao.java b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/persistence/GetPopupResearchersDao.java new file mode 100644 index 00000000..5b3b269e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/persistence/GetPopupResearchersDao.java @@ -0,0 +1,24 @@ +package app.module.admin.usecase.household.getPopupResearchers.adapters.persistence; + +import java.util.List; +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchers; +import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchersCmd; +import app.module.admin.usecase.household.getPopupResearchers.ports.GetPopupResearchersPortOut; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.PageImpl; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class GetPopupResearchersDao implements GetPopupResearchersPortOut { + private final GetPopupResearchersMapper mapper; + + @Override + public Page operate(Pageable pageable, GetPopupResearchersCmd cmd) { + List result = mapper.getPopupResearchers(pageable, cmd); + + return new PageImpl<>(result, pageable, result.isEmpty() ? 0 : result.get(0).getTotal()); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/persistence/GetPopupResearchersMapper.java b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/persistence/GetPopupResearchersMapper.java new file mode 100644 index 00000000..5f4b6210 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/persistence/GetPopupResearchersMapper.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.household.getPopupResearchers.adapters.persistence; + +import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchers; +import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchersCmd; +import java.util.List; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.data.domain.Pageable; + +@Mapper +public interface GetPopupResearchersMapper { + List getPopupResearchers(@Param("pageable") Pageable pageable, + @Param("cmd") GetPopupResearchersCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/web/GetPopupResearchersController.java b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/web/GetPopupResearchersController.java new file mode 100644 index 00000000..ae68c3a5 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/web/GetPopupResearchersController.java @@ -0,0 +1,29 @@ +package app.module.admin.usecase.household.getPopupResearchers.adapters.web; + +import app.module.admin.usecase.household.getPopupResearchers.ports.GetPopupResearchersPortIn; +import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchersCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.context.properties.bind.DefaultValue; +import org.springframework.data.domain.Pageable; +import org.springframework.data.web.PageableDefault; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.GetMapping; +import app.module.admin.usecase.household.getPopupResearchers.adapters.web.model.GetPopupResearchersReqVO; +import app.module.admin.usecase.household.getPopupResearchers.adapters.web.model.GetPopupResearchersResVO; + +@RestController +@RequiredArgsConstructor +class GetPopupResearchersController { + + private final GetPopupResearchersPortIn portIn; + + @GetMapping(path = "/api/popupResearchers") + ResponseEntity operate( + @PageableDefault(size = 10) Pageable pageable, GetPopupResearchersReqVO reqVO) { + return ResponseEntity.status(HttpStatus.OK).body(portIn.operate(pageable, + new GetPopupResearchersCmd(reqVO.getSearchField(), reqVO.getSearchValue(), + reqVO.getRegionMainCode()))); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/web/model/GetPopupResearchersReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/web/model/GetPopupResearchersReqVO.java new file mode 100644 index 00000000..d6ae3632 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/web/model/GetPopupResearchersReqVO.java @@ -0,0 +1,16 @@ +package app.module.admin.usecase.household.getPopupResearchers.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetPopupResearchersReqVO { + private String searchField; + private String searchValue; + private String regionMainCode; +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticeUI/model/GetNoticesReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/web/model/GetPopupResearchersResVO.java similarity index 58% rename from admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticeUI/model/GetNoticesReqVO.java rename to admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/web/model/GetPopupResearchersResVO.java index f2d68206..2e65e5b1 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticeUI/model/GetNoticesReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/adapters/web/model/GetPopupResearchersResVO.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.communication.notice.getNoticeUI.model; +package app.module.admin.usecase.household.getPopupResearchers.adapters.web.model; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; @@ -9,5 +9,5 @@ import lombok.Setter; @Setter @AllArgsConstructor @EqualsAndHashCode -public class GetNoticesReqVO { +public class GetPopupResearchersResVO { } diff --git a/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/GetPopupResearchersPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/GetPopupResearchersPortIn.java new file mode 100644 index 00000000..b097bbfb --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/GetPopupResearchersPortIn.java @@ -0,0 +1,10 @@ +package app.module.admin.usecase.household.getPopupResearchers.ports; + +import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchers; +import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchersCmd; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; + +public interface GetPopupResearchersPortIn { + Page operate(Pageable pageable, GetPopupResearchersCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/GetPopupResearchersPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/GetPopupResearchersPortOut.java new file mode 100644 index 00000000..3c266993 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/GetPopupResearchersPortOut.java @@ -0,0 +1,10 @@ +package app.module.admin.usecase.household.getPopupResearchers.ports; + +import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchers; +import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchersCmd; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; + +public interface GetPopupResearchersPortOut { + Page operate(Pageable pageable, GetPopupResearchersCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/application/GetPopupResearchersService.java b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/application/GetPopupResearchersService.java new file mode 100644 index 00000000..95989c83 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/application/GetPopupResearchersService.java @@ -0,0 +1,21 @@ +package app.module.admin.usecase.household.getPopupResearchers.ports.application; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchers; +import app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchersCmd; +import app.module.admin.usecase.household.getPopupResearchers.ports.GetPopupResearchersPortIn; +import app.module.admin.usecase.household.getPopupResearchers.ports.GetPopupResearchersPortOut; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class GetPopupResearchersService implements GetPopupResearchersPortIn { + private final GetPopupResearchersPortOut portOut; + + @Override + public Page operate(Pageable pageable, GetPopupResearchersCmd cmd) { + return portOut.operate(pageable, cmd); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/application/domain/GetPopupResearchers.java b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/application/domain/GetPopupResearchers.java new file mode 100644 index 00000000..3906fcba --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/application/domain/GetPopupResearchers.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.household.getPopupResearchers.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetPopupResearchers { + private Long adminSeq; + private String name; + private String phone; + private String regionMainName; + private Integer householdCount; + private Integer total; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/application/domain/GetPopupResearchersCmd.java b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/application/domain/GetPopupResearchersCmd.java new file mode 100644 index 00000000..d8447cf1 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getPopupResearchers/ports/application/domain/GetPopupResearchersCmd.java @@ -0,0 +1,16 @@ +package app.module.admin.usecase.household.getPopupResearchers.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetPopupResearchersCmd { + private String searchField; + private String searchValue; + private String regionMainCode; +} diff --git a/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml b/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml index 3296b40e..d0444e2c 100644 --- a/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml +++ b/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml @@ -5,6 +5,7 @@ namespace="app.module.admin.usecase.household.createHousehold.adapters.persistence.CreateHouseholdMapper"> + /* createHousehold : 임가 등록 */ SELECT nextval('household_seq') @@ -81,6 +82,7 @@ + /* createHouseholdHasRole : 임가 역할 등록 */ INSERT INTO household_has_role (id, household_seq, role_id, @@ -95,4 +97,22 @@ ) + + + /* createResearcherHasHousehold : 임가 등록 시 담당 조사원 매핑 */ + INSERT INTO researcher_has_household + ( + id, + household_seq, + admin_seq, + + ) + VALUES + ( + nextval('researcher_has_household_seq'), + #{householdSeq}, + #{adminSeq}, + + ) + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/CreateResearcherMappingMapper.xml b/admin/src/main/resources/mappers/household/CreateResearcherMappingMapper.xml new file mode 100644 index 00000000..07dc5eb9 --- /dev/null +++ b/admin/src/main/resources/mappers/household/CreateResearcherMappingMapper.xml @@ -0,0 +1,37 @@ + + + + + + /* deleteResearcherMapping : 조사원 임가 매핑 삭제 */ + UPDATE researcher_has_household + SET + WHERE is_deleted = false + AND household_seq IN + + #{householdSeq} + + + + + /* createResearcherMapping : 조사원 임가 매핑 등록 */ + INSERT INTO researcher_has_household + ( + id, + admin_seq, + household_seq, + + ) + VALUES + + ( + nextval('researcher_has_household_seq'), + #{adminSeq}, + #{householdSeq}, + + ) + + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml b/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml index d3d2e4d0..7111192a 100644 --- a/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml +++ b/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml @@ -6,38 +6,77 @@ \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/GetForestProductsStatusMapper.xml b/admin/src/main/resources/mappers/household/GetForestProductsStatusMapper.xml index f9e95670..58c22ef0 100644 --- a/admin/src/main/resources/mappers/household/GetForestProductsStatusMapper.xml +++ b/admin/src/main/resources/mappers/household/GetForestProductsStatusMapper.xml @@ -16,27 +16,55 @@ /* getHouseholdsStatus : 임가현황 리스트 조회 */ - WITH record_progress AS ( - SELECT ROUND( - 100.0 * - (SELECT COUNT(*) - FROM daily_record - WHERE record_month = #{cmd.recordMonth} AND all_status = 'DONE') - / NULLIF( - (SELECT COUNT(*) - FROM daily_day_group - WHERE end_day <= EXTRACT(DAY FROM CURRENT_DATE)), 0 - ), - 2 - ) AS progress_percent - ) /* 일계부 입력 진행 완료 퍼센테이지 (이번달 작성 완료일 수 / 현재날짜 기준 전체 입력 가능 날짜 수) */ + WITH daily_progress AS ( + /* 임가별 이번달 완료된 일 수 계산 */ + SELECT + household_seq, + COUNT(*) as completed_days + FROM daily_record + WHERE record_month = #{cmd.recordMonth} + AND all_status IN ('DONE', 'TODAY_NONE') + GROUP BY household_seq + ), + total_days AS ( + /* 오늘 날짜 기준 전체 입력 가능 날짜 수 */ + SELECT COUNT(*) as total_possible_days + FROM daily_day_group + WHERE end_day <= EXTRACT(DAY FROM CURRENT_DATE) + ), + visit_summary AS ( + /* 임가별 1차임가방문, 2차임가방문, 답례품전달여부 */ + SELECT + rhh.household_seq, + MIN(v.visit_date) AS first_visit_date, + MAX(v.visit_date) AS second_visit_date, + BOOL_OR(v.is_gift_sent) AS is_gift_sent + FROM household_visit v + JOIN researcher_has_household rhh ON v.household_seq = rhh.household_seq + WHERE rhh.is_deleted = false + AND TO_CHAR(v.visit_date, 'YYYYMM') = #{cmd.recordMonth} + GROUP BY rhh.household_seq + ) SELECT hvr.*, COUNT(*) OVER () AS total FROM ( SELECT - r.admin_seq AS adminSeq, - h.seq AS householdSeq, - h.household_num AS householdNum, - h.owner_name AS householdName, - h.phone AS householdPhone, - h.region_main_code AS regionMainCode, - h.region_main_name AS regionMainName, - h.region_sub_code AS regionSubCode, - h.region_sub_name AS regionSubName, - h.region_detail_code AS regionDetailCode, - h.region_detail_name AS regionDetailName, - h.industry_large_code as industryLargeCode, - h.industry_large_name AS industryLargeName, - h.industry_middle_code as industryMiddleCode, - h.industry_middle_name AS industryMiddleName, - h.is_panel AS isPanel, - ps.progress_percent AS progressPercent, - v.first_visit_date AS firstVisitDate, - v.second_visit_date AS secondVisitDate, - COALESCE(v.is_gift_sent, false) AS isGiftSent, - r.researcher_name AS researcherName, - r.researcher_phone AS researcherPhone + r.admin_seq AS adminSeq, + h.seq AS householdSeq, + h.household_num AS householdNum, + h.owner_name AS householdName, + h.phone AS householdPhone, + h.region_main_code AS regionMainCode, + h.region_main_name AS regionMainName, + h.region_sub_code AS regionSubCode, + h.region_sub_name AS regionSubName, + h.region_detail_code AS regionDetailCode, + h.region_detail_name AS regionDetailName, + h.industry_large_code AS industryLargeCode, + h.industry_large_name AS industryLargeName, + h.industry_middle_code AS industryMiddleCode, + h.industry_middle_name AS industryMiddleName, + h.is_panel AS isPanel, + /* 일계부 입력 진행 완료 퍼센테이지 (이번달 작성 완료일 수 / 현재날짜 기준 전체 입력 가능 날짜 수) */ + ROUND( + 100.0 * COALESCE(dp.completed_days, 0) / NULLIF(td.total_possible_days, 0), + 2 + ) AS progressPercent, + vs.first_visit_date AS firstVisitDate, + vs.second_visit_date AS secondVisitDate, + COALESCE(vs.is_gift_sent, false) AS isGiftSent, + r.researcher_name AS researcherName, + r.researcher_phone AS researcherPhone FROM v_household_with_code h - LEFT JOIN v_household_visit v ON h.seq = v.household_seq + CROSS JOIN total_days td + LEFT JOIN daily_progress dp ON h.seq = dp.household_seq + LEFT JOIN visit_summary vs ON h.seq = vs.household_seq LEFT JOIN v_household_researcher r ON h.seq = r.household_seq - CROSS JOIN record_progress ps ) AS hvr 1=1 - + /* 경영주 검색 */ @@ -69,7 +89,7 @@ - + /* 조사원 검색 */ diff --git a/admin/src/main/resources/mappers/household/GetPopupResearchersMapper.xml b/admin/src/main/resources/mappers/household/GetPopupResearchersMapper.xml new file mode 100644 index 00000000..082fdc48 --- /dev/null +++ b/admin/src/main/resources/mappers/household/GetPopupResearchersMapper.xml @@ -0,0 +1,50 @@ + + + + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/notice/CreateNoticeMapper.xml b/admin/src/main/resources/mappers/notice/CreateNoticeMapper.xml new file mode 100644 index 00000000..e5d1c88a --- /dev/null +++ b/admin/src/main/resources/mappers/notice/CreateNoticeMapper.xml @@ -0,0 +1,59 @@ + + + + + + + + SELECT nextval('notice_seq') + + + INSERT INTO notice ( + id, + content, + end_date, + start_date, + title, + visible, + created_at, + created_by, + updated_at, + updated_by, + is_deleted + ) VALUES ( + #{id}, + #{content}, + #{endDate}, + #{startDate}, + #{title}, + #{visible}, + #{createdAt}, + #{createdBy}, + #{updatedAt}, + #{updatedBy}, + false + ) + + + + + INSERT INTO notice_has_upload_file + ( + notice_id, + upload_files_id, + + ) + VALUES + + ( + #{id}, + #{fileId}, + + ) + + + + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/notice/GetNoticeMapper.xml b/admin/src/main/resources/mappers/notice/GetNoticeMapper.xml new file mode 100644 index 00000000..1a0fb58c --- /dev/null +++ b/admin/src/main/resources/mappers/notice/GetNoticeMapper.xml @@ -0,0 +1,49 @@ + + + + + + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/notice/GetNoticesMapper.xml b/admin/src/main/resources/mappers/notice/GetNoticesMapper.xml new file mode 100644 index 00000000..c0ccc944 --- /dev/null +++ b/admin/src/main/resources/mappers/notice/GetNoticesMapper.xml @@ -0,0 +1,97 @@ + + + + + + + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/notice/RemoveNoticesMapper.xml b/admin/src/main/resources/mappers/notice/RemoveNoticesMapper.xml new file mode 100644 index 00000000..d253a98a --- /dev/null +++ b/admin/src/main/resources/mappers/notice/RemoveNoticesMapper.xml @@ -0,0 +1,26 @@ + + + + + /* deleteNotices : 게시물 삭제 */ + UPDATE notice + SET + WHERE id IN + + #{id} + + + + + /* deleteNoticeHasFiles : 게시물-파일 매핑 논리 삭제 */ + UPDATE notice_has_upload_file + SET + WHERE notice_id IN + + #{id} + + + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/notice/UpdateNoticeMapper.xml b/admin/src/main/resources/mappers/notice/UpdateNoticeMapper.xml new file mode 100644 index 00000000..fa705ec4 --- /dev/null +++ b/admin/src/main/resources/mappers/notice/UpdateNoticeMapper.xml @@ -0,0 +1,45 @@ + + + + + + /* deleteFileUploads 게시글 수정 시, 첨부파일 join 데이터 삭제 */ + UPDATE notice_has_upload_file + SET + + WHERE notice_id = #{noticeId} + + + + /* createFileUploads 게시글 수정 시, 첨부파일 join 데이터 등록 */ + INSERT INTO notice_has_upload_file + ( + notice_id, + upload_files_id, + + ) + VALUES + + ( + #{id}, + #{fileId}, + + ) + + + + + /* updateNotice 게시글 수정 */ + UPDATE notice + SET + content = #{content}, + end_date = #{endDate}, + start_date = #{startDate}, + title = #{title}, + visible = #{visible}, + + WHERE id = #{id} + + \ No newline at end of file diff --git a/admin/src/main/resources/static/ui/uiUtil.js b/admin/src/main/resources/static/ui/uiUtil.js index 06803740..1a3cb59b 100644 --- a/admin/src/main/resources/static/ui/uiUtil.js +++ b/admin/src/main/resources/static/ui/uiUtil.js @@ -37,6 +37,9 @@ let uiUtil = { isoStrToReadable(isoStr) { return isoStr.replace(/T/, ' ').substring(0, 19); }, + isoStrToDateOnly(isoStr) { + return isoStr.split('T')[0]; + }, // Pagination UI 생성 함수 getPagingUI(curPageNo, size, totalPages, moveHandler) { curPageNo = parseInt(curPageNo); @@ -280,6 +283,8 @@ uiUtil.showFileInfo = (input, uploadFile, showImg) => { inputGroup.find('.fileInfo').remove(); + + inputGroup.append(` `); + const fileInfo = inputGroup.find('.fileInfo'); if (!showImg) { fileInfo.find('img').remove(); @@ -453,7 +459,7 @@ const showAudit = (auditItem, createdBy, createdAt, updatedBy, updatedAt) => { }) })(); -const ifNullDash = (value, fallback = '-') => { +const ifNullHyphen = (value, fallback = '-') => { return value !== null && value !== undefined && value !== '' ? value : fallback; } diff --git a/admin/src/main/resources/templates/common/modal-researcher-mapping.html b/admin/src/main/resources/templates/common/modal-researcher-mapping.html index 1fb87610..833d6dfb 100644 --- a/admin/src/main/resources/templates/common/modal-researcher-mapping.html +++ b/admin/src/main/resources/templates/common/modal-researcher-mapping.html @@ -5,6 +5,7 @@
+
@@ -51,9 +52,7 @@ 실사

-
@@ -64,10 +63,10 @@
- -
@@ -75,6 +74,7 @@
+

총 0건

@@ -88,46 +88,8 @@ - - - - - - - - - - - - - - - - - - - - - - + +
담당임가 수
-
- -
-
홍길동010-0000-0000서울40
-
- -
-
홍길동010-0000-0000서울40
-
- -
-
홍길동010-0000-0000서울40
@@ -136,7 +98,7 @@
-
@@ -151,6 +113,8 @@ + + + +
\ No newline at end of file diff --git a/admin/src/main/resources/templates/communication/notice/create.html b/admin/src/main/resources/templates/communication/notice/create.html new file mode 100644 index 00000000..520cc0cf --- /dev/null +++ b/admin/src/main/resources/templates/communication/notice/create.html @@ -0,0 +1,182 @@ + + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
제목* +
+
+ +
+
+
내용* + +
첨부파일* +
+ +
+ + + + +
게시기간* +
+
+
+ +
+
- +
+
+ +
+
+
+ +
노출여부* +
+ +
+
+ +
+
+ + +
+
+
+
+ + +
+ +
+ + + + + + +
+ + \ No newline at end of file diff --git a/admin/src/main/resources/templates/communication/notice/notices.html b/admin/src/main/resources/templates/communication/notice/notices.html new file mode 100644 index 00000000..9d463823 --- /dev/null +++ b/admin/src/main/resources/templates/communication/notice/notices.html @@ -0,0 +1,237 @@ + + + +
+
+ + + + + + + +
+ +
+
+ +
+
+

+ 검색필드 +

+
+
+ +
+
+ +
+
+

+ 검색필드 +

+
+
+
+ +
+
+
+ +
+
+

+ 검색필드 +

+
+
+ +
+
+ +
+ + +
+
+ + +
+
+
+ +
+

총 0건

+ + + + + + + + + + + + + + + +
+
+ +
+
제목게시일게시기간노출
여부
최종수정자
+
+ + +
+ +
+
+ + + + +
+
+
+
+ + +
+ +
+ + + +
+ + \ No newline at end of file diff --git a/admin/src/main/resources/templates/communication/notice/{id}.html b/admin/src/main/resources/templates/communication/notice/{id}.html new file mode 100644 index 00000000..6eb51c31 --- /dev/null +++ b/admin/src/main/resources/templates/communication/notice/{id}.html @@ -0,0 +1,239 @@ + + + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
제목* +
+
+ +
+
+
내용* + +
첨부파일* +
+ +
+ + + + +
게시기간* +
+
+
+ +
+
- +
+
+ +
+
+
+ +
노출여부* +
+ +
+
+ +
+
+ + +
+
+
+
+ + +
+ +
+ + + + + + +
+ + \ No newline at end of file diff --git a/admin/src/main/resources/templates/communication/notices.html b/admin/src/main/resources/templates/communication/notices.html deleted file mode 100644 index 1419696b..00000000 --- a/admin/src/main/resources/templates/communication/notices.html +++ /dev/null @@ -1,9 +0,0 @@ - - - -
-

/communication/notices

-
- - \ No newline at end of file diff --git a/admin/src/main/resources/templates/household/households.html b/admin/src/main/resources/templates/household/households.html index ea0af4c0..48e606d0 100644 --- a/admin/src/main/resources/templates/household/households.html +++ b/admin/src/main/resources/templates/household/households.html @@ -252,7 +252,7 @@
@@ -265,8 +265,8 @@ 업종(대분류) 업종(중분류) 당월 일계부 현황 - 당월 1차 일가방문 - 당월 2차 일가방문 + 당월 1차 임가방문 + 당월 2차 임가방문 답례품 전달 조사원 조사원 휴대전화 @@ -292,7 +292,7 @@ 임가 등록 -
@@ -300,7 +300,7 @@ - +
@@ -330,7 +330,7 @@
@@ -340,14 +340,14 @@ ${ct.regionMainName} ${ct.regionSubName} ${ct.regionDetailName} - ${ifNullDash(ct.industryLargeName)} - ${ifNullDash(ct.industryMiddleName)} + ${ifNullHyphen(ct.industryLargeName)} + ${ifNullHyphen(ct.industryMiddleName)} ${ct.progressPercent}% - ${ifNullDash(ct.firstVisitDate)} - ${ifNullDash(ct.secondVisitDate)} + ${ifNullHyphen(ct.firstVisitDate)} + ${ifNullHyphen(ct.secondVisitDate)} ${ct.isGiftSent ? "전달" : "미전달"} - ${ifNullDash(ct.researcherName)} - ${ifNullDash(ct.researcherPhone)} + ${ifNullHyphen(ct.researcherName)} + ${ifNullHyphen(ct.researcherPhone)} ` ); @@ -398,6 +398,55 @@ f.submit(); } + + + +
\ No newline at end of file diff --git a/admin/src/main/resources/templates/household/households/create.html b/admin/src/main/resources/templates/household/households/create.html index d04c5d50..6dcbfe9f 100644 --- a/admin/src/main/resources/templates/household/households/create.html +++ b/admin/src/main/resources/templates/household/households/create.html @@ -201,7 +201,7 @@
- +
+
+
+

지출의 종류

+ +
+
+
    + +
  • +
  • +
    +
+
+
+
+ + +
+
+ +
+
    +
  • +
+ +
+
+ +
+
+ +
+
+ +
+
+ + +
+ +
+ +
+
+ +
+
+ +
+
    +
  • 예 : 2, 2.5
  • +
+
+ +
+
+

+ 단위 +

+
+
+ + +
+
+

단위

+ +
+
+
    + +
  • option1 +
  • +
    +
+
+
+
+
+ + + + + +
+ +
+ +
+ +
+
+ +
+
+ + 원 +
+ +
    +
  • 예 : 30000
  • +
+
+
+ +
+
+ +
+
+ + + + + + + + \ No newline at end of file diff --git a/front/src/main/resources/templates/info/monthly/form.html b/front/src/main/resources/templates/info/monthly/form.html index df478c95..c7f8a01a 100644 --- a/front/src/main/resources/templates/info/monthly/form.html +++ b/front/src/main/resources/templates/info/monthly/form.html @@ -40,37 +40,19 @@ -
-
-

+

+
+
-
- - -
-
-

지목

- -
-
-
    - -
  • option1 -
  • -
    -
-
-
+
+
+ +
@@ -170,6 +152,12 @@
+ +
@@ -222,6 +210,12 @@
+ + @@ -274,6 +268,12 @@ + + @@ -326,6 +326,12 @@ + +
diff --git a/front/src/main/resources/templates/info/monthly/{id}.html b/front/src/main/resources/templates/info/monthly/{id}.html index 2342e0c7..29c9eac8 100644 --- a/front/src/main/resources/templates/info/monthly/{id}.html +++ b/front/src/main/resources/templates/info/monthly/{id}.html @@ -123,7 +123,6 @@ elementRefs: { noDataCheckbox: document.getElementById("forestProductStatus"), select:{ - landTypeSelect : null, mainYieldUnitCodeSelect : null, mainSaleUnitCodeSelect : null, subYieldUnitCodeSelect : null, @@ -308,7 +307,7 @@ $('.addPopup').find('.modal-content-inner').html(rstHtml); const selectConfigs = [ - { id: 'landTypeSelect', targetId: 'landType', key: 'landTypeSelect' }, + { id: 'mainYieldUnitCodeSelect', targetId: 'mainYieldUnitCode', key: 'mainYieldUnitCodeSelect' }, { id: 'mainSaleUnitCodeSelect', targetId: 'mainSaleUnitCode', key: 'mainSaleUnitCodeSelect' }, { id: 'subYieldUnitCodeSelect', targetId: 'subYieldUnitCode', key: 'subYieldUnitCodeSelect' }, @@ -321,11 +320,27 @@ selectBox.core.init($select, { selectItemCallback({ selectValue, dataValue }) { document.querySelector(`#${targetId}`).value = dataValue; + + const withoutCode = targetId.replace(/Code$/, ''); + console.log(withoutCode); + if(dataValue == "code.record.unit.self") { + console.log(dataValue + "close") + document.querySelector('#'+withoutCode).value=""; + document.querySelector('#'+withoutCode+'Div').style.display ='block'; + } else { + console.log(dataValue + "close") + document.querySelector('#'+withoutCode).value=""; + document.querySelector('#'+withoutCode+'Div').style.display ='none'; + } } }); ENV.elementRefs.select[key] = selectBox; }); + + ENV.module.modalPopup.open(); + + document.querySelector('.modal-content').scrollTop = 0; }, function(code, rstData) { kri.logger.error('Do nothing. code: '+ code, rstData); @@ -351,7 +366,7 @@ //등록 아이템 저장 saveFormData() { const form = document.getElementById('forestForm'); - const selects = ['landType', 'mainYieldUnitCode', 'mainSaleUnitCode', 'subYieldUnitCode', 'subSaleUnitCode']; + const selects = ['mainYieldUnitCode', 'mainSaleUnitCode', 'subYieldUnitCode', 'subSaleUnitCode']; selects.forEach(id => { const sel = document.getElementById(id + 'Select'); if (sel && sel.value) form[id].value = sel.value; @@ -359,22 +374,70 @@ const errors = []; if (!form.cropName.value) errors.push({field: 'cropName', message: '재배 작물명을 입력해주세요.'}); - if (form.mainYield.value && !form.mainYieldUnitCode.value) errors.push({ - field: 'mainYieldUnitCode', - message: '단위를 선택해주세요.' - }); - if (form.mainSaleAmount.value && !form.mainSaleUnitCode.value) errors.push({ - field: 'mainSaleUnitCode', - message: '단위를 선택해주세요.' - }); - if (form.subYield.value && !form.subYieldUnitCode.value) errors.push({ - field: 'subYieldUnitCode', - message: '단위를 선택해주세요.' - }); - if (form.subSaleAmount.value && !form.subSaleUnitCode.value) errors.push({ - field: 'subSaleUnitCode', - message: '단위를 선택해주세요.' - }); + + + if(form.mainYield.value){ + if(!form.mainYieldUnitCode.value){ + errors.push({ + field: 'mainYieldUnitCode', + message: '단위를 선택해주세요.' + }); + } else if (form.mainYieldUnitCode.value && form.mainYieldUnitCode.value =="code.record.unit.self" && !form.mainYieldUnit.value){ + + errors.push({ + field: 'mainYieldUnit', + message: '단위를 입력해주세요.' + }); + } + } + + if(form.mainSaleAmount.value){ + if(!form.mainSaleUnitCode.value){ + errors.push({ + field: 'mainSaleUnitCode', + message: '단위를 선택해주세요.' + }); + } else if (form.mainSaleUnitCode.value && form.mainSaleUnitCode.value =="code.record.unit.self" && !form.mainSaleUnit.value){ + + errors.push({ + field: 'mainSaleUnit', + message: '단위를 입력해주세요.' + }); + } + } + + + if(form.subYield.value){ + if(!form.subYieldUnitCode.value){ + errors.push({ + field: 'subYieldUnitCode', + message: '단위를 선택해주세요.' + }); + } else if (form.subYieldUnitCode.value && form.subYieldUnitCode.value =="code.record.unit.self" && !form.subYieldUnit.value){ + + errors.push({ + field: 'subYieldUnit', + message: '단위를 입력해주세요.' + }); + } + } + + + if(form.subSaleAmount.value){ + if(!form.subSaleUnitCode.value){ + errors.push({ + field: 'subSaleUnitCode', + message: '단위를 선택해주세요.' + }); + } else if (form.subSaleUnitCode.value && form.subSaleUnitCode.value =="code.record.unit.self" && !form.subSaleUnit.value){ + + errors.push({ + field: 'subSaleUnit', + message: '단위를 입력해주세요.' + }); + } + } + kri.form.error(errors); if (errors.length > 0) return; @@ -405,14 +468,32 @@ const form = document.getElementById('forestForm'); Object.entries(product).forEach(([key, val]) => { const field = form.elements.namedItem(key); - if (field) field.value = val; + if (field) { + field.value = val; + if(key == 'mainYieldUnitCode' && val == "code.record.unit.self"){ + document.getElementById("mainYieldUnitDiv").style.display = "block"; + } + if(key == 'mainSaleUnitCode' && val == "code.record.unit.self"){ + document.getElementById("mainSaleUnitDiv").style.display = "block"; + } + if(key == 'subYieldUnitCode' && val == "code.record.unit.self"){ + document.getElementById("subYieldUnitDiv").style.display = "block"; + } + if(key == 'subSaleUnitCode' && val == "code.record.unit.self"){ + document.getElementById("subSaleUnitDiv").style.display = "block"; + } + } }); - ENV.elementRefs.select.landTypeSelect.setValue(product.landType); + ENV.elementRefs.select.mainYieldUnitCodeSelect.setValue(product.mainYieldUnitCode); ENV.elementRefs.select.mainSaleUnitCodeSelect.setValue(product.mainSaleUnitCode); ENV.elementRefs.select.subYieldUnitCodeSelect.setValue(product.subYieldUnitCode); ENV.elementRefs.select.subSaleUnitCodeSelect.setValue(product.subSaleUnitCode); + document.getElementById("mainYieldUnit").value = product.mainYieldUnit; + document.getElementById("mainSaleUnit").value = product.mainSaleUnit; + document.getElementById("subYieldUnit").value = product.subYieldUnit; + document.getElementById("subSaleUnit").value = product.subSaleUnit; },100); @@ -439,9 +520,13 @@ return found ? found.codeText : '-'; }, // 단위 코드 - getUnitLabel(code) { - const found = ENV.data.unitList.find(i => i.id === code); - return found ? found.codeText : '-'; + getUnitLabel(code,inputValue) { + if(code == "code.record.unit.self"){ + return inputValue; + } else { + const found = ENV.data.unitList.find(i => i.id === code); + return found ? found.codeText : '-'; + } }, @@ -485,6 +570,12 @@ const getUnit = formControl.getUnitLabel; const getPurpose = formControl.getPurposeLabel; + // const mainYieldUnit = !product.mainYieldUnitCode ? '' + // const mainSaleUnit + // const subYieldUnit + // const subSaleUnit + + const tag1 = product.landArea ? `${format(product.landArea)}평` : ''; let tag2 = ''; @@ -492,25 +583,25 @@ else if (product.town) tag2 = `
  • ${product.town}
  • `; else if (product.streetNum) tag2 = `
  • ${product.streetNum}
  • `; - const tag3 = product.landType ? `
  • 지목

    ${getPurpose(product.landType)}
  • ` : ''; + const tag3 = product.landType ? `
  • 지목

    ${product.landType}
  • ` : ''; const tag4 = product.availableArea ? `
  • 가능면적

    ${format(product.availableArea)}평
  • ` : ''; let tag5 = ''; if (product.mainYield && product.mainSaleAmount) { - tag5 = `
  • 주생산물 수확량 / 판매량

    ${format(product.mainYield)}${getUnit(product.mainYieldUnitCode)} / ${format(product.mainSaleAmount)}${getUnit(product.mainSaleUnitCode)}
  • `; + tag5 = `
  • 주생산물 수확량 / 판매량

    ${format(product.mainYield)}${getUnit(product.mainYieldUnitCode,product.mainYieldUnit)} / ${format(product.mainSaleAmount)}${getUnit(product.mainSaleUnitCode,product.mainSaleUnit)}
  • `; } else if (product.mainYield) { - tag5 = `
  • 주생산물 수확량

    ${format(product.mainYield)}${getUnit(product.mainYieldUnitCode)}
  • `; + tag5 = `
  • 주생산물 수확량

    ${format(product.mainYield)}${getUnit(product.mainYieldUnitCode,product.mainYieldUnit)}
  • `; } else if (product.mainSaleAmount) { - tag5 = `
  • 주생산물 판매량

    ${format(product.mainSaleAmount)}${getUnit(product.mainSaleUnitCode)}
  • `; + tag5 = `
  • 주생산물 판매량

    ${format(product.mainSaleAmount)}${getUnit(product.mainSaleUnitCode,product.mainSaleUnit)}
  • `; } let tag6 = ''; if (product.subYield && product.subSaleAmount) { - tag6 = `
  • 부생산물 수확량 / 판매량

    ${format(product.subYield)}${getUnit(product.subYieldUnitCode)} / ${format(product.subSaleAmount)}${getUnit(product.subSaleUnitCode)}
  • `; + tag6 = `
  • 부생산물 수확량 / 판매량

    ${format(product.subYield)}${getUnit(product.subYieldUnitCode,product.subYieldUnit)} / ${format(product.subSaleAmount)}${getUnit(product.subSaleUnitCode,product.subSaleUnit)}
  • `; } else if (product.subYield) { - tag6 = `
  • 부생산물 수확량

    ${format(product.subYield)}${getUnit(product.subYieldUnitCode)}
  • `; + tag6 = `
  • 부생산물 수확량

    ${format(product.subYield)}${getUnit(product.subYieldUnitCode,product.subYieldUnit)}
  • `; } else if (product.subSaleAmount) { - tag6 = `
  • 부생산물 판매량

    ${format(product.subSaleAmount)}${getUnit(product.subSaleUnitCode)}
  • `; + tag6 = `
  • 부생산물 판매량

    ${format(product.subSaleAmount)}${getUnit(product.subSaleUnitCode,product.subSaleUnit)}
  • `; } let buttonGroupHtml = ''; diff --git a/front/src/main/resources/templates/record/calendar.html b/front/src/main/resources/templates/record/calendar.html index f0dfa54e..65b058e1 100644 --- a/front/src/main/resources/templates/record/calendar.html +++ b/front/src/main/resources/templates/record/calendar.html @@ -24,399 +24,653 @@
    - @@ -445,20 +699,21 @@ }; let formControl = { - setDetail(searchMonth, rowdata, currentDate, viewDate) { - console.log(typeof rowdata, searchMonth, rowdata.no, rowdata.children) - let todoList = []; + setDetail(rowdata, currentDate, viewDate) { + const searchMonth = viewDate.getFullYear().toString() + (viewDate.getMonth() + 1).toString().padStart(2, '0'); + let rowList = []; let etcList = []; - if (typeof rowdata === 'object' && rowdata.children !== undefined) { - todoList = rowdata.children.filter(f => !(f.code === 'MONTHLY' || f.code === 'BANK')); + if (rowdata == null) { + kri.logger.error('달력 선택 데이터 없음.') + } + if (rowdata != null && typeof rowdata === 'object' && rowdata.children !== undefined) { + rowList = rowdata.children.filter(f => !(f.code === 'MONTHLY' || f.code === 'BANK')); etcList = rowdata.children.filter(f => f.code === 'MONTHLY' || f.code === 'BANK'); } - console.log(todoList) - console.log(etcList) let tmpl = $.templates('#dailyNoneTmpl'); let html = ''; - if (todoList === undefined || todoList.length === 0) { + if (rowList === undefined || rowList.length === 0) { html = tmpl.render({ month: searchMonth, no: rowdata.no, @@ -471,7 +726,7 @@ month: searchMonth, no: rowdata.no, date: currentDate, - list: todoList, + list: rowList, etcList: etcList, }); } @@ -512,7 +767,7 @@ + + + \ No newline at end of file diff --git a/front/src/main/resources/templates/record/daily/finish.html b/front/src/main/resources/templates/record/daily/finish.html new file mode 100644 index 00000000..e6ec3c08 --- /dev/null +++ b/front/src/main/resources/templates/record/daily/finish.html @@ -0,0 +1,52 @@ + + + +
    +
    +
    +
    + +

    + 일계부 등록이
    + 종료 되었습니다. +

    +

    + 추가 입력 없이 등록 절차를 마쳤습니다.
    + 항목에 대한 '추가/수정/삭제'는 일계부에서 가능합니다. +

    +
    + +
    +
    +
    +
    +

    [[${item.desc}]]

    +
    +
      +
    • +

      없음

      +
    • +
    +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    + +
    + +
    + + \ No newline at end of file diff --git a/front/src/main/resources/templates/record/daily.html b/front/src/main/resources/templates/record/daily/index.html similarity index 87% rename from front/src/main/resources/templates/record/daily.html rename to front/src/main/resources/templates/record/daily/index.html index 39cefb1a..a82fb67e 100644 --- a/front/src/main/resources/templates/record/daily.html +++ b/front/src/main/resources/templates/record/daily/index.html @@ -60,7 +60,7 @@
    - + +
    @@ -115,8 +120,8 @@ httpUrl: { create: /*[[|/api/record/daily/${reqVO.searchMonth}/${reqVO.groupNo}|]]*/'createUrl', }, - month: [[${reqVO.searchMonth}]], - groupNo: [[${reqVO.groupNo}]], + month: /*[[${reqVO.searchMonth}]]*/'month', + groupNo: /*[[${reqVO.groupNo}]]*/'groupNo', submitted: false, }; @@ -140,17 +145,17 @@ let message = ', 등록하실 항목이 없나요?'; let $messageWrap = $('#content .tit-group h3'); - if ($messageWrap.data('start').indexOf($messageWrap.data('end')) !== -1) { + if ($messageWrap.data('start').indexOf($messageWrap.data('end')) === -1) { message = $messageWrap.data('start') + '~' + $messageWrap.data('end') + message; } else { message = $messageWrap.data('start') + message; } etUI.dialog.alert({ - title: "등록 항목 확인", + title: '등록 항목 확인', message: message, - type: "confirm", - dialogType: "confirm", + type: 'confirm', + dialogType: 'confirm', callback: function () { formControl.create(); }, @@ -159,7 +164,8 @@ create() { const f = document.reqForm; - if ($(f).find('input:checked').length === 0) { + const $checked = $(f).find('input:checked'); + if ($checked.length === 0) { f.todayNone.value = 'Y'; } @@ -169,9 +175,15 @@ obj, function () { if (f.todayNone.value === 'Y') { - krip.daily.goToMain(); + if ($('._nextStep').data('last')) { + krip.daily.goToNext('LAST', ENV.month, ENV.groupNo); + } else { + krip.daily.goToDone(ENV.month, ENV.groupNo); + } + } else if ($checked.data('target') !== undefined) { + krip.daily.goToNext($checked.data('target'), ENV.month, ENV.groupNo); } else { - krip.daily.goToNext($('input:checked').eq(0).data('target'), ENV.month, ENV.groupNo); + krip.daily.goToMain(); } }, ); diff --git a/front/src/main/resources/templates/record/expense/index.html b/front/src/main/resources/templates/record/expense/index.html index edccc0c7..12e20794 100644 --- a/front/src/main/resources/templates/record/expense/index.html +++ b/front/src/main/resources/templates/record/expense/index.html @@ -92,13 +92,15 @@ -
    +
    @@ -106,7 +108,7 @@
    -
    +
    + + +
    @@ -143,7 +148,7 @@ // 등록 버튼 selectorId: '.button-modal01', // 등록 영역 - selector: '.modal01', + selector: '.formModal', }, month: /*[[${reqVO.searchMonth}]]*/'month', groupNo: /*[[${reqVO.groupNo}]]*/'groupNo', @@ -165,10 +170,7 @@ console.log('selectItemCallback', selectValue, dataValue) $('input[name="unitCode"]').val(dataValue) - // TODO : ui js 에서 show 적용유무 파악하기 - if (dataValue === 'code.record.unit.self') { - $('#unitCode').parent().find('.component-input').addClass('show'); - } + etUI.pages.initDirectInputToggle(); } }); @@ -220,16 +222,7 @@ ENV.httpUrl.create.replace('{id}', f.id.value ? f.id.value : '0'), obj, function (rstData, status) { - console.log('rstData', rstData) location.reload(); - // TODO : next - /* - if (f.todayNone.value === 'Y') { - krip.daily.goToMain(); - } else { - krip.daily.goToNext($('input:checked').eq(0).data('target'), ENV.month, ENV.groupNo); - } - */ }, ); }, diff --git a/front/src/main/resources/templates/record/income/index.html b/front/src/main/resources/templates/record/income/index.html index de1251bd..a7b5387b 100644 --- a/front/src/main/resources/templates/record/income/index.html +++ b/front/src/main/resources/templates/record/income/index.html @@ -96,13 +96,15 @@ -
    +
    @@ -110,7 +112,7 @@
    -
    +
    + + +
    @@ -147,7 +152,7 @@ // 등록 버튼 selectorId: '.button-modal01', // 등록 영역 - selector: '.modal01', + selector: '.formModal', }, month: /*[[${reqVO.searchMonth}]]*/'month', groupNo: /*[[${reqVO.groupNo}]]*/'groupNo', @@ -178,12 +183,7 @@ console.log('selectItemCallback', selectValue, dataValue) $('input[name="unitCode"]').val(dataValue) - // TODO : ui js 에서 show 적용유무 파악하기 - /* - if (dataValue === 'code.record.unit.self') { - $('#unitCode').parent().find('.component-input').addClass('show'); - } - */ + etUI.pages.initDirectInputToggle(); } }); @@ -240,16 +240,7 @@ ENV.httpUrl.create.replace('{id}', f.id.value ? f.id.value : '0'), obj, function (rstData, status) { - console.log('rstData', rstData) location.reload(); - // TODO : next - /* - if (f.todayNone.value === 'Y') { - krip.daily.goToMain(); - } else { - krip.daily.goToNext($('input:checked').eq(0).data('target'), ENV.month, ENV.groupNo); - } - */ }, ); }, diff --git a/front/src/main/resources/templates/record/power/form.html b/front/src/main/resources/templates/record/power/form.html new file mode 100644 index 00000000..ac4ec902 --- /dev/null +++ b/front/src/main/resources/templates/record/power/form.html @@ -0,0 +1,77 @@ + + + + + + + + \ No newline at end of file diff --git a/front/src/main/resources/templates/record/power/index.html b/front/src/main/resources/templates/record/power/index.html new file mode 100644 index 00000000..04feb6b0 --- /dev/null +++ b/front/src/main/resources/templates/record/power/index.html @@ -0,0 +1,251 @@ + + + +
    +
    +
    +
    +

    + + [[${#temporals.format(dailyRecord.startDate, 'M월 d일')}]],
    +
    + + [[${#temporals.format(dailyRecord.startDate, 'M월 d')}]]~[[${#temporals.format(dailyRecord.endDate, 'd일')}]],
    +
    + 동력 사용내역 [[${#lists.isEmpty(incomeList) ? 0 : #lists.size(incomeList)}]]건 등록
    + 되었습니다. +

    +

    동력 사용내역을 등록해 주세요.

    +
    + + + + +
    + +
    +
    + + +
    +

    + 총 [[${#lists.size(incomeList)}]]건 + +

    +
    +
    +
    +

    [[${item.categorySelf}]]

    +
    + + +
    +
    +
      +
    • +

      외상판매

      + 아니오 +
    • +
    • +

      재배형태

      + 재배형태 +
    • +
    • +

      수입원

      + 소비자 +
    • +
    • +

      수량

      + 500g +
    • +
    • +

      현금

      + 302,000원 +
    • +
    • +

      현물평가액

      + 302,000원 +
    • +
    +
    +
    + +
    +
    +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + + + +
    + +
    + + +
    + + \ No newline at end of file