二期版本

target/classes/mapper/repair/RepairRecordMapper.xml

@@ -781,7 +781,7 @@
 
     <!-- 报表导出获取除已超时外的其他数据获取方式-->
     <select id="queryNotTimeoutReportExport" resultType="com.repair.model.vo.ReportExportVo">
-        select rr.user_id,1 as details,rr.id,rr.record_no,rr.area_id as area_name,rr.user_name,rr.user_phone,rat.name as
+        select rr.user_id,1 as details,rr.id,rr.record_no,rr.area_id+''+rr.address as area_name,rr.user_name,rr.user_phone,rat.name as
         article_name,
         rr.description,rr.report_time,rr.maintenancer_name,rr.maintenance_state
         from repair_record rr
@@ -809,7 +809,7 @@
     <!-- 报表导出获取除已超时数据获取方式-->
     <select id="queryTimeoutReportExport" resultType="com.repair.model.vo.ReportExportVo">
         SELECT * FROM (
-        select rr3.user_id,1 as details,rr3.id,rr3.record_no,rr3.area_id as
+        select rr3.user_id,1 as details,rr3.id,rr3.record_no,rr3.area_id+''+rr3.address as
         area_name,rr3.user_name,rr3.user_phone,rat.name as article_name,
         rr3.description,rr3.report_time,(select user_name from repair_user where id = rdr.users_id) as
         maintenancer_name,rr3.maintenance_state