设备查询 修改

@@ -212,9 +212,9 @@ public class EquipmentController {
         if (equipmentStatisticDTO.getShowDepartId()) {
         if (equipmentStatisticDTO.getShowDepartId()) {
             List<Map<String, Object>> departIdMapList = WrapperFactory.joinWrapper()
             List<Map<String, Object>> departIdMapList = WrapperFactory.joinWrapper()
                     .select("count(*) as total", "depart_id as departId")
                     .select("count(*) as total", "depart_id as departId")
-                    .from(EquipmentAsset.class)
-                    .innerJoin(EquipmentInfo.class, EquipmentInfo.class.getDeclaredField("assetId"), EquipmentAsset.class.getDeclaredField("id"))
-                    .innerJoin(EquipmentExt.class, EquipmentExt.class.getDeclaredField("infoId"), EquipmentInfo.class.getDeclaredField("id"))
+                    .from(EquipmentInfo.class)
+                    .leftJoin(EquipmentAsset.class, EquipmentInfo.class.getDeclaredField("assetId"), EquipmentAsset.class.getDeclaredField("id"))
+                    .leftJoin(EquipmentExt.class, EquipmentExt.class.getDeclaredField("infoId"), EquipmentInfo.class.getDeclaredField("id"))
                     .where()
                     .where()
                     .eq(StringUtils.isNotEmpty(equipmentStatisticDTO.getIsSpecial()), "is_special", equipmentStatisticDTO.getIsSpecial())
                     .eq(StringUtils.isNotEmpty(equipmentStatisticDTO.getIsSpecial()), "is_special", equipmentStatisticDTO.getIsSpecial())
                     .in(true,"depart_id", Arrays.asList(departs.split(",")))
                     .in(true,"depart_id", Arrays.asList(departs.split(",")))
@@ -359,6 +359,7 @@ public class EquipmentController {
                 .groupBy("EquipmentInfo_equipmentStatus");//EquipmentInfo_isSpecial
                 .groupBy("EquipmentInfo_equipmentStatus");//EquipmentInfo_isSpecial
         sql = sql.replace("EquipmentInfo.maintenance_cost as EquipmentInfo_maintenanceCost,", "")
         sql = sql.replace("EquipmentInfo.maintenance_cost as EquipmentInfo_maintenanceCost,", "")
                 .replace("EquipmentInfo.gz_count as EquipmentInfo_gzCount,", "");
                 .replace("EquipmentInfo.gz_count as EquipmentInfo_gzCount,", "");
+        sql = sql.replaceAll("inner join", "left join");
         List<Map<String, Object>> countMapList = iCommonSqlService.queryWrapperForList(sql, queryWrapper);
         List<Map<String, Object>> countMapList = iCommonSqlService.queryWrapperForList(sql, queryWrapper);
         for (Map<String, Object> item : countMapList) {
         for (Map<String, Object> item : countMapList) {
             String key = "" + item.get("EquipmentInfo_equipmentStatus");
             String key = "" + item.get("EquipmentInfo_equipmentStatus");