Merge branch 'dev_screen_data_2.0' into dev_temp

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java

@@ -317,8 +317,10 @@ public class IndexServiceImpl implements IndexService {
         list.forEach(l->{
             BigDecimal num = new BigDecimal(l.getTotalScore()).setScale(1, BigDecimal.ROUND_HALF_UP).stripTrailingZeros();
             l.setScroe(num);
-            l.setSatisfactionRatio(nf.format(Double.parseDouble(l.getSatisfactionRatio())));
-            l.setClosedProjectRatio(nf.format(Double.parseDouble(l.getClosedProjectRatio())));
+            BigDecimal num1 = new BigDecimal(l.getSatisfactionRatio()).setScale(1, BigDecimal.ROUND_HALF_UP);
+            l.setSatisfactionRatio(num1 + "%");
+            BigDecimal num2 = new BigDecimal(l.getClosedProjectRatio()).setScale(1, BigDecimal.ROUND_HALF_UP);
+            l.setClosedProjectRatio(num2 + "%");
         });
 
         return list;