diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pt/service/impl/RemoteCallsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/pt/service/impl/RemoteCallsServiceImpl.java index 6c6b20d..535fbc9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pt/service/impl/RemoteCallsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pt/service/impl/RemoteCallsServiceImpl.java @@ -63,17 +63,6 @@ public class RemoteCallsServiceImpl implements RemoteCallsService { @Resource private CasesImportService casesImportService; - public static void main(String[] args) { - String warnFactor = "123321张三"; - String[] split = warnFactor.split("、"); - if (split.length == 2) { - System.err.println(split[0]); - System.err.println(split[1]); - } else { - System.err.println(split[0]); - } - } - /** * 获取填充信息后的map * @@ -141,7 +130,6 @@ public class RemoteCallsServiceImpl implements RemoteCallsService { // 使用SimpleDateFormat对象将Date对象格式化为字符串 String firstWarnTime = sdf.format(x.getFirstWarnTimeDate()); String eventTime = sdf.format(x.getEventTimeDate()); - x.setContent(x.getTitle()); x.setFirstWarnTime(firstWarnTime); x.setEventTime(firstWarnTime); x.setLastWarnTime(eventTime); @@ -152,6 +140,12 @@ public class RemoteCallsServiceImpl implements RemoteCallsService { wrapper.eq("CASE_SERIAL", list.get(0)); CasesImport casesImport = casesImportService.getOne(wrapper); if (BeanUtil.isNotEmpty(casesImport)) { + // 如果是紧急事件content使用原始工单的content + if ("3".equals(x.getScenceType())) { + x.setContent(casesImport.getCaseContent()); + } else { + x.setContent(x.getTitle()); + } // 如果类型是同人事件,上报⼈姓名和电话不取原始工单,直接从预警因素字段取,顿号分隔。 if ("2".equals(x.getScenceType())) { String warnFactor = x.getWarnFactor();