Merge remote-tracking branch 'origin/develop_tzs_main' into develop_tzs_main

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/JgChangeRegistrationUnitServiceImpl.java

@@ -3656,6 +3656,34 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             if (device.containsKey("record")) {
                 unitEq.setEquId((String) device.get("record"));//设备主键
             }
+            if (device.containsKey("nextInspectDate") && device.get("nextInspectDate") != null) {
+                Object nextInspectDate = device.get("nextInspectDate");
+                // 处理 Timestamp 类型
+                if (nextInspectDate instanceof java.sql.Timestamp) {
+                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                    device.put("nextInspectDate", sdf.format((java.sql.Timestamp) nextInspectDate));
+                } else if (nextInspectDate instanceof Date) {
+                    // 处理其他 Date 类型
+                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                    device.put("nextInspectDate", sdf.format((Date) nextInspectDate));
+                } else if (nextInspectDate instanceof Number) {
+                    // 如果是时间戳格式（纯数字），则转换为 YYYY-MM-DD 格式
+                    Instant instant = Instant.ofEpochMilli(((Number) nextInspectDate).longValue());
+                    ZoneId zoneId = ZoneId.systemDefault();
+                    DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd").withZone(zoneId);
+                    device.put("nextInspectDate", formatter.format(instant));
+                } else if (nextInspectDate instanceof String && !((String) nextInspectDate).contains("-")) {
+                    // 如果是不含 "-" 的字符串格式时间戳
+                    try {
+                        Instant instant = Instant.ofEpochMilli(Long.parseLong((String) nextInspectDate));
+                        ZoneId zoneId = ZoneId.systemDefault();
+                        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd").withZone(zoneId);
+                        device.put("nextInspectDate", formatter.format(instant));
+                    } catch (NumberFormatException e) {
+                        // 如果转换失败，保持原值
+                    }
+                }
+            }
             unitEq.setUnitChangeRegistrationId(registrationUnit.getSequenceNbr().toString());//单位变更业务主键
             unitEq.setDeviceInfo(JSON.toJSONString(device));//设备信息json
             jgRelationEquipList.add(unitEq);