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

bug53699虚拟清单消息内容+53598标签英文名下划线修改

Browse Source
This commit is contained in:
xiejunyu
2022-06-10 13:56:25 +08:00
parent a2e22a7f55
commit 79fbe8506c
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+11 -3
View File
@@ -90,6 +90,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
@Autowired @Autowired
private DummyLogEOServiceImpl dummyLogEOService; private DummyLogEOServiceImpl dummyLogEOService;
@Autowired
private DummyInventoryBaseEOMapper dummyInventoryBaseEOMapper;
/** /**
* 保存 * 保存
@@ -304,7 +306,13 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
} }
} }
} }
Date now = new Date();
UpdateWrapper<DummyInventoryBaseEO> baseWrapper=new UpdateWrapper<>();
baseWrapper.set("update_by",sysUser.getUsername())
.set("update_time",now)
.set("state",dummyInventoryBaseEO.getState())
.eq("id",dummyInventoryBaseEO.getId());
dummyInventoryBaseEOMapper.update(null,baseWrapper);
// this.updateById(dummyInventoryBaseEO); // this.updateById(dummyInventoryBaseEO);
//不管有没有维护清单,都返回操作成功 //不管有没有维护清单,都返回操作成功
//发布与撤回均需要发消息(向订阅的人员发消息) //发布与撤回均需要发消息(向订阅的人员发消息)
@@ -368,7 +376,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
List<DummyContentChangeEO> dummyContentChangeEOInfoList = iDummyContentChangeEOService.list(wrapperInfo); List<DummyContentChangeEO> dummyContentChangeEOInfoList = iDummyContentChangeEOService.list(wrapperInfo);
Date lastIssueTime = null; Date lastIssueTime = null;
Date now = new Date();
if (CollectionUtils.isNotEmpty(dummyContentChangeEOInfoList)) { if (CollectionUtils.isNotEmpty(dummyContentChangeEOInfoList)) {
lastIssueTime = dummyContentChangeEOInfoList.get(0).getUpdateTime(); lastIssueTime = dummyContentChangeEOInfoList.get(0).getUpdateTime();
@@ -1098,7 +1106,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
contentInfo = "The " + hrefUrl + " 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";
contentInfoTemp = "The " + baseName + " virtual list you subscribed to has been updated as follows : " + "\r\n"; contentInfoTemp = "The " + baseName + " virtual list you subscribed to has been updated as follows : " + "\r\n";
//拼接维护清单的消息 //拼接维护清单的消息
contentInfo = setContentInfo(contentInfo, baseDiff,null); contentInfo = setContentInfo(contentInfo, baseDiff,contentLog);
contentInfoTemp = setContentInfo(contentInfoTemp, baseDiff,contentLog); contentInfoTemp = setContentInfo(contentInfoTemp, baseDiff,contentLog);
//封装消息的实体类 //封装消息的实体类
SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo); SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java
+6 -6
View File
@@ -141,9 +141,9 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
onlCgformTag.setDbFieldName("grp_" + onlCgformTag.getDbFieldName()); onlCgformTag.setDbFieldName("grp_" + onlCgformTag.getDbFieldName());
} }
if(StringUtils.isNotBlank(onlCgformTag.getDbFieldEnName())){ // if(StringUtils.isNotBlank(onlCgformTag.getDbFieldEnName())){
onlCgformTag.setDbFieldEnName(onlCgformTag.getDbFieldEnName().replace(" ","_")); // onlCgformTag.setDbFieldEnName(onlCgformTag.getDbFieldEnName().replace(" ","_"));
} // }
} }
save(onlCgformTag); save(onlCgformTag);
} }
@@ -196,9 +196,9 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
//字段名称设置成拼音+下划线,存入数据库 //字段名称设置成拼音+下划线,存入数据库
String pinYin = HanYuPinYinUtil.changeToNumberPinYin(onlCgformTag.getDbFieldTxt()); String pinYin = HanYuPinYinUtil.changeToNumberPinYin(onlCgformTag.getDbFieldTxt());
onlCgformTag.setDbFieldName(pinYin.replace(" ","_")); onlCgformTag.setDbFieldName(pinYin.replace(" ","_"));
if(StringUtils.isNotBlank(onlCgformTag.getDbFieldEnName())){ // if(StringUtils.isNotBlank(onlCgformTag.getDbFieldEnName())){
onlCgformTag.setDbFieldEnName(onlCgformTag.getDbFieldEnName().replace(" ","_")); // onlCgformTag.setDbFieldEnName(onlCgformTag.getDbFieldEnName().replace(" ","_"));
} // }
//处理DBLength为null的情况，默认为100 //处理DBLength为null的情况，默认为100
if (onlCgformTag.getDbLength() == null){ if (onlCgformTag.getDbLength() == null){
onlCgformTag.setDbLength(100); onlCgformTag.setDbLength(100);