Merge branch 'dev' into 'kangsun'

# Conflicts:
#   admin/src/main/java/app/module/admin/usecase/researcher/service/ResearcherService.java
This commit is contained in:
이강선 매니저/ST
2025-06-16 11:00:44 +00:00
28 changed files with 680 additions and 109 deletions

View File

@@ -21,4 +21,9 @@ public interface ResearcherMapper {
List<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
Long visitHouseholdListCountAll(ResearchersDetailReqVO reqVO);
Integer visitHouseholdDelete(@Param("selectIds") List<Integer> 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);
}

View File

@@ -6,7 +6,7 @@ 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;
import app.module.admin.usecase.researcher.web.model.HouseholdSearchReqVO;
import app.module.admin.usecase.researcher.web.model.MappingHouseholdListUIReqVO;
import app.module.admin.usecase.researcher.web.model.MappingHouseholdListReqVO;
import app.module.admin.usecase.researcher.web.model.ResearchersDetailReqVO;
import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO;
import org.springframework.data.domain.Page;

View File

@@ -12,7 +12,7 @@ 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;
import app.module.admin.usecase.researcher.web.model.HouseholdSearchReqVO;
import app.module.admin.usecase.researcher.web.model.MappingHouseholdListUIReqVO;
import app.module.admin.usecase.researcher.web.model.MappingHouseholdListReqVO;
import app.module.admin.usecase.researcher.web.model.ResearchersDetailReqVO;
import app.module.admin.usecase.researcher.web.model.ResearchersListReqVO;
import app.module.core.config.application.util.CommonUtil;
@@ -88,4 +88,16 @@ public class ResearcherServiceImpl implements ResearcherService {
return new PageImpl<>(households, pageable,
households.isEmpty() ? 0 : households.get(0).getTotal());
}
@Override
public Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO) {
int i = 0;
String deletedBy = CommonUtil.getLoginUsername();
for(Integer householdSeq : reqVO.getSelectedIds()) {
researcherMapper.deleteHouseholdResearcherMapping(reqVO.getResearcherSeq(), householdSeq,deletedBy);
i += researcherMapper.insertHouseholdResearcherMapping(reqVO.getResearcherSeq(), householdSeq,deletedBy);
}
return i;
}
}

View File

@@ -69,10 +69,8 @@ class ResearcherController {
return ResponseEntity.status(HttpStatus.OK).body(researcherService.searchMappingHousehold(reqVO));
}
@PostMapping("/mappingHousehold/")
@ResponseBody
public String registerSurveyor(@RequestParam("surveyorId") String surveyorId) {
//surveyorService.registerSurveyor(surveyorId);
return "success";
@PostMapping("/mappingHousehold/update")
ResponseEntity<?> updateMappingHousehold(@RequestBody MappingHouseholdListReqVO reqVO ) {
return ResponseEntity.status(HttpStatus.OK).body(researcherService.updateMappingHousehold(reqVO));
}
}

View File

@@ -0,0 +1,13 @@
package app.module.admin.usecase.researcher.web.model;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
@Getter
@Setter
public class MappingHouseholdListReqVO {
private List<Integer> selectedIds;
private Integer researcherSeq;
}

View File

@@ -1,22 +0,0 @@
package app.module.admin.usecase.researcher.web.model;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class MappingHouseholdListUIReqVO {
private Integer page;
private Integer size;
private String searchRegionMainCode;
public Integer getPage() {
// 요청 페이지 넘버 - 초기값 `0`
return page != null ? page : 0;
}
public Integer getSize() {
// 페이지 당 아이템 수 - 초기값 `10`
return size != null ? size : 10;
}
}

View File

@@ -37,6 +37,7 @@ class UICodeSaveController {
saveVO.getOrderNo(),
saveVO.getCodeText(),
saveVO.getCodeValue(),
saveVO.getCodeType(),
saveVO.getMsgCode(),
saveVO.getInUse()),
"create".equals(saveVO.getMode()));

View File

@@ -24,6 +24,7 @@ public class UICodeSaveVO {
private String codeText;
@NotBlank(message = "{valid.common.required}")
private String codeValue;
private String codeType;
private String msgCode;
private Boolean inUse;
private String mode;