diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java index 5c93c6d..db269ac 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java @@ -2208,6 +2208,10 @@ public class PatrolResultController extends BaseController { list = patrolResultService.select6FsResultValue(patrolResult); } + for (ResultValue object : list) { + object.setValue(object.formatValue(object.getValue())); + } + return AjaxResult.success(list); } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/ResultValue.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/ResultValue.java index ba7d32b..e249f4b 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/ResultValue.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/ResultValue.java @@ -20,6 +20,24 @@ public class ResultValue implements Serializable { private String value; private String createTime; + public String formatValue(String args) { + String pattern = "(\\d+(\\.\\d+)?)"; + String valueOnlyPrecise = args.replaceAll(".*?(" + pattern + ").*", "$1"); + if(valueOnlyPrecise.startsWith(".")) { + valueOnlyPrecise = "0" + valueOnlyPrecise; + } + + if(valueOnlyPrecise.equals("0.0")) { + valueOnlyPrecise = "0"; + } + + if(args.startsWith("-")) { + valueOnlyPrecise = "-" + valueOnlyPrecise; + } + + return valueOnlyPrecise; + } + @Override public String toString() { return "ResultValue{" +