Merge branch 'kangsun' into 'dev'

[BO] 웹자원 반영 + 테이블 colspan 추가, 임산물 현황 작업 중

See merge request korea-research/korea-research!44
This commit is contained in:
이강선 매니저/ST
2025-06-25 04:33:55 +00:00
25 changed files with 605 additions and 31 deletions

View File

@@ -4,6 +4,7 @@ import app.module.admin.config.application.util.AdminUtil;
import app.module.admin.config.application.util.DateUiUtil;
import app.module.admin.usecase.household.getHouseholdStatus.ports.GetHouseholdStatusPortIn;
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestParam;
@RequiredArgsConstructor
class GetHouseholdStatusUIController {
private final GetHouseholdStatusPortIn getHouseholdStatusPortIn;
private final UICodeListPortIn uiCodeListPortIn;
@GetMapping(path = "/households/{seq}")
String operate(
@@ -30,6 +32,8 @@ class GetHouseholdStatusUIController {
model.addAttribute("recordMonth", recordMonth);
model.addAttribute("userRole", AdminUtil.getLoginUserRole());
model.addAttribute("unitCodes", uiCodeListPortIn.connect("code.record.unit"));
// 임가 상세 정보
model.addAttribute("householdInfo",
getHouseholdStatusPortIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null));

View File

@@ -0,0 +1,19 @@
package app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.adapters.persistence;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatus;
import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatusCmd;
import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.GetForestProductStatusPortOut;
import java.util.Optional;
import org.springframework.stereotype.Repository;
@Repository
@RequiredArgsConstructor
class GetForestProductStatusDao implements GetForestProductStatusPortOut {
private final GetForestProductStatusMapper mapper;
@Override
public Optional<GetForestProductStatus> operate(GetForestProductStatusCmd cmd) {
return mapper.getForestProductStatus(cmd);
}
}

View File

@@ -0,0 +1,11 @@
package app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.adapters.persistence;
import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatus;
import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatusCmd;
import java.util.Optional;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface GetForestProductStatusMapper {
Optional<GetForestProductStatus> getForestProductStatus(GetForestProductStatusCmd cmd);
}

View File

@@ -0,0 +1,22 @@
package app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.adapters.web;
import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.GetForestProductStatusPortIn;
import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatusCmd;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequiredArgsConstructor
class GetForestProductStatusController {
private final GetForestProductStatusPortIn portIn;
@GetMapping(path = "/api/forestProduct/{id}")
ResponseEntity<?> operate(@PathVariable Long id) {
return ResponseEntity.status(HttpStatus.OK)
.body(portIn.operate(new GetForestProductStatusCmd(id)).orElse(null));
}
}

View File

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

View File

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

View File

@@ -0,0 +1,9 @@
package app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports;
import java.util.Optional;
import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatus;
import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatusCmd;
public interface GetForestProductStatusPortIn {
Optional<GetForestProductStatus> operate(GetForestProductStatusCmd cmd);
}

View File

@@ -0,0 +1,9 @@
package app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports;
import java.util.Optional;
import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatus;
import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatusCmd;
public interface GetForestProductStatusPortOut {
Optional<GetForestProductStatus> operate(GetForestProductStatusCmd cmd);
}

View File

@@ -0,0 +1,20 @@
package app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatus;
import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain.GetForestProductStatusCmd;
import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.GetForestProductStatusPortIn;
import app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.GetForestProductStatusPortOut;
import java.util.Optional;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
class GetForestProductStatusService implements GetForestProductStatusPortIn {
private final GetForestProductStatusPortOut portOut;
@Override
public Optional<GetForestProductStatus> operate(GetForestProductStatusCmd cmd) {
return portOut.operate(cmd);
}
}

View File

@@ -0,0 +1,31 @@
package app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetForestProductStatus {
private Long id;
private String streetNum;
private String landType;
private String town;
private String cropName;
private String landArea;
private String mainYield;
private String mainYieldUnitCode;
private String mainYieldUnit;
private String mainSaleAmount;
private String mainSaleUnitCode;
private String mainSaleUnit;
private String subYield;
private String subYieldUnitCode;
private String subYieldUnit;
private String subSaleAmount;
private String subSaleUnitCode;
private String subSaleUnit;
}

View File

@@ -0,0 +1,14 @@
package app.module.admin.usecase.household.tab.forestProduct.getForestProductStatus.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetForestProductStatusCmd {
private Long id;
}

View File

@@ -30,7 +30,7 @@ class RemoveHouseholdVisitInfosController {
}
portIn.operate(
new RemoveHouseholdVisitInfosCmd(reqVO.getHouseholdSeq(), reqVO.getRemoveIds()));
new RemoveHouseholdVisitInfosCmd(reqVO.getHouseholdSeq(), reqVO.getVisitRemoveIds()));
return ResponseEntity.status(HttpStatus.OK).body(new RemoveHouseholdVisitInfosResVO(
messageUtil.getMessage("operation.common.remove.done")));

View File

@@ -13,5 +13,5 @@ import lombok.Setter;
@EqualsAndHashCode
public class RemoveHouseholdVisitInfosReqVO {
private Long householdSeq;
private List<Long> removeIds;
private List<Long> visitRemoveIds;
}