Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardMonitorOneService.java

@@ -209,7 +209,7 @@ public class JxCenterWorkingBoardMonitorOneService extends JxCenterWorkingBoardC
     private String calcRepairRate(List<MesOutPutStatistics> outPutStatisticsList, List<MesRepairTask> repairTaskList, MesWorkCenterExt workCenterExtDb) {
         Double repairQty = CollectionUtils.isEmpty(repairTaskList) ? new Double(0) : getListSizeD(repairTaskList.stream().filter(o -> (null != o && o.getWorkOrderNo().equals(outPutStatisticsList.get(0).getWorkOrderNo()) && o.getWorkTime().equals(workCenterExtDb.getWorkTime()))).collect(Collectors.toList()));
         Double qty = getOutPutStatisticsList2AmountQty(outPutStatisticsList);
-        return getBigDecimalPercent(format1RounHalfUp(MathOperation.sub(new Double(100), MathOperation.div(qty, MathOperation.add(qty, repairQty)))));
+        return getBigDecimalPercent(format1RounHalfUp(MathOperation.sub(new Double(100), MathOperation.mul(MathOperation.div(qty, MathOperation.add(qty, repairQty)), new Double(100)))));
     }
 
     private MesOutPutStatistics getOutPutStatisticsByCenter(String organizeCode, String workCenterCode) {