*）修改模板

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/DPSubController.java

@@ -44,7 +44,7 @@ public class DPSubController {
             Assert.notNull(param.get("record"), "设备ID不能为空");
             Assert.notNull(param.get("equList"), "设备种类不能为空");
             template = template + "_" + param.get("equList");
-        } else if (template.equals("emergency") || template.equals("problem")) {
+        } else if (template.equals("emergency") || template.equals("problem") || template.equals("registration")) {
             Assert.notNull(param.get("sequenceNbr"), "sequenceNbr不能为空");
         } else {
             throw new RuntimeException("暂无模板");

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

@@ -133,7 +133,7 @@ public class DPSubServiceImpl {
             log.info("{}tab页获取详情接口，共耗时：{} 毫秒", tab.get("displayName"), (e - s));
         }
 
-        if (tab.getString("template").contains("emergency") && tab.getString("key").equals("keyinfo")){
+        if ((!tab.getString("template").contains("equip") || !tab.getString("template").contains("company")) && tab.getString("key").equals("keyinfo")){
             content.put(tab.getString("key"), JSONObject.parseObject(apiResult.toString()));
             return;
         }

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

@@ -68,7 +68,7 @@
           {"dataRenderingMode": "defaultText","dataIndex": "FACTORY_NUM","width": 180,"align": "left","title": "出厂编号/产品编码","key": "6"},
           {"dataRenderingMode": "defaultText","dataIndex": "PRODUCE_UNIT_NAME","width": 180,"align": "left","title": "制造单位","key": "7"},
           {"dataRenderingMode": "defaultText","dataIndex": "USE_UNIT_NAME","width": 180,"align": "left","title": "使用单位","key": "8"},
-          {"dataRenderingMode": "actionDetailBtn","dataIndex": "action","width": 60,"align": "left","title": "操作","key": "9"}
+          {"dataRenderingMode": "actionDetailBtn","dataIndex": "action","width": 60,"align": "left","title": "操作","key": "9", "conf": { "title": "设备详情", "linkModelKey": "equip" } }
         ]
       }
     }

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

@@ -65,10 +65,10 @@
         "rowKey": "sequenceNbr",
         "showPage" : true,
         "columns": [
-          {"dataRenderingMode": "defaultText","dataIndex": "recDate","width": 200,"align": "left","title": "通话时间","key": "1"},
-          {"dataRenderingMode": "defaultText","dataIndex": "fileType","width": 200,"align": "left","title": "通话类型","key": "2"},
-          {"dataRenderingMode": "defaultText","dataIndex": "tel","width": 200,"align": "left","title": "电话号码","key": "3"},
-          {"dataRenderingMode": "defaultText","dataIndex": "telTime","width": 200,"align": "left","title": "通话时长","key": "4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "recDate","width": 300,"align": "left","title": "通话时间","key": "1"},
+          {"dataRenderingMode": "defaultText","dataIndex": "fileType","width": 300,"align": "left","title": "通话类型","key": "2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "tel","width": 300,"align": "left","title": "电话号码","key": "3"},
+          {"dataRenderingMode": "defaultText","dataIndex": "telTime","width": 300,"align": "left","title": "通话时长","key": "4"},
           {"dataRenderingMode": "audioDetailBtn","dataIndex": "action","width": 60,"align": "left","title": "操作","key": "5"}
         ]
       }

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

@@ -67,7 +67,8 @@
           {"dataRenderingMode": "defaultText","dataIndex": "unitType","width": 150,"align": "left","title": "企业类型","key": "D1CB84A4-E037-446A-9469-65B76E381585"},
           {"dataRenderingMode": "defaultText","dataIndex": "useUnitCode","width": 180,"align": "left","title": "企业统一信用代码","key": "0BB7318F-5134-42B6-A835-FC86D68066C2"},
           {"dataRenderingMode": "defaultText","dataIndex": "useContact","width": 180,"align": "left","title": "企业联系人","key": "6EB924FB-EFEA-4779-ADF8-78F310818D2D"},
-          {"dataRenderingMode": "defaultText","dataIndex": "contactPhone","width": 180,"align": "left","title": "联系电话","key": "87C53BEA-829C-4539-9FCA-E2AF6A53DA15"}
+          {"dataRenderingMode": "defaultText","dataIndex": "contactPhone","width": 180,"align": "left","title": "联系电话","key": "87C53BEA-829C-4539-9FCA-E2AF6A53DA15"},
+          {"dataRenderingMode": "actionDetailBtn","dataIndex": "action","width": 60,"align": "left","title": "操作","key": "9" }
         ]
       }
     }

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

@@ -39,7 +39,8 @@
           {"dataRenderingMode": "defaultText","dataIndex": "FACTORY_NUM","width": 180,"align": "left","title": "产品编号","key": "0BB7318F-5134-42B6-A835-FC86D68066C2"},
           {"dataRenderingMode": "defaultText","dataIndex": "USE_INNER_CODE","width": 180,"align": "left","title": "单位内编号","key": "0BB7318F-5134-42B6-A835-FC86D68066C3"},
           {"dataRenderingMode": "defaultText","dataIndex": "EQU_CODE","width": 180,"align": "left","title": "设备代码","key": "0BB7318F-5134-42B6-A835-FC86D68066C4"},
-          {"dataRenderingMode": "defaultText","dataIndex": "SUPERVISORY_CODE","width": 180,"align": "left","title": "监管码","key": "0BB7318F-5134-42B6-A835-FC86D68066C5"}
+          {"dataRenderingMode": "defaultText","dataIndex": "SUPERVISORY_CODE","width": 180,"align": "left","title": "监管码","key": "0BB7318F-5134-42B6-A835-FC86D68066C5"},
+          {"dataRenderingMode": "actionDetailBtn","dataIndex": "action","width": 60,"align": "left","title": "操作","key": "9", "conf": { "title": "设备详情", "linkModelKey": "equip" } }
         ]
       }
     }