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

bug51788相关人员导入格式校验+bug51455订阅领域删除消息

Browse Source
This commit is contained in:
xiejunyu
2022-06-07 15:01:43 +08:00
parent 59b9bce658
commit 47d5be0a41
5 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java
+1 -1
View File
@@ -68,7 +68,7 @@ public class SysDictItemController {
// QueryWrapper<SysDictItem> queryWrapper = QueryGenerator.initQueryWrapper(sysDictItem, req.getParameterMap());
Page<SysDictItem> page = new Page<SysDictItem>(pageNo, pageSize);
QueryWrapper<SysDictItem> queryWrapper = new QueryWrapper<>();
queryWrapper.orderByDesc("sort_order")
queryWrapper.orderByAsc("sort_order")
.eq("del_flag",CommonConstant.DEL_FLAG_0)
.eq("dict_id",sysDictItem.getDictId());
if(StringUtils.isNotEmpty(sysDictItem.getItemText())){
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java
+4 -1
View File
@@ -91,6 +91,9 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
QueryWrapper<SysCategory> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("sys_dict_id", sysCategory.getSysDictId()).eq("del_flag",CommonConstant.DEL_FLAG_0);
if(StringUtils.isNotBlank(sysCategory.getPid())){
queryWrapper.eq("pid",sysCategory.getPid());
}
List<SysCategory> sysCategoryList = list(queryWrapper);
List<String> sysCategoryNameList = sysCategoryList.stream().map(e -> e.getName()).collect(Collectors.toList());
if(sysCategoryNameList.contains(sysCategory.getName())){
@@ -422,7 +425,7 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
QueryWrapper<SysCategory> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("sys_dict_id",sysCategory.getSysDictId())
.eq("pid",0)
.orderByDesc("sort_order");
.orderByAsc("sort_order");
List<SysCategory> list = list(queryWrapper);
return list;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+4 -2
View File
@@ -260,6 +260,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
}
//文档动态-------------------
//http://localhost:3000/docManage/library/detail?id=7a10adf4d01248b7a82368c0aed3a03f&wen2_ben3_kuang4=&shu1_ru4_kuang4_lian4_jie1=&serial_number=ceshi20220607&ren2_yuan2_xuan3_ze2=&biao1_zhun3_xuan3_ze2=&title=ceshi20220607&e_e_e=&title_en=ceshi20220607&state=%E7%8E%B0%E8%A1%8C&region=&issue_time=2022-06-07&technology_territory=&shu4_zi4_shu1_ru4_kuang4=&collectFlag=0&subscribeFlag=0
String hrefTemp =category + " " + "<a href='/docManage/library/detail?id=" + id +
"&title=" + title +
"&serial_number=" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>" + " " + titleEn + ",";
@@ -271,7 +272,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
serialNumberList.add(serialNumber);
String href = "<a href='/docManage/library/detail?id=" + id +
"&title=" + title +
"&serial_number=" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>,";
"&serial_number=" + serialNumber;
sb.append(href);
}
}
@@ -301,7 +302,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
List<String> userIdList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
String content = sysUser.getUsername() + " delete " + StringUtils.join(serialNumberList, ",") + ",Please pay attention to check.";
String contentInfo = sysUser.getUsername() + " delete " + sbStr + ",Please pay attention to check.";
// String contentInfo = sysUser.getUsername() + " delete " + sbStr + ",Please pay attention to check.";
String contentInfo =content;
//封装消息的实体类
SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
sysAnnouncementService.saveAnnouncement(sysAnnouncement);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+2 -2
View File
@@ -884,7 +884,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
//实施类别
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getImplementType())) {
List<SysDictItem> implementType = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getValue());
String implementTypeEnName = implementType.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getImplementType())).map(f -> f.getItemText()).collect(Collectors.joining(","));
String implementTypeEnName = implementType.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getImplementType())).map(f -> f.getEnName()).collect(Collectors.joining(","));
dummyInventoryInfoEO.setImplementType(implementTypeEnName);
}else {
dummyInventoryInfoEO.setImplementType("null");
@@ -906,7 +906,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
//认证级别
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationRank())) {
List<SysDictItem> attestationRank = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getValue());
String attestationRankEnName = attestationRank.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getAttestationRank())).map(f -> f.getItemText()).collect(Collectors.joining(","));
String attestationRankEnName = attestationRank.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getAttestationRank())).map(f -> f.getEnName()).collect(Collectors.joining(","));
dummyInventoryInfoEO.setAttestationRank(attestationRankEnName);
}else {
dummyInventoryInfoEO.setAttestationRank("null");
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+7
View File
@@ -724,6 +724,13 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
String fileName = file.getOriginalFilename();
// 获取文件后缀
String prefix = fileName.substring(fileName.lastIndexOf("."));
if(!(prefix.equals(".xls") || prefix.equals(".xlsx"))){
if (CutEnum.CN.getValue().equals(cut)) {
throw new JeroBootException("文件格式错误,请导入.xls或.xlsx格式");
} else {
throw new JeroBootException("The file format is wrong, please import. xls or. xlsx format.");
}
}
File excelFile = File.createTempFile(fileName, prefix);
file.transferTo(excelFile);