*）修改设备模板报错

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

@@ -60,7 +60,7 @@
             ui."USE_UNIT_CREDIT_CODE" useUnitCreditCode,
             ui."USE_UNIT_NAME" useUnitName,
             (select name from tz_equipment_category where code = ri."EQU_LIST") equList,
-            ri.equ_list AS EQU_LIST_CODE,
+            ri.equ_list AS equListCode,
             (select name from tz_equipment_category where code = ri."EQU_CATEGORY") equCategory,
             oi."CODE96333" code96333,
             oi."SUPERVISORY_CODE" supervisoryCode,

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

@@ -46,6 +46,9 @@ public class DPSubController {
             if (ValidationUtil.isEmpty(param.get("equList"))){
                 param.put("equList", param.get("EQU_LIST_CODE"));
             }
+            if (!ValidationUtil.isEmpty(param.get("equListCode"))){
+                param.put("equList", param.get("equListCode"));
+            }
             Assert.notNull(param.get("record"), "设备ID不能为空");
             Assert.notNull(param.get("equList"), "设备种类不能为空");
             template = template + "_" + param.get("equList");

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

@@ -35,11 +35,11 @@
         "rowKey": "record",
         "columns": [
           {"dataRenderingMode": "defaultText","dataIndex": "problemStatusName","width": 150,"align": "left","title": "状态","key": "AA6DE857-C788-494F-8F16-2ECFC7E34528"},
-          {"dataRenderingMode": "defaultText","dataIndex": "equList","width": 160,"align": "left","title": "设备种类","key": "611DAF3D-5B79-466C-BEF2-CC91580091FA"},
-          {"dataRenderingMode": "defaultText","dataIndex": "equCategory","width": 150,"align": "left","title": "设备类别","key": "D1CB84A4-E037-446A-9469-65B76E381585"},
-          {"dataRenderingMode": "defaultText","dataIndex": "supervisoryCode","width": 180,"align": "left","title": "监管码","key": "0BB7318F-5134-42B6-A835-FC86D68066C2"},
-          {"dataRenderingMode": "defaultText","dataIndex": "code96333","width": 180,"align": "left","title": "96333码","key": "6EB924FB-EFEA-4779-ADF8-78F310818D2D"},
-          {"dataRenderingMode": "defaultText","dataIndex": "useUnitName","width": 180,"align": "left","title": "主体单位","key": "87C53BEA-829C-4539-9FCA-E2AF6A53DA15"},
+          {"dataRenderingMode": "defaultText","dataIndex": "equList","width": 200,"align": "left","title": "设备种类","key": "611DAF3D-5B79-466C-BEF2-CC91580091FA"},
+          {"dataRenderingMode": "defaultText","dataIndex": "equCategory","width": 300,"align": "left","title": "设备类别","key": "D1CB84A4-E037-446A-9469-65B76E381585"},
+          {"dataRenderingMode": "defaultText","dataIndex": "supervisoryCode","width": 200,"align": "left","title": "监管码","key": "0BB7318F-5134-42B6-A835-FC86D68066C2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "code96333","width": 200,"align": "left","title": "96333码","key": "6EB924FB-EFEA-4779-ADF8-78F310818D2D"},
+          {"dataRenderingMode": "defaultText","dataIndex": "useUnitName","width": 300,"align": "left","title": "主体单位","key": "87C53BEA-829C-4539-9FCA-E2AF6A53DA15"},
           {"dataRenderingMode": "actionDetailBtn","dataIndex": "action","width": 60,"align": "left","title": "操作","key": "9", "conf": { "title": "设备详情", "linkModelKey": "equip" }}
         ]
       }
@@ -64,11 +64,11 @@
         "rowKey": "sequenceNbr",
         "columns": [
           {"dataRenderingMode": "defaultText","dataIndex": "problemStatusName","width": 150,"align": "left","title": "状态","key": "AA6DE857-C788-494F-8F16-2ECFC7E34528"},
-          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 160,"align": "left","title": "企业名称","key": "611DAF3D-5B79-466C-BEF2-CC91580091FA"},
-          {"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": "governingBody","width": 300,"align": "left","title": "企业名称","key": "611DAF3D-5B79-466C-BEF2-CC91580091FA"},
+          {"dataRenderingMode": "defaultText","dataIndex": "unitType","width": 200,"align": "left","title": "企业类型","key": "D1CB84A4-E037-446A-9469-65B76E381585"},
+          {"dataRenderingMode": "defaultText","dataIndex": "useUnitCode","width": 300,"align": "left","title": "企业统一信用代码","key": "0BB7318F-5134-42B6-A835-FC86D68066C2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "useContact","width": 200,"align": "left","title": "企业联系人","key": "6EB924FB-EFEA-4779-ADF8-78F310818D2D"},
+          {"dataRenderingMode": "defaultText","dataIndex": "contactPhone","width": 200,"align": "left","title": "联系电话","key": "87C53BEA-829C-4539-9FCA-E2AF6A53DA15"},
           {"dataRenderingMode": "actionDetailBtn","dataIndex": "action","width": 60,"align": "left","title": "操作","key": "9","conf": { "title": "企业详情", "linkModelKey": "company" }}
         ]
       }