中控总览

ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeEcuInfoServiceImpl.java

@@ -114,9 +114,18 @@ public class EbikeEcuInfoServiceImpl extends ServiceImpl<EbikeEcuInfoMapper, Ebi
         QueryWrapper queryWrapper = QueryWrapper.create()
                 .select(
                         EBIKE_ECU_INFO.OPERATOR_ID,
-                        QueryMethods.count().as(EbikeEcuInOverview::getCount)
+                        QueryMethods.count().as("count")
                 )
-                .where(EBIKE_ECU_INFO.IS_CLAIM.eq(Boolean.FALSE))
+                //排除已被领取的中控（电池中控一体，从领电中领走）
+//                .where(EBIKE_ECU_INFO.IS_CLAIM.eq(Boolean.FALSE))
+                .and(EBIKE_ECU_INFO.IS_DELETED.eq(Boolean.FALSE))
+                //排除已绑定的中控
+//                .and(QueryMethods.notExists(
+//                        QueryWrapper.create()
+//                                .select()
+//                                .from(EBIKE_BIKE_INFO)
+//                                .where(EBIKE_BIKE_INFO.ECU_ID.eq(EBIKE_ECU_INFO.ECU_ID))
+//                ))
                 .from(EBIKE_ECU_INFO)
                 .groupBy(EBIKE_ECU_INFO.OPERATOR_ID);
         return ebikeEcuInfoMapper.selectListByQueryAs(queryWrapper, EbikeEcuInOverview.class);