Merge remote-tracking branch 'origin/master'

zxkf-api/src/main/java/api/controller/Report/WorkReportController.java

@@ -62,8 +62,8 @@ public class WorkReportController extends BaseController {
         var table = ReportBaseService.selectWorkOrderTypeReport(input);
         if (table != null && table.size() > 0) {
             for (WorkOrderTypeReport report : table) {
-                report.setProcessedRate("100%");
-                report.setCompletedRate("100%");
+                report.setProcessedRate("100.00%");
+                report.setCompletedRate("100.00%");
                 if (report.getType_count()>0)
                 {
                     double Processed = ((double)report.getProcessed() / report.getType_count());//结果的百分比
@@ -83,8 +83,8 @@ public class WorkReportController extends BaseController {
         var table= ReportBaseService.selectWorkOrderTypeReport( input);
         if (table != null && table.size() > 0) {
             for (WorkOrderTypeReport report : table) {
-                report.setProcessedRate("100%");
-                report.setCompletedRate("100%");
+                report.setProcessedRate("100.00%");
+                report.setCompletedRate("100.00%");
                 if (report.getType_count()>0)
                 {
                     double Processed =  ((double)report.getProcessed() / report.getType_count());//结果的百分比
@@ -105,8 +105,8 @@ public class WorkReportController extends BaseController {
         var table = ReportBaseService.selectRecordReport(input);
         if (table != null && table.size() > 0) {
             for (RecordReport report : table) {
-                report.setAnswerRate("100%");
-                report.setMydRate("100%");
+                report.setAnswerRate("100.00%");
+                report.setMydRate("100.00%");
                 if (report.getLdCount()>0)
                 {
                     double Answer = ((double)report.getAnswer() / report.getLdCount());//结果的百分比
@@ -129,8 +129,8 @@ public class WorkReportController extends BaseController {
         var table = ReportBaseService.selectRecordReport(input);
         if (table != null && table.size() > 0) {
             for (RecordReport report : table) {
-                report.setAnswerRate("100%");
-                report.setMydRate("100%");
+                report.setAnswerRate("100.00%");
+                report.setMydRate("100.00%");
                 if (report.getLdCount()>0)
                 {
                     double Answer = ((double)report.getAnswer() / report.getLdCount());//结果的百分比