*）修改模板字段顺序

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

@@ -75,6 +75,7 @@
   ],
   "content": {
     "keyinfo": {
+      "title": "{useUnit}",
       "status": [],
       "qrcode": {
         "title": "监管码",

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

@@ -134,23 +134,25 @@
   ],
   "content": {
     "keyinfo": {
+      "title": "{PRODUCT_NAME}",
       "status": [],
       "qrcode": {
         "title": "监管码",
         "problem": []
       },
       "keyParams": [
-        { "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": "PRODUCT_NAME", "label": "设备名称", "source": "param"  },
         { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
-        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
+        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
+        { "key": "ADDRESS", "label": "设备使用地点" },
+        { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
+        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REC_DATE", "label": "登记日期" },
+        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
+        { "key": "USE_INNER_CODE", "label": "单位内编号" }
       ],
       "infoRecords": {
         "title": "监管记录",

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

@@ -138,46 +138,49 @@
   ],
   "content": {
     "keyinfo": {
+      "title": "{PRODUCT_NAME}",
       "status": [],
       "qrcode": {
         "title": "监管码",
         "problem": []
       },
       "keyParams_default": [
-        { "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": "PRODUCT_NAME", "label": "设备名称", "source": "param"  },
         { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
-        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
-      ],
-      "keyParams_2300_true": [
+        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
+        { "key": "ADDRESS", "label": "设备使用地点" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
         { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
         { "key": "REC_DATE", "label": "登记日期" },
+        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
+        { "key": "USE_INNER_CODE", "label": "单位内编号" }
+      ],
+      "keyParams_2300_true": [
+        { "key": "EQU_LIST", "label": "设备类别", "source": "param"  },
+        { "key": "PRODUCT_NAME", "label": "设备名称", "source": "param"  },
         { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
         { "key": "ADDRESS", "label": "设备使用地点" },
-        { "key": "EQU_LIST", "label": "设备类别", "source": "param"  },
+        { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
+        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REC_DATE", "label": "登记日期" },
         { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
       ],
       "keyParams_2300_false": [
+        { "key": "EQU_TYPE", "label": "气瓶品种" },
+        { "key": "PRODUCT_NAME", "label": "产品名称" },
+        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
+        { "key": "ADDRESS", "label": "设备使用地点" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
         { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
         { "key": "REC_DATE", "label": "登记日期" },
-        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
-        { "key": "ADDRESS", "label": "设备使用地点" },
+        { "key": "NEXT_INSPECTION_DATE", "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": "下次检验日期" }
+        { "key": "FILLING_MEDIUM", "label": "充装介质" }
       ],
       "infoRecords": {
         "title": "监管记录",

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

@@ -134,25 +134,27 @@
   ],
   "content": {
     "keyinfo": {
+      "title": "{PRODUCT_NAME}",
       "status": [],
       "qrcode": {
         "title": "监管码",
         "problem": []
       },
       "keyParams": [
-        { "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": "PRODUCT_NAME", "label": "设备名称", "source": "param"  },
         { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
+        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
+        { "key": "ADDRESS", "label": "设备使用地点" },
+        { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
+        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REC_DATE", "label": "登记日期" },
+        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
         { "key": "ME_UNIT_NAME", "label": "维保单位名称" },
         { "key": "INFORM_END", "label": "维保备案有效期" },
-        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
+        { "key": "USE_INNER_CODE", "label": "单位内编号" }
       ],
       "infoRecords": {
         "title": "监管记录",

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

@@ -130,23 +130,25 @@
   ],
   "content": {
     "keyinfo": {
+      "title": "{PRODUCT_NAME}",
       "status": [],
       "qrcode": {
         "title": "监管码",
         "problem": []
       },
       "keyParams": [
-        { "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": "PRODUCT_NAME", "label": "设备名称", "source": "param"  },
         { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
-        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
+        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
+        { "key": "ADDRESS", "label": "设备使用地点" },
+        { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
+        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REC_DATE", "label": "登记日期" },
+        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
+        { "key": "USE_INNER_CODE", "label": "单位内编号" }
       ],
       "infoRecords": {
         "title": "监管记录",

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

@@ -126,23 +126,25 @@
   ],
   "content": {
     "keyinfo": {
+      "title": "{PRODUCT_NAME}",
       "status": [],
       "qrcode": {
         "title": "监管码",
         "problem": []
       },
       "keyParams": [
-        { "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": "PRODUCT_NAME", "label": "设备名称", "source": "param"  },
         { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
-        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
+        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
+        { "key": "ADDRESS", "label": "设备使用地点" },
+        { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
+        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REC_DATE", "label": "登记日期" },
+        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
+        { "key": "USE_INNER_CODE", "label": "单位内编号" }
       ],
       "infoRecords": {
         "title": "监管记录",

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

@@ -120,23 +120,25 @@
   ],
   "content": {
     "keyinfo": {
+      "title": "{PRODUCT_NAME}",
       "status": [],
       "qrcode": {
         "title": "监管码",
         "problem": []
       },
       "keyParams": [
-        { "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": "PRODUCT_NAME", "label": "设备名称", "source": "param"  },
         { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
-        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
+        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
+        { "key": "ADDRESS", "label": "设备使用地点" },
+        { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
+        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REC_DATE", "label": "登记日期" },
+        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
+        { "key": "USE_INNER_CODE", "label": "单位内编号" }
       ],
       "infoRecords": {
         "title": "监管记录",

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

@@ -126,31 +126,34 @@
   ],
   "content": {
     "keyinfo": {
+      "title": "{PRODUCT_NAME}",
       "status": [],
       "qrcode": {
         "title": "监管码",
         "problem": []
       },
       "keyParams_default": [
-        { "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": "PRODUCT_NAME", "label": "设备名称", "source": "param"  },
         { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
-        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
-      ],
-      "keyParams_8300": [
+        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
+        { "key": "ADDRESS", "label": "设备使用地点" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
         { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
         { "key": "REC_DATE", "label": "登记日期" },
+        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
+        { "key": "USE_INNER_CODE", "label": "单位内编号" }
+      ],
+      "keyParams_8300": [
+        { "key": "EQU_LIST", "label": "设备类别", "source": "param"  },
+        { "key": "PRODUCT_NAME", "label": "设备名称", "source": "param"  },
         { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
         { "key": "ADDRESS", "label": "设备使用地点" },
-        { "key": "EQU_LIST", "label": "设备类别", "source": "param"  },
+        { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
+        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REC_DATE", "label": "登记日期" },
         { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
       ],
       "infoRecords": {

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

@@ -126,23 +126,25 @@
   ],
   "content": {
     "keyinfo": {
+      "title": "{PRODUCT_NAME}",
       "status": [],
       "qrcode": {
         "title": "监管码",
         "problem": []
       },
       "keyParams": [
-        { "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": "PRODUCT_NAME", "label": "设备名称", "source": "param"  },
         { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
-        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
+        { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
+        { "key": "ADDRESS", "label": "设备使用地点" },
+        { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
+        { "key": "ORG_BRANCH_NAME", "label": "登记机关" },
+        { "key": "REC_DATE", "label": "登记日期" },
+        { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
+        { "key": "USE_INNER_CODE", "label": "单位内编号" }
       ],
       "infoRecords": {
         "title": "监管记录",

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

@@ -76,6 +76,7 @@
   ],
   "content": {
     "keyinfo": {
+      "title": "{principalUnit}",
       "keyParams": [
         { "key": "sourceType", "label": "隐患主体类型" },
         { "key": "problemType", "label": "隐患类型" },