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}