1

src/main/java/com/sooka/sponest/data/emergency/domain/vo/ExportVo.java

@@ -19,11 +19,11 @@ public class ExportVo {
 
 //    /** 企业所属街道 */
 //    @Excel(name = "企业所属街道")
-//    private String jdName;
+    private String jdName;
 //
 //    /** 企业所属社区 */
 //    @Excel(name = "企业所属社区")
-//    private String sqName;
+    private String sqName;
 
     /** 巡检人 */
     @Excel(name = "巡检人")
@@ -73,7 +73,7 @@ public class ExportVo {
 
 //    /** 巡检记录 */
 //    @Excel(name = "巡检记录")
-//    private List<TBusInspection> tBusInspectionList;
+    private List<TBusInspection> tBusInspectionList;
 
 
 }

src/main/resources/mapper/emergency/appmin/AppXunjianimgMapper.xml

@@ -21,6 +21,7 @@
         (select bus_items_name from t_bus_items where bus_items_id = (select parent_id from t_bus_items where bus_items_id=i.bus_items_id)) ejName,
         (select dict_label from onest_system.sys_dict_data where dict_value= i.items_type) itemsTypeValue,
         (select dict_label from onest_system.sys_dict_data where dict_value=i.risk_status) riskStatusValue,
+        i.risk_status riskStatus,
         g.bus_enterprise_name busEnterpriseName,
         attach.attach_url attachUrl
         from t_bus_inspection i