단위-> 직접선택 추가에 따른 필드 추가 대응

This commit is contained in:
주우성
2025-06-18 11:47:53 +09:00
parent ccdc2c0f59
commit 1f3516c45f
30 changed files with 96 additions and 1 deletions

View File

@@ -34,6 +34,7 @@ class CreateBankDao implements CreateBankPortOut {
cmd.getSourcePurpose(),
cmd.getCount(),
cmd.getUnitCode(),
cmd.getUnit(),
cmd.getPrice(),
cmd.getMonth(),
cmd.getMonthlyInputStatusId(),

View File

@@ -30,6 +30,7 @@ public class CreateForestProductDto {
private Integer count;
private String unitCode;
private String unit;
private Integer price;
private String month;

View File

@@ -25,6 +25,7 @@ public class CreateBankCmd extends AuditCommand {
private Integer count;
private String unitCode;
private String unit;
private Integer price;
private String month;

View File

@@ -42,6 +42,7 @@ class GetBanksDao implements GetBanksPortOut {
article.getSourcePurpose(),
article.getCount(),
article.getUnitCode(),
article.getUnit(),
article.getPrice(),
article.getMonth(),
article.getMonthlyInputStatusId(),

View File

@@ -27,6 +27,7 @@ public class GetBanksDto {
private Integer count;
private String unitCode;
private String unit;
private Integer price;
private String month;

View File

@@ -29,6 +29,7 @@ public class GetBanks {
private Integer count;
private String unitCode;
private String unite;
private Integer price;
private String month;

View File

@@ -83,6 +83,7 @@ class CreateBankInputController {
item.getSourcePurpose(),
item.getCount(),
item.getUnitCode(),
item.getUnit(),
item.getPrice(),
currentMonthlyInfo.getMonth(),
currentMonthlyInfo.getId()

View File

@@ -25,6 +25,7 @@ public class CreateBankInputProductReqVO {
private Integer count;
private String unitCode;
private String unit;
private Integer price;

View File

@@ -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(),

View File

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

View File

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

View File

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

View File

@@ -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(),

View File

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

View File

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

View File

@@ -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(),

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -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()
));
}

View File

@@ -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;//
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -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},
<include refid="common.fields.UpdateBaseSet"/>
WHERE id = #{id}