设备查询修改

sonin
sk-module-equipment/src/main/java/com/skua/modules/equipment/controller/EquipmentController.java
--- a/sk-module-equipment/src/main/java/com/skua/modules/equipment/controller/EquipmentController.java
查看文件 @0ac65a9
+++ b/sk-module-equipment/src/main/java/com/skua/modules/equipment/controller/EquipmentController.java
查看文件 @0ac65a9
@@ -522,8 +522,8 @@ public class EquipmentController {
        		.select(" (SELECT MAX(real_start_time) FROM equipment_maintain_task WHERE equipment_id = equipment_info.id and results_enforcement='4') as equipmentExt_maintainLastTime ")
        		.select(" (select TIMESTAMPDIFF(HOUR, NOW(),(select min(start_time) from equipment_maintain_task where start_time>NOW() and equipment_id = equipment_info.id))) as  equipmentExt_maintainCountdown ")
        		.select(" (select max(repair_date) from equipment_repair where info_id=equipment_info.id) as  equipmentExt_repairLastTime ")
-        		.from(EquipmentAsset.class)
+                .from(EquipmentInfo.class)
-                .innerJoin(EquipmentInfo.class, EquipmentInfo::getAssetId, EquipmentAsset::getId)
+                .leftJoin(EquipmentAsset.class, EquipmentInfo::getAssetId, EquipmentAsset::getId)
                .leftJoin(EquipmentBrand.class, EquipmentInfo::getEquipmentBrand, EquipmentBrand::getId)
                .leftJoin(EquipmentCategory.class, EquipmentInfo::getEquipmentType, EquipmentCategory::getId)
                .where()