diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java index 5ea5110a..a8a05235 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java @@ -18,7 +18,6 @@ public class GetDailyExpenseRecords { private String quantity; private String unitCode; private String unitText; - private String unitSelf; private String price; private String estimatedValue; private String updatedBy; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyFarmingRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyFarmingRecords.java index d7593e43..c9bf3e75 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyFarmingRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyFarmingRecords.java @@ -15,7 +15,6 @@ public class GetDailyFarmingRecords { private String productName; private String usage; private BigDecimal quantity; - private String unitCode; private String unitText; private String estimatedValue; private String updatedBy; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java index 9f4a99c8..490c91b4 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java @@ -21,7 +21,6 @@ public class GetDailyIncomeRecords { private BigDecimal quantity; private String unitCode; private String unitText; - private String unitSelf; private String price; private String estimatedValue; private String updatedBy; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyWorkRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyWorkRecords.java index e057b165..0012c996 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyWorkRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyWorkRecords.java @@ -14,11 +14,9 @@ public class GetDailyWorkRecords { private String itemName; private String workName; private String workLandArea; - private String areaUnitCodeText; - private String areaUnitSelf; + private String areaUnitText; private String harvestQuantity; - private String harvestUnitCodeText; - private String harvestUnitSelf; + private String harvestUnitText; private String ownerTime; private String spouseTime; private String familyMHours; diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersVisitDetailReqVO.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersVisitDetailReqVO.java index 38b7fee2..0c411ee9 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersVisitDetailReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersVisitDetailReqVO.java @@ -14,5 +14,5 @@ public class ResearchersVisitDetailReqVO { private String visitDate; private ManagementType managementType; private String content; - private String isGiftSentFlag; + private String isGiftSent; } diff --git a/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml b/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml index 33fdb343..bd15f374 100644 --- a/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml +++ b/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml @@ -30,8 +30,11 @@ di.source_purpose, /* 수입원(용도) */ di.quantity, /* 수량 */ di.unit_code, /* 단위 코드 */ - ui_unit.code_text AS unit_text, /* 단위 코드 텍스트 */ - di.unit_self, /* 단위(직접입력) */ + CASE + WHEN di.unit_code = 'code.record.unit.self' + THEN di.unit_self + ELSE ui_unit.code_text + END AS unit_text, /* 단위 코드 텍스트 */ di.price, /* 현금 */ di.estimated_value, /* 현물평가액 */ di.updated_by, /* 최종수정자 */ @@ -51,26 +54,32 @@ resultType="app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyWorkRecords"> /* getDailyWorkRecords : 일계부 등록 현황 상세 임업노동 투입 내역 조회 */ SELECT dw.id, - dw.item_name, /* 품목명 */ - dw.work_name, /* 작업명*/ - dw.work_land_area, /* 작업 면적 */ - ui_area.code_text AS areaUnitCodeText, /* 작업면적 단위(코드매핑) */ - dw.area_unit_self, /* 작업면적 단위(직접입력) */ - dw.harvest_quantity, /* 수확량 */ - ui_harvest.code_text AS harvestUnitCodeText, /* 수확량 단위 (코드매핑) */ - dw.harvest_unit_self, /* 수확량 단위 (직접입력) */ - dw.owner_time, /* 경영주 시간 */ - dw.spouse_time, /* 배우자 시간 */ - dw.family_m_hours, /* 가족노동(남) */ - dw.family_f_hours, /* 가족노동(여) */ - dw.hired_m_hours, /* 고용노동(남) */ - dw.hired_f_hours, /* 고용노동(여) */ - dw.shared_m_hours, /* 품앗이(남) */ - dw.shared_f_hours, /* 품앗이(여) */ - dw.volunteer_m_hours, /* 일손돕기(남) */ - dw.volunteer_f_hours, /* 일손돕기(여) */ - dw.updated_by, /* 최종수정자 */ - dw.updated_at /* 최종수정날짜 */ + dw.item_name, /* 품목명 */ + dw.work_name, /* 작업명*/ + dw.work_land_area, /* 작업 면적 */ + CASE + WHEN dw.area_unit_code = 'code.record.unit.self' + THEN dw.area_unit_self + ELSE ui_area.code_text + END AS areaUnitText, /* 작업면적 단위 텍스트 */ + dw.harvest_quantity, /* 수확량 */ + CASE + WHEN dw.harvest_unit_code = 'code.record.unit.self' + THEN dw.harvest_unit_self + ELSE ui_harvest.code_text + END AS harvestUnitText, /* 수확량 단위 텍스트 */ + dw.owner_time, /* 경영주 시간 */ + dw.spouse_time, /* 배우자 시간 */ + dw.family_m_hours, /* 가족노동(남) */ + dw.family_f_hours, /* 가족노동(여) */ + dw.hired_m_hours, /* 고용노동(남) */ + dw.hired_f_hours, /* 고용노동(여) */ + dw.shared_m_hours, /* 품앗이(남) */ + dw.shared_f_hours, /* 품앗이(여) */ + dw.volunteer_m_hours, /* 일손돕기(남) */ + dw.volunteer_f_hours, /* 일손돕기(여) */ + dw.updated_by, /* 최종수정자 */ + dw.updated_at /* 최종수정날짜 */ FROM daily_work dw LEFT JOIN uicode ui_area ON ui_area.parent_id = 'code.record.unit' @@ -92,8 +101,11 @@ de.source_purpose, /* 지출원(용도) */ de.quantity, /* 수량 */ de.unit_code, /* 단위 */ - ui_unit.code_text AS unit_text, /* 단위 코드 텍스트 */ - de.unit_self, /* 단위(직접입력) */ + CASE + WHEN de.unit_code = 'code.record.unit.self' + THEN de.unit_self + ELSE ui_unit.code_text + END AS unit_text, /* 단위 코드 텍스트 */ de.price, /* 현금 */ de.estimated_value, /* 현물평가액 */ de.updated_by, /* 최종수정자 */ @@ -128,7 +140,11 @@ df.usage, /* 용도 */ df.quantity, /* 수량 */ df.unit_code, /* 단위 코드 */ - ui_unit.code_text AS unit_text, /* 단위 코드 텍스트 */ + CASE + WHEN df.unit_code = 'code.record.unit.self' + THEN df.unit_self + ELSE ui_unit.code_text + END AS unit_text, /* 단위 코드 텍스트 */ df.estimated_value, /* 현물평가액 */ df.updated_by, /* 최종수정자 */ TO_CHAR(df.updated_at, 'YYYY-MM-DD HH24:MI') AS updated_at /* 최종수정날짜 */ @@ -145,14 +161,17 @@ /* getDailyFarmingRecords : 일계부 등록 현황 상세 자가농업 생산물 중 자가소비량 조회 */ SELECT df.id, /* 자가농업 id */ CASE - WHEN df.product_self is not null + WHEN df.product_code = 'code.record.farming.self' THEN df.product_self ELSE ui_product.code_text END AS product_name, /* 생산물명 */ df.usage, /* 용도 */ df.quantity, /* 수량 */ - df.unit_code, /* 단위 코드 */ - ui_unit.code_text AS unit_text, /* 단위 코드 텍스트 */ + CASE + WHEN df.unit_code = 'code.record.unit.self' + THEN df.unit_self + ELSE ui_unit.code_text + END AS unit_text, /* 단위 코드 텍스트 */ df.estimated_value, /* 현물평가액 */ df.updated_by, /* 최종수정자 */ TO_CHAR(df.updated_at, 'YYYY-MM-DD HH24:MI') AS updated_at /* 최종수정날짜 */ diff --git a/admin/src/main/resources/messages/uri.properties b/admin/src/main/resources/messages/uri.properties index 2c61728c..3227db30 100644 --- a/admin/src/main/resources/messages/uri.properties +++ b/admin/src/main/resources/messages/uri.properties @@ -37,7 +37,7 @@ uri.admin.household.households.view.{{pathVar}}=\uC784\uAC00 \uC0C1\uC138 uri.admin.researcher=\uC870\uC0AC\uC6D0 \uD604\uD669 uri.admin.researcher.researchers=\uC870\uC0AC\uC6D0 \uD604\uD669 uri.admin.researcher.researchers.create=\uC870\uC0AC\uC6D0 \uB4F1\uB85D -uri.admin.researcher.researchers.view.{{pathVar}}=\uC870\uC0AC\uC6D0 \uC0C1\uC138 +uri.admin.researcher.{{pathVar}}=\uC870\uC0AC\uC6D0 \uC0C1\uC138 uri.admin.dashboard=\uB300\uC2DC\uBCF4\uB4DC uri.admin.dashboard.overview=\uB300\uC2DC\uBCF4\uB4DC diff --git a/admin/src/main/resources/static/assets/images/common/ico_calendar.svg b/admin/src/main/resources/static/assets/images/common/ico_calendar.svg new file mode 100644 index 00000000..316a9cd1 --- /dev/null +++ b/admin/src/main/resources/static/assets/images/common/ico_calendar.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/admin/src/main/resources/static/assets/styles/style.css b/admin/src/main/resources/static/assets/styles/style.css index 065f253e..a1ddad5b 100644 --- a/admin/src/main/resources/static/assets/styles/style.css +++ b/admin/src/main/resources/static/assets/styles/style.css @@ -4704,6 +4704,9 @@ button.swiper-pagination-bullet { display: -webkit-box; display: -webkit-flex; display: flex; + -webkit-box-align: center; + -webkit-align-items: center; + align-items: center; gap: 0.8rem; } @@ -4827,7 +4830,7 @@ input[type=number] { -webkit-box-align: center; -webkit-align-items: center; align-items: center; - height: 16rem; + height: 32rem; border: 1px solid gainsboro; background-color: #ffffff; overflow: hidden; @@ -4984,6 +4987,96 @@ input[type=number] { color: red; } +.input-file-group input { + display: none; +} +.input-file-group .file-txt { + display: -webkit-box; + display: -webkit-flex; + display: flex; + -webkit-box-align: center; + -webkit-align-items: center; + align-items: center; + -webkit-box-pack: center; + -webkit-justify-content: center; + justify-content: center; + width: 8rem; + height: 3.6rem; + background-color: #495057; + color: #FFFFFF; + font-size: 1.5rem; + font-weight: 600; + border-radius: 0.4rem; +} +.input-file-group .desc { + margin-top: 0.8rem; + display: block; + text-align: left; + font-size: 1.4rem; + color: #868E96; +} +.input-file-group .file-list { + margin-top: 1.6rem; + text-align: left; +} +.input-file-group .file-list li { + display: -webkit-box; + display: -webkit-flex; + display: flex; + -webkit-box-align: center; + -webkit-align-items: center; + align-items: center; +} +.input-file-group .file-list li .btn-delete { + margin-left: 0.4rem; + padding: 0; + width: 1.6rem; + height: 1.6rem; + background-image: url("../images/common/ico_close_white.svg"); + background-color: #CED4DA; + background-repeat: no-repeat; + background-size: 10px 10px; + background-position: center; + border-radius: 0.2rem; +} +.input-file-group .file-list li + li { + margin-top: 0.8rem; +} + +input[type=datetime-local] { + position: relative; + background: url("../images/common/ico_calendar.svg") no-repeat right 16px center/20px auto; +} + +input[type=datetime-local]::-webkit-calendar-picker-indicator { + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; + background: transparent; + color: transparent; + cursor: pointer; +} + +.date-range-group { + display: -webkit-box; + display: -webkit-flex; + display: flex; + -webkit-box-align: center; + -webkit-align-items: center; + align-items: center; + gap: 0.6rem; +} +.date-range-group .component-input { + width: -webkit-fit-content !important; + width: -moz-fit-content !important; + width: fit-content !important; +} +.date-range-group .component-input .input-field { + width: 23rem; +} + /* component checkbox */ .component-input { /* component checkbox switch */ diff --git a/admin/src/main/resources/templates/common/modal-household-mapping.html b/admin/src/main/resources/templates/common/modal-household-mapping.html index b18e80e6..135bfb87 100644 --- a/admin/src/main/resources/templates/common/modal-household-mapping.html +++ b/admin/src/main/resources/templates/common/modal-household-mapping.html @@ -10,11 +10,11 @@ - - - + diff --git a/admin/src/main/resources/templates/households/tab/bank-auto-transfer.html b/admin/src/main/resources/templates/households/tab/bank-auto-transfer.html new file mode 100644 index 00000000..2cf21b68 --- /dev/null +++ b/admin/src/main/resources/templates/households/tab/bank-auto-transfer.html @@ -0,0 +1,175 @@ + + + +
+
+
+
+ +
+
+

수입 (0건)

+
+
+ + +
+
+
+ + + + + + + + + + + + + + + + +
선택재배형태수입의 종류대상수입원수량단위현금(원)
+
+ + +
+
+

지출 (0건)

+
+
+ + +
+
+
+ + + + + + + + + + + + + + +
선택지출의 종류용도수량단위현금(원)
+
+
+
+
+ + +
+ \ No newline at end of file diff --git a/admin/src/main/resources/templates/households/tab/daily-record.html b/admin/src/main/resources/templates/households/tab/daily-record.html new file mode 100644 index 00000000..0c23edf6 --- /dev/null +++ b/admin/src/main/resources/templates/households/tab/daily-record.html @@ -0,0 +1,642 @@ + + + +
+
+ +
+
+
+
    +
  • +

    작성완료

    + 6건 +
  • +
  • +

    미작성

    + 6건 +
  • +
  • +

    미완료

    + 6건 +
  • +
  • +

    대기

    + 6건 +
  • +
  • +

    완료율

    + 56.12% +
  • +
+
+ + + + + + + + + + + + + + + + +
입력날짜완료상태수입노동투입지출동력사용시간임업 자가소비량농업 자가소비량
+
+
+ + + +
+ + +
+ \ No newline at end of file diff --git a/admin/src/main/resources/templates/households/tab/forest-product.html b/admin/src/main/resources/templates/households/tab/forest-product.html new file mode 100644 index 00000000..1ce4ce76 --- /dev/null +++ b/admin/src/main/resources/templates/households/tab/forest-product.html @@ -0,0 +1,121 @@ + + + +
+
+
+
+
+

+
+
+ + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
주생산물부생산물
선택지번지목읍면동가능면적(평)재배작물명면적(평)수확량단위판매량단위수확량단위판매량단위
+
+
+
+ + +
+ \ No newline at end of file diff --git a/admin/src/main/resources/templates/households/tab/household-visit.html b/admin/src/main/resources/templates/households/tab/household-visit.html new file mode 100644 index 00000000..9c8e3d32 --- /dev/null +++ b/admin/src/main/resources/templates/households/tab/household-visit.html @@ -0,0 +1,98 @@ + + + +
+
+
+
+
+

+
+
+ + +
+
+
+ + + + + + + + + + + + + + +
선택방문일관리분야내용최종 수정자답례품 전달
+
+
+
+ + +
+ \ No newline at end of file diff --git a/admin/src/main/resources/templates/households/{seq}-2.html b/admin/src/main/resources/templates/households/{seq}-2.html new file mode 100644 index 00000000..ce1b0380 --- /dev/null +++ b/admin/src/main/resources/templates/households/{seq}-2.html @@ -0,0 +1,1303 @@ + + + +
+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
임가번호 + 16750 + 경영주 + 홍길동 + 연령 + 75 +
가구 연락처 + 031-0000-0000 + 휴대폰 번호 + 010-0000-0000 +
실사 + 서울 + 지역 + 31.경기도 + 세부 지역 + 9.경기 +
전체 주소 + 경기도 성남시 분당구 산성대로 OOOO +
업종 대분류 + 40. 수실류재배업 + 업종 중분류1 + 42. 대추재배업 + 업종 중분류2 + 52_1. 조경수 +
규모/세부품목 + 52_1_1. 조경수 +
담당 조사원 + 김조사 + 담당조사원 연락처 + 010-0000-0000 + 유지여부 + 1.유지 +
비고 + - +
+ +
+
+ + +
+
+
+ +
+
+
+ + + + + +
+ +
+
+ +
+
+ +
+
+
+
    +
  • +

    작성완료

    + 6건 +
  • +
  • +

    미작성

    + 6건 +
  • +
  • +

    미완료

    + 6건 +
  • +
  • +

    대기

    + 6건 +
  • +
  • +

    완료율

    + 56.12% +
  • +
+
+ + + + + + + + + + + + + + + + +
입력날짜완료상태수입노동투입지출동력사용시간임업 자가소비량농업 자가소비량
+
+
+ + + +
+ +
+
+
+
+

+
+
+ + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
주생산물부생산물
선택지번지목읍면동가능면적(평)재배작물명면적(평)수확량단위판매량단위수확량단위판매량단위
+
+
+
+ +
+
+
+ +
+
+

수입 (0건)

+
+
+ + +
+
+
+ + + + + + + + + + + + + + + + +
선택재배형태수입의 종류대상수입원수량단위현금(원)
+
+ + +
+
+

지출 (0건)

+
+
+ + +
+
+
+ + + + + + + + + + + + + + +
선택지출의 종류용도수량단위현금(원)
+
+
+
+
+ +
+
+
+
+

+
+
+ + +
+
+
+ + + + + + + + + + + + + + +
선택방문일관리분야내용최종 수정자답례품 전달
+
+
+
+
+
+ +
+
+
+ +
+
+ + +
+
+
+
+
+
+ + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + +
+ + \ No newline at end of file diff --git a/admin/src/main/resources/templates/households/{seq}.html b/admin/src/main/resources/templates/households/{seq}.html index 90a994ff..aa2f76a1 100644 --- a/admin/src/main/resources/templates/households/{seq}.html +++ b/admin/src/main/resources/templates/households/{seq}.html @@ -135,463 +135,20 @@
-
- -
-
-
-
    -
  • -

    작성완료

    - 6건 -
  • -
  • -

    미작성

    - 6건 -
  • -
  • -

    미완료

    - 6건 -
  • -
  • -

    대기

    - 6건 -
  • -
  • -

    완료율

    - 56.12% -
  • -
-
- - - - - - - - - - - - - - + + - -
입력날짜완료상태수입노동투입지출동력사용시간임업 자가소비량농업 자가소비량
-
-
+ + - - -
- -
-
-
-
-

-
-
- - - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
주생산물부생산물
선택지번지목읍면동가능면적(평)재배작물명면적(평)수확량단위판매량단위수확량단위판매량단위
-
-
-
- -
-
-
- -
-
-

수입 (0건)

-
-
- - -
-
-
- - - - - - - - - - - - - - - - -
선택재배형태수입의 종류대상수입원수량단위현금(원)
-
- - -
-
-

지출 (0건)

-
-
- - -
-
-
- - - - - - - - - - - - - - -
선택지출의 종류용도수량단위현금(원)
-
-
-
-
- -
-
-
-
-

-
-
- - -
-
-
- - - - - - - - - - - - - - -
선택방문일관리분야내용최종 수정자답례품 전달
-
-
-
+ +
- +
@@ -614,10 +171,10 @@ -
+ -
+
@@ -686,563 +243,6 @@ } - - - - - - - -