更新接口

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/CheckServiceImpl.java

@@ -1052,7 +1052,14 @@ public class CheckServiceImpl implements ICheckService {
 
     @Override
     public Map<String, Object> getCheckDetail(String id) {
-        return checkMapper.getCheckDetail(id);
+        Map<String, Object> map = checkMapper.getCheckDetail(id);
+        if (map.containsKey("isOk")) {
+            map.put("status", CheckStatusEnum.getEnum(String.valueOf(map.get("isOk"))).getName());
+        }
+        if (map.containsKey("picture")) {
+            map.put("picture", fileUrl + map.get("picture"));
+        }
+        return map;
     }
 
     @Override

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

@@ -2019,13 +2019,14 @@
     <select id="getCheckDetail" resultType="Map">
         SELECT
             pc.id checkId,
-            pc.is_ok isOk,
+            pci.is_ok isOk,
             date_format(
                 pc.check_time,
                 '%Y-%m-%d %H:%i:%s'
             ) maintenanceDate,
             pp.id pointId,
             pp.equipment_id equipmentId,
+            pp.remark remark,
             pp.owner_name ownerName,
             pp.equipment_name equipmentName,
             pp.belong_system_id systemId,
@@ -2041,12 +2042,17 @@
             ppl.name planName,
             pp.plan_type planType,
             ppt.user_name planUser,
-            pii.name itemName
+            pci.input_name itemName,
+            pii.maintenance_content itemContent,
+            pcs.photo_data picture,
+            pcs.point_name pointName,
+            pcs.shot_type shotType
         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_check_input pci ON pci.check_id = pc.id
         LEFT JOIN p_input_item pii ON pii.id = pci.input_id
+        LEFT JOIN p_check_shot pcs ON pcs.check_id = pc.id
         LEFT JOIN p_plan_task ppt ON ppt.id = pc.plan_task_id
         WHERE
             pc.id = #{id}