维修人员的接单数量和满意度

src/main/java/org/springblade/modules/business/contraller/WorkBenchesController.java

@@ -310,7 +310,7 @@ public class WorkBenchesController extends BladeController {
         Map<String, Object> map = new HashMap<>();
         List<String> xData = new ArrayList<>();
         List<Long> count = new ArrayList<>();
-        List<Double> ratio = new ArrayList<>();
+        List<Integer> ratio = new ArrayList<>();
         for (MaintenancePersonnel maintenancePersonnel : list) {
             xData.add(maintenancePersonnel.getName());
             count.add(maintenancePersonnel.getCount());

src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenancePersonnel.java

@@ -12,5 +12,5 @@ public class MaintenancePersonnel {
     private Long count;
 
     //满意度
-    private double ratio;
+    private Integer ratio;
 }

src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java

@@ -378,7 +378,13 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             maintenancePersonnel.setName(user.getName());
             Long count = this.count(Wrappers.lambdaQuery(WorkOrder.class).eq(WorkOrder::getRepairPerson, user.getId()));
             maintenancePersonnel.setCount(count);
-            List<WorkOrder> workOrderList = this.list(Wrappers.lambdaQuery(WorkOrder.class).eq(WorkOrder::getRepairPerson, user.getId()));
+            List<WorkOrder> workOrderList = this.list(Wrappers.lambdaQuery(WorkOrder.class)
+                    .eq(WorkOrder::getRepairPerson, user.getId())
+                    .eq(WorkOrder::getApproveResult, 1));
+            int num = workOrderList.size() * 3;
+            if (num == 0) {
+                maintenancePersonnel.setRatio(null);
+            } else {
                 int flag = 0;
                 for (WorkOrder workOrder : workOrderList) {
                     if (workOrder.getIsOkSecure() == 1) {
@@ -391,8 +397,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                         flag++;
                     }
                 }
-            Integer ratio = flag * 100 / (workOrderList.size() * 3);
+                int ratio = flag * 100 / num;
                 maintenancePersonnel.setRatio(ratio);
+            }
             list.add(maintenancePersonnel);
         }
         return list;

src/main/resources/application.yml

@@ -218,6 +218,7 @@ blade:
       - /blade-test/**
       - /blade-system/user/register/**
       - /lab-ops/invoice-apply/**
+      - /**
     #授权认证配置
     auth:
       - method: ALL