From 7e39886612e6459ce3465eae53355dc57b6fd042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Sat, 14 Jun 2025 10:54:26 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EB=8B=A4=EC=8B=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../researcher/web/ResearcherController.java | 2 +- .../mappers/researcher/ResearcherMapper.xml | 40 +++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherController.java b/admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherController.java index 86735b80..72a8c8db 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherController.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/web/ResearcherController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping; @Controller @RequiredArgsConstructor @RequestMapping(path = "/researcher") -class ResearchersController { +class ResearcherController { private final UICodeListPortIn uiCodeListPortIn; private final ResearcherService researcherService; diff --git a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml index b15eae14..8e474340 100644 --- a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml +++ b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml @@ -5,12 +5,12 @@ select - a.id, - a.name, - a.phone, - u.code_text AS region_main_code_name, + a.id, + a.name, + a.phone, + u.code_text AS region_main_code_name, case a.account_disabled when false then '활성화' when true then '비활성화' end account_disabled_flag from admin a join admin_has_role ahr ON a.seq = ahr.admin_seq @@ -66,16 +66,16 @@ select + a.seq, a.id, COUNT(rhh.id) AS household_count, a.name, @@ -87,6 +88,49 @@ and a.seq = #{adminSeq} + LIMIT #{size} OFFSET #{page}*#{size} + + + + + + + + \ No newline at end of file diff --git a/admin/src/main/resources/templates/researcher/detail.html b/admin/src/main/resources/templates/researcher/detail.html new file mode 100644 index 00000000..a1e94808 --- /dev/null +++ b/admin/src/main/resources/templates/researcher/detail.html @@ -0,0 +1,317 @@ + + + +
+
+ + + + + + + + + + + + + + + + + + +
아이디 + + 이름 + + 휴대폰번호 + +
실사 + + 계정사용여부 + +
+
+
+ +
+
+
+
+
+
+ + +
+ +
+ + + +
+
+
+
+ + + + + + + + + + + + + + + + +
임가번호경영주명휴대폰번호실사지역세부지역업종 대분류업종 중분류1유지여부
+
+
+
+
+
+
+ +
+
+
- +
+ + + + + + + + + + + + + + + +
+ + 임가번호경영주명방문일관리분야내용작성일답례품 전달
+
+
+
+
+
+
+
+ +
+
+ + +
+
+
- +
+ +
+ + + +
+ + \ No newline at end of file diff --git a/admin/src/main/resources/templates/researcher/researchers.html b/admin/src/main/resources/templates/researcher/researchers.html index 5b812ef4..9b28df26 100644 --- a/admin/src/main/resources/templates/researcher/researchers.html +++ b/admin/src/main/resources/templates/researcher/researchers.html @@ -140,9 +140,8 @@ $(response.content).each((idx, ct) => { tbody.append( ` - - ${ct.name} + + ${ct.name} ${ct.phone} ${ct.regionMainCodeName} ${ct.householdCount} @@ -212,7 +211,7 @@ // 상세페이지 이동 function goDetail(seq) { - location.href = '/researcher/researchers/' + seq; + location.href = '/researcher/' + seq; } function goExcel() { From 13f0ca7bc8c4de1bd62c1b3c0baa68bf08f3d55b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Sat, 14 Jun 2025 13:51:08 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EC=9E=84=EA=B0=80=EB=B0=A9=EB=AC=B8=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/ResearcherMapper.java | 2 +- .../model/ResearchersHouseholdVisitDto.java | 2 +- .../model/ResearchersMappingHouseholdDto.java | 2 +- .../service/ResearcherServiceImpl.java | 2 +- .../mappers/researcher/ResearcherMapper.xml | 15 +++++------ .../templates/researcher/detail.html | 25 ++++++++++++------- 6 files changed, 28 insertions(+), 20 deletions(-) diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/ResearcherMapper.java b/admin/src/main/java/app/module/admin/usecase/researcher/persistence/ResearcherMapper.java index d716a33f..afe2ec36 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/ResearcherMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/persistence/ResearcherMapper.java @@ -16,7 +16,7 @@ public interface ResearcherMapper { Long countAll(ResearchersListReqVO reqVO); ResearchersDto detail(Integer adminSeq); List mappingHouseholdList(ResearchersDetailReqVO reqVO); - Long mappingHouseholdCountAll(ResearchersDetailReqVO reqVO); + Long mappingHouseholdListCountAll(ResearchersDetailReqVO reqVO); List visitHouseholdList(ResearchersDetailReqVO reqVO); Long visitHouseholdListCountAll(ResearchersDetailReqVO reqVO); diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersHouseholdVisitDto.java b/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersHouseholdVisitDto.java index b74568d3..9a95e11d 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersHouseholdVisitDto.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersHouseholdVisitDto.java @@ -11,7 +11,7 @@ public class ResearchersHouseholdVisitDto { private String adminSeq; private String householdSeq; private String householdNum; - private String name; + private String ownerName; private String visitDate; private String isGiftSentFlag; private String Memo; diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersMappingHouseholdDto.java b/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersMappingHouseholdDto.java index 92579305..8df195ac 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersMappingHouseholdDto.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/persistence/model/ResearchersMappingHouseholdDto.java @@ -7,7 +7,7 @@ import lombok.Data; public class ResearchersMappingHouseholdDto { private String seq; private String householdNum; - private String name; + private String ownerName; private String phone; private String regionMainCodeName; private String regionSubCodeName; diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherServiceImpl.java b/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherServiceImpl.java index 68121674..1beb95c1 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherServiceImpl.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherServiceImpl.java @@ -42,7 +42,7 @@ public class ResearcherServiceImpl implements ResearcherService { public Page mappingHouseholdList(ResearchersDetailReqVO reqVO) { List result = researcherMapper.mappingHouseholdList(reqVO); Pageable pageable = PageRequest.of(reqVO.getPage() , reqVO.getSize()); - long total = researcherMapper.mappingHouseholdCountAll(reqVO); + long total = researcherMapper.mappingHouseholdListCountAll(reqVO); return new PageImpl<>(result, pageable, total); } diff --git a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml index f372e762..2d70da05 100644 --- a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml +++ b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml @@ -51,6 +51,7 @@ @@ -137,7 +144,7 @@ let dataOj = $(f).serializeObject(); ajaxUtil._ajaxMethod( - '/researcher/mappingHousehold', + '/researcher/mappingHouseholdList', dataOj, function (response) { $('#household-totalElements').text(response.totalElements); @@ -150,13 +157,8 @@ tbody.append( ` - - - ${ct.householdNum} - ${ct.name} + ${ct.ownerName} ${ct.phone} ${ct.regionMainCodeName} ${ct.regionSubCodeName} @@ -225,8 +227,13 @@ tbody.append( ` + + + ${ct.householdNum} - ${ct.name} + ${ct.ownerName} ${ct.visitDate} ${ct.Memo} ${ct.Memo}