From b77319e9fb0fa49c09f7981e5445f0efd887ceaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Tue, 24 Jun 2025 18:58:50 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EC=9E=84=EA=B0=80=EB=B0=A9=EB=AC=B8?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EB=B0=A9=EB=AC=B8=20=EB=B9=84=EC=9C=A8=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adpaters/persistence/ResearcherDao.java | 5 ++ .../persistence/ResearcherMapper.java | 1 + .../model/VisitHouseholdPercentageDto.java | 14 +++ .../adpaters/web/ResearcherApiController.java | 5 ++ .../researcher/ports/ResearcherPortIn.java | 1 + .../researcher/ports/ResearcherPortOut.java | 1 + .../ports/application/ResearcherService.java | 5 ++ .../mappers/researcher/ResearcherMapper.xml | 65 +++++++++++++- .../templates/researcher/detail.html | 85 ++++++++++++++----- 9 files changed, 160 insertions(+), 22 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/model/VisitHouseholdPercentageDto.java 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} + + - - 임가번호 - 경영주명 - 방문일 - 관리분야 - 내용 - 작성일 - 답례품 전달 - - - - - + + + + + + + + + + + + + + + + +
+ + 임가번호경영주명방문일관리분야내용작성일답례품 전달
@@ -169,6 +186,7 @@ if (!form.searchMonth.value) { form.searchMonth.value = '[[${currentMonth}]]'; // 기본값 복원 } + getVisitHouseholdPercentage(); getHouseholdVisitList(0); } }); @@ -241,6 +259,35 @@ ); } + // 임가 방문 퍼센트 + const getVisitHouseholdPercentage=()=>{ + const f = document.householdReqForm; + + let dataObj = { + seq: f.seq.value, + searchMonth: f.searchMonth.value, + }; + ajaxUtil._ajaxMethod( + '/api/researcher/visitHousehold/percentage', + dataObj, + function (response) { + $('#firstVisitCount').text(response.firstVisitCount); + $('#secondVisitCount').text(response.secondVisitCount); + $('#giftSentCount').text(response.giftSentCount); + $('#firstVisitPercentage').text(response.firstVisitPercentage); + $('#secondVisitPercentage').text(response.secondVisitPercentage); + $('#giftSentPercentage').text(response.giftSentPercentage); + $('.totalHouseholdCount').text(response.totalHouseholdCount); + }, + function (code, rstData) { + + }, + 'get', + 'json', + null + ); + } + // 임가 방문 정보 const getHouseholdVisitList = (pageNo) => { const f = document.householdReqForm; @@ -346,7 +393,7 @@ JSON.stringify(selectIds), function (response) { if(response > 0){ - alert('선택한 임가정보가 삭제되었습니다.'); + alert('선택한 임가 방문 정보가 삭제되었습니다.'); getHouseholdVisitList(document.householdReqForm.page.value); } else { alert('삭제에 실패했습니다.'); From b4b06d96b53a66bac682069807bd7dd32f130216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Tue, 24 Jun 2025 19:07:20 +0900 Subject: [PATCH 2/4] =?UTF-8?q?ui=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/uiCode/uiCodeList.html | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/admin/src/main/resources/templates/uiCode/uiCodeList.html b/admin/src/main/resources/templates/uiCode/uiCodeList.html index 3a90da90..f17195eb 100644 --- a/admin/src/main/resources/templates/uiCode/uiCodeList.html +++ b/admin/src/main/resources/templates/uiCode/uiCodeList.html @@ -98,11 +98,15 @@ -
- +
+
+
+ +
+
@@ -231,13 +235,17 @@ const previouslySelected = treeWrap.querySelector('button.selected'); if (previouslySelected) { previouslySelected.classList.remove('selected'); - if (previouslySelected.classList.contains('tit')) { + /* if (previouslySelected.classList.contains('tit')) { previouslySelected.parentNode.classList.add('folding'); - } + }*/ } button.classList.add('selected'); if (button.classList.contains('tit')) { - button.parentNode.classList.remove('folding'); + if(button.parentNode.classList.contains('folding')){ + button.parentNode.classList.remove('folding'); + }else{ + button.parentNode.classList.add('folding'); + } } // 노드 데이터 추출 const data = { From 04229757dc7229d1fcfc7fbce8af152b67cac21e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Tue, 24 Jun 2025 20:31:48 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=97=85=EB=A1=9C?= =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/main/resources/static/ui/uiUtil.js | 51 +++++++++--------- .../templates/communication/notice/{id}.html | 54 +++++++++---------- 2 files changed, 50 insertions(+), 55 deletions(-) diff --git a/admin/src/main/resources/static/ui/uiUtil.js b/admin/src/main/resources/static/ui/uiUtil.js index 01e3e488..4275841c 100644 --- a/admin/src/main/resources/static/ui/uiUtil.js +++ b/admin/src/main/resources/static/ui/uiUtil.js @@ -211,7 +211,9 @@ uiUtil.uploadFile = (fileUploadType, input) => { return; } - const inputGroup = $(input).parent('.input-group'); + + const inputGroup = $(input).parent().parent().find('.input-group'); + if (!inputGroup.length) { alert( `${input.name} 앨리먼트의 부모가 input-group 클래스를 가져야 uiUtil.uploadFile 메서드를 실행할 수 있습니다.`); @@ -246,11 +248,11 @@ uiUtil.uploadFile = (fileUploadType, input) => { inputGroup.find('.invalid-feedback').text(''); // 기존 mappingId 가 있다면 초기화 - inputGroup.find('input[name=fileMappingId]').remove(); + /* inputGroup.find('input[name=fileMappingId]').remove();*/ - // 신규 mappingId 추가 +/* // 신규 mappingId 추가 inputGroup.append( - ``); + ``);*/ // 업로드 파일 정보 보이기 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 @@