diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java index a746c5ad..4b9a68a9 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java @@ -54,6 +54,11 @@ public class ResearcherDao implements ResearcherPortOut { return new PageImpl<>(result, pageable, total); } + @Override + public VisitHouseholdPercentageDto selectVisitHouseholdPercentage(ResearchersDetailReqVO reqVO) { + return researcherMapper.selectVisitHouseholdPercentage(reqVO); + } + @Override public Page visitHouseholdList(ResearchersDetailReqVO reqVO) { List result = researcherMapper.visitHouseholdList(reqVO); diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherMapper.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherMapper.java index da23f937..0eb5e6d4 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherMapper.java @@ -22,6 +22,7 @@ public interface ResearcherMapper { ResearchersHouseholdVisitDto visitHouseholdDetail(Integer id); Long visitHouseholdListCountAll(ResearchersDetailReqVO reqVO); Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO); + VisitHouseholdPercentageDto selectVisitHouseholdPercentage(ResearchersDetailReqVO reqVO); Integer visitHouseholdDelete(@Param("selectIds") List selectIds,@Param("deletedBy") String deletedBy); void deleteHouseholdResearcherMapping(@Param("researcherSeq") Integer researcherSeq, @Param("householdSeq") Integer householdSeq, @Param("deletedBy") String deletedBy); Integer insertHouseholdResearcherMapping(@Param("researcherSeq") Integer researcherSeq, @Param("householdSeq") Integer householdSeq, @Param("createdBy") String createdBy); diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/VisitHouseholdPercentageDto.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/VisitHouseholdPercentageDto.java new file mode 100644 index 00000000..ccb8604e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/VisitHouseholdPercentageDto.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.researcher.adpaters.persistence.model; + +import lombok.Data; + +@Data +public class VisitHouseholdPercentageDto { + private Integer totalHouseholdCount; + private Integer firstVisitCount; + private Integer secondVisitCount; + private Integer giftSentCount; + private Double firstVisitPercentage; + private Double secondVisitPercentage; + private Double giftSentPercentage; +} diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java index d9a4ea86..b96e643f 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java @@ -29,6 +29,11 @@ class ResearcherApiController { return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.mappingHouseholdList(reqVO)); } + @GetMapping(path = "/visitHousehold/percentage") + ResponseEntity selectVisitHouseholdPercentage( @ModelAttribute ResearchersDetailReqVO reqVO) { + return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.selectVisitHouseholdPercentage(reqVO)); + } + @GetMapping(path = "/visitHousehold/list") ResponseEntity visitHouseholdList( @ModelAttribute ResearchersDetailReqVO reqVO) { return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.visitHouseholdList(reqVO)); diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java index e5e2652f..3ac93585 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java @@ -11,6 +11,7 @@ public interface ResearcherPortIn { ResearchersDto detail(Integer adminSeq); Page mappingHouseholdList(ResearchersDetailReqVO reqVO); Page visitHouseholdList(ResearchersDetailReqVO reqVO); + VisitHouseholdPercentageDto selectVisitHouseholdPercentage(ResearchersDetailReqVO reqVO); Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO); ResearchersHouseholdVisitPopUpDto visitHouseholdDetail(Integer id); Integer visitHouseholdDelete(List selectIds); diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortOut.java b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortOut.java index caf95b57..161a2971 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortOut.java @@ -10,6 +10,7 @@ public interface ResearcherPortOut { Page list(ResearchersListReqVO reqVO); ResearchersDto detail(Integer adminSeq); Page mappingHouseholdList(ResearchersDetailReqVO reqVO); + VisitHouseholdPercentageDto selectVisitHouseholdPercentage(ResearchersDetailReqVO reqVO); Page visitHouseholdList(ResearchersDetailReqVO reqVO); Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO); ResearchersHouseholdVisitPopUpDto visitHouseholdDetail(Integer id); diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/ports/application/ResearcherService.java b/admin/src/main/java/app/module/admin/usecase/researcher/ports/application/ResearcherService.java index c590aab5..d992bc91 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/ports/application/ResearcherService.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/ports/application/ResearcherService.java @@ -35,6 +35,11 @@ class ResearcherService implements ResearcherPortIn { return portOut.visitHouseholdList(reqVO); } + @Override + public VisitHouseholdPercentageDto selectVisitHouseholdPercentage(ResearchersDetailReqVO reqVO) { + return portOut.selectVisitHouseholdPercentage(reqVO); + } + @Override public Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO) { return portOut.updateVisitHousehold(reqVO); diff --git a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml index f5c8a24e..d3fe3f15 100644 --- a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml +++ b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml @@ -121,9 +121,8 @@ case rhv.is_gift_sent when false then '전달완료' when true then '-' end is_gift_sent_flag, rhv.created_at from household_visit rhv - join researcher_has_household rhh on rhh.household_seq = rhv.household_seq - join household h on rhh.household_seq = h.seq - join admin a on a.seq = rhh.admin_seq + join household h on rhv.household_seq = h.seq + join researcher_has_household rhh on rhh.household_seq = h.seq and rhh.is_deleted = false where rhv.is_deleted = false and rhh.admin_seq = #{seq} @@ -134,6 +133,66 @@ LIMIT #{size} OFFSET #{page}*#{size} + + `); + ``);*/ // 업로드 파일 정보 보이기 uiUtil.showFileInfo(input, res, $(input).attr('accept') === 'image/*'); @@ -274,18 +276,16 @@ uiUtil.uploadFile = (fileUploadType, input) => { * @param {boolean} showImg 미리보기 이미지 노출 여부 */ uiUtil.showFileInfo = (input, uploadFile, showImg) => { - const inputGroup = $(input).parent('.input-group'); + const inputGroup = $(input).parent().parent().find('.input-group'); if (!inputGroup.length) { alert( `${input.name} 앨리먼트의 부모가 input-group 클래스를 가져야 showFileInfo 메서드를 실행할 수 있습니다.`); return; } - inputGroup.find('.fileInfo').remove(); + /* inputGroup.find('.fileInfo').remove();*/ - - - inputGroup.append(` +/* inputGroup.append(` - `); + `);*/ + + inputGroup.append(` + `); + const fileInfo = inputGroup.find('.fileInfo'); - if (!showImg) { +/* if (!showImg) { fileInfo.find('img').remove(); - } + }*/ // 파일 삭제 함수 정의 - inputGroup.find('.resetFile').on('click', () => { - let fileInput = inputGroup.find('input[type=file]'); - fileInput.replaceWith(` - - `); - - inputGroup.find('input[name=fileMappingId]').remove(); - inputGroup.find('.fileInfo').fadeOut((evt) => { - $(evt.target).remove(); + inputGroup.find('.resetFile').on('click', function () { + const $fileInfo = $(this).closest('.fileInfo'); + $fileInfo.fadeOut(function () { + $(this).remove(); }); - return false; }); diff --git a/admin/src/main/resources/templates/communication/notice/{id}.html b/admin/src/main/resources/templates/communication/notice/{id}.html index 6eb51c31..9f248ec7 100644 --- a/admin/src/main/resources/templates/communication/notice/{id}.html +++ b/admin/src/main/resources/templates/communication/notice/{id}.html @@ -14,11 +14,11 @@ 제목* -
-
- -
+
+
+
+
@@ -28,20 +28,28 @@ - 첨부파일* + 첨부파일 +
+ +

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

+
    + +
+
+ + - 게시기간* @@ -57,11 +65,9 @@
- - 노출여부* @@ -75,8 +81,6 @@ - - @@ -102,7 +106,6 @@