diff --git a/src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java b/src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java index 4ffbe59..0947cba 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java @@ -154,7 +154,7 @@ public class StWaterRController { BigDecimal value = monthFlow.getValue(); list.stream().forEach(w -> { w.setApprovalV(value); - w.setIsStandard(w.getQ().compareTo(value) >= 0 ? "0" : "1"); + w.setIsStandard(w.getQ().compareTo(value) >= 0 ? true : false); }); } return R.ok(list); diff --git a/src/main/java/com/gunshi/project/xyt/model/StWaterR.java b/src/main/java/com/gunshi/project/xyt/model/StWaterR.java index 6c08e3d..67100e7 100644 --- a/src/main/java/com/gunshi/project/xyt/model/StWaterR.java +++ b/src/main/java/com/gunshi/project/xyt/model/StWaterR.java @@ -70,8 +70,8 @@ public class StWaterR extends GenericPageParams implements Serializable { * 是否达标 */ @TableField(exist = false) - @Schema(description="是否达标(0是;1否)") - private String isStandard; + @Schema(description="是否达标") + private Boolean isStandard; /** * 水量