1.工作台查询列表接口平台已经倒叙排列，直接使用即可，之前遗漏未修改完整

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -621,9 +621,12 @@
             pp."TEMPERATURE" temperature,
             pp."MEDIUM" medium,
             pp."REMARKS" remarks,
-            (select INSPECT_ORG_NAME from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY REC_DATE DESC limit 1) inspectOrgName,
-            (select name from cb_data_dictionary where type = 'JYJL' and code = (select INSPECT_CONCLUSION from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY REC_DATE DESC limit 1)) inspectConclusion,
-            to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY REC_DATE DESC limit 1), 'YYYY-MM-DD') nextInspectDate
+            pp."WORK_PRESSURE" AS workPressure,
+            pp."WORK_TEMPERATURE" AS workTemperature,
+            pp."WORK_MEDIUM" AS workMedium,
+            (select INSPECT_ORG_NAME from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY INSPECT_DATE DESC limit 1) inspectOrgName,
+            (select name from cb_data_dictionary where type = 'JYJL' and code = (select INSPECT_CONCLUSION from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY INSPECT_DATE DESC limit 1)) inspectConclusion,
+            to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY INSPECT_DATE DESC limit 1), 'YYYY-MM-DD') nextInspectDate
         FROM
             idx_biz_jg_use_info ui
             LEFT JOIN idx_biz_jg_register_info ri on ri."RECORD" = ui."RECORD"

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -2483,10 +2483,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         // 填充有效数据
         for (int curr = 0; curr < equData.size(); curr++) {
             JSONObject obj = (JSONObject) equData.get(curr);
+
             int serialNum = curr + 1;
             for (String fieldName : fieldNames) {
                 exportParamsMap.put("num" + serialNum, (current - 1) * size + (curr + 1));
-                exportParamsMap.put(fieldName + serialNum, ValidationUtil.isEmpty(obj.get(fieldName)) ? "" : obj.get(fieldName));
+                exportParamsMap.put(fieldName + serialNum, setSpecialParamFields(fieldName, obj));
             }
         }
 
@@ -2500,6 +2501,24 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         }
     }
 
+    private Object trimIfEmpty(Object obj) {
+        return ValidationUtil.isEmpty(obj) ? "" : obj;
+    }
+
+
+    private Object setSpecialParamFields(String fieldName, JSONObject equip){
+        switch (fieldName) {
+            case "pressure":
+                return trimIfEmpty(equip.get(fieldName)) + "/" + trimIfEmpty(equip.get("workPressure"));
+            case "temperature":
+                return trimIfEmpty(equip.get(fieldName)) + "/" + trimIfEmpty(equip.get("workTemperature"));
+            case "medium":
+                return trimIfEmpty(equip.get(fieldName)) + "/" + trimIfEmpty(equip.get("workMedium"));
+            default:
+                return ValidationUtil.isEmpty(equip.get(fieldName)) ? "" : equip.get(fieldName);
+        }
+    }
+
 
     /**
      * 填充设备最新的数据至历史json