Merge branch 'kangsun' into 'dev'

[BO] 임가현황 작업 중 (9)

See merge request korea-research/korea-research!19
This commit is contained in:
이강선 매니저/ST
2025-06-17 12:45:59 +00:00
49 changed files with 861 additions and 97 deletions

View File

@@ -41,6 +41,7 @@ public class AdminDetailsService implements UserDetailsService {
boolean accountDisabled = Optional.ofNullable(adminUser.getAccountDisabled()).orElse(false);
return new AdminUser(
adminUser.getSeq(),
adminUser.getId(),
adminUser.getPassword(),
adminUser.getRoles().stream().map(CoreRole::getId).findFirst().orElse(null),

View File

@@ -7,10 +7,12 @@ import org.springframework.security.core.userdetails.User;
@Getter
public class AdminUser extends User {
private Long seq;
private String roleId;
private long remainPasswordDays;
public AdminUser(
Long seq,
String username,
String password,
String roleId,
@@ -28,6 +30,7 @@ public class AdminUser extends User {
credentialsNonExpired,
accountNonLocked,
authorities);
this.seq = seq;
this.roleId = roleId;
this.remainPasswordDays = remainPasswordDays;
}

View File

@@ -33,4 +33,14 @@ public class AdminUtil {
AdminUser user = (AdminUser) authentication.getPrincipal();
return user.getRoleId().isEmpty() ? null : user.getRoleId();
}
public static Long getLoginUserSeq() {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
if (authentication == null || !(authentication.getPrincipal() instanceof AdminUser)) {
return null;
}
AdminUser user = (AdminUser) authentication.getPrincipal();
return user.getSeq();
}
}

View File

@@ -0,0 +1,24 @@
package app.module.admin.usecase.household.getBankAutoTransferRecords.adapters.persistence;
import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferExpenseRecords;
import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferIncomeRecords;
import java.util.Collections;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecords;
import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecordsCmd;
import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.GetBankAutoTransferRecordsPortOut;
import java.util.List;
import org.springframework.stereotype.Repository;
@Repository
@RequiredArgsConstructor
class GetBankAutoTransferRecordsDao implements GetBankAutoTransferRecordsPortOut {
private final GetBankAutoTransferRecordsMapper mapper;
@Override
public GetBankAutoTransferRecords operate(GetBankAutoTransferRecordsCmd cmd) {
return new GetBankAutoTransferRecords(
mapper.getBankAutoTransferIncomeRecords(cmd), // 수입
mapper.getBankAutoTransferExpenseRecords(cmd)); // 지출
}
}

View File

@@ -0,0 +1,17 @@
package app.module.admin.usecase.household.getBankAutoTransferRecords.adapters.persistence;
import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferExpenseRecords;
import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferIncomeRecords;
import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecordsCmd;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface GetBankAutoTransferRecordsMapper {
// 은행자동이체 수입
List<GetBankAutoTransferIncomeRecords> getBankAutoTransferIncomeRecords(
GetBankAutoTransferRecordsCmd cmd);
// 은행자동이체 지출
List<GetBankAutoTransferExpenseRecords> getBankAutoTransferExpenseRecords(
GetBankAutoTransferRecordsCmd cmd);
}

View File

@@ -0,0 +1,24 @@
package app.module.admin.usecase.household.getBankAutoTransferRecords.adapters.web;
import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.GetBankAutoTransferRecordsPortIn;
import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecords;
import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecordsCmd;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.GetMapping;
import app.module.admin.usecase.household.getBankAutoTransferRecords.adapters.web.model.GetAutoTransferRecordsReqVO;
import app.module.admin.usecase.household.getBankAutoTransferRecords.adapters.web.model.GetAutoTransferRecordsResVO;
@RestController
@RequiredArgsConstructor
class GetBankAutoTransferRecordsController {
private final GetBankAutoTransferRecordsPortIn portIn;
@GetMapping(path = "/api/household/bankAutoTransfer")
ResponseEntity<GetBankAutoTransferRecords> operate(GetAutoTransferRecordsReqVO reqVO) {
return ResponseEntity.status(HttpStatus.OK).body(portIn.operate(
new GetBankAutoTransferRecordsCmd(reqVO.getHouseholdSeq(), reqVO.getRecordMonth())));
}
}

View File

@@ -0,0 +1,15 @@
package app.module.admin.usecase.household.getBankAutoTransferRecords.adapters.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetAutoTransferRecordsReqVO {
private Long householdSeq;
private String recordMonth;
}

View File

@@ -0,0 +1,13 @@
package app.module.admin.usecase.household.getBankAutoTransferRecords.adapters.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetAutoTransferRecordsResVO {
}

View File

@@ -0,0 +1,9 @@
package app.module.admin.usecase.household.getBankAutoTransferRecords.ports;
import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecords;
import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecordsCmd;
import java.util.List;
public interface GetBankAutoTransferRecordsPortIn {
GetBankAutoTransferRecords operate(GetBankAutoTransferRecordsCmd cmd);
}

View File

@@ -0,0 +1,9 @@
package app.module.admin.usecase.household.getBankAutoTransferRecords.ports;
import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecords;
import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecordsCmd;
import java.util.List;
public interface GetBankAutoTransferRecordsPortOut {
GetBankAutoTransferRecords operate(GetBankAutoTransferRecordsCmd cmd);
}

View File

@@ -0,0 +1,20 @@
package app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecords;
import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecordsCmd;
import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.GetBankAutoTransferRecordsPortIn;
import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.GetBankAutoTransferRecordsPortOut;
import java.util.List;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
class GetBankAutoTransferRecordsService implements GetBankAutoTransferRecordsPortIn {
private final GetBankAutoTransferRecordsPortOut portOut;
@Override
public GetBankAutoTransferRecords operate(GetBankAutoTransferRecordsCmd cmd) {
return portOut.operate(cmd);
}
}

View File

@@ -0,0 +1,20 @@
package app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetBankAutoTransferExpenseRecords {
private Long id;
private String categoryText;
private String categorySelf;
private String sourcePurpose;
private Integer count;
private String unitText;
private Integer price;
}

View File

@@ -0,0 +1,21 @@
package app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetBankAutoTransferIncomeRecords {
private Long id;
private String cropText;
private String categoryText;
private String categorySelf;
private String sourcePurpose;
private Integer count;
private String unitText;
private Integer price;
}

View File

@@ -0,0 +1,16 @@
package app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetBankAutoTransferRecords {
List<GetBankAutoTransferIncomeRecords> incomes;
List<GetBankAutoTransferExpenseRecords> expenses;
}

View File

@@ -0,0 +1,15 @@
package app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetBankAutoTransferRecordsCmd {
private Long householdSeq;
private String recordMonth;
}

View File

@@ -14,12 +14,12 @@ public class GetDailyExpenseRecords {
private Long id;
private String inputType;
private Boolean isCredit;
private String categoryCode;
private String categorySelf;
private String sourcePurpose;
private BigDecimal quantity;
private String unitCode;
private String unitText;
private String unitSelf;
private String price;
private String estimatedValue;
private String updatedBy;

View File

@@ -16,12 +16,12 @@ public class GetDailyIncomeRecords {
private Boolean isCredit;
private String cropCode;
private String cropText;
private String categoryCode;
private String categorySelf;
private String sourcePurpose;
private BigDecimal quantity;
private String unitCode;
private String unitText;
private String unitSelf;
private String price;
private String estimatedValue;
private String updatedBy;

View File

@@ -3,6 +3,7 @@ package app.module.admin.usecase.household.getForestProductsStatus.adapters.pers
import app.module.admin.usecase.household.getForestProductsStatus.ports.GetForestProductsStatusPortOut;
import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatus;
import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd;
import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusResult;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;
@@ -13,7 +14,13 @@ class GetForestProductsStatusDao implements GetForestProductsStatusPortOut {
private final GetForestProductsStatusMapper mapper;
@Override
public List<GetForestProductsStatus> operate(GetForestProductsStatusCmd cmd) {
return mapper.getForestProductsStatus(cmd);
public GetForestProductsStatusResult operate(GetForestProductsStatusCmd cmd) {
// 임산물 등록 상태 조회
String monthlyStatus = mapper.getMonthlyStatus(cmd);
// 임산물 목록 조회
List<GetForestProductsStatus> forestProducts = mapper.getForestProductsStatus(cmd);
return new GetForestProductsStatusResult(monthlyStatus, forestProducts);
}
}

View File

@@ -7,5 +7,6 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface GetForestProductsStatusMapper {
String getMonthlyStatus(GetForestProductsStatusCmd cmd);
List<GetForestProductsStatus> getForestProductsStatus(GetForestProductsStatusCmd cmd);
}

View File

@@ -3,6 +3,7 @@ package app.module.admin.usecase.household.getForestProductsStatus.adapters.web;
import app.module.admin.usecase.household.getForestProductsStatus.ports.GetForestProductsStatusPortIn;
import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatus;
import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd;
import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusResult;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
@@ -18,10 +19,10 @@ class GetForestProductsStatusController {
private final GetForestProductsStatusPortIn portIn;
@GetMapping(path = "/api/household/forestProducts")
ResponseEntity<List<GetForestProductsStatus>> operate(
ResponseEntity<GetForestProductsStatusResult> operate(
GetForestProductsStatusReqVO reqVO) {
return ResponseEntity.status(HttpStatus.OK)
.body(portIn.operate(
new GetForestProductsStatusCmd(reqVO.getHouseholdSeq(), reqVO.getMonth())));
new GetForestProductsStatusCmd(reqVO.getHouseholdSeq(), reqVO.getRecordMonth())));
}
}

View File

@@ -11,5 +11,5 @@ import lombok.Setter;
@EqualsAndHashCode
public class GetForestProductsStatusReqVO {
private Long householdSeq;
private String month;
private String recordMonth;
}

View File

@@ -1,9 +1,8 @@
package app.module.admin.usecase.household.getForestProductsStatus.ports;
import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatus;
import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd;
import java.util.List;
import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusResult;
public interface GetForestProductsStatusPortIn {
List<GetForestProductsStatus> operate(GetForestProductsStatusCmd cmd);
GetForestProductsStatusResult operate(GetForestProductsStatusCmd cmd);
}

View File

@@ -1,9 +1,8 @@
package app.module.admin.usecase.household.getForestProductsStatus.ports;
import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatus;
import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd;
import java.util.List;
import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusResult;
public interface GetForestProductsStatusPortOut {
List<GetForestProductsStatus> operate(GetForestProductsStatusCmd cmd);
GetForestProductsStatusResult operate(GetForestProductsStatusCmd cmd);
}

View File

@@ -1,11 +1,10 @@
package app.module.admin.usecase.household.getForestProductsStatus.ports.application;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatus;
import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd;
import app.module.admin.usecase.household.getForestProductsStatus.ports.GetForestProductsStatusPortIn;
import app.module.admin.usecase.household.getForestProductsStatus.ports.GetForestProductsStatusPortOut;
import java.util.List;
import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd;
import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusResult;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@Service
@@ -14,7 +13,7 @@ class GetForestProductsStatusService implements GetForestProductsStatusPortIn {
private final GetForestProductsStatusPortOut portOut;
@Override
public List<GetForestProductsStatus> operate(GetForestProductsStatusCmd cmd) {
public GetForestProductsStatusResult operate(GetForestProductsStatusCmd cmd) {
return portOut.operate(cmd);
}
}

View File

@@ -11,5 +11,5 @@ import lombok.Setter;
@EqualsAndHashCode
public class GetForestProductsStatusCmd {
private Long householdSeq;
private String month;
private String recordMonth;
}

View File

@@ -0,0 +1,16 @@
package app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetForestProductsStatusResult {
private String monthlyStatus;
private List<GetForestProductsStatus> forestProducts;
}

View File

@@ -0,0 +1,20 @@
package app.module.admin.usecase.household.getHouseholdVisitInfos.adapters.persistence;
import java.util.Collections;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos;
import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfosCmd;
import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.GetHouseholdVisitInfosPortOut;
import java.util.List;
import org.springframework.stereotype.Repository;
@Repository
@RequiredArgsConstructor
class GetHouseholdVisitInfosDao implements GetHouseholdVisitInfosPortOut {
private final GetHouseholdVisitInfosMapper mapper;
@Override
public List<GetHouseholdVisitInfos> operate(GetHouseholdVisitInfosCmd cmd) {
return mapper.getHouseholdVisitInfos(cmd);
}
}

View File

@@ -0,0 +1,11 @@
package app.module.admin.usecase.household.getHouseholdVisitInfos.adapters.persistence;
import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos;
import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfosCmd;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface GetHouseholdVisitInfosMapper {
List<GetHouseholdVisitInfos> getHouseholdVisitInfos(GetHouseholdVisitInfosCmd cmd);
}

View File

@@ -0,0 +1,26 @@
package app.module.admin.usecase.household.getHouseholdVisitInfos.adapters.web;
import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.GetHouseholdVisitInfosPortIn;
import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos;
import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfosCmd;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.GetMapping;
import app.module.admin.usecase.household.getHouseholdVisitInfos.adapters.web.model.GetHouseholdVisitInfosReqVO;
import app.module.admin.usecase.household.getHouseholdVisitInfos.adapters.web.model.GetHouseholdVisitInfosResVO;
@RestController
@RequiredArgsConstructor
class GetHouseholdVisitInfosController {
private final GetHouseholdVisitInfosPortIn portIn;
@GetMapping(path = "/api/household/visitInfos")
ResponseEntity<List<GetHouseholdVisitInfos>> operate(
GetHouseholdVisitInfosReqVO reqVO) {
return ResponseEntity.status(HttpStatus.OK).body(portIn.operate(
new GetHouseholdVisitInfosCmd(reqVO.getHouseholdSeq(), reqVO.getRecordMonth())));
}
}

View File

@@ -0,0 +1,15 @@
package app.module.admin.usecase.household.getHouseholdVisitInfos.adapters.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetHouseholdVisitInfosReqVO {
private Long householdSeq;
private String recordMonth;
}

View File

@@ -0,0 +1,13 @@
package app.module.admin.usecase.household.getHouseholdVisitInfos.adapters.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetHouseholdVisitInfosResVO {
}

View File

@@ -0,0 +1,9 @@
package app.module.admin.usecase.household.getHouseholdVisitInfos.ports;
import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos;
import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfosCmd;
import java.util.List;
public interface GetHouseholdVisitInfosPortIn {
List<GetHouseholdVisitInfos> operate(GetHouseholdVisitInfosCmd cmd);
}

View File

@@ -0,0 +1,9 @@
package app.module.admin.usecase.household.getHouseholdVisitInfos.ports;
import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos;
import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfosCmd;
import java.util.List;
public interface GetHouseholdVisitInfosPortOut {
List<GetHouseholdVisitInfos> operate(GetHouseholdVisitInfosCmd cmd);
}

View File

@@ -0,0 +1,20 @@
package app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos;
import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfosCmd;
import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.GetHouseholdVisitInfosPortIn;
import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.GetHouseholdVisitInfosPortOut;
import java.util.List;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
class GetHouseholdVisitInfosService implements GetHouseholdVisitInfosPortIn {
private final GetHouseholdVisitInfosPortOut portOut;
@Override
public List<GetHouseholdVisitInfos> operate(GetHouseholdVisitInfosCmd cmd) {
return portOut.operate(cmd);
}
}

View File

@@ -0,0 +1,20 @@
package app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetHouseholdVisitInfos {
private Long id;
private String visitDate;
private String managementType;
private String content;
private Boolean isGiftSent;
private String updatedBy;
private String updatedAt;
}

View File

@@ -0,0 +1,15 @@
package app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetHouseholdVisitInfosCmd {
private Long householdSeq;
private String recordMonth;
}

View File

@@ -1,5 +1,6 @@
package app.module.admin.usecase.household.getHouseholdsStatus.adapters.web;
import app.module.admin.config.application.util.AdminUtil;
import app.module.admin.usecase.household.getHouseholdsStatus.ports.GetHouseholdsStatusPortIn;
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus;
import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatusCmd;
@@ -42,6 +43,7 @@ class GetHouseholdsStatusController {
reqVO.getResearcherField(),
reqVO.getResearcherValue(),
reqVO.getIsPanel(),
AdminUtil.getLoginUserSeq(),
reqVO.getUserRole(),
reqVO.getUserRegionMainCode()
))

View File

@@ -11,7 +11,8 @@ import lombok.Setter;
@NoArgsConstructor
@EqualsAndHashCode
public class GetHouseholdsStatus {
private Integer householdSeq;
private Long adminSeq;
private Long householdSeq;
private String householdNum;
private String householdName;
private String householdPhone;

View File

@@ -40,6 +40,8 @@ public class GetHouseholdsStatusCmd {
private String researcherValue;
// 패널 유지 여부
private Boolean isPanel;
// 로그인한 유저 seq
private Long adminSeq;
// 로그인한 유저 역할
private String userRole;
// 로그인한 유저 실사 지역