From 0b5c59e76e2ecf0217ea7db64539b0a812f3386a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Tue, 24 Jun 2025 09:36:30 +0900 Subject: [PATCH 01/22] =?UTF-8?q?=ED=8D=BC=EB=B8=94=20=EC=98=AE=EA=B8=B0?= =?UTF-8?q?=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/static/assets/styles/style.css | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/admin/src/main/resources/static/assets/styles/style.css b/admin/src/main/resources/static/assets/styles/style.css index cd3bc019..065f253e 100644 --- a/admin/src/main/resources/static/assets/styles/style.css +++ b/admin/src/main/resources/static/assets/styles/style.css @@ -6637,6 +6637,9 @@ input[type=number] { width: 14rem; } .filter-wrap .component-btns { + min-width: -webkit-max-content; + min-width: -moz-max-content; + min-width: max-content; margin-top: auto; } .filter-wrap .btn { @@ -6704,6 +6707,9 @@ input[type=number] { .table-group .table-tit-group .bottom-btn-group { margin-top: 0; } +.table-group .table-tit-group .component-select { + width: 14rem; +} table { table-layout: fixed; @@ -7192,6 +7198,8 @@ table tbody th { justify-content: space-between; } .dounut-chart-area .chart-group { + -webkit-flex-wrap: wrap; + flex-wrap: wrap; display: -webkit-box; display: -webkit-flex; display: flex; @@ -7234,16 +7242,18 @@ table tbody th { margin-top: 3.2rem; } .dounut-chart-area .chart-group dl dd .percent { + margin-right: 2rem; position: relative; display: block; font-size: 5.6rem; font-weight: 700; + letter-spacing: -1px; } .dounut-chart-area .chart-group dl dd .percent::after { position: absolute; content: "%"; display: block; - right: -1.8rem; + right: -3.5rem; top: 0; } .dounut-chart-area .chart-group dl dd .d-flex { @@ -7289,8 +7299,8 @@ table tbody th { left: 50%; -webkit-transform: translateX(-50%); transform: translateX(-50%); - width: 4px; - height: 50px; + width: 0.2rem; + height: 3.5rem; background: #ffffff; } @@ -7303,8 +7313,8 @@ table tbody th { transform: translateX(-50%) rotate(calc(var(--percent) * 3.6deg)); -webkit-transform-origin: center 80px; transform-origin: center 80px; - width: 4px; - height: 50px; + width: 0.2rem; + height: 3.5rem; background: #ffffff; } From 37442a200768aa439a6deda675693292245b7332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Tue, 24 Jun 2025 09:47:47 +0900 Subject: [PATCH 02/22] =?UTF-8?q?=ED=8D=BC=EB=B8=94=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/main/resources/templates/researcher/detail.html | 4 ++-- .../src/main/resources/templates/researcher/researchers.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/src/main/resources/templates/researcher/detail.html b/admin/src/main/resources/templates/researcher/detail.html index 55aad8a3..2fa66b87 100644 --- a/admin/src/main/resources/templates/researcher/detail.html +++ b/admin/src/main/resources/templates/researcher/detail.html @@ -198,7 +198,7 @@ tbody.append( ` - ${ct.householdNum} + ${ct.householdNum} ${ct.ownerName || '-'} ${ct.phone || '-'} ${ct.regionMainCodeName || '-'} @@ -271,7 +271,7 @@ - ${ct.householdNum} + ${ct.householdNum} ${ct.ownerName} ${ct.visitDate} ${ct.managementType} diff --git a/admin/src/main/resources/templates/researcher/researchers.html b/admin/src/main/resources/templates/researcher/researchers.html index 5e034f6e..493ec830 100644 --- a/admin/src/main/resources/templates/researcher/researchers.html +++ b/admin/src/main/resources/templates/researcher/researchers.html @@ -125,7 +125,7 @@ tbody.append( ` - ${ct.name || '-'} + ${ct.name || '-'} ${ct.phone || '-'} ${ct.regionMainCodeName || '-'} ${ct.householdCount || '-'} From 1cb662c45c6717a88b4e70ca3bfb3872db43186e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Tue, 24 Jun 2025 09:59:27 +0900 Subject: [PATCH 03/22] =?UTF-8?q?[FO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20?= =?UTF-8?q?=ED=95=AD=EB=AA=A9=20=EB=AA=85=EC=B9=AD=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/main/resources/templates/record/daily/index.html | 6 +++--- .../src/main/resources/templates/record/forestry/index.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/front/src/main/resources/templates/record/daily/index.html b/front/src/main/resources/templates/record/daily/index.html index 919da8d3..a8d357ff 100644 --- a/front/src/main/resources/templates/record/daily/index.html +++ b/front/src/main/resources/templates/record/daily/index.html @@ -42,7 +42,7 @@
- +
  • 예 : 2, 2.5
  • @@ -133,7 +134,8 @@
    - + 원
      @@ -149,7 +151,8 @@
      - + 원
        diff --git a/front/src/main/resources/templates/record/farming/form.html b/front/src/main/resources/templates/record/farming/form.html index ca08d2a0..c14ba8ab 100644 --- a/front/src/main/resources/templates/record/farming/form.html +++ b/front/src/main/resources/templates/record/farming/form.html @@ -67,7 +67,7 @@
        + th:value="${detail.quantity}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="수량을 입력해 주세요">
        • 예 : 2, 2.5
        • @@ -122,7 +122,7 @@
          + th:value="${detail.estimatedValue}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="금액을 입력해 주세요"> 원
            diff --git a/front/src/main/resources/templates/record/forestry/form.html b/front/src/main/resources/templates/record/forestry/form.html index 273900ef..0596d1a4 100644 --- a/front/src/main/resources/templates/record/forestry/form.html +++ b/front/src/main/resources/templates/record/forestry/form.html @@ -42,7 +42,7 @@
            + th:value="${detail.quantity}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="수량을 입력해 주세요">
            • 예 : 2, 2.5
            • @@ -97,7 +97,7 @@
              + th:value="${detail.estimatedValue}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="금액을 입력해 주세요"> 원
                diff --git a/front/src/main/resources/templates/record/income/form.html b/front/src/main/resources/templates/record/income/form.html index 4b9c87b7..a04258ff 100644 --- a/front/src/main/resources/templates/record/income/form.html +++ b/front/src/main/resources/templates/record/income/form.html @@ -110,7 +110,7 @@
                + th:value="${detail.quantity}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="수량을 입력해 주세요">
                • 예 : 2, 2.5
                • @@ -165,7 +165,7 @@
                  + th:value="${detail.price}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="금액을 입력해 주세요"> 원
                    @@ -182,7 +182,7 @@
                    + th:value="${detail.estimatedValue}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="금액을 입력해 주세요"> 원
                      diff --git a/front/src/main/resources/templates/record/power/form.html b/front/src/main/resources/templates/record/power/form.html index d70ba58a..5adb16cd 100644 --- a/front/src/main/resources/templates/record/power/form.html +++ b/front/src/main/resources/templates/record/power/form.html @@ -45,7 +45,8 @@
                      - + 시간
                      @@ -57,7 +58,8 @@
                      - + 시간
                      diff --git a/front/src/main/resources/templates/record/work/form.html b/front/src/main/resources/templates/record/work/form.html index b941a2ab..3b7eda2e 100644 --- a/front/src/main/resources/templates/record/work/form.html +++ b/front/src/main/resources/templates/record/work/form.html @@ -52,7 +52,7 @@
                      + th:value="${detail.workLandArea}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="작업 면적을 입력해 주세요">
                      • 예 : 180, 6
                      • @@ -109,7 +109,7 @@
                        + th:value="${detail.harvestQuantity}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="수확량을 입력해 주세요">
                        @@ -174,7 +174,7 @@
                        + th:value="${detail.ownerTime}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00"> 시간
                        @@ -187,7 +187,7 @@
                        + th:value="${detail.spouseTime}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00"> 시간
                        @@ -202,7 +202,7 @@
                        남 + th:value="${detail.familyMHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00"> 시간
                        @@ -210,7 +210,7 @@
                        여 + th:value="${detail.familyFHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00"> 시간
                        @@ -227,7 +227,7 @@
                        남 + th:value="${detail.hiredMHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00"> 시간
                        @@ -235,7 +235,7 @@
                        여 + th:value="${detail.hiredFHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00"> 시간
                        @@ -252,7 +252,7 @@
                        남 + th:value="${detail.sharedMHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00"> 시간
                        @@ -260,7 +260,7 @@
                        여 + th:value="${detail.sharedFHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00"> 시간
                        @@ -277,7 +277,7 @@
                        남 + th:value="${detail.volunteerMHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00"> 시간
                        @@ -285,7 +285,7 @@
                        여 + th:value="${detail.volunteerFHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00"> 시간
                        From 9c32e40a728cb69ad7dbc9b1482a02aa39294866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Tue, 24 Jun 2025 10:52:53 +0900 Subject: [PATCH 05/22] =?UTF-8?q?[HTML]=20=EB=82=A0=EC=A7=9C:=202025?= =?UTF-8?q?=EB=85=84=206=EC=9B=94=2024=EC=9D=BC=20=ED=99=94=EC=9A=94?= =?UTF-8?q?=EC=9D=BC=20=EC=98=A4=EC=A0=84=2010:02:55=20[=EA=B3=B5=ED=86=B5?= =?UTF-8?q?]=20=EC=88=98=EC=A0=95=20::=20=EC=A0=84=EC=B2=B4=20=EB=A9=94?= =?UTF-8?q?=EB=89=B4=20=EB=86=92=EC=9D=B4=20=EB=B0=8F=20=EC=84=9C=EB=B8=8C?= =?UTF-8?q?=20=ED=97=A4=EB=8D=94=20=EB=82=B4=20=EC=97=AC=EB=B0=B1=20?= =?UTF-8?q?=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/static/assets/styles/style.css | 14 +++++++++++ .../templates/policy/privacy-wrap.html | 4 ++-- .../templates/policy/terms-wrap.html | 24 +++++++++---------- 3 files changed, 28 insertions(+), 14 deletions(-) diff --git a/front/src/main/resources/static/assets/styles/style.css b/front/src/main/resources/static/assets/styles/style.css index 54e8dba5..cf6f27c4 100644 --- a/front/src/main/resources/static/assets/styles/style.css +++ b/front/src/main/resources/static/assets/styles/style.css @@ -7496,6 +7496,7 @@ button.swiper-pagination-bullet { -webkit-box-align: center; -webkit-align-items: center; align-items: center; + padding: 0rem; } .header .header-wrap.sub .inner .btn-back { width: 2.4rem; @@ -8078,6 +8079,19 @@ button.swiper-pagination-bullet { padding-bottom: 0rem; } +.allmenu-wrap.component-modal .modal-content-inner { + height: 100%; + display: -webkit-box; + display: -webkit-flex; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -webkit-flex-direction: column; + flex-direction: column; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + justify-content: space-between; +} .allmenu-wrap.component-modal .modal-header { padding: 3.2rem 2.4rem 2.4rem; display: block; diff --git a/front/src/main/resources/templates/policy/privacy-wrap.html b/front/src/main/resources/templates/policy/privacy-wrap.html index 65e60ea2..c7d652c1 100644 --- a/front/src/main/resources/templates/policy/privacy-wrap.html +++ b/front/src/main/resources/templates/policy/privacy-wrap.html @@ -2,7 +2,7 @@ From 004cbf16d76b6834e9ed0a8dae1718f4d9713f81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Tue, 24 Jun 2025 11:10:43 +0900 Subject: [PATCH 08/22] =?UTF-8?q?[FO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20?= =?UTF-8?q?=ED=98=84=EA=B8=88,=20=ED=98=84=EB=AC=BC=20=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=ED=83=80=EC=9E=85=20Long=20=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EC=9D=BC=EA=B4=84=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/sql/schema/02_create-record.sql | 16 ++++++++-------- .../persistence/model/DailyExpenseDto.java | 4 ++-- .../web/model/CreateDailyExpenseReqVO.java | 4 ++-- .../domain/CreateDailyExpenseCmd.java | 4 ++-- .../persistence/model/DailyFarmingDto.java | 2 +- .../web/model/CreateDailyFarmingReqVO.java | 2 +- .../domain/CreateDailyFarmingCmd.java | 2 +- .../persistence/model/DailyForestryDto.java | 2 +- .../web/model/CreateDailyForestryReqVO.java | 2 +- .../domain/CreateDailyForestryCmd.java | 2 +- .../persistence/model/DailyIncomeDto.java | 4 ++-- .../web/model/CreateDailyIncomeReqVO.java | 4 ++-- .../application/domain/CreateDailyIncomeCmd.java | 4 ++-- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/core/src/main/resources/sql/schema/02_create-record.sql b/core/src/main/resources/sql/schema/02_create-record.sql index df3bff36..332b77e5 100644 --- a/core/src/main/resources/sql/schema/02_create-record.sql +++ b/core/src/main/resources/sql/schema/02_create-record.sql @@ -153,8 +153,8 @@ CREATE TABLE daily_income ( quantity varchar(10), -- 수량 unit_code varchar(255), -- 단위(매핑코드) unit_self varchar(100), -- 단위(직접입력) - price integer, -- 현금(원) - estimated_value integer, -- 현물(평가액) + price bigint, -- 현금(원) + estimated_value bigint, -- 현물(평가액) created_at timestamp(6), -- 생성일 created_by varchar(255), -- 생성자 updated_at timestamp(6), -- 수정일 @@ -211,11 +211,11 @@ CREATE TABLE daily_expense ( expense_kind varchar(100), -- 지출의 종류 expense_kind_mark varchar(10), -- 종류 부호 source_purpose varchar(10), -- 지출원(용도) - quantity varchar(10), -- 수량 + quantity varchar(10), -- 수량 unit_code varchar(255), -- 단위(매핑코드) - unit_self varchar(100), -- 단위(직접입력) - price integer, -- 현금(원) - estimated_value integer, -- 현물(평가액) + unit_self varchar(100), -- 단위(직접입력) + price bigint, -- 현금(원) + estimated_value bigint, -- 현물(평가액) created_at timestamp(6), -- 생성일 created_by varchar(255), -- 생성자 updated_at timestamp(6), -- 수정일 @@ -386,7 +386,7 @@ CREATE TABLE daily_forestry ( quantity varchar(10), -- 수량 unit_code varchar(255), -- 단위(매핑코드) unit_self varchar(100), -- 단위(직접입력) - estimated_value integer, -- 현물평가 + estimated_value bigint, -- 현물평가 created_at timestamp(6), -- 생성일 created_by varchar(255), -- 생성자 updated_at timestamp(6), -- 수정일 @@ -437,7 +437,7 @@ CREATE TABLE daily_farming ( quantity varchar(10), -- 수량 unit_code varchar(255), -- 단위(매핑코드) unit_self varchar(100), -- 단위(직접입력) - estimated_value integer, -- 현물평가액 + estimated_value bigint, -- 현물평가액 created_at timestamp(6), -- 생성일 created_by varchar(255), -- 생성자 updated_at timestamp(6), -- 수정일 diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/model/DailyExpenseDto.java b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/model/DailyExpenseDto.java index fbefcd17..aa9eb01f 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/model/DailyExpenseDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/model/DailyExpenseDto.java @@ -17,8 +17,8 @@ public class DailyExpenseDto { private String unitCode; private String unitLabel; private String unitSelf; - private Integer price; - private Integer estimatedValue; + private Long price; + private Long estimatedValue; /** * 수정 가능 여부 diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/model/CreateDailyExpenseReqVO.java b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/model/CreateDailyExpenseReqVO.java index 84ca31ee..fb32ef44 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/model/CreateDailyExpenseReqVO.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/model/CreateDailyExpenseReqVO.java @@ -52,9 +52,9 @@ public class CreateDailyExpenseReqVO extends DailyUIReqVO { /** * 현금 */ - private Integer price; + private Long price; /** * 현물평가액 */ - private Integer estimatedValue; + private Long estimatedValue; } diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/domain/CreateDailyExpenseCmd.java b/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/domain/CreateDailyExpenseCmd.java index ce462a0a..31f1d638 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/domain/CreateDailyExpenseCmd.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/domain/CreateDailyExpenseCmd.java @@ -29,6 +29,6 @@ public class CreateDailyExpenseCmd extends FrontAuditCommand { private Double quantity; private String unitCode; private String unitSelf; - private Integer price; - private Integer estimatedValue; + private Long price; + private Long estimatedValue; } diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/model/DailyFarmingDto.java b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/model/DailyFarmingDto.java index 965946d2..43c35436 100644 --- a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/model/DailyFarmingDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/model/DailyFarmingDto.java @@ -16,7 +16,7 @@ public class DailyFarmingDto { private String unitCode; private String unitLabel; private String unitSelf; - private Integer estimatedValue; + private Long estimatedValue; /** * 수정 가능 여부 diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/model/CreateDailyFarmingReqVO.java b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/model/CreateDailyFarmingReqVO.java index 937318be..afa63e09 100644 --- a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/model/CreateDailyFarmingReqVO.java +++ b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/model/CreateDailyFarmingReqVO.java @@ -46,5 +46,5 @@ public class CreateDailyFarmingReqVO extends DailyUIReqVO { /** * 현물평가액 */ - private Integer estimatedValue; + private Long estimatedValue; } diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/domain/CreateDailyFarmingCmd.java b/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/domain/CreateDailyFarmingCmd.java index 1f5c6f46..59e0b1c8 100644 --- a/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/domain/CreateDailyFarmingCmd.java +++ b/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/domain/CreateDailyFarmingCmd.java @@ -21,5 +21,5 @@ public class CreateDailyFarmingCmd extends FrontAuditCommand { private Double quantity; private String unitCode; private String unitSelf; - private Integer estimatedValue; + private Long estimatedValue; } diff --git a/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/model/DailyForestryDto.java b/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/model/DailyForestryDto.java index c462672f..0a72fad6 100644 --- a/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/model/DailyForestryDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/model/DailyForestryDto.java @@ -14,7 +14,7 @@ public class DailyForestryDto { private String unitCode; private String unitLabel; private String unitSelf; - private Integer estimatedValue; + private Long estimatedValue; /** * 수정 가능 여부 diff --git a/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/web/model/CreateDailyForestryReqVO.java b/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/web/model/CreateDailyForestryReqVO.java index 03a0ddb5..1fd96020 100644 --- a/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/web/model/CreateDailyForestryReqVO.java +++ b/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/web/model/CreateDailyForestryReqVO.java @@ -42,5 +42,5 @@ public class CreateDailyForestryReqVO extends DailyUIReqVO { /** * 현물평가액 */ - private Integer estimatedValue; + private Long estimatedValue; } diff --git a/front/src/main/java/app/module/front/usecase/daily/forestry/ports/application/domain/CreateDailyForestryCmd.java b/front/src/main/java/app/module/front/usecase/daily/forestry/ports/application/domain/CreateDailyForestryCmd.java index 1a6ab55c..e3ffe812 100644 --- a/front/src/main/java/app/module/front/usecase/daily/forestry/ports/application/domain/CreateDailyForestryCmd.java +++ b/front/src/main/java/app/module/front/usecase/daily/forestry/ports/application/domain/CreateDailyForestryCmd.java @@ -19,5 +19,5 @@ public class CreateDailyForestryCmd extends FrontAuditCommand { private Double quantity; private String unitCode; private String unitSelf; - private Integer estimatedValue; + private Long estimatedValue; } diff --git a/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyIncomeDto.java b/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyIncomeDto.java index ad1b92fb..34de8e81 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyIncomeDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyIncomeDto.java @@ -19,8 +19,8 @@ public class DailyIncomeDto { private String unitCode; private String unitLabel; private String unitSelf; - private Integer price; - private Integer estimatedValue; + private Long price; + private Long estimatedValue; /** * 수정 가능 여부 diff --git a/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/model/CreateDailyIncomeReqVO.java b/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/model/CreateDailyIncomeReqVO.java index dbf0a371..1444b1f8 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/model/CreateDailyIncomeReqVO.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/model/CreateDailyIncomeReqVO.java @@ -55,9 +55,9 @@ public class CreateDailyIncomeReqVO extends DailyUIReqVO { /** * 현금 */ - private Integer price; + private Long price; /** * 현물평가액 */ - private Integer estimatedValue; + private Long estimatedValue; } diff --git a/front/src/main/java/app/module/front/usecase/daily/income/ports/application/domain/CreateDailyIncomeCmd.java b/front/src/main/java/app/module/front/usecase/daily/income/ports/application/domain/CreateDailyIncomeCmd.java index 5a33d68e..d519308b 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/ports/application/domain/CreateDailyIncomeCmd.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/ports/application/domain/CreateDailyIncomeCmd.java @@ -30,6 +30,6 @@ public class CreateDailyIncomeCmd extends FrontAuditCommand { private Double quantity; private String unitCode; private String unitSelf; - private Integer price; - private Integer estimatedValue; + private Long price; + private Long estimatedValue; } From ccd8a585d88956de480e2c5e7116ef5b9214843f Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Tue, 24 Jun 2025 11:45:54 +0900 Subject: [PATCH 09/22] =?UTF-8?q?[FO]=20=EC=9D=80=ED=96=89=EC=9E=90?= =?UTF-8?q?=EB=8F=99=EC=9D=B4=EC=B2=B4=EB=82=B4=EC=97=AD,=20=EC=9E=84?= =?UTF-8?q?=EC=82=B0=EB=AC=BC=ED=98=84=ED=99=A9=20-=20=20=EC=88=98?= =?UTF-8?q?=EB=9F=89=20=EC=86=8C=EC=88=98=EC=A0=90=20=EC=A0=80=EC=9E=A5=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95,=20=EC=88=AB=EC=9E=90?= =?UTF-8?q?=20=ED=82=A4=ED=8C=A8=EB=93=9C=20=EC=A0=81=EC=9A=A9,=20?= =?UTF-8?q?=ED=83=80=EC=9E=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/CreateForestProductDto.java | 4 ++-- .../application/domain/CreateBankCmd.java | 4 ++-- .../persistence/model/GetBanksDto.java | 4 ++-- .../ports/application/domain/GetBanks.java | 4 ++-- .../web/model/CreateBankInputProductReqVO.java | 4 ++-- .../model/CreateForestProductDto.java | 12 ++++++------ .../domain/CreateForestProductCmd.java | 12 ++++++------ .../application/domain/GetForestProduct.java | 12 ++++++------ .../model/GetForestProductsDto.java | 12 ++++++------ .../application/domain/GetForestProducts.java | 12 ++++++------ .../model/GetMonthlyForestProductsDto.java | 12 ++++++------ .../domain/GetMonthlyForestProducts.java | 12 ++++++------ .../model/UpdateForestProductDto.java | 12 ++++++------ .../domain/UpdateForestProductCmd.java | 12 ++++++------ .../web/model/CreateMonthlyProductReqVO.java | 12 ++++++------ .../resources/templates/info/bank/input.html | 2 +- .../templates/info/bank/inputForm.html | 7 +++++-- .../resources/templates/info/bank/output.html | 2 +- .../templates/info/bank/outputForm.html | 7 +++++-- .../resources/templates/info/monthly/form.html | 18 ++++++++++++------ .../resources/templates/info/monthly/{id}.html | 3 ++- 21 files changed, 96 insertions(+), 83 deletions(-) diff --git a/front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/model/CreateForestProductDto.java b/front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/model/CreateForestProductDto.java index 047b5947..21876472 100644 --- a/front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/model/CreateForestProductDto.java +++ b/front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/model/CreateForestProductDto.java @@ -29,10 +29,10 @@ public class CreateForestProductDto { private String sourcePurpose; - private Integer count; + private String count; private String unitCode; private String unit; - private Integer price; + private Long price; private String month; private Long monthlyInputStatusId; diff --git a/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/application/domain/CreateBankCmd.java b/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/application/domain/CreateBankCmd.java index 1283a151..b623415c 100644 --- a/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/application/domain/CreateBankCmd.java +++ b/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/application/domain/CreateBankCmd.java @@ -23,10 +23,10 @@ public class CreateBankCmd extends AuditCommand { private String sourcePurpose; - private Integer count; + private String count; private String unitCode; private String unit; - private Integer price; + private Long price; private String month; private Long monthlyInputStatusId; diff --git a/front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/model/GetBanksDto.java b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/model/GetBanksDto.java index 5f24ade2..0cd7d304 100644 --- a/front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/model/GetBanksDto.java +++ b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/model/GetBanksDto.java @@ -25,10 +25,10 @@ public class GetBanksDto { private String sourcePurpose; - private Integer count; + private String count; private String unitCode; private String unit; - private Integer price; + private Long price; private String month; private Long monthlyInputStatusId; diff --git a/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/domain/GetBanks.java b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/domain/GetBanks.java index 52a2c63a..5a205c21 100644 --- a/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/domain/GetBanks.java +++ b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/domain/GetBanks.java @@ -27,10 +27,10 @@ public class GetBanks { private String sourcePurpose; - private Integer count; + private String count; private String unitCode; private String unit; - private Integer price; + private Long price; private String month; private Long monthlyInputStatusId; diff --git a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputProductReqVO.java b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputProductReqVO.java index deca74f6..cf6fa217 100644 --- a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputProductReqVO.java +++ b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputProductReqVO.java @@ -23,10 +23,10 @@ public class CreateBankInputProductReqVO { private String sourcePurpose; - private Integer count; + private String count; private String unitCode; private String unit; - private Integer price; + private Long price; } diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/createForestProduct/adapters/persistence/model/CreateForestProductDto.java b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/createForestProduct/adapters/persistence/model/CreateForestProductDto.java index 9aa369d0..40128ef5 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/createForestProduct/adapters/persistence/model/CreateForestProductDto.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/createForestProduct/adapters/persistence/model/CreateForestProductDto.java @@ -21,24 +21,24 @@ public class CreateForestProductDto { private String landType; // code -> 직접 private String town; - private Integer availableArea; + private String availableArea; private String cropName; private String cropCode; - private Integer landArea; + private String landArea; private String month; - private BigDecimal mainYield; + private String mainYield; private String mainYieldUnitCode; private String mainYieldUnit; - private BigDecimal mainSaleAmount; + private String mainSaleAmount; private String mainSaleUnitCode; private String mainSaleUnit; - private BigDecimal subYield; + private String subYield; private String subYieldUnitCode; private String subYieldUnit; - private BigDecimal subSaleAmount; + private String subSaleAmount; private String subSaleUnitCode; private String subSaleUnit; private Long monthlyInputStatusId; diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/createForestProduct/ports/application/domain/CreateForestProductCmd.java b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/createForestProduct/ports/application/domain/CreateForestProductCmd.java index c4d38a4c..3369e641 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/createForestProduct/ports/application/domain/CreateForestProductCmd.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/createForestProduct/ports/application/domain/CreateForestProductCmd.java @@ -19,24 +19,24 @@ public class CreateForestProductCmd extends AuditCommand { private String landType; private String town; - private Integer availableArea; + private String availableArea; private String cropName; private String cropCode; - private Integer landArea; + private String landArea; private String month; - private BigDecimal mainYield; + private String mainYield; private String mainYieldUnitCode; private String mainYieldUnit; - private BigDecimal mainSaleAmount; + private String mainSaleAmount; private String mainSaleUnitCode; private String mainSaleUnit; - private BigDecimal subYield; + private String subYield; private String subYieldUnitCode; private String subYieldUnit; - private BigDecimal subSaleAmount; + private String subSaleAmount; private String subSaleUnitCode; private String subSaleUnit; diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getForestProduct/ports/application/domain/GetForestProduct.java b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getForestProduct/ports/application/domain/GetForestProduct.java index e98bb2b2..811d87ce 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getForestProduct/ports/application/domain/GetForestProduct.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getForestProduct/ports/application/domain/GetForestProduct.java @@ -20,24 +20,24 @@ public class GetForestProduct { private String landType; private String town; - private Integer availableArea; + private String availableArea; private String cropName; private String cropCode; - private Integer landArea; + private String landArea; private String month; - private BigDecimal mainYield; + private String mainYield; private String mainYieldUnitCode; private String mainYieldUnit; - private BigDecimal mainSaleAmount; + private String mainSaleAmount; private String mainSaleUnitCode; private String mainSaleUnit; - private BigDecimal subYield; + private String subYield; private String subYieldUnitCode; private String subYieldUnit; - private BigDecimal subSaleAmount; + private String subSaleAmount; private String subSaleUnitCode; private String subSaleUnit; diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getForestProducts/adapters/persistence/model/GetForestProductsDto.java b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getForestProducts/adapters/persistence/model/GetForestProductsDto.java index 04beaaac..b4bc7f24 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getForestProducts/adapters/persistence/model/GetForestProductsDto.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getForestProducts/adapters/persistence/model/GetForestProductsDto.java @@ -19,24 +19,24 @@ public class GetForestProductsDto { private String landType; private String town; - private Integer availableArea; + private String availableArea; private String cropName; private String cropCode; - private Integer landArea; + private String landArea; private String month; - private BigDecimal mainYield; + private String mainYield; private String mainYieldUnitCode; private String mainYieldUnit; - private BigDecimal mainSaleAmount; + private String mainSaleAmount; private String mainSaleUnitCode; private String mainSaleUnit; - private BigDecimal subYield; + private String subYield; private String subYieldUnitCode; private String subYieldUnit; - private BigDecimal subSaleAmount; + private String subSaleAmount; private String subSaleUnitCode; private String subSaleUnit; diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getForestProducts/ports/application/domain/GetForestProducts.java b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getForestProducts/ports/application/domain/GetForestProducts.java index 90612890..484c1886 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getForestProducts/ports/application/domain/GetForestProducts.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getForestProducts/ports/application/domain/GetForestProducts.java @@ -21,24 +21,24 @@ public class GetForestProducts { private String landType; private String town; - private Integer availableArea; + private String availableArea; private String cropName; private String cropCode; - private Integer landArea; + private String landArea; private String month; - private BigDecimal mainYield; + private String mainYield; private String mainYieldUnitCode; private String mainYieldUnit; - private BigDecimal mainSaleAmount; + private String mainSaleAmount; private String mainSaleUnitCode; private String mainSaleUnit; - private BigDecimal subYield; + private String subYield; private String subYieldUnitCode; private String subYieldUnit; - private BigDecimal subSaleAmount; + private String subSaleAmount; private String subSaleUnitCode; private String subSaleUnit; diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getMonthlyForestProducts/adapters/persistence/model/GetMonthlyForestProductsDto.java b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getMonthlyForestProducts/adapters/persistence/model/GetMonthlyForestProductsDto.java index 9cd4e094..5dda1840 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getMonthlyForestProducts/adapters/persistence/model/GetMonthlyForestProductsDto.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getMonthlyForestProducts/adapters/persistence/model/GetMonthlyForestProductsDto.java @@ -19,24 +19,24 @@ public class GetMonthlyForestProductsDto { private String landType; private String town; - private Integer availableArea; + private String availableArea; private String cropName; private String cropCode; - private Integer landArea; + private String landArea; private String month; - private BigDecimal mainYield; + private String mainYield; private String mainYieldUnitCode; private String mainYieldUnit; - private BigDecimal mainSaleAmount; + private String mainSaleAmount; private String mainSaleUnitCode; private String mainSaleUnit; - private BigDecimal subYield; + private String subYield; private String subYieldUnitCode; private String subYieldUnit; - private BigDecimal subSaleAmount; + private String subSaleAmount; private String subSaleUnitCode; private String subSaleUnit; diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getMonthlyForestProducts/ports/application/domain/GetMonthlyForestProducts.java b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getMonthlyForestProducts/ports/application/domain/GetMonthlyForestProducts.java index c2ef1440..666043f7 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getMonthlyForestProducts/ports/application/domain/GetMonthlyForestProducts.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getMonthlyForestProducts/ports/application/domain/GetMonthlyForestProducts.java @@ -21,24 +21,24 @@ public class GetMonthlyForestProducts { private String landType; private String town; - private Integer availableArea; + private String availableArea; private String cropName; private String cropCode; - private Integer landArea; + private String landArea; private String month; - private BigDecimal mainYield; + private String mainYield; private String mainYieldUnitCode; private String mainYieldUnit; - private BigDecimal mainSaleAmount; + private String mainSaleAmount; private String mainSaleUnitCode; private String mainSaleUnit; - private BigDecimal subYield; + private String subYield; private String subYieldUnitCode; private String subYieldUnit; - private BigDecimal subSaleAmount; + private String subSaleAmount; private String subSaleUnitCode; private String subSaleUnit; diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/updateForestProduct/adapters/persistence/model/UpdateForestProductDto.java b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/updateForestProduct/adapters/persistence/model/UpdateForestProductDto.java index ea795552..c889b62d 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/updateForestProduct/adapters/persistence/model/UpdateForestProductDto.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/updateForestProduct/adapters/persistence/model/UpdateForestProductDto.java @@ -21,24 +21,24 @@ public class UpdateForestProductDto { private String landType; private String town; - private Integer availableArea; + private String availableArea; private String cropName; private String cropCode; - private Integer landArea; + private String landArea; private String month; - private BigDecimal mainYield; + private String mainYield; private String mainYieldUnitCode; private String mainYieldUnit; - private BigDecimal mainSaleAmount; + private String mainSaleAmount; private String mainSaleUnitCode; private String mainSaleUnit; - private BigDecimal subYield; + private String subYield; private String subYieldUnitCode; private String subYieldUnit; - private BigDecimal subSaleAmount; + private String subSaleAmount; private String subSaleUnitCode; private String subSaleUnit; diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/updateForestProduct/ports/application/domain/UpdateForestProductCmd.java b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/updateForestProduct/ports/application/domain/UpdateForestProductCmd.java index 986de966..784b0f04 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/updateForestProduct/ports/application/domain/UpdateForestProductCmd.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/updateForestProduct/ports/application/domain/UpdateForestProductCmd.java @@ -20,24 +20,24 @@ public class UpdateForestProductCmd { private String landType; private String town; - private Integer availableArea; + private String availableArea; private String cropName; private String cropCode; - private Integer landArea; + private String landArea; private String month; - private BigDecimal mainYield; + private String mainYield; private String mainYieldUnitCode; private String mainYieldUnit; - private BigDecimal mainSaleAmount; + private String mainSaleAmount; private String mainSaleUnitCode; private String mainSaleUnit; - private BigDecimal subYield; + private String subYield; private String subYieldUnitCode; private String subYieldUnit; - private BigDecimal subSaleAmount; + private String subSaleAmount; private String subSaleUnitCode; private String subSaleUnit; diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyUI/createMonthlyUI/adapters/web/model/CreateMonthlyProductReqVO.java b/front/src/main/java/app/module/front/usecase/info/monthlyUI/createMonthlyUI/adapters/web/model/CreateMonthlyProductReqVO.java index 7374e0ae..ee89a091 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyUI/createMonthlyUI/adapters/web/model/CreateMonthlyProductReqVO.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyUI/createMonthlyUI/adapters/web/model/CreateMonthlyProductReqVO.java @@ -16,21 +16,21 @@ public class CreateMonthlyProductReqVO { private String landType;// private String town;// - private Integer availableArea;// + private String availableArea;// private String cropName;// - private Integer landArea;// + private String landArea;// - private BigDecimal mainYield;// + private String mainYield;// private String mainYieldUnitCode;// private String mainYieldUnit;// - private BigDecimal mainSaleAmount;// + private String mainSaleAmount;// private String mainSaleUnitCode;// private String mainSaleUnit;// - private BigDecimal subYield;// + private String subYield;// private String subYieldUnitCode;// private String subYieldUnit;// - private BigDecimal subSaleAmount;// + private String subSaleAmount;// private String subSaleUnitCode;// private String subSaleUnit;// diff --git a/front/src/main/resources/templates/info/bank/input.html b/front/src/main/resources/templates/info/bank/input.html index f03c2a4f..83002cc4 100644 --- a/front/src/main/resources/templates/info/bank/input.html +++ b/front/src/main/resources/templates/info/bank/input.html @@ -497,7 +497,7 @@ if (rstData.code === 'SUCCESS') { ajaxUtil._alert('등록이 완료되었습니다.', null, function () { - history.back() + location.href = '/info/bank'; }); } else if (rstData.code === 'ERROR') { ajaxUtil._alert('잠시 뒤에 다시 시도해 주세요.', null); diff --git a/front/src/main/resources/templates/info/bank/inputForm.html b/front/src/main/resources/templates/info/bank/inputForm.html index d9f524d8..05001479 100644 --- a/front/src/main/resources/templates/info/bank/inputForm.html +++ b/front/src/main/resources/templates/info/bank/inputForm.html @@ -120,7 +120,8 @@
                        - +
                        • 예 : 2, 2.5
                        • @@ -179,7 +180,9 @@
                          - + 원