From 1f3516c45fcbc0c9688e0fba110201b61c822a0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=9A=B0=EC=84=B1?= Date: Wed, 18 Jun 2025 11:47:53 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8B=A8=EC=9C=84->=20=EC=A7=81=EC=A0=91?= =?UTF-8?q?=EC=84=A0=ED=83=9D=20=EC=B6=94=EA=B0=80=EC=97=90=20=EB=94=B0?= =?UTF-8?q?=EB=A5=B8=20=ED=95=84=EB=93=9C=20=EC=B6=94=EA=B0=80=20=EB=8C=80?= =?UTF-8?q?=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../createBank/adapters/persistence/CreateBankDao.java | 1 + .../persistence/model/CreateForestProductDto.java | 1 + .../ports/application/domain/CreateBankCmd.java | 1 + .../bank/getBanks/adapters/persistence/GetBanksDao.java | 1 + .../getBanks/adapters/persistence/model/GetBanksDto.java | 1 + .../bank/getBanks/ports/application/domain/GetBanks.java | 1 + .../adapters/web/CreateBankInputController.java | 1 + .../adapters/web/model/CreateBankInputProductReqVO.java | 1 + .../adapters/persistence/CreateForestProductDao.java | 4 ++++ .../persistence/model/CreateForestProductDto.java | 6 +++++- .../ports/application/domain/CreateForestProductCmd.java | 4 ++++ .../ports/application/domain/GetForestProduct.java | 4 ++++ .../adapters/persistence/GetForestProductsDao.java | 4 ++++ .../adapters/persistence/model/GetForestProductsDto.java | 4 ++++ .../ports/application/domain/GetForestProducts.java | 4 ++++ .../adapters/persistence/GetMonthlyForestProductsDao.java | 4 ++++ .../persistence/model/GetMonthlyForestProductsDto.java | 4 ++++ .../application/domain/GetMonthlyForestProducts.java | 4 ++++ .../adapters/persistence/UpdateForestProductDao.java | 4 ++++ .../persistence/model/UpdateForestProductDto.java | 4 ++++ .../ports/application/domain/UpdateForestProductCmd.java | 4 ++++ .../adapters/web/CreateMonthlyController.java | 4 ++++ .../adapters/web/model/CreateMonthlyProductReqVO.java | 4 ++++ .../src/main/resources/mappers/bank/CreateBankMapper.xml | 2 ++ front/src/main/resources/mappers/bank/GetBanksMapper.xml | 1 + .../mappers/product/CreateForestProductMapper.xml | 8 ++++++++ .../resources/mappers/product/GetForestProductMapper.xml | 4 ++++ .../resources/mappers/product/GetForestProductsMapper.xml | 4 ++++ .../mappers/product/GetMonthlyForestProductsMapper.xml | 4 ++++ .../mappers/product/UpdateForestProductMapper.xml | 4 ++++ 30 files changed, 96 insertions(+), 1 deletion(-) diff --git a/front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/CreateBankDao.java b/front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/CreateBankDao.java index b13c8fb6..465cdd96 100644 --- a/front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/CreateBankDao.java +++ b/front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/CreateBankDao.java @@ -34,6 +34,7 @@ class CreateBankDao implements CreateBankPortOut { cmd.getSourcePurpose(), cmd.getCount(), cmd.getUnitCode(), + cmd.getUnit(), cmd.getPrice(), cmd.getMonth(), cmd.getMonthlyInputStatusId(), 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 11f4bd93..06b87b51 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 @@ -30,6 +30,7 @@ public class CreateForestProductDto { private Integer count; private String unitCode; + private String unit; private Integer price; private String month; 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 048fa4e2..1283a151 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 @@ -25,6 +25,7 @@ public class CreateBankCmd extends AuditCommand { private Integer count; private String unitCode; + private String unit; private Integer price; private String month; diff --git a/front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/GetBanksDao.java b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/GetBanksDao.java index c8df24a7..455584e1 100644 --- a/front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/GetBanksDao.java +++ b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/GetBanksDao.java @@ -42,6 +42,7 @@ class GetBanksDao implements GetBanksPortOut { article.getSourcePurpose(), article.getCount(), article.getUnitCode(), + article.getUnit(), article.getPrice(), article.getMonth(), article.getMonthlyInputStatusId(), 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 8ea9f471..5f24ade2 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 @@ -27,6 +27,7 @@ public class GetBanksDto { private Integer count; private String unitCode; + private String unit; private Integer price; private String month; 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 7d28cec1..3cf21a5d 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 @@ -29,6 +29,7 @@ public class GetBanks { private Integer count; private String unitCode; + private String unite; private Integer price; private String month; diff --git a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/CreateBankInputController.java b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/CreateBankInputController.java index 4f715ee1..a5c8510f 100644 --- a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/CreateBankInputController.java +++ b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/CreateBankInputController.java @@ -83,6 +83,7 @@ class CreateBankInputController { item.getSourcePurpose(), item.getCount(), item.getUnitCode(), + item.getUnit(), item.getPrice(), currentMonthlyInfo.getMonth(), currentMonthlyInfo.getId() 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 bd2dcf54..deca74f6 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 @@ -25,6 +25,7 @@ public class CreateBankInputProductReqVO { private Integer count; private String unitCode; + private String unit; private Integer price; diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/createForestProduct/adapters/persistence/CreateForestProductDao.java b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/createForestProduct/adapters/persistence/CreateForestProductDao.java index f0091563..0f64a651 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/createForestProduct/adapters/persistence/CreateForestProductDao.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/createForestProduct/adapters/persistence/CreateForestProductDao.java @@ -35,12 +35,16 @@ class CreateForestProductDao implements CreateForestProductPortOut { cmd.getMonth(), cmd.getMainYield(), cmd.getMainYieldUnitCode(), + cmd.getMainYieldUnit(), cmd.getMainSaleAmount(), cmd.getMainSaleUnitCode(), + cmd.getMainSaleUnit(), cmd.getSubYield(), cmd.getSubYieldUnitCode(), + cmd.getSubYieldUnit(), cmd.getSubSaleAmount(), cmd.getSubSaleUnitCode(), + cmd.getSubSaleUnit(), cmd.getMonthlyInputStatusId(), cmd.getCreatedAt(), cmd.getCreatedBy(), 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 c40ba74d..9aa369d0 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 @@ -18,7 +18,7 @@ public class CreateForestProductDto { private Long householdSeq; private String streetNum; - private String landType; + private String landType; // code -> 직접 private String town; private Integer availableArea; @@ -30,13 +30,17 @@ public class CreateForestProductDto { private BigDecimal mainYield; private String mainYieldUnitCode; + private String mainYieldUnit; private BigDecimal mainSaleAmount; private String mainSaleUnitCode; + private String mainSaleUnit; private BigDecimal subYield; private String subYieldUnitCode; + private String subYieldUnit; private BigDecimal 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 ddfc00f9..c4d38a4c 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 @@ -28,13 +28,17 @@ public class CreateForestProductCmd extends AuditCommand { private BigDecimal mainYield; private String mainYieldUnitCode; + private String mainYieldUnit; private BigDecimal mainSaleAmount; private String mainSaleUnitCode; + private String mainSaleUnit; private BigDecimal subYield; private String subYieldUnitCode; + private String subYieldUnit; private BigDecimal subSaleAmount; private String subSaleUnitCode; + private String subSaleUnit; private Long monthlyInputStatusId; 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 2d2b7ccb..e98bb2b2 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 @@ -29,13 +29,17 @@ public class GetForestProduct { private BigDecimal mainYield; private String mainYieldUnitCode; + private String mainYieldUnit; private BigDecimal mainSaleAmount; private String mainSaleUnitCode; + private String mainSaleUnit; private BigDecimal subYield; private String subYieldUnitCode; + private String subYieldUnit; private BigDecimal subSaleAmount; private String subSaleUnitCode; + private String subSaleUnit; private Long monthlyInputStatusId; diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getForestProducts/adapters/persistence/GetForestProductsDao.java b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getForestProducts/adapters/persistence/GetForestProductsDao.java index e3c0cc29..84b7255e 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getForestProducts/adapters/persistence/GetForestProductsDao.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getForestProducts/adapters/persistence/GetForestProductsDao.java @@ -43,12 +43,16 @@ class GetForestProductsDao implements GetForestProductsPortOut { article.getMonth(), article.getMainYield(), article.getMainYieldUnitCode(), + article.getMainYieldUnit(), article.getMainSaleAmount(), article.getMainSaleUnitCode(), + article.getMainSaleUnit(), article.getSubYield(), article.getSubYieldUnitCode(), + article.getSubYieldUnit(), article.getSubSaleAmount(), article.getSubSaleUnitCode(), + article.getSubSaleUnit(), article.getMonthlyInputStatusId(), article.getCreatedAt(), article.getCreatedBy(), 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 78fa4a18..04beaaac 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 @@ -28,13 +28,17 @@ public class GetForestProductsDto { private BigDecimal mainYield; private String mainYieldUnitCode; + private String mainYieldUnit; private BigDecimal mainSaleAmount; private String mainSaleUnitCode; + private String mainSaleUnit; private BigDecimal subYield; private String subYieldUnitCode; + private String subYieldUnit; private BigDecimal subSaleAmount; private String subSaleUnitCode; + private String subSaleUnit; private Long monthlyInputStatusId; 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 0bfa102c..90612890 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 @@ -30,13 +30,17 @@ public class GetForestProducts { private BigDecimal mainYield; private String mainYieldUnitCode; + private String mainYieldUnit; private BigDecimal mainSaleAmount; private String mainSaleUnitCode; + private String mainSaleUnit; private BigDecimal subYield; private String subYieldUnitCode; + private String subYieldUnit; private BigDecimal subSaleAmount; private String subSaleUnitCode; + private String subSaleUnit; private Long monthlyInputStatusId; diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getMonthlyForestProducts/adapters/persistence/GetMonthlyForestProductsDao.java b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getMonthlyForestProducts/adapters/persistence/GetMonthlyForestProductsDao.java index f33ed1bf..270aa7fe 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getMonthlyForestProducts/adapters/persistence/GetMonthlyForestProductsDao.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/getMonthlyForestProducts/adapters/persistence/GetMonthlyForestProductsDao.java @@ -43,12 +43,16 @@ class GetMonthlyForestProductsDao implements GetMonthlyForestProductsPortOut { article.getMonth(), article.getMainYield(), article.getMainYieldUnitCode(), + article.getMainYieldUnit(), article.getMainSaleAmount(), article.getMainSaleUnitCode(), + article.getMainSaleUnit(), article.getSubYield(), article.getSubYieldUnitCode(), + article.getSubYieldUnit(), article.getSubSaleAmount(), article.getSubSaleUnitCode(), + article.getSubSaleUnit(), article.getMonthlyInputStatusId(), article.getCreatedAt(), article.getCreatedBy(), 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 f204d754..9cd4e094 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 @@ -28,13 +28,17 @@ public class GetMonthlyForestProductsDto { private BigDecimal mainYield; private String mainYieldUnitCode; + private String mainYieldUnit; private BigDecimal mainSaleAmount; private String mainSaleUnitCode; + private String mainSaleUnit; private BigDecimal subYield; private String subYieldUnitCode; + private String subYieldUnit; private BigDecimal subSaleAmount; private String subSaleUnitCode; + private String subSaleUnit; private Long monthlyInputStatusId; 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 90cfa3fa..c2ef1440 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 @@ -30,13 +30,17 @@ public class GetMonthlyForestProducts { private BigDecimal mainYield; private String mainYieldUnitCode; + private String mainYieldUnit; private BigDecimal mainSaleAmount; private String mainSaleUnitCode; + private String mainSaleUnit; private BigDecimal subYield; private String subYieldUnitCode; + private String subYieldUnit; private BigDecimal subSaleAmount; private String subSaleUnitCode; + private String subSaleUnit; private Long monthlyInputStatusId; diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/updateForestProduct/adapters/persistence/UpdateForestProductDao.java b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/updateForestProduct/adapters/persistence/UpdateForestProductDao.java index 75e92772..a1723b17 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/updateForestProduct/adapters/persistence/UpdateForestProductDao.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/updateForestProduct/adapters/persistence/UpdateForestProductDao.java @@ -31,12 +31,16 @@ class UpdateForestProductDao implements UpdateForestProductPortOut { command.getMonth(), command.getMainYield(), command.getMainYieldUnitCode(), + command.getMainYieldUnit(), command.getMainSaleAmount(), command.getMainSaleUnitCode(), + command.getMainSaleUnit(), command.getSubYield(), command.getSubYieldUnitCode(), + command.getSubYieldUnit(), command.getSubSaleAmount(), command.getSubSaleUnitCode(), + command.getSubSaleUnit(), command.getMonthlyInputStatusId(), LocalDateTime.now(), CommonUtil.getLoginUsername() 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 2de067d3..ea795552 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 @@ -30,13 +30,17 @@ public class UpdateForestProductDto { private BigDecimal mainYield; private String mainYieldUnitCode; + private String mainYieldUnit; private BigDecimal mainSaleAmount; private String mainSaleUnitCode; + private String mainSaleUnit; private BigDecimal subYield; private String subYieldUnitCode; + private String subYieldUnit; private BigDecimal subSaleAmount; private String subSaleUnitCode; + private String subSaleUnit; private Long monthlyInputStatusId; 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 925a176b..986de966 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 @@ -29,13 +29,17 @@ public class UpdateForestProductCmd { private BigDecimal mainYield; private String mainYieldUnitCode; + private String mainYieldUnit; private BigDecimal mainSaleAmount; private String mainSaleUnitCode; + private String mainSaleUnit; private BigDecimal subYield; private String subYieldUnitCode; + private String subYieldUnit; private BigDecimal subSaleAmount; private String subSaleUnitCode; + private String subSaleUnit; private Long monthlyInputStatusId; diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyUI/createMonthlyUI/adapters/web/CreateMonthlyController.java b/front/src/main/java/app/module/front/usecase/info/monthlyUI/createMonthlyUI/adapters/web/CreateMonthlyController.java index a576db91..a838f143 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyUI/createMonthlyUI/adapters/web/CreateMonthlyController.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyUI/createMonthlyUI/adapters/web/CreateMonthlyController.java @@ -64,12 +64,16 @@ class CreateMonthlyController { currentMonthlyInfo.getMonth(), item.getMainYield(), item.getMainYieldUnitCode(), + item.getMainYieldUnit(), item.getMainSaleAmount(), item.getMainSaleUnitCode(), + item.getMainSaleUnit(), item.getSubYield(), item.getSubYieldUnitCode(), + item.getSubYieldUnit(), item.getSubSaleAmount(), item.getSubSaleUnitCode(), + item.getSubSaleUnit(), currentMonthlyInfo.getId() )); } 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 9ea1a3b4..7374e0ae 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 @@ -22,13 +22,17 @@ public class CreateMonthlyProductReqVO { private BigDecimal mainYield;// private String mainYieldUnitCode;// + private String mainYieldUnit;// private BigDecimal mainSaleAmount;// private String mainSaleUnitCode;// + private String mainSaleUnit;// private BigDecimal subYield;// private String subYieldUnitCode;// + private String subYieldUnit;// private BigDecimal subSaleAmount;// private String subSaleUnitCode;// + private String subSaleUnit;// } diff --git a/front/src/main/resources/mappers/bank/CreateBankMapper.xml b/front/src/main/resources/mappers/bank/CreateBankMapper.xml index 62f87f4d..571f2b26 100644 --- a/front/src/main/resources/mappers/bank/CreateBankMapper.xml +++ b/front/src/main/resources/mappers/bank/CreateBankMapper.xml @@ -22,6 +22,7 @@ source_purpose, count, unit_code, + unit, price, month, monthly_input_status_id, @@ -42,6 +43,7 @@ #{sourcePurpose}, #{count}, #{unitCode}, + #{unit}, #{price}, #{month}, #{monthlyInputStatusId}, diff --git a/front/src/main/resources/mappers/bank/GetBanksMapper.xml b/front/src/main/resources/mappers/bank/GetBanksMapper.xml index 38790be9..c583dbae 100644 --- a/front/src/main/resources/mappers/bank/GetBanksMapper.xml +++ b/front/src/main/resources/mappers/bank/GetBanksMapper.xml @@ -20,6 +20,7 @@ a.source_purpose AS sourcePurpose, a.count AS count, a.unit_code AS unitCode, + a.unit AS unit, a.price AS price, a.month AS month, a.monthly_input_status_id AS monthlyInputStatusId, diff --git a/front/src/main/resources/mappers/product/CreateForestProductMapper.xml b/front/src/main/resources/mappers/product/CreateForestProductMapper.xml index b7039c13..10f9e0b2 100644 --- a/front/src/main/resources/mappers/product/CreateForestProductMapper.xml +++ b/front/src/main/resources/mappers/product/CreateForestProductMapper.xml @@ -23,12 +23,16 @@ month, main_yield, main_yield_unit_code, + main_yield_unit, main_sale_amount, main_sale_unit_code, + main_sale_unit, sub_yield, sub_yield_unit_code, + sub_yield_unit, sub_sale_amount, sub_sale_unit_code, + sub_sale_unit, monthly_input_status_id, created_at, created_by, @@ -48,12 +52,16 @@ #{month}, #{mainYield}, #{mainYieldUnitCode}, + #{mainYieldUnit}, #{mainSaleAmount}, #{mainSaleUnitCode}, + #{mainSaleUnit}, #{subYield}, #{subYieldUnitCode}, + #{subYieldUnit}, #{subSaleAmount}, #{subSaleUnitCode}, + #{subSaleUnit}, #{monthlyInputStatusId}, #{createdAt}, #{createdBy}, diff --git a/front/src/main/resources/mappers/product/GetForestProductMapper.xml b/front/src/main/resources/mappers/product/GetForestProductMapper.xml index 159014cd..68bb68fb 100644 --- a/front/src/main/resources/mappers/product/GetForestProductMapper.xml +++ b/front/src/main/resources/mappers/product/GetForestProductMapper.xml @@ -20,12 +20,16 @@ a.month AS month, a.main_yield AS mainYield, a.main_yield_unit_code AS mainYieldUnitCode, + a.main_yield_unit AS mainYieldUnit, a.main_sale_amount AS mainSaleAmount, a.main_sale_unit_code AS mainSaleUnitCode, + a.main_sale_unit AS mainSaleUnit, a.sub_yield AS subYield, a.sub_yield_unit_code AS subYieldUnitCode, + a.sub_yield_unit AS subYieldUnit, a.sub_sale_amount AS subSaleAmount, a.sub_sale_unit_code AS subSaleUnitCode, + a.sub_sale_unit AS subSaleUnit, a.monthly_input_status_id AS monthlyInputStatusId, a.created_at AS createdAt, a.created_by AS createdBy, diff --git a/front/src/main/resources/mappers/product/GetForestProductsMapper.xml b/front/src/main/resources/mappers/product/GetForestProductsMapper.xml index ab6dbec0..04730795 100644 --- a/front/src/main/resources/mappers/product/GetForestProductsMapper.xml +++ b/front/src/main/resources/mappers/product/GetForestProductsMapper.xml @@ -21,12 +21,16 @@ a.month AS month, a.main_yield AS mainYield, a.main_yield_unit_code AS mainYieldUnitCode, + a.main_yield_unit AS mainYieldUnit, a.main_sale_amount AS mainSaleAmount, a.main_sale_unit_code AS mainSaleUnitCode, + a.main_sale_unit AS mainSaleUnit, a.sub_yield AS subYield, a.sub_yield_unit_code AS subYieldUnitCode, + a.sub_yield_unit AS subYieldUnit, a.sub_sale_amount AS subSaleAmount, a.sub_sale_unit_code AS subSaleUnitCode, + a.sub_sale_unit AS subSaleUnit, a.monthly_input_status_id AS monthlyInputStatusId, a.created_at AS createdAt, a.created_by AS createdBy, diff --git a/front/src/main/resources/mappers/product/GetMonthlyForestProductsMapper.xml b/front/src/main/resources/mappers/product/GetMonthlyForestProductsMapper.xml index 639fcda6..3f19e57c 100644 --- a/front/src/main/resources/mappers/product/GetMonthlyForestProductsMapper.xml +++ b/front/src/main/resources/mappers/product/GetMonthlyForestProductsMapper.xml @@ -21,12 +21,16 @@ a.month AS month, a.main_yield AS mainYield, a.main_yield_unit_code AS mainYieldUnitCode, + a.main_yield_unit AS mainYieldUnit, a.main_sale_amount AS mainSaleAmount, a.main_sale_unit_code AS mainSaleUnitCode, + a.main_sale_unit AS mainSaleUnit, a.sub_yield AS subYield, a.sub_yield_unit_code AS subYieldUnitCode, + a.sub_yield_unit AS subYieldUnit, a.sub_sale_amount AS subSaleAmount, a.sub_sale_unit_code AS subSaleUnitCode, + a.sub_sale_unit AS subSaleUnit, a.monthly_input_status_id AS monthlyInputStatusId, a.created_at AS createdAt, a.created_by AS createdBy, diff --git a/front/src/main/resources/mappers/product/UpdateForestProductMapper.xml b/front/src/main/resources/mappers/product/UpdateForestProductMapper.xml index d901cb60..bc4aa614 100644 --- a/front/src/main/resources/mappers/product/UpdateForestProductMapper.xml +++ b/front/src/main/resources/mappers/product/UpdateForestProductMapper.xml @@ -21,12 +21,16 @@ month = #{month}, main_yield = #{mainYield}, main_yield_unit_code = #{mainYieldUnitCode}, + main_yield_unit = #{mainYieldUnit}, main_sale_amount = #{mainSaleAmount}, main_sale_unit_code = #{mainSaleUnitCode}, + main_sale_unit = #{mainSaleUnit}, sub_yield = #{subYield}, sub_yield_unit_code = #{subYieldUnitCode}, + sub_yield_unit = #{subYieldUnit}, sub_sale_amount = #{subSaleAmount}, sub_sale_unit_code = #{subSaleUnitCode}, + sub_sale_unit = #{subSaleUnit}, monthly_input_status_id = #{monthlyInputStatusId}, WHERE id = #{id}