更新接口

amos-boot-system-maintenance/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -1899,9 +1899,9 @@
                 pc.id checkId,
                 pc.user_id userId,
                 pc.is_ok isOk,
-                pr.owner_id ownerId,
+                pp.owner_id ownerId,
                 date_format(
-                pc.check_time ,
+                pc.check_time,
                 '%Y-%m-%d %H:%i:%s'
                 ) checkDate,
                 pp.id pointId,
@@ -1913,7 +1913,6 @@
                 CONCAT(pp.address, pp.building_name) buildingName
             FROM p_check pc
             LEFT JOIN p_point pp ON pp.id = pc.point_id
-            LEFT JOIN p_route pr on pr.id = pc.route_id
         ) a
         <include refid="mobile-check-record-where" />
         limit #{offset},#{pageSize}
@@ -1999,8 +1998,11 @@
         pc.id checkId,
         pc.user_id userId,
         pc.is_ok isOk,
-        pr.owner_id ownerId,
-        pc.check_time checkDate,
+        pp.owner_id ownerId,
+        date_format(
+        pc.check_time,
+        '%Y-%m-%d %H:%i:%s'
+        ) checkDate,
         pp.id pointId,
         pp.equipment_id equipmentId,
         pp.equipment_name equipmentName,
@@ -2010,7 +2012,6 @@
         CONCAT(pp.address, pp.building_name) buildingName
         FROM p_check pc
         LEFT JOIN p_point pp ON pp.id = pc.point_id
-        LEFT JOIN p_route pr on pr.id = pc.route_id
         ) a
         <include refid="mobile-check-record-where" />
     </select>
@@ -2019,15 +2020,29 @@
         SELECT
             pc.id checkId,
             pc.is_ok isOk,
-            pc.create_date maintenanceDate,
+            date_format(
+                pc.check_time,
+                '%Y-%m-%d %H:%i:%s'
+            ) maintenanceDate,
             pp.id pointId,
             pp.equipment_id equipmentId,
             pp.equipment_name equipmentName,
             pp.belong_system_id systemId,
             pp.belong_system_name systemName,
-            CONCAT(pp.address, pp.building_name) address
+            CONCAT(pp.address, pp.building_name) address,
+            CONCAT(date_format(
+                ppl.plan_begin,
+                '%Y-%m-%d %H:%i:%s'
+            ), '-', date_format(
+                ppl.plan_end,
+                '%Y-%m-%d %H:%i:%s'
+            )) planDate,
+            ppl.name planName,
+            ppt.user_name planUser
         FROM p_check pc
         LEFT JOIN p_point pp ON pp.id = pc.point_id
+        LEFT JOIN p_plan ppl ON ppl.id = pc.plan_id
+        LEFT JOIN p_plan_task ppt ON ppt.id = pc.plan_task_id
         WHERE
             pc.id = #{id}
     </select>