Merge branch 'kangsun' into 'dev'

[BO] 수현매니저님 조사원 현황 팝업 임가 리스트 service 작업

See merge request korea-research/korea-research!13
This commit is contained in:
이강선 매니저/ST
2025-06-16 11:05:33 +00:00
10 changed files with 240 additions and 8 deletions

View File

@@ -0,0 +1,25 @@
package app.module.admin.usecase.researcher.getPopupHouseholds.adapters.persistence;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.GetPopupHouseholdsPortOut;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholdsCmd;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Repository;
@Repository
@RequiredArgsConstructor
class GetPopupHouseholdsDao implements GetPopupHouseholdsPortOut {
private final GetPopupHouseholdsMapper mapper;
@Override
public Page<GetPopupHouseholds> operate(Pageable pageable, GetPopupHouseholdsCmd cmd) {
List<GetPopupHouseholds> result = mapper.getPopupHouseholds(pageable, cmd);
return new PageImpl<>(result, pageable, result.isEmpty() ? 0 : result.get(0).getHouseholdSeq());
}
}

View File

@@ -0,0 +1,14 @@
package app.module.admin.usecase.researcher.getPopupHouseholds.adapters.persistence;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholdsCmd;
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 GetPopupHouseholdsMapper {
List<GetPopupHouseholds> getPopupHouseholds(@Param("pageable") Pageable pageable,
@Param("cmd") GetPopupHouseholdsCmd cmd);
}

View File

@@ -0,0 +1,10 @@
package app.module.admin.usecase.researcher.getPopupHouseholds.ports;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholdsCmd;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
public interface GetPopupHouseholdsPortIn {
Page<GetPopupHouseholds> operate(Pageable pageable, GetPopupHouseholdsCmd cmd);
}

View File

@@ -0,0 +1,10 @@
package app.module.admin.usecase.researcher.getPopupHouseholds.ports;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholdsCmd;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
public interface GetPopupHouseholdsPortOut {
Page<GetPopupHouseholds> operate(Pageable pageable, GetPopupHouseholdsCmd cmd);
}

View File

@@ -0,0 +1,21 @@
package app.module.admin.usecase.researcher.getPopupHouseholds.ports.application;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholdsCmd;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.GetPopupHouseholdsPortIn;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.GetPopupHouseholdsPortOut;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
class GetPopupHouseholdsService implements GetPopupHouseholdsPortIn {
private final GetPopupHouseholdsPortOut portOut;
@Override
public Page<GetPopupHouseholds> operate(Pageable pageable, GetPopupHouseholdsCmd cmd) {
return portOut.operate(pageable, cmd);
}
}

View File

@@ -0,0 +1,31 @@
package app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetPopupHouseholds {
private Integer householdSeq;
private String householdNum;
private String householdName;
private String householdPhone;
private String regionMainCode;
private String regionMainName;
private String regionSubCode;
private String regionSubName;
private String regionDetailCode;
private String regionDetailName;
private String industryLargeCode;
private String industryLargeName;
private String industryMiddleCode;
private String industryMiddleName;
private Boolean isPanel;
private String researcherName;
private Integer total;
}

View File

@@ -0,0 +1,20 @@
package app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetPopupHouseholdsCmd {
private String ownerField;
private String ownerValue;
private String regionMainCode;
private String regionSubCode;
private String regionDetailCode;
private Boolean isPanel;
private Boolean isMapping;
}

View File

@@ -1,6 +1,7 @@
package app.module.admin.usecase.researcher.service;
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
import app.module.admin.usecase.researcher.persistence.model.ResearchersDto;
import app.module.admin.usecase.researcher.persistence.model.ResearchersHouseholdVisitDto;
import app.module.admin.usecase.researcher.persistence.model.ResearchersMappingHouseholdDto;
@@ -19,6 +20,5 @@ public interface ResearcherService {
Page<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO);
Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
Integer visitHouseholdDelete(List<Integer> selectIds);
Page<GetHouseholdsStatus> searchMappingHousehold(HouseholdSearchReqVO reqVO);
Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO);
Page<GetPopupHouseholds> searchMappingHousehold(HouseholdSearchReqVO reqVO);
}

View File

@@ -3,6 +3,9 @@ package app.module.admin.usecase.researcher.service;
import app.module.admin.usecase.household.getHouseholdsStatus.adapters.persistence.GetHouseholdsStatusMapper;
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus;
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatusCmd;
import app.module.admin.usecase.researcher.getPopupHouseholds.adapters.persistence.GetPopupHouseholdsMapper;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds;
import app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholdsCmd;
import app.module.admin.usecase.researcher.persistence.ResearcherMapper;
import app.module.admin.usecase.researcher.persistence.model.ResearchersDto;
@@ -28,7 +31,7 @@ import java.util.List;
@RequiredArgsConstructor
public class ResearcherServiceImpl implements ResearcherService {
private final ResearcherMapper researcherMapper;
private final GetHouseholdsStatusMapper householdsStatusMapper;
private final GetPopupHouseholdsMapper getPopupHouseholdsMapper;
@Override
public Page<ResearchersDto> list(ResearchersListReqVO reqVO) {
@@ -68,14 +71,22 @@ public class ResearcherServiceImpl implements ResearcherService {
}
@Override
public Page<GetHouseholdsStatus> searchMappingHousehold(HouseholdSearchReqVO reqVO) {
public Page<GetPopupHouseholds> searchMappingHousehold(HouseholdSearchReqVO reqVO) {
Pageable pageable = PageRequest.of(reqVO.getPage() , reqVO.getSize());
List<GetHouseholdsStatus> householdsStatus = householdsStatusMapper.getHouseholdsStatus(pageable,
new GetHouseholdsStatusCmd(reqVO));
List<GetPopupHouseholds> households = getPopupHouseholdsMapper.getPopupHouseholds(pageable,
new GetPopupHouseholdsCmd(
reqVO.getOwnerField(),
reqVO.getOwnerValue(),
reqVO.getRegionMainCode(),
reqVO.getRegionSubCode(),
reqVO.getRegionDetailCode(),
reqVO.getIsPanel(),
reqVO.getIsMapping()
));
return new PageImpl<>(householdsStatus, pageable,
householdsStatus.isEmpty() ? 0 : householdsStatus.get(0).getTotal());
return new PageImpl<>(households, pageable,
households.isEmpty() ? 0 : households.get(0).getTotal());
}
@Override

View File

@@ -0,0 +1,90 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper
namespace="app.module.admin.usecase.researcher.getPopupHouseholds.adapters.persistence.GetPopupHouseholdsMapper">
<select id="getPopupHouseholds"
resultType="app.module.admin.usecase.researcher.getPopupHouseholds.ports.application.domain.GetPopupHouseholds">
SELECT
hvr.*,
COUNT(*) OVER () AS total
FROM (
SELECT
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,
r.researcher_name AS researcherName
FROM v_household_with_code h
LEFT JOIN v_household_visit v ON h.seq = v.household_seq
LEFT JOIN v_household_researcher r ON h.seq = r.household_seq
) AS hvr
<where>
1=1
<if test="cmd.ownerField != null and cmd.ownerField != ''">
/* 경영주 검색 */
<choose>
<when test="cmd.ownerField eq 'name'">
AND hvr.householdName ILIKE '%' || #{cmd.ownerValue} || '%'
</when>
<when test="cmd.ownerField eq 'phone'">
AND hvr.householdPhone ILIKE '%' || #{cmd.ownerValue} || '%'
</when>
</choose>
</if>
<if test="cmd.regionMainCode != null and cmd.regionMainCode != ''">
/* 실사 검색 */
AND hvr.regionMainCode = #{cmd.regionMainCode}
</if>
<if test="cmd.regionSubCode != null and cmd.regionSubCode != ''">
/* 지역 검색 */
AND hvr.regionSubCode = #{cmd.regionSubCode}
</if>
<if test="cmd.regionDetailCode != null and cmd.regionDetailCode != ''">
/* 세부지역 검색 */
AND hvr.regionDetailCode = #{cmd.regionDetailCode}
</if>
<if test="cmd.isPanel != null">
/* 패널 유지 여부 */
<choose>
<when test="cmd.isPanel">
AND hvr.isPanel = true
</when>
<when test="!cmd.isPanel">
AND hvr.isPanel = false
</when>
</choose>
</if>
<if test="cmd.isMapping != null">
/* 패널 유지 여부 */
<choose>
<when test="cmd.isMapping">
AND r.researcher_name is not null
</when>
<when test="!cmd.isMapping">
AND r.researcher_name is null
</when>
</choose>
</if>
</where>
ORDER BY hvr.householdNum ASC
OFFSET #{pageable.offset} ROWS FETCH NEXT #{pageable.pageSize} ROWS ONLY
</select>
</mapper>