含水率自定义元素2

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/MixProportionInfoServiceImpl.java

@@ -208,8 +208,8 @@ public class MixProportionInfoServiceImpl extends BaseServiceImpl<MixProportionI
             sand = dto.getSand().divide(new BigDecimal(100)).multiply(info.getSand());
             //黄砂
             BigDecimal sand2 = info.getSand().add(sand);
-            if (StringUtils.isNotBlank(key1)) {
-                map.put(key1, sand2);
+            if (StringUtils.isNotBlank(key5)) {
+                map.put(key5, sand2);
             }
         }
         //碎石1
@@ -243,8 +243,8 @@ public class MixProportionInfoServiceImpl extends BaseServiceImpl<MixProportionI
         //施工配合比计算
         //水泥
         BigDecimal cement = info.getCement();
-        if (StringUtils.isNotBlank(key5)) {
-            map.put(key5, cement);
+        if (StringUtils.isNotBlank(key1)) {
+            map.put(key1, cement);
         }
 
         //水