단위-> 직접선택 추가에 따른 필드 추가 대응
This commit is contained in:
@@ -34,6 +34,7 @@ class CreateBankDao implements CreateBankPortOut {
|
||||
cmd.getSourcePurpose(),
|
||||
cmd.getCount(),
|
||||
cmd.getUnitCode(),
|
||||
cmd.getUnit(),
|
||||
cmd.getPrice(),
|
||||
cmd.getMonth(),
|
||||
cmd.getMonthlyInputStatusId(),
|
||||
|
||||
@@ -30,6 +30,7 @@ public class CreateForestProductDto {
|
||||
|
||||
private Integer count;
|
||||
private String unitCode;
|
||||
private String unit;
|
||||
private Integer price;
|
||||
private String month;
|
||||
|
||||
|
||||
@@ -25,6 +25,7 @@ public class CreateBankCmd extends AuditCommand {
|
||||
|
||||
private Integer count;
|
||||
private String unitCode;
|
||||
private String unit;
|
||||
private Integer price;
|
||||
private String month;
|
||||
|
||||
|
||||
@@ -42,6 +42,7 @@ class GetBanksDao implements GetBanksPortOut {
|
||||
article.getSourcePurpose(),
|
||||
article.getCount(),
|
||||
article.getUnitCode(),
|
||||
article.getUnit(),
|
||||
article.getPrice(),
|
||||
article.getMonth(),
|
||||
article.getMonthlyInputStatusId(),
|
||||
|
||||
@@ -27,6 +27,7 @@ public class GetBanksDto {
|
||||
|
||||
private Integer count;
|
||||
private String unitCode;
|
||||
private String unit;
|
||||
private Integer price;
|
||||
private String month;
|
||||
|
||||
|
||||
@@ -29,6 +29,7 @@ public class GetBanks {
|
||||
|
||||
private Integer count;
|
||||
private String unitCode;
|
||||
private String unite;
|
||||
private Integer price;
|
||||
private String month;
|
||||
|
||||
|
||||
@@ -83,6 +83,7 @@ class CreateBankInputController {
|
||||
item.getSourcePurpose(),
|
||||
item.getCount(),
|
||||
item.getUnitCode(),
|
||||
item.getUnit(),
|
||||
item.getPrice(),
|
||||
currentMonthlyInfo.getMonth(),
|
||||
currentMonthlyInfo.getId()
|
||||
|
||||
@@ -25,6 +25,7 @@ public class CreateBankInputProductReqVO {
|
||||
|
||||
private Integer count;
|
||||
private String unitCode;
|
||||
private String unit;
|
||||
private Integer price;
|
||||
|
||||
|
||||
|
||||
@@ -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(),
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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(),
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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(),
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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()
|
||||
));
|
||||
}
|
||||
|
||||
@@ -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;//
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user