From c1cdf890e1edc0b63d085e522be7e9150ac4bd84 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 14 九月 2024 13:54:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
index 87dfe19..1ed89f0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
@@ -124,7 +124,7 @@
multifileMapper.insert(multifile);
}
}
- String title = "銆愰殣鎮ｉ殢鎵嬫媿銆戞彁鎶ヤ汉 - "+hiddenDanger.getLoginUserInfo().getRealname();
+ String title = "[闅愭偅闅忔墜鎷峕鎻愭姤浜�-"+hiddenDanger.getLoginUserInfo().getRealname();
//json鏁版嵁
Map<String,Object> jsonMap = new HashMap<>();
jsonMap.put("area", "鍙戠幇鍖哄煙:" + hiddenDangerParam.getName());
@@ -144,7 +144,7 @@
createNotices.setSendacopy(Constants.ZERO);
createNotices.setParam2("0");
createNotices.setParam3(hiddenDanger.getLoginUserInfo().getMemberId().toString());
- createNotices.setInfo("澶勭悊涓�");
+ createNotices.setInfo("寰�"+member.getName()+"澶勭悊");
noticesJoinMapper.insert(createNotices);
//瀛樺偍澶勭悊浜虹殑閫氱煡娑堟伅
@@ -163,6 +163,7 @@
notices.setStatus(Constants.ZERO);
notices.setSendacopy(Constants.ZERO);
notices.setReaded(Constants.ZERO);
+ notices.setInfo("寰�"+member.getName()+"澶勭悊");
noticesJoinMapper.insert(notices);
@@ -511,12 +512,15 @@
BeanUtils.copyProperties(notices,newNotices);
newNotices.setId(null);
newNotices.setCreateDate(new Date());
- newNotices.setParam2("3");
+ newNotices.setParam2("0");
newNotices.setUserId(hiddenDanger.getCheckUserId());
+ newNotices.setInfo("寰�"+member.getName()+"澶勭悊");
noticesJoinMapper.insert(newNotices);
notices.setStatus(Constants.ONE);
+ notices.setParam2("3");
notices.setEditDate(new Date());
notices.setReaded(Constants.ONE);
+ notices.setInfo("寰�"+member.getName()+"澶勭悊");
noticesJoinMapper.updateById(notices);
}
}
--
Gitblit v1.9.3