1.使用标志车用气瓶修改位置

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml

@@ -71,14 +71,13 @@
         tzjia.*,
         cdd1.NAME AS inspectionClassify,
         cdd3.NAME AS inspectionType,
-        cdd.NAME AS equipClassify,
+        (SELECT name FROM "tz_equipment_category" ca where ca.code = tzjia.equip_classify)  AS equipClassify,
         cdd2.NAME AS statusName
         FROM
         tz_jyjc_inspection_application AS tzjia
-        LEFT JOIN cb_data_dictionary cdd ON cdd.code = tzjia.equip_classify and cdd.type = 'BJSBZL'
-        LEFT JOIN cb_data_dictionary cdd1 ON cdd1.code = tzjia.inspection_classify
+        LEFT JOIN cb_data_dictionary cdd1 ON cdd1.code = tzjia.inspection_classify AND cdd1.TYPE = 'JYJCLB'
         LEFT JOIN cb_data_dictionary cdd2 ON cdd2.code = tzjia.status and cdd2.type = 'JYLCZT'
-        LEFT JOIN cb_data_dictionary cdd3 ON cdd3.code = tzjia.inspection_type
+        LEFT JOIN cb_data_dictionary cdd3 ON cdd3.code = tzjia.inspection_type AND cdd3.TYPE = 'JYJC'
         <where>
             <if test="jyjcInspectionApplicationModel.applicationNo != null and jyjcInspectionApplicationModel.applicationNo != ''">
                 and tzjia.application_no like concat('%',#{jyjcInspectionApplicationModel.applicationNo},'%')

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

@@ -509,7 +509,6 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             List<JSONObject> records = response.getResult().getRecords();
             ArrayList<Map<String, Object>> arrayList = new ArrayList<>();
             records.forEach(item -> {
-                // item.remove("SEQUENCE_NBR");
                 HashMap<String, Object> objectHashMap = new HashMap<>();
                 for (Map.Entry<String, Object> stringObjectEntry : item.entrySet()) {
                     objectHashMap.put(stringObjectEntry.getKey(), stringObjectEntry.getValue());