导入配合比，类型调整

blade-service/blade-manager/src/main/java/org/springblade/manager/excel/MixProportionInfoExcel.java

@@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  *
@@ -28,40 +29,40 @@ public class MixProportionInfoExcel implements Serializable {
     private String waterBinderRatio;
 
     @ExcelProperty(value = "水泥")
-    private Double cement ;
+    private BigDecimal cement ;
 
     @ExcelProperty(value = "砂")
-    private Double sand;
+    private BigDecimal sand;
 
     @ExcelProperty(value = "碎石1")
-    private Double macadamOne ;
+    private BigDecimal macadamOne ;
 
     @ExcelProperty(value = "碎石2")
-    private Double macadamTwo;
+    private BigDecimal macadamTwo;
 
     @ExcelProperty(value = "碎石3")
-    private Double macadamThree;
+    private BigDecimal macadamThree;
 
     @ExcelProperty(value = "水")
-    private Double water;
+    private BigDecimal water;
 
     @ExcelProperty(value = "掺加剂")
-    private Double admixture;
+    private BigDecimal admixture;
 
     @ExcelProperty(value = "粉煤灰")
-    private Double coalAsh;
+    private BigDecimal coalAsh;
 
     @ExcelProperty(value = "矿渣粉")
-    private Double slagPowder;
+    private BigDecimal slagPowder;
 
     @ExcelProperty(value = "坍落度")
-    private Double slumps;
+    private BigDecimal slumps;
 
     @ExcelProperty(value = "单位体积重")
     private String bulkDensity;
 
     @ExcelProperty(value = "28天抗压强度")
-    private Double compressiveStrength;
+    private BigDecimal compressiveStrength;
 
 
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/MixProportionInfoMapper.xml

@@ -7,7 +7,7 @@
     <select id="compareInfo" resultType="java.lang.Integer">
         select count(1)
         from m_mix_proportion_info
-        WHERE is_deleted = 0 and report_number in
+        WHERE is_deleted = 0 and contract_id = #{contractId} and ( report_number in
         <foreach collection="number" item="n" open="(" separator="," close=")">
             #{n}
         </foreach>
@@ -15,6 +15,7 @@
         <foreach collection="strength" item="s" open="(" separator="," close=")">
             #{s}
         </foreach>
+        )
     </select>
     <select id="designStrengthList" resultType="java.lang.String">
         select design_strength