*）修改模板

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

@@ -197,9 +197,13 @@ public class DPSubServiceImpl {
             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")){
+            // 处理图片
+            JSONArray jsonArray = result.getJSONArray("PRODUCT_PHOTO");
+            if (!ValidationUtil.isEmpty(jsonArray)){
+                content.getJSONObject("keyinfo").put("photo", jsonArray.getJSONObject(0).getString("url"));
+            }
             // 处理问题列表
             List<Map<String, String>> problem = dpSubBizService.queryProblemListByEquipId(param.getString("record"));
             if (!ValidationUtil.isEmpty(problem)){
@@ -214,6 +218,12 @@ public class DPSubServiceImpl {
                 ((JSONObject)infoRecords).put("datas", datas);
                 param.put("reghistory", datas);
             }
+        } else if(tab.getString("template").contains("company")){
+            // 处理图片
+            JSONArray jsonArray = result.getJSONArray("unitBusinessLicense");
+            if (!ValidationUtil.isEmpty(jsonArray)){
+                content.getJSONObject("keyinfo").put("photo", jsonArray.getJSONObject(0).getString("url"));
+            }
         }
         return content;
     }

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

@@ -75,8 +75,7 @@
   "content": {
     "keyinfo": {
       "status": [
-        { "key": "unitType", "label": "", "icon": "", "value": "success" },
-        { "key": "2", "label": "", "icon": "", "value": "success" },
+        { "key": "2", "label": "在业", "icon": "", "value": "success" },
         { "key": "3", "label": "否", "icon": "", "value": "error" },
         { "key": "4", "label": "否", "icon": "", "value": "stop" }
       ],

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

@@ -120,7 +120,10 @@
   ],
   "content": {
     "keyinfo": {
-      "status": [],
+      "status": [
+        { "key": "1", "label": "在用", "icon": "", "value": "success" },
+        { "key": "2", "label": "否", "icon": "", "value": "stop" }
+      ],
       "qrcode": {
         "title": "监管码",
         "problem": []

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

@@ -124,7 +124,10 @@
   ],
   "content": {
     "keyinfo": {
-      "status": [],
+      "status": [
+        { "key": "1", "label": "在用", "icon": "", "value": "success" },
+        { "key": "2", "label": "否", "icon": "", "value": "stop" }
+      ],
       "qrcode": {
         "title": "监管码",
         "problem": []

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

@@ -120,7 +120,11 @@
   ],
   "content": {
     "keyinfo": {
-      "status": [],
+      "status": [
+        { "key": "1", "label": "在用", "icon": "", "value": "success" },
+        { "key": "2", "label": "否", "icon": "", "value": "stop" },
+        { "key": "3", "label": "否", "icon": "", "value": "stop" }
+      ],
       "qrcode": {
         "title": "监管码",
         "problem": []

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

@@ -116,7 +116,10 @@
   ],
   "content": {
     "keyinfo": {
-      "status": [],
+      "status": [
+        { "key": "1", "label": "在用", "icon": "", "value": "success" },
+        { "key": "2", "label": "否", "icon": "", "value": "stop" }
+      ],
       "qrcode": {
         "title": "监管码",
         "problem": []

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

@@ -112,7 +112,10 @@
   ],
   "content": {
     "keyinfo": {
-      "status": [],
+      "status": [
+        { "key": "1", "label": "在用", "icon": "", "value": "success" },
+        { "key": "2", "label": "否", "icon": "", "value": "stop" }
+      ],
       "qrcode": {
         "title": "监管码",
         "problem": []

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

@@ -106,7 +106,10 @@
   ],
   "content": {
     "keyinfo": {
-      "status": [],
+      "status": [
+        { "key": "1", "label": "在用", "icon": "", "value": "success" },
+        { "key": "2", "label": "否", "icon": "", "value": "stop" }
+      ],
       "qrcode": {
         "title": "监管码",
         "problem": []

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

@@ -112,7 +112,10 @@
   ],
   "content": {
     "keyinfo": {
-      "status": [],
+      "status": [
+        { "key": "1", "label": "在用", "icon": "", "value": "success" },
+        { "key": "2", "label": "否", "icon": "", "value": "stop" }
+      ],
       "qrcode": {
         "title": "监管码",
         "problem": []

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

@@ -112,7 +112,10 @@
   ],
   "content": {
     "keyinfo": {
-      "status": [],
+      "status": [
+        { "key": "1", "label": "在用", "icon": "", "value": "success" },
+        { "key": "2", "label": "否", "icon": "", "value": "stop" }
+      ],
       "qrcode": {
         "title": "监管码",
         "problem": []