*）增加标题

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/AlertCalledServiceImpl.java

@@ -1284,6 +1284,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
         datas.put("datas", records);
         datas.put("title", "处置记录");
         datas.put("renderType", "timeline");
+        keyinfoData.put("title", objectMap.get("useUnitName"));
         keyinfoData.put("keyParams", jsonData);
         keyinfoData.put("infoRecords", datas);
         keyinfoData.put("qrcode", qrcode);

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/resources/json/emergencyInformation.json

@@ -36,7 +36,7 @@
   },
   {
     "key": "useUnitName",
-    "label": "单位名称",
+    "label": "使用单位",
     "type": "text"
   },
   {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationManageServiceImpl.java

@@ -648,6 +648,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
         map.put("datas", collect);
         map.put("title", "使用登记证流水");
         map.put("renderType", "timeline");
+        result.put("title", objectMap.get("useUnitName"));
         result.put("keyParams", jsonData);
         result.put("infoRecords", map);
         return result;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java

@@ -630,6 +630,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         datas.put("datas", records);
         datas.put("title", "审批进度");
         datas.put("renderType", "timeline");
+        resultMap.put("title", map.get("applicationUnitName"));
         resultMap.put("infoRecords", datas);
         resultMap.put("keyParams", jsonData);
         return resultMap;

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

@@ -39,6 +39,9 @@ public class DPSubController {
     public ResponseModel<JSONObject> commonQuery(@PathVariable String template, @RequestBody Map<String, Object> param) {
         if (template.equals("company")) { // 企业
             Assert.notNull(param.get("useUnitCode"), "企业统一信用代码不能为空");
+            if (ValidationUtil.isEmpty(param.get("useUnit"))){
+                param.put("useUnit", param.get("unitName"));
+            }
         } else if (template.equals("reportEqu")) { // 监督检验
             Assert.notNull(param.get("sequenceNbr"), "sequenceNbr不能为空");
         } else if (template.equals("equip")) { //设备

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

@@ -511,7 +511,13 @@ public class DPSubServiceImpl {
         }
         String problemTime = result.getString("problemTime");
         String problemStatus = result.getString("problemStatus");
-
+        if (ValidationUtil.isEmpty(problemTime)){
+            try {
+                problemTime =  DateUtil.formatDate(new Date(), DateUtil.Y_M_D_HMS);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
         String color = null;
         if (!ValidationUtil.isEmpty(problemTime)) {
             try {