diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/WelfareSelectionSituationService.java b/src/main/java/com/budwk/app/zhgh/welfare/service/WelfareSelectionSituationService.java index 42aabda..fbf36e0 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/service/WelfareSelectionSituationService.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/service/WelfareSelectionSituationService.java @@ -24,9 +24,16 @@ public interface WelfareSelectionSituationService extends BaseService !line.trim().startsWith("查看详情:")) - .collect(Collectors.joining("\n")) - .trim(); + String messageBody = removeExistingNoticeDetailLinks(plainContent, detailUrl); String sendContent = StrUtil.isBlank(messageBody) ? detailLine : messageBody + "\n" + detailLine; // 详情地址已经包含在消息正文中,跳转参数保持为空,避免消息中心再次追加 PC、移动端详情链接。 boolean success = smsService.sendMsg("6", loginNames, null, title, sendContent, null, null); @@ -161,6 +159,23 @@ public class WelfareSelectionSituationServiceImpl extends BaseServiceImpl { entities.add(new ExcelExportEntity(option.getOptionName(), option.getOptionName(), 20)); }); + entities.add(new ExcelExportEntity("备注", "remark", 30)); ExcelExportEntity userSignEntity = new ExcelExportEntity("签字", "userSign", 20); userSignEntity.setType(2); userSignEntity.setExportImageType(2); diff --git a/src/main/resources/views/platform/zhgh/welfare/selectionSituation/index.html b/src/main/resources/views/platform/zhgh/welfare/selectionSituation/index.html index f14c4ed..b699c2f 100644 --- a/src/main/resources/views/platform/zhgh/welfare/selectionSituation/index.html +++ b/src/main/resources/views/platform/zhgh/welfare/selectionSituation/index.html @@ -153,6 +153,7 @@ layout("/layouts/platform.html"){ > +