From 0dedf1daf5b888426e975d2eb047dc88c4f54965 Mon Sep 17 00:00:00 2001
From: han0 <wslshanlin@sina.com>
Date: Thu, 11 Jul 2024 10:33:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B6=8B=E5=8A=BF?=
 =?UTF-8?q?=E8=A1=A8=E4=BB=B7=E6=A0=BC=E7=B2=BE=E5=BA=A6=E4=B8=A2=E5=A4=B1?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mjkf/xinke/main/model/db/PriceResult.java | 56 +++++++++----------
 1 file changed, 28 insertions(+), 28 deletions(-)

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 7bff802..f7b532a 100644
--- a/src/main/java/mjkf/xinke/main/model/db/PriceResult.java
+++ b/src/main/java/mjkf/xinke/main/model/db/PriceResult.java
@@ -86,59 +86,59 @@ public class PriceResult extends Model<PriceResult> {
 
     @ApiModelProperty("福州交通局价格")
     @TableField("PRICE_FTB")
-    private Integer priceFtb;
+    private Float priceFtb;
 
     @ApiModelProperty("福州交通局浮动")
     @TableField("FLUCTUATING_FTB")
-    private Integer fluctuatingFtb;
+    private Float fluctuatingFtb;
 
     @ApiModelProperty("三明钢铁价格")
     @TableField("PRICE_SS")
-    private Integer priceSs;
+    private Float priceSs;
 
     @ApiModelProperty("三明钢铁浮动")
     @TableField("FLUCTUATING_SS")
-    private Integer fluctuatingSs;
+    private Float fluctuatingSs;
 
     @ApiModelProperty("福州公路局价格")
     @TableField("PRICE_FHB")
-    private Integer priceFhb;
+    private Float priceFhb;
 
     @ApiModelProperty("福州公路局浮动")
     @TableField("FLUCTUATING_FHB")
-    private Integer fluctuatingFhb;
+    private Float fluctuatingFhb;
 
     @ApiModelProperty("网络价格")
     @TableField("PRICE_NETWORK")
-    private Integer priceNetwork;
+    private Float priceNetwork;
 
     @ApiModelProperty("网络浮动")
     @TableField("FLUCTUATING_NETWORK")
-    private Integer fluctuatingNetwork;
+    private Float fluctuatingNetwork;
 
     @ApiModelProperty("调查价格")
     @TableField("PRICE_SURVEY")
-    private Integer priceSurvey;
+    private Float priceSurvey;
 
     @ApiModelProperty("调查浮动")
     @TableField("FLUCTUATING_SURVEY")
-    private Integer fluctuatingSurvey;
+    private Float fluctuatingSurvey;
 
     @ApiModelProperty("上月发布价格")
     @TableField("PRICE_LAST_MONTH")
-    private Integer priceLastMonth;
+    private Float priceLastMonth;
 
     @ApiModelProperty("计算价格")
     @TableField("PRICE_CALCULATE")
-    private Integer priceCalculate;
+    private Float priceCalculate;
 
     @ApiModelProperty("推荐价格")
     @TableField("PRICE_RECOMMEND")
-    private Integer priceRecommend;
+    private Float priceRecommend;
 
     @ApiModelProperty("推荐浮动")
     @TableField("FLUCTUATING_RECOMMEND")
-    private Integer fluctuatingRecommend;
+    private Float fluctuatingRecommend;
 
     @Override
     public Serializable pkVal() {
@@ -146,20 +146,20 @@ public class PriceResult extends Model<PriceResult> {
     }
 
     public PriceResult update(PriceResultEditRequest item) {
-        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());
+        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());
         return this;
     }
 }