WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug53177+51747消息链接跳转修改

Browse Source
This commit is contained in:
xiejunyu
2022-05-31 18:26:51 +08:00
parent 337d846879
commit 4af789cab3
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+1 -1
View File
@@ -2086,7 +2086,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
String hrefTemp = backUrl + "/docManage/library/detail?id=" + idTemp; String hrefTemp = backUrl + "/docManage/library/detail?id=" + idTemp;
String content = sysUser.getUsername() + " add " + serialNumber + ",Please pay attention to check."; String content = sysUser.getUsername() + " add " + serialNumber + ",Please pay attention to check.";
//In the XXXX technical field you subscribed to, the standard "GBXXX" has been updated. //In the XXXX technical field you subscribed to, the standard "GBXXX" has been updated.
String contentInfo = "In the "+ technologyTerritoryName + " technical field you subscribed to, the standard "+ serialNumber +" has been updated."; String contentInfo = "In the "+ technologyTerritoryName + " technical field you subscribed to, the standard "+ serialNumber +" has been updated."+ href;
// String contentInfo = sysUser.getUsername() + " add " + serialNumber + ",Please pay attention to check."; // String contentInfo = sysUser.getUsername() + " add " + serialNumber + ",Please pay attention to check.";
//封装消息的实体类 //封装消息的实体类
SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo); SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+10 -1
View File
@@ -1051,6 +1051,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String addSerialNumber,String deleteSerialNumber,String state,String cut) { String addSerialNumber,String deleteSerialNumber,String state,String cut) {
String baseName = queryById(idTemp).getName();//基础表id String baseName = queryById(idTemp).getName();//基础表id
String useExplain = queryById(idTemp).getUseExplain();
//查询订阅用户 //查询订阅用户
List<String> userNameList = dummyReadEOService.queryReadUserInfo(idTemp); List<String> userNameList = dummyReadEOService.queryReadUserInfo(idTemp);
if (CollectionUtils.isNotEmpty(userNameList)) {//有订阅的用户,发送消息 if (CollectionUtils.isNotEmpty(userNameList)) {//有订阅的用户,发送消息
@@ -1063,12 +1064,20 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
List<String> thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList()); List<String> thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList());
if (userIdList.size() != 0) { if (userIdList.size() != 0) {
String href = backUrl + "/dummy/dummyInventoryBaseEO/issue?id=" + idTemp; String href = backUrl + "/dummy/dummyInventoryBaseEO/issue?id=" + idTemp;
//http://localhost:3000/virtualListDetails?name=66666&useExplain=66&id=1528930716744699905&title=%E7%BB%B4%E6%8A%A4%E8%99%9A%E6%8B%9F%E6%B8%85%E5%8D%95
String hrefUrl = "<a href='/virtualListDetails?name=" + baseName +
"&useExplain=" + useExplain +
"&id=" + idTemp +
"&title=维护虚拟清单" + "'" + " target='_blank'>"
+ baseName + "</a>" + " ";
String content = null; String content = null;
String contentInfo = null; String contentInfo = null;
if(InventoryStateEnum.ISSUE.getValue().equals(state)) { if(InventoryStateEnum.ISSUE.getValue().equals(state)) {
//The xx virtual list you subscribed to has been updated as follows:1 . xxxxx 2.xxxx //The xx virtual list you subscribed to has been updated as follows:1 . xxxxx 2.xxxx
content = "The " + baseName + " virtual list you subscribed to has been updated."; content = "The " + baseName + " virtual list you subscribed to has been updated.";
contentInfo = "The " + baseName + " virtual list you subscribed to has been updated as follows : " + "\r\n"; contentInfo = "The " + hrefUrl + " virtual list you subscribed to has been updated as follows : " + "\r\n";
//拼接维护清单的消息 //拼接维护清单的消息
contentInfo = setContentInfo(contentInfo, baseDiff, infoDiffList, addSerialNumber, deleteSerialNumber,null); contentInfo = setContentInfo(contentInfo, baseDiff, infoDiffList, addSerialNumber, deleteSerialNumber,null);