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 @@