*）修改直接返回API结果

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/DPSubServiceImpl.java

@@ -165,6 +165,10 @@ public class DPSubServiceImpl {
 
     public JSONObject buildContentKeyinfoData(JSONObject tab, JSONObject content, Object apiResult){
         JSONObject result = JSONObject.parseObject(apiResult.toString());
+        if (tab.getString("template").contains("emergency")){
+            content.put("keyinfo", result);
+            return content;
+        }
         JSONObject param = tab.getJSONObject("param");
         Object keyParams = JsonValueUtils.getValueByKey(content, "keyinfo", "keyinfo.keyParams");
         if (ValidationUtil.isEmpty(keyParams)){
@@ -190,9 +194,10 @@ public class DPSubServiceImpl {
         ((JSONArray) keyParams).stream().forEach(x -> {
             JSONObject xobj = (JSONObject) x;
             xobj.put("type", "text");
-            xobj.put("value", result.get(xobj.getString("key")));
+            xobj.put("value", "param".equals(xobj.getString("source")) ? param.get(xobj.getString("key")) : result.get(xobj.getString("key")));
         });
         this.processQRCodeWidget(content.getJSONObject("keyinfo").getJSONObject("qrcode"), result);
+        this.processQRCodeWidget(content.getJSONObject("keyinfo").getJSONObject("qrcode"), result);
 
         if (tab.getString("template").contains("equip")){
             // 处理问题列表

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/company.json

@@ -8,7 +8,10 @@
       "dataConfig": {
         "api": {
           "httpMethod":"GET",
-          "apiPath":"/jczs/baseEnterprise/{sequenceNbr}"
+          "apiPath":"/tcm/baseEnterprise/getInfoByUseCode/map",
+          "params": {
+            "useCode": "{useUnitCode}"
+          }
         }
       }
     },
@@ -71,9 +74,15 @@
   ],
   "content": {
     "keyinfo": {
-      "status": [],
+      "status": [
+        { "key": "unitType", "label": "", "icon": "", "value": "success" },
+        { "key": "2", "label": "", "icon": "", "value": "success" },
+        { "key": "3", "label": "否", "icon": "", "value": "error" },
+        { "key": "4", "label": "否", "icon": "", "value": "stop" }
+      ],
       "qrcode": {
-        "title": "监管码"
+        "title": "监管码",
+        "problem": []
       },
       "keyParams": [
         { "key": "unitType", "label": "单位类型" },

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_1000.json

@@ -8,7 +8,7 @@
       "dataConfig": {
         "api": {
           "httpMethod":"GET",
-          "apiPath":"/ymt/equipment-category/getFormRecordById",
+          "apiPath":"/ymt/equipment-category/getFormRecordById/map",
           "params": {
             "alias": "{EQU_LIST_CODE}",
             "id": "{SEQUENCE_NBR}"
@@ -122,20 +122,21 @@
     "keyinfo": {
       "status": [],
       "qrcode": {
-        "title": "监管码"
+        "title": "监管码",
+        "problem": []
       },
       "keyParams": [
-        { "key": "unitType", "label": "使用登记证编号" },
-        { "key": "useUnit", "label": "登记机关" },
-        { "key": "useUnitCode", "label": "登记日期" },
-        { "key": "governingBody", "label": "使用单位名称" },
-        { "key": "unitType", "label": "设备使用地点" },
-        { "key": "useUnit", "label": "设备种类" },
-        { "key": "useUnitCode", "label": "设备类别" },
-        { "key": "governingBody", "label": "设备品种" },
-        { "key": "governingBody", "label": "单位内编号" },
-        { "key": "governingBody", "label": "设备代码" },
-        { "key": "governingBody", "label": "下一次检验日期" }
+        { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
+        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REC_DATE", "label": "登记日期" },
+        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
+        { "key": "ADDRESS", "label": "设备使用地点" },
+        { "key": "EQU_TYPE", "label": "设备种类", "source": "param"  },
+        { "key": "EQU_LIST", "label": "设备类别", "source": "param"  },
+        { "key": "EQU_CATEGORY", "label": "设备品种", "source": "param"  },
+        { "key": "USE_INNER_CODE", "label": "单位内编号" },
+        { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
+        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
       ],
       "infoRecords": {
         "title": "监管记录",

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_2000.json

@@ -8,7 +8,7 @@
       "dataConfig": {
         "api": {
           "httpMethod":"GET",
-          "apiPath":"/ymt/equipment-category/getFormRecordById",
+          "apiPath":"/ymt/equipment-category/getFormRecordById/map",
           "params": {
             "alias": "{EQU_LIST_CODE}",
             "id": "{SEQUENCE_NBR}"
@@ -126,43 +126,44 @@
     "keyinfo": {
       "status": [],
       "qrcode": {
-        "title": "监管码"
+        "title": "监管码",
+        "problem": []
       },
       "keyParams_default": [
-        { "key": "unitType", "label": "使用登记证编号" },
-        { "key": "useUnit", "label": "登记机关" },
-        { "key": "useUnitCode", "label": "登记日期" },
-        { "key": "governingBody", "label": "使用单位名称" },
-        { "key": "unitType", "label": "设备使用地点" },
-        { "key": "useUnit", "label": "设备种类" },
-        { "key": "useUnitCode", "label": "设备类别" },
-        { "key": "governingBody", "label": "设备品种" },
-        { "key": "governingBody", "label": "单位内编号" },
-        { "key": "governingBody", "label": "设备代码" },
-        { "key": "governingBody", "label": "下一次检验日期" }
+        { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
+        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REC_DATE", "label": "登记日期" },
+        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
+        { "key": "ADDRESS", "label": "设备使用地点" },
+        { "key": "EQU_TYPE", "label": "设备种类", "source": "param"  },
+        { "key": "EQU_LIST", "label": "设备类别", "source": "param"  },
+        { "key": "EQU_CATEGORY", "label": "设备品种", "source": "param"  },
+        { "key": "USE_INNER_CODE", "label": "单位内编号" },
+        { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
+        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
       ],
       "keyParams_2300_true": [
-        { "key": "unitType", "label": "使用登记证编号" },
-        { "key": "useUnit", "label": "登记机关" },
-        { "key": "useUnitCode", "label": "登记日期" },
-        { "key": "governingBody", "label": "使用单位名称" },
-        { "key": "unitType", "label": "设备使用地点" },
-        { "key": "useUnit", "label": "设备类别" },
-        { "key": "useUnitCode", "label": "下一次检验日期" }
+        { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
+        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REC_DATE", "label": "登记日期" },
+        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
+        { "key": "ADDRESS", "label": "设备使用地点" },
+        { "key": "EQU_LIST", "label": "设备类别", "source": "param"  },
+        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
       ],
       "keyParams_2300_false": [
-        { "key": "unitType", "label": "使用登记证编号" },
-        { "key": "useUnit", "label": "登记机关" },
-        { "key": "useUnitCode", "label": "登记日期" },
-        { "key": "governingBody", "label": "使用单位名称" },
-        { "key": "unitType", "label": "使用单位地址" },
-        { "key": "useUnit", "label": "车牌号" },
-        { "key": "useUnitCode", "label": "车辆VIN码" },
-        { "key": "useUnitCode", "label": "气瓶品种" },
-        { "key": "useUnitCode", "label": "产品名称" },
-        { "key": "useUnitCode", "label": "气瓶数量" },
-        { "key": "useUnitCode", "label": "充装介质" },
-        { "key": "useUnitCode", "label": "下次检验日期" }
+        { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
+        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REC_DATE", "label": "登记日期" },
+        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
+        { "key": "ADDRESS", "label": "设备使用地点" },
+        { "key": "CAR_NUMBER", "label": "车牌号" },
+        { "key": "IDENTIFICATION_CODE", "label": "车辆VIN码" },
+        { "key": "EQU_TYPE", "label": "气瓶品种" },
+        { "key": "PRODUCT_NAME", "label": "产品名称" },
+        { "key": "GAS_NUM", "label": "气瓶数量" },
+        { "key": "FILLING_MEDIUM", "label": "充装介质" },
+        { "key": "NEXT_INSPECTION_DATE", "label": "下次检验日期" }
       ],
       "infoRecords": {
         "title": "监管记录",

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_3000.json

@@ -8,7 +8,7 @@
       "dataConfig": {
         "api": {
           "httpMethod":"GET",
-          "apiPath":"/ymt/equipment-category/getFormRecordById",
+          "apiPath":"/ymt/equipment-category/getFormRecordById/map",
           "params": {
             "alias": "{EQU_LIST_CODE}",
             "id": "{SEQUENCE_NBR}"
@@ -122,22 +122,23 @@
     "keyinfo": {
       "status": [],
       "qrcode": {
-        "title": "监管码"
+        "title": "监管码",
+        "problem": []
       },
       "keyParams": [
-        { "key": "unitType", "label": "使用登记证编号" },
-        { "key": "useUnit", "label": "登记机关" },
-        { "key": "useUnitCode", "label": "登记日期" },
-        { "key": "governingBody", "label": "使用单位名称" },
-        { "key": "unitType", "label": "设备使用地点" },
-        { "key": "useUnit", "label": "设备种类" },
-        { "key": "useUnitCode", "label": "设备类别" },
-        { "key": "governingBody", "label": "设备品种" },
-        { "key": "governingBody", "label": "单位内编号" },
-        { "key": "governingBody", "label": "设备代码" },
-        { "key": "governingBody", "label": "维保单位名称" },
-        { "key": "governingBody", "label": "维保备案有效期" },
-        { "key": "governingBody", "label": "下一次检验日期" }
+        { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
+        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REC_DATE", "label": "登记日期" },
+        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
+        { "key": "ADDRESS", "label": "设备使用地点" },
+        { "key": "EQU_TYPE", "label": "设备种类", "source": "param" },
+        { "key": "EQU_LIST", "label": "设备类别", "source": "param" },
+        { "key": "EQU_CATEGORY", "label": "设备品种", "source": "param" },
+        { "key": "USE_INNER_CODE", "label": "单位内编号" },
+        { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
+        { "key": "ME_UNIT_NAME", "label": "维保单位名称" },
+        { "key": "INFORM_END", "label": "维保备案有效期" },
+        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
       ],
       "infoRecords": {
         "title": "监管记录",

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_4000.json

@@ -8,7 +8,7 @@
       "dataConfig": {
         "api": {
           "httpMethod":"GET",
-          "apiPath":"/ymt/equipment-category/getFormRecordById",
+          "apiPath":"/ymt/equipment-category/getFormRecordById/map",
           "params": {
             "alias": "{EQU_LIST_CODE}",
             "id": "{SEQUENCE_NBR}"
@@ -118,20 +118,21 @@
     "keyinfo": {
       "status": [],
       "qrcode": {
-        "title": "监管码"
+        "title": "监管码",
+        "problem": []
       },
       "keyParams": [
-        { "key": "unitType", "label": "使用登记证编号" },
-        { "key": "useUnit", "label": "登记机关" },
-        { "key": "useUnitCode", "label": "登记日期" },
-        { "key": "governingBody", "label": "使用单位名称" },
-        { "key": "unitType", "label": "设备使用地点" },
-        { "key": "useUnit", "label": "设备种类" },
-        { "key": "useUnitCode", "label": "设备类别" },
-        { "key": "governingBody", "label": "设备品种" },
-        { "key": "governingBody", "label": "单位内编号" },
-        { "key": "governingBody", "label": "设备代码" },
-        { "key": "governingBody", "label": "下一次检验日期" }
+        { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
+        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REC_DATE", "label": "登记日期" },
+        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
+        { "key": "ADDRESS", "label": "设备使用地点" },
+        { "key": "EQU_TYPE", "label": "设备种类", "source": "param"  },
+        { "key": "EQU_LIST", "label": "设备类别", "source": "param"  },
+        { "key": "EQU_CATEGORY", "label": "设备品种", "source": "param"  },
+        { "key": "USE_INNER_CODE", "label": "单位内编号" },
+        { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
+        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
       ],
       "infoRecords": {
         "title": "监管记录",

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_5000.json

@@ -8,7 +8,7 @@
       "dataConfig": {
         "api": {
           "httpMethod":"GET",
-          "apiPath":"/ymt/equipment-category/getFormRecordById",
+          "apiPath":"/ymt/equipment-category/getFormRecordById/map",
           "params": {
             "alias": "{EQU_LIST_CODE}",
             "id": "{SEQUENCE_NBR}"
@@ -114,20 +114,21 @@
     "keyinfo": {
       "status": [],
       "qrcode": {
-        "title": "监管码"
+        "title": "监管码",
+        "problem": []
       },
       "keyParams": [
-        { "key": "unitType", "label": "使用登记证编号" },
-        { "key": "useUnit", "label": "登记机关" },
-        { "key": "useUnitCode", "label": "登记日期" },
-        { "key": "governingBody", "label": "使用单位名称" },
-        { "key": "unitType", "label": "设备使用地点" },
-        { "key": "useUnit", "label": "设备种类" },
-        { "key": "useUnitCode", "label": "设备类别" },
-        { "key": "governingBody", "label": "设备品种" },
-        { "key": "governingBody", "label": "单位内编号" },
-        { "key": "governingBody", "label": "设备代码" },
-        { "key": "governingBody", "label": "下一次检验日期" }
+        { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
+        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REC_DATE", "label": "登记日期" },
+        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
+        { "key": "ADDRESS", "label": "设备使用地点" },
+        { "key": "EQU_TYPE", "label": "设备种类", "source": "param"  },
+        { "key": "EQU_LIST", "label": "设备类别", "source": "param"  },
+        { "key": "EQU_CATEGORY", "label": "设备品种", "source": "param"  },
+        { "key": "USE_INNER_CODE", "label": "单位内编号" },
+        { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
+        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
       ],
       "infoRecords": {
         "title": "监管记录",

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_6000.json

@@ -8,7 +8,7 @@
       "dataConfig": {
         "api": {
           "httpMethod":"GET",
-          "apiPath":"/ymt/equipment-category/getFormRecordById",
+          "apiPath":"/ymt/equipment-category/getFormRecordById/map",
           "params": {
             "alias": "{EQU_LIST_CODE}",
             "id": "{SEQUENCE_NBR}"
@@ -108,20 +108,21 @@
     "keyinfo": {
       "status": [],
       "qrcode": {
-        "title": "监管码"
+        "title": "监管码",
+        "problem": []
       },
       "keyParams": [
-        { "key": "unitType", "label": "使用登记证编号" },
-        { "key": "useUnit", "label": "登记机关" },
-        { "key": "useUnitCode", "label": "登记日期" },
-        { "key": "governingBody", "label": "使用单位名称" },
-        { "key": "unitType", "label": "设备使用地点" },
-        { "key": "useUnit", "label": "设备种类" },
-        { "key": "useUnitCode", "label": "设备类别" },
-        { "key": "governingBody", "label": "设备品种" },
-        { "key": "governingBody", "label": "单位内编号" },
-        { "key": "governingBody", "label": "设备代码" },
-        { "key": "governingBody", "label": "下一次检验日期" }
+        { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
+        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REC_DATE", "label": "登记日期" },
+        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
+        { "key": "ADDRESS", "label": "设备使用地点" },
+        { "key": "EQU_TYPE", "label": "设备种类", "source": "param"  },
+        { "key": "EQU_LIST", "label": "设备类别", "source": "param"  },
+        { "key": "EQU_CATEGORY", "label": "设备品种", "source": "param"  },
+        { "key": "USE_INNER_CODE", "label": "单位内编号" },
+        { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
+        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
       ],
       "infoRecords": {
         "title": "监管记录",

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_8000.json

@@ -8,7 +8,7 @@
       "dataConfig": {
         "api": {
           "httpMethod":"GET",
-          "apiPath":"/ymt/equipment-category/getFormRecordById",
+          "apiPath":"/ymt/equipment-category/getFormRecordById/map",
           "params": {
             "alias": "{EQU_LIST_CODE}",
             "id": "{SEQUENCE_NBR}"
@@ -114,29 +114,30 @@
     "keyinfo": {
       "status": [],
       "qrcode": {
-        "title": "监管码"
+        "title": "监管码",
+        "problem": []
       },
       "keyParams_default": [
-        { "key": "unitType", "label": "使用登记证编号" },
-        { "key": "useUnit", "label": "登记机关" },
-        { "key": "useUnitCode", "label": "登记日期" },
-        { "key": "governingBody", "label": "使用单位名称" },
-        { "key": "unitType", "label": "设备使用地点" },
-        { "key": "useUnit", "label": "设备种类" },
-        { "key": "useUnitCode", "label": "设备类别" },
-        { "key": "governingBody", "label": "设备品种" },
-        { "key": "governingBody", "label": "单位内编号" },
-        { "key": "governingBody", "label": "设备代码" },
-        { "key": "governingBody", "label": "下一次检验日期" }
+        { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
+        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REC_DATE", "label": "登记日期" },
+        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
+        { "key": "ADDRESS", "label": "设备使用地点" },
+        { "key": "EQU_TYPE", "label": "设备种类", "source": "param"  },
+        { "key": "EQU_LIST", "label": "设备类别", "source": "param"  },
+        { "key": "EQU_CATEGORY", "label": "设备品种", "source": "param"  },
+        { "key": "USE_INNER_CODE", "label": "单位内编号" },
+        { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
+        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
       ],
       "keyParams_8300": [
-        { "key": "unitType", "label": "使用登记证编号" },
-        { "key": "useUnit", "label": "登记机关" },
-        { "key": "useUnitCode", "label": "登记日期" },
-        { "key": "governingBody", "label": "使用单位名称" },
-        { "key": "unitType", "label": "设备使用地点" },
-        { "key": "useUnit", "label": "设备类别" },
-        { "key": "useUnitCode", "label": "下一次检验日期" }
+        { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
+        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REC_DATE", "label": "登记日期" },
+        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
+        { "key": "ADDRESS", "label": "设备使用地点" },
+        { "key": "EQU_LIST", "label": "设备类别", "source": "param"  },
+        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
       ],
       "infoRecords": {
         "title": "监管记录",

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_9000.json

@@ -8,7 +8,7 @@
       "dataConfig": {
         "api": {
           "httpMethod":"GET",
-          "apiPath":"/ymt/equipment-category/getFormRecordById",
+          "apiPath":"/ymt/equipment-category/getFormRecordById/map",
           "params": {
             "alias": "{EQU_LIST_CODE}",
             "id": "{SEQUENCE_NBR}"
@@ -114,20 +114,21 @@
     "keyinfo": {
       "status": [],
       "qrcode": {
-        "title": "监管码"
+        "title": "监管码",
+        "problem": []
       },
       "keyParams": [
-        { "key": "unitType", "label": "使用登记证编号" },
-        { "key": "useUnit", "label": "登记机关" },
-        { "key": "useUnitCode", "label": "登记日期" },
-        { "key": "governingBody", "label": "使用单位名称" },
-        { "key": "unitType", "label": "设备使用地点" },
-        { "key": "useUnit", "label": "设备种类" },
-        { "key": "useUnitCode", "label": "设备类别" },
-        { "key": "governingBody", "label": "设备品种" },
-        { "key": "governingBody", "label": "单位内编号" },
-        { "key": "governingBody", "label": "设备代码" },
-        { "key": "governingBody", "label": "下一次检验日期" }
+        { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
+        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REC_DATE", "label": "登记日期" },
+        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
+        { "key": "ADDRESS", "label": "设备使用地点" },
+        { "key": "EQU_TYPE", "label": "设备种类", "source": "param"  },
+        { "key": "EQU_LIST", "label": "设备类别", "source": "param"  },
+        { "key": "EQU_CATEGORY", "label": "设备品种", "source": "param"  },
+        { "key": "USE_INNER_CODE", "label": "单位内编号" },
+        { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
+        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
       ],
       "infoRecords": {
         "title": "监管记录",