diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/GetDailyRecordStatusDetailController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/GetDailyRecordStatusDetailController.java index f8557b35..a0c1e47d 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/GetDailyRecordStatusDetailController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/GetDailyRecordStatusDetailController.java @@ -125,7 +125,7 @@ class GetDailyRecordStatusDetailController { "수입", List.of("임가번호", "경영주 성명", "날", "짜", "유형", "수입 부호", "지출 부호", "재배형태 코드", "수입의 종류", "종류 부호", "수입원", "수량", "단위", "현금(원)", "현물(평가액)"), rows, - Set.of(11, 13, 14), + Set.of(13, 14), Map.of( 0, IndexedColors.LIGHT_YELLOW, 2, IndexedColors.LIGHT_TURQUOISE, @@ -178,7 +178,7 @@ class GetDailyRecordStatusDetailController { List.of("임가번호", "경영주 성명", "날", "짜", "품목명", "품목부호", "작업명", "작업 부호", "작업면적", "단위", "수확량", "단위", "경영주", "배우자", "가족노동-남", "가족노동-여", "고용노동-남", "고용노동-여", "품앗이-남", "품앗이-여", "일손돕기-남", "일손돕기-여"), rows, - Set.of(8, 10, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21), + null, Map.of( 0, IndexedColors.LIGHT_YELLOW, 2, IndexedColors.LIGHT_TURQUOISE, @@ -222,7 +222,7 @@ class GetDailyRecordStatusDetailController { "지출", List.of("임가번호", "경영주 성명", "날", "짜", "유형", "수입 부호", "지출 부호", "지출의 종류", "종류 부호", "용도", "수량", "단위", "현금(원)", "현물(평가액)"), rows, - Set.of(10, 12, 13), + Set.of(12, 13), Map.of( 0, IndexedColors.LIGHT_YELLOW, 2, IndexedColors.LIGHT_TURQUOISE, @@ -257,7 +257,7 @@ class GetDailyRecordStatusDetailController { "동력사용시간", List.of("임가번호", "경영주 성명", "날", "짜", "명칭", "명칭 부호", "자가 사용시간", "임차 사용시간"), rows, - Set.of(6, 7), + null, Map.of( 0, IndexedColors.LIGHT_YELLOW, 2, IndexedColors.LIGHT_TURQUOISE, @@ -295,7 +295,7 @@ class GetDailyRecordStatusDetailController { "임업_자가소비량", List.of("임가번호", "경영주 성명", "날", "짜", "수입 부호", "지출 부호", "생산물", "용도", "수량", "단위", "현물(평가액)"), rows, - Set.of(8, 10), + Set.of(10), Map.of( 0, IndexedColors.LIGHT_YELLOW, 2, IndexedColors.LIGHT_TURQUOISE, @@ -333,7 +333,7 @@ class GetDailyRecordStatusDetailController { "농업_자가소비량", List.of("임가번호", "경영주 성명", "날", "짜", "수입 부호", "지출 부호", "생산물", "용도", "수량", "단위", "현물(평가액)"), rows, - Set.of(8, 10), + Set.of(10), Map.of( 0, IndexedColors.LIGHT_YELLOW, 2, IndexedColors.LIGHT_TURQUOISE, diff --git a/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml b/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml index 332815c0..3d90ad50 100644 --- a/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml +++ b/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml @@ -23,15 +23,15 @@ /* getDailyIncomeRecords : 일계부 등록 현황 상세 수입 조회 */ SELECT di.id, /* 수입 id */ di.input_type, /* 입력구분 */ - di.category, - di.income_mark, - di.expense_mark, + di.category, /* 유형 */ + di.income_mark, /* 수입 부호 */ + di.expense_mark, /* 지출 부호 */ di.is_credit, /* 외상판매여부 */ di.crop_code, /* 재배형태 코드 */ ui_crop.code_value AS crop_value, /* 재배형태 코드 값 */ ui_crop.code_text AS crop_text, /* 재배형태 코드 텍스트 */ di.income_kind, /* 수입의 종류 */ - di.income_kind_mark, + di.income_kind_mark, /* 종류 부호 */ di.source_purpose, /* 수입원(용도) */ di.quantity, /* 수량 */ di.unit_code, /* 단위 코드 */ @@ -75,9 +75,9 @@ /* getDailyWorkRecords : 일계부 등록 현황 상세 임업노동 투입 내역 조회 */ SELECT dw.id, dw.item_name, /* 품목명 */ - dw.item_mark, + dw.item_mark, /* 품목 부호 */ dw.work_name, /* 작업명*/ - dw.work_mark, + dw.work_mark, /* 작업 부호 */ dw.work_land_area, /* 작업 면적 */ CASE WHEN dw.area_unit_code = 'code.record.area.self' @@ -133,12 +133,12 @@ /* getDailyExpenseRecords : 일계부 등록 현황 상세 지출 조회 */ SELECT de.id, /* 지출 id */ de.input_type, /* 입력구분 */ - de.category, - de.income_mark, - de.expense_mark, + de.category, /* 유형 */ + de.income_mark, /* 수입 부호 */ + de.expense_mark, /* 지출 부호 */ de.is_credit, /* 외상판매여부 */ de.expense_kind, /* 지출 종류 */ - de.expense_kind_mark, + de.expense_kind_mark, /* 종류 부호 */ de.source_purpose, /* 지출원(용도) */ de.quantity, /* 수량 */ de.unit_code, /* 단위 */ @@ -208,8 +208,8 @@ resultType="app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyForestryRecords"> /* getDailyForestryRecords : 일계부 등록 현황 상세 자가임업 생산물 중 자가소비량 조회 */ SELECT df.id, /* 자가임업 id */ - df.income_mark, - df.expense_mark, + df.income_mark, /* 수입 부호 */ + df.expense_mark, /* 지출 부호 */ df.product_name, /* 생산물 */ df.usage, /* 용도 */ df.quantity, /* 수량 */ @@ -249,8 +249,8 @@ resultType="app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyFarmingRecords"> /* getDailyFarmingRecords : 일계부 등록 현황 상세 자가농업 생산물 중 자가소비량 조회 */ SELECT df.id, /* 자가농업 id */ - df.income_mark, - df.expense_mark, + df.income_mark, /* 수입 부호 */ + df.expense_mark, /* 종류 부호 */ CASE WHEN df.product_code = 'code.record.farming.self' THEN df.product_self diff --git a/admin/src/main/resources/templates/households/modal/modal-daily-expense.html b/admin/src/main/resources/templates/households/modal/modal-daily-expense.html index 6906e4c0..273429b2 100644 --- a/admin/src/main/resources/templates/households/modal/modal-daily-expense.html +++ b/admin/src/main/resources/templates/households/modal/modal-daily-expense.html @@ -114,7 +114,7 @@ - 현물평가액(원)* + 현물(평가액)*
diff --git a/admin/src/main/resources/templates/households/modal/modal-daily-farming.html b/admin/src/main/resources/templates/households/modal/modal-daily-farming.html index 639cc04d..2401b925 100644 --- a/admin/src/main/resources/templates/households/modal/modal-daily-farming.html +++ b/admin/src/main/resources/templates/households/modal/modal-daily-farming.html @@ -93,7 +93,7 @@ - 현물평가액(원)* + 현물(평가액)*
diff --git a/admin/src/main/resources/templates/households/modal/modal-daily-forestry.html b/admin/src/main/resources/templates/households/modal/modal-daily-forestry.html index bef88ecc..34e079b8 100644 --- a/admin/src/main/resources/templates/households/modal/modal-daily-forestry.html +++ b/admin/src/main/resources/templates/households/modal/modal-daily-forestry.html @@ -83,7 +83,7 @@ - 현물평가액(원)* + 현물(평가액)*
diff --git a/admin/src/main/resources/templates/households/modal/modal-daily-income.html b/admin/src/main/resources/templates/households/modal/modal-daily-income.html index 071b3dc6..ade463cb 100644 --- a/admin/src/main/resources/templates/households/modal/modal-daily-income.html +++ b/admin/src/main/resources/templates/households/modal/modal-daily-income.html @@ -126,7 +126,7 @@
- 현물평가액(원)* + 현물(평가액)*