功能修改-sjx

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml

@@ -186,7 +186,6 @@
             </if>
         </where>
         GROUP BY b.WC_NAME, a.WORK_CENTER_ID
-        order by COUNT(CASE WHEN a.STATUS in (10004,10005,10006,10015,10021) THEN a.WORK_CENTER_ID END)/COUNT( CASE WHEN a.STATUS >= 10003 THEN a.WORK_CENTER_ID END ) desc
     </select>
 
     <select id="selectTeam" resultType="java.lang.String">

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java

@@ -369,9 +369,14 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         }
         List<WorkOrderDto> list = baseMapper.selectSchedulingCount(workOrder);
         list.forEach(item -> {
-            item.setSchedulingRate(String.format("%.2f", (double) item.getSchedulingCount() / item.getTotalCount() * 100));
+            if(item.getTotalCount() != 0){
+                item.setSchedulingRate(String.format("%.2f", (double) item.getSchedulingCount() / item.getTotalCount() * 100));
+            }
         });
-        return list;
+        List<WorkOrderDto> sortedList = list.stream()
+                .sorted((o1, o2) -> Double.compare(Double.parseDouble(o2.getSchedulingRate()), Double.parseDouble(o1.getSchedulingRate())))
+                .collect(Collectors.toList());
+        return sortedList;
     }
 
     @Override