含水率不必填

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/MixProportionInfoController.java

@@ -39,10 +39,10 @@ public class MixProportionInfoController extends BladeController {
             @ApiImplicitParam(name = "key", value = "当前输入框位置", required = true),
             @ApiImplicitParam(name = "contractId", value = "合同段id", required = true),
             @ApiImplicitParam(name = "designStrength", value = "设计强度", required = true),
-            @ApiImplicitParam(name = "sand", value = "黄砂含水率", required = true),
-            @ApiImplicitParam(name = "macadamOne", value = "碎石1含水率", required = true),
-            @ApiImplicitParam(name = "macadamTwo", value = "碎石2含水率", required = true),
-            @ApiImplicitParam(name = "macadamThree", value = "碎石3含水率", required = true),
+            @ApiImplicitParam(name = "sand", value = "黄砂含水率", required = false),
+            @ApiImplicitParam(name = "macadamOne", value = "碎石1含水率", required = false),
+            @ApiImplicitParam(name = "macadamTwo", value = "碎石2含水率", required = false),
+            @ApiImplicitParam(name = "macadamThree", value = "碎石3含水率", required = false),
     })
     public R calculateWater(@Valid @RequestBody MoistureContentDTO dto) {
         return mixProportionInfoService.calculateWater(dto);

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

@@ -122,6 +122,9 @@ public class MixProportionInfoServiceImpl extends BaseServiceImpl<MixProportionI
      */
     @Override
     public R calculateWater(MoistureContentDTO dto) {
+        if (StringUtils.isBlank(dto.getDesignStrength())){
+            throw new ServiceException("请先选择设计强度");
+        }
         //获取位置前缀后缀
         String prefix= dto.getKey().replaceAll("__[\\d_]+", "");
         String suffix = dto.getKey().replaceAll("key_\\d+__", "");
@@ -138,34 +141,49 @@ public class MixProportionInfoServiceImpl extends BaseServiceImpl<MixProportionI
             throw new ServiceException("获取配合比信息失败");
         }
         //含水量计算
+        BigDecimal sand = new BigDecimal(0);
+        BigDecimal macadamOne = new BigDecimal(0);
+        BigDecimal macadamTwo = new BigDecimal(0);
+        BigDecimal macadamThree = new BigDecimal(0);
         //黄砂
-        BigDecimal sand = dto.getSand().divide(new BigDecimal(100)).multiply(info.getSand());
+        if (dto.getSand() != null) {
+            sand = dto.getSand().divide(new BigDecimal(100)).multiply(info.getSand());
+            //黄砂
+            BigDecimal sand2 = info.getSand().add(sand);
+            map.put(prefix + "__" + s1 + "_" + (s2 + 1), sand2);
+        }
         //碎石1
-        BigDecimal macadamOne = dto.getMacadamOne().divide(new BigDecimal(100)).multiply(info.getMacadamOne());
+        if (dto.getMacadamOne() != null) {
+            macadamOne = dto.getMacadamOne().divide(new BigDecimal(100)).multiply(info.getMacadamOne());
+            //碎石1
+            BigDecimal macadamOne2 = info.getMacadamOne().add(macadamOne);
+            map.put(prefix + "__" +s1 + "_" +(s2+2),macadamOne2);
+        }
         //碎石2
-        BigDecimal macadamTwo = dto.getMacadamTwo().divide(new BigDecimal(100)).multiply(info.getMacadamTwo());
+        if (dto.getMacadamTwo() != null) {
+            macadamTwo = dto.getMacadamTwo().divide(new BigDecimal(100)).multiply(info.getMacadamTwo());
+            //碎石2
+            BigDecimal macadamTwo2 = info.getMacadamTwo().add(macadamTwo);
+            map.put(prefix + "__" +s1 + "_" +(s2+3),macadamTwo2);
+        }
         //碎石3
-        BigDecimal macadamThree = dto.getMacadamThree().divide(new BigDecimal(100)).multiply(info.getMacadamThree());
+        if (dto.getMacadamThree() != null) {
+            macadamThree = dto.getMacadamThree().divide(new BigDecimal(100)).multiply(info.getMacadamThree());
+            //碎石3
+            BigDecimal macadamThree2 = info.getMacadamThree().add(macadamThree);
+            map.put(prefix + "__" +s1 + "_" +(s2+4),macadamThree2);
+        }
 
         //施工配合比计算
         //水泥
         BigDecimal cement = info.getCement();
         map.put(prefix + "__" +s1 + "_" +(s2),cement);
-        //黄砂
-        BigDecimal sand2 = info.getSand().add(sand);
-        map.put(prefix + "__" +s1 + "_" +(s2+1),sand2);
-        //碎石1
-        BigDecimal macadamOne2 = info.getMacadamOne().add(macadamOne);
-        map.put(prefix + "__" +s1 + "_" +(s2+2),macadamOne2);
-        //碎石2
-        BigDecimal macadamTwo2 = info.getMacadamTwo().add(macadamTwo);
-        map.put(prefix + "__" +s1 + "_" +(s2+3),macadamTwo2);
-        //碎石3
-        BigDecimal macadamThree2 = info.getMacadamThree().add(macadamThree);
-        map.put(prefix + "__" +s1 + "_" +(s2+4),macadamThree2);
+
         //水
-        BigDecimal water = info.getWater().subtract(sand).subtract(macadamOne).subtract(macadamTwo).subtract(macadamThree);
-        map.put(prefix + "__" +s1 + "_" +(s2+5),water);
+        if (dto.getSand() != null && dto.getMacadamOne() != null && dto.getMacadamTwo() != null && dto.getMacadamThree() != null) {
+            BigDecimal water = info.getWater().subtract(sand).subtract(macadamOne).subtract(macadamTwo).subtract(macadamThree);
+            map.put(prefix + "__" + s1 + "_" + (s2 + 5), water);
+        }
         //掺加剂
         BigDecimal admixture = info.getAdmixture();
         map.put(prefix + "__" +s1 + "_" +(s2+6),admixture);