diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/GetHouseholdsExcelController.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/GetHouseholdsExcelController.java index aa4c6ede..d4f6279e 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/GetHouseholdsExcelController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/GetHouseholdsExcelController.java @@ -56,6 +56,7 @@ class GetHouseholdsExcelController { getHouseholdsStatusPortIn.operate(pageable, new GetHouseholdsStatusCmd( reqVO.getRecordMonth(), + reqVO.getHouseholdNum(), reqVO.getOwnerField(), reqVO.getOwnerValue(), reqVO.getRegionMainCode(), @@ -154,7 +155,7 @@ class GetHouseholdsExcelController { StringUtils.defaultString(item.getIndustryDetail()), StringUtils.defaultString(item.getResearcherName()), StringUtils.defaultString(item.getResearcherPhone()), - StringUtils.defaultString(item.getCompletionRate()) + "%", + StringUtils.defaultString(item.getCompletionRate()), StringUtils.defaultString(item.getFirstVisitDate()), StringUtils.defaultString(item.getSecondVisitDate()), StringUtils.defaultString(item.getGiftSend()), @@ -180,7 +181,7 @@ class GetHouseholdsExcelController { "규모/세부품목", "조사원", "조사원 연락처", - "당월 일계부 현황", + "당월 일계부 현황(%)", "당월 1차 임가방문", "당월 2차 임가방문", "답례품 전달", @@ -496,6 +497,7 @@ class GetHouseholdsExcelController { StringUtils.defaultString(item.getWorkName()), StringUtils.defaultString(item.getWorkMark()), StringUtils.defaultString(item.getWorkLandArea()), + StringUtils.defaultString(item.getAreaMark()), StringUtils.defaultString(item.getAreaUnitName()), StringUtils.defaultString(item.getHarvestQuantity()), StringUtils.defaultString(item.getHarvestUnitName()), @@ -523,6 +525,7 @@ class GetHouseholdsExcelController { "작업명", "작업 부호", "작업면적", + "면적 부호", "단위", "수확량", "단위", diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/model/GetHouseholdsExcelReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/model/GetHouseholdsExcelReqVO.java index efd6578a..fff4485e 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/model/GetHouseholdsExcelReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/adapters/web/model/GetHouseholdsExcelReqVO.java @@ -14,6 +14,8 @@ import lombok.Setter; public class GetHouseholdsExcelReqVO { // 연월 private String recordMonth; + // 임가번호 + private String householdNum; // 경영주 검색 필드 (전체, 경영주명, 전화번호) private String ownerField; // 경영주 검색어 diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyWork.java b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyWork.java index 2eb4e434..175e4d08 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyWork.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelDownload/getHouseholdsExcel/ports/application/domain/GetDailyWork.java @@ -19,6 +19,7 @@ public class GetDailyWork { private String workName; private String workMark; private String workLandArea; + private String areaMark; private String areaUnitName; private String harvestQuantity; private String harvestUnitName; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java index 9a0ce4c9..0b29f315 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java @@ -26,6 +26,7 @@ class GetHouseholdsStatusController { getHouseholdsStatusPortIn.operate(pageable, new GetHouseholdsStatusCmd( reqVO.getRecordMonth(), + reqVO.getHouseholdNum(), reqVO.getOwnerField(), reqVO.getOwnerValue(), reqVO.getRegionMainCode(), diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/model/GetHouseholdsStatusReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/model/GetHouseholdsStatusReqVO.java index 213907a1..808140b1 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/model/GetHouseholdsStatusReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/model/GetHouseholdsStatusReqVO.java @@ -13,6 +13,8 @@ import lombok.Setter; public class GetHouseholdsStatusReqVO { // 연월 private String recordMonth; + // 임가번호 + private String householdNum; // 경영주 검색 필드 (전체, 경영주명, 전화번호) private String ownerField; // 경영주 검색어 diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatusCmd.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatusCmd.java index 999fbf6d..06f5a659 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatusCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatusCmd.java @@ -12,6 +12,8 @@ import lombok.Setter; public class GetHouseholdsStatusCmd { // 연월 private String recordMonth; + // 임가번호 + private String householdNum; // 경영주 검색 필드 (전체, 경영주명, 전화번호) private String ownerField; // 경영주 검색어 diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/adapters/web/model/GetHouseholdsUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/adapters/web/model/GetHouseholdsUIReqVO.java index 8e6124b1..3c3aeaa5 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/adapters/web/model/GetHouseholdsUIReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/adapters/web/model/GetHouseholdsUIReqVO.java @@ -15,6 +15,7 @@ public class GetHouseholdsUIReqVO { private String sort; private Integer size; private String recordMonth; + private String householdNum; private String ownerField; private String ownerValue; private String regionMainCode; diff --git a/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml b/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml index b1f2c355..0c4ae00f 100644 --- a/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml +++ b/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml @@ -95,6 +95,11 @@ 1=1 + + /* 임가번호 검색 */ + AND hvr.householdNum ILIKE '%' || #{cmd.householdNum} || '%' + + /* 경영주 검색 */ diff --git a/admin/src/main/resources/mappers/household/excelDownload/GetHouseholdsExcelMapper.xml b/admin/src/main/resources/mappers/household/excelDownload/GetHouseholdsExcelMapper.xml index 754bbf0f..64d99bc3 100644 --- a/admin/src/main/resources/mappers/household/excelDownload/GetHouseholdsExcelMapper.xml +++ b/admin/src/main/resources/mappers/household/excelDownload/GetHouseholdsExcelMapper.xml @@ -312,6 +312,7 @@ dw.work_name , dw.work_mark , dw.work_land_area , + dw.area_mark , case when dw.area_unit_code = 'code.record.area.self' then dw.area_unit_self else unit_code.code_value end as area_unit_name, dw.harvest_quantity , diff --git a/admin/src/main/resources/templates/households/households.html b/admin/src/main/resources/templates/households/households.html index ad101cc5..5c363d67 100644 --- a/admin/src/main/resources/templates/households/households.html +++ b/admin/src/main/resources/templates/households/households.html @@ -31,6 +31,22 @@ + +
+
+

+ 임가번호 +

+
+
+
+
+ +
+
+
+
+