diff --git a/src/main/java/mjkf/xinke/main/model/db/PriceResult.java b/src/main/java/mjkf/xinke/main/model/db/PriceResult.java index 7d8aea1..26f4b1b 100644 --- a/src/main/java/mjkf/xinke/main/model/db/PriceResult.java +++ b/src/main/java/mjkf/xinke/main/model/db/PriceResult.java @@ -175,20 +175,20 @@ public class PriceResult extends Model { public PriceResult update(PriceResultEditRequest item) { this.setDisplayDigit(item.getDisplayDigit()); - this.setPriceFtb(item.getPriceFtb().floatValue()); - this.setFluctuatingFtb(item.getFluctuatingFtb().floatValue()); - this.setPriceSs(item.getPriceSs().floatValue()); - this.setFluctuatingSs(item.getFluctuatingSs().floatValue()); - this.setPriceFhb(item.getPriceFhb().floatValue()); - this.setFluctuatingFhb(item.getFluctuatingFhb().floatValue()); - this.setPriceNetwork(item.getPriceNetwork().floatValue()); - this.setFluctuatingNetwork(item.getFluctuatingNetwork().floatValue()); - this.setPriceSurvey(item.getPriceSurvey().floatValue()); - this.setFluctuatingSurvey(item.getFluctuatingSurvey().floatValue()); - this.setPriceLastMonth(item.getPriceLastMonth().floatValue()); - this.setPriceCalculate(item.getPriceCalculate().floatValue()); - this.setPriceRecommend(item.getPriceRecommend().floatValue()); - this.setFluctuatingRecommend(item.getFluctuatingRecommend().floatValue()); + this.setPriceFtb(item.getPriceFtb()); + this.setFluctuatingFtb(item.getFluctuatingFtb()); + this.setPriceSs(item.getPriceSs()); + this.setFluctuatingSs(item.getFluctuatingSs()); + this.setPriceFhb(item.getPriceFhb()); + this.setFluctuatingFhb(item.getFluctuatingFhb()); + this.setPriceNetwork(item.getPriceNetwork()); + this.setFluctuatingNetwork(item.getFluctuatingNetwork()); + this.setPriceSurvey(item.getPriceSurvey()); + this.setFluctuatingSurvey(item.getFluctuatingSurvey()); + this.setPriceLastMonth(item.getPriceLastMonth()); + this.setPriceCalculate(item.getPriceCalculate()); + this.setPriceRecommend(item.getPriceRecommend()); + this.setFluctuatingRecommend(item.getFluctuatingRecommend()); return this; } diff --git a/src/main/java/mjkf/xinke/main/model/vo/PriceResultEditRequest.java b/src/main/java/mjkf/xinke/main/model/vo/PriceResultEditRequest.java index 564aea8..90d0317 100644 --- a/src/main/java/mjkf/xinke/main/model/vo/PriceResultEditRequest.java +++ b/src/main/java/mjkf/xinke/main/model/vo/PriceResultEditRequest.java @@ -8,55 +8,48 @@ import lombok.Setter; @Getter @Setter public class PriceResultEditRequest { -// private String materialId; - -// private String name; - -// private Integer year; - -// private Integer month; // @JsonProperty(value = "price_ftb") - private Integer priceFtb; + private Float priceFtb; // @JsonProperty(value = "fluctuating_ftb") - private Integer fluctuatingFtb; + private Float fluctuatingFtb; // @JsonProperty(value = "price_ss") - private Integer priceSs; + private Float priceSs; // @JsonProperty(value = "fluctuating_ss") - private Integer fluctuatingSs; + private Float fluctuatingSs; // @JsonProperty(value = "price_fhb") - private Integer priceFhb; + private Float priceFhb; // @JsonProperty(value = "fluctuating_fhb") - private Integer fluctuatingFhb; + private Float fluctuatingFhb; // @JsonProperty(value = "price_network") - private Integer priceNetwork; + private Float priceNetwork; // @JsonProperty(value = "fluctuating_network") - private Integer fluctuatingNetwork; + private Float fluctuatingNetwork; // @JsonProperty(value = "price_survey") - private Integer priceSurvey; + private Float priceSurvey; // @JsonProperty(value = "fluctuating_survey") - private Integer fluctuatingSurvey; + private Float fluctuatingSurvey; // @JsonProperty(value = "priceLast_month") - private Integer priceLastMonth; + private Float priceLastMonth; // @JsonProperty(value = "price_calculate") - private Integer priceCalculate; + private Float priceCalculate; // @JsonProperty(value = "price_recommend") - private Integer priceRecommend; + private Float priceRecommend; // @JsonProperty(value = "fluctuating_recommend") - private Integer fluctuatingRecommend; + private Float fluctuatingRecommend; private Integer displayDigit; }